Bump to 4.6.0

Currently translated at 100.0% (4613 of 4613 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/de/

powered by weblate

.github/workflows/tests.yml

@@ -18,17 +18,17 @@ jobs:
     name: Tests
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: ["3.7", "3.8", "3.9"]
         database: [sqlite, postgres, mysql]
         exclude:
           - database: mysql
-            python-version: 3.7
-          - database: sqlite
-            python-version: 3.7
+            python-version: "3.8"
           - database: mysql
-            python-version: 3.6
+            python-version: "3.9"
           - database: sqlite
-            python-version: 3.6
+            python-version: "3.7"
+          - database: sqlite
+            python-version: "3.8"
     steps:
       - uses: actions/checkout@v2
       - uses: getong/mariadb-action@v1.1

doc/admin/config.rst

@@ -220,12 +220,30 @@ Example::
 ``user``, ``password``
     The SMTP user data to use for the connection. Empty by default.
 
+``tls``, ``ssl``
+    Use STARTTLS or SSL for the SMTP connection. Off by default.
+
 ``from``
     The email address to set as ``From`` header in outgoing emails by the system.
     Default: ``pretix@localhost``
 
-``tls``, ``ssl``
-    Use STARTTLS or SSL for the SMTP connection. Off by default.
+``from_notifications``
+    The email address to set as ``From`` header in admin notification emails by the system.
+    Defaults to the value of ``from``.
+
+``from_organizers``
+    The email address to set as ``From`` header in outgoing emails by the system sent on behalf of organizers.
+    Defaults to the value of ``from``.
+
+``custom_sender_verification_required``
+    If this is on (the default), organizers need to verify email addresses they want to use as senders in their event.
+
+``custom_sender_spf_string``
+    If this is set to a valid SPF string, pretix will show a warning if organizers use a sender address from a domain
+    that does not include this value.
+
+``custom_smtp_allow_private_networks``
+    If this is off (the default), custom SMTP servers cannot be private network addresses.
 
 ``admins``
     Comma-separated list of email addresses that should receive a report about every error code 500 thrown by pretix.
@@ -282,7 +300,7 @@ You can use an existing memcached server as pretix's caching backend::
 ``location``
     The location of memcached, either a host:port combination or a socket file.
 
-If no memcached is configured, pretix will use Django's built-in local-memory caching method.
+If no memcached is configured, pretix will use redis for caching. If neither is configured, pretix will not use any caching.
 
 .. note:: If you use memcached and you deploy pretix across multiple servers, you should use *one*
           shared memcached instance, not multiple ones, because cache invalidations would not be
@@ -445,8 +463,10 @@ You can configure the maximum file size for uploading various files::
     max_size_image = 12
     ; Max upload size for favicons in MiB, defaults to 1 MiB
     max_size_favicon = 2
-    ; Max upload size for email attachments in MiB, defaults to 10 MiB
+    ; Max upload size for email attachments of manually sent emails in MiB, defaults to 10 MiB
     max_size_email_attachment = 15
+    ; Max upload size for email attachments of automatically sent emails in MiB, defaults to 1 MiB
+    max_size_email_auto_attachment = 2
     ; Max upload size for other files in MiB, defaults to 10 MiB
     ; This includes all file upload type order questions
     max_size_other = 100

doc/admin/installation/manual_smallscale.rst

@@ -142,7 +142,7 @@ If you're running MySQL, also install the client library::
 
     (venv)$ pip3 install mysqlclient
 
-Note that you need Python 3.6 or newer. You can find out your Python version using ``python -V``.
+Note that you need Python 3.7 or newer. You can find out your Python version using ``python -V``.
 
 We also need to create a data directory::
 
@@ -259,14 +259,14 @@ The following snippet is an example on how to configure a nginx proxy for pretix
         }
 
         location /static/ {
-            alias /var/pretix/venv/lib/python3.7/site-packages/pretix/static.dist/;
+            alias /var/pretix/venv/lib/python3.10/site-packages/pretix/static.dist/;
             access_log off;
             expires 365d;
             add_header Cache-Control "public";
         }
     }
 
-.. note:: Remember to replace the ``python3.7`` in the ``/static/`` path in the config 
+.. note:: Remember to replace the ``python3.10`` in the ``/static/`` path in the config
           above with your python version.
 
 We recommend reading about setting `strong encryption settings`_ for your web server.

doc/api/resources/invoices.rst

@@ -58,6 +58,12 @@ lines                                 list of objects            The actual invo
                                                                  created before this field was introduced as well as for
                                                                  all lines not created by a product (e.g. a shipping or
                                                                  cancellation fee).
+├ subevent                            integer                    Event series date ID used to create this line. Note that everything
+                                                                 about the subevent might have changed since the creation
+                                                                 of the invoice. Can be ``null`` for all invoice lines
+                                                                 created before this field was introduced as well as for
+                                                                 all lines not created by a product (e.g. a shipping or
+                                                                 cancellation fee) as well as for all events that are not a series.
 ├ fee_type                            string                     Fee type, e.g. ``shipping``, ``service``, ``payment``,
                                                                  ``cancellation``, ``giftcard``, or ``other. Can be ``null`` for
                                                                  all invoice lines
@@ -120,6 +126,10 @@ internal_reference                    string                     Customer's refe
 
    The attribute ``lines.event_location`` has been added.
 
+.. versionchanged:: 4.6
+
+   The attribute ``lines.subevent`` has been added.
+
 
 Endpoints
 ---------
@@ -185,6 +195,7 @@ Endpoints
                 "description": "Budget Ticket",
                 "item": 1234,
                 "variation": 245,
+                "subevent": null,
                 "fee_type": null,
                 "fee_internal_type": null,
                 "event_date_from": "2017-12-27T10:00:00Z",
@@ -274,6 +285,7 @@ Endpoints
             "description": "Budget Ticket",
             "item": 1234,
             "variation": 245,
+            "subevent": null,
             "fee_type": null,
             "fee_internal_type": null,
             "event_date_from": "2017-12-27T10:00:00Z",

doc/api/resources/item_variations.rst

@@ -24,6 +24,9 @@ active                                boolean                    If ``false``, t
 description                           multi-lingual string       A public description of the variation. May contain
                                                                  Markdown syntax or can be ``null``.
 position                              integer                    An integer, used for sorting
+require_approval                      boolean                    If ``true``, orders with this variation will need to be
+                                                                 approved by the event organizer before they can be
+                                                                 paid.
 require_membership                    boolean                    If ``true``, booking this variation requires an active membership.
 require_membership_hidden             boolean                    If ``true`` and ``require_membership`` is set, this variation will
                                                                  be hidden from users without a valid membership.
@@ -76,6 +79,7 @@ Endpoints
               "en": "S"
             },
             "active": true,
+            "require_approval": false,
             "require_membership": false,
             "require_membership_hidden": false,
             "require_membership_types": [],
@@ -97,6 +101,7 @@ Endpoints
               "en": "L"
             },
             "active": true,
+            "require_approval": false,
             "require_membership": false,
             "require_membership_hidden": false,
             "require_membership_types": [],
@@ -147,6 +152,7 @@ Endpoints
         "price": "10.00",
         "original_price": null,
         "active": true,
+        "require_approval": false,
         "require_membership": false,
         "require_membership_hidden": false,
         "require_membership_types": [],
@@ -183,6 +189,7 @@ Endpoints
         "value": {"en": "Student"},
         "default_price": "10.00",
         "active": true,
+        "require_approval": false,
         "require_membership": false,
         "require_membership_hidden": false,
         "require_membership_types": [],
@@ -209,6 +216,7 @@ Endpoints
         "price": "10.00",
         "original_price": null,
         "active": true,
+        "require_approval": false,
         "require_membership": false,
         "require_membership_hidden": false,
         "require_membership_types": [],
@@ -266,6 +274,7 @@ Endpoints
         "price": "10.00",
         "original_price": null,
         "active": false,
+        "require_approval": false,
         "require_membership": false,
         "require_membership_hidden": false,
         "require_membership_types": [],

doc/api/resources/taxrules.rst

@@ -16,15 +16,22 @@ Field                                 Type                       Description
 ===================================== ========================== =======================================================
 id                                    integer                    Internal ID of the tax rule
 name                                  multi-lingual string       The tax rules' name
+internal_name                         string                     An optional name that is only used in the backend
 rate                                  decimal (string)           Tax rate in percent
 price_includes_tax                    boolean                    If ``true`` (default), tax is assumed to be included in
                                                                  the specified product price
 eu_reverse_charge                     boolean                    If ``true``, EU reverse charge rules are applied
 home_country                          string                     Merchant country (required for reverse charge), can be
                                                                  ``null`` or empty string
+keep_gross_if_rate_changes            boolean                    If ``true``, changes of the tax rate based on custom
+                                                                 rules keep the gross price constant (default is ``false``)
 ===================================== ========================== =======================================================
 
 
+.. versionchanged:: 4.6
+
+    The ``internal_name`` and ``keep_gross_if_rate_changes`` attributes have been added.
+
 Endpoints
 ---------
 
@@ -56,9 +63,11 @@ Endpoints
           {
             "id": 1,
             "name": {"en": "VAT"},
+            "internal_name": "VAT",
             "rate": "19.00",
             "price_includes_tax": true,
             "eu_reverse_charge": false,
+            "keep_gross_if_rate_changes": false,
             "home_country": "DE"
           }
         ]
@@ -94,9 +103,11 @@ Endpoints
       {
         "id": 1,
         "name": {"en": "VAT"},
+        "internal_name": "VAT",
         "rate": "19.00",
         "price_includes_tax": true,
         "eu_reverse_charge": false,
+        "keep_gross_if_rate_changes": false,
         "home_country": "DE"
       }
 
@@ -140,9 +151,11 @@ Endpoints
       {
         "id": 1,
         "name": {"en": "VAT"},
+        "internal_name": "VAT",
         "rate": "19.00",
         "price_includes_tax": true,
         "eu_reverse_charge": false,
+        "keep_gross_if_rate_changes": false,
         "home_country": "DE"
       }
 
@@ -185,9 +198,11 @@ Endpoints
       {
         "id": 1,
         "name": {"en": "VAT"},
+        "internal_name": "VAT",
         "rate": "20.00",
         "price_includes_tax": true,
         "eu_reverse_charge": false,
+        "keep_gross_if_rate_changes": false,
         "home_country": "DE"
       }
 

doc/user/events/email.rst

@@ -203,4 +203,4 @@ Then, please contact support@pretix.eu and we will enable DKIM for your domain o
 
 
 .. _Sender Policy Framework: https://en.wikipedia.org/wiki/Sender_Policy_Framework
-.. _SPF specification: http://www.openspf.org/SPF_Record_Syntax
+.. _SPF specification: http://www.open-spf.org/SPF_Record_Syntax

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.6.0.dev0"
+__version__ = "4.6.0"

src/pretix/api/serializers/event.py

@@ -637,7 +637,7 @@ class SubEventSerializer(I18nAwareModelSerializer):
 class TaxRuleSerializer(CountryFieldMixin, I18nAwareModelSerializer):
     class Meta:
         model = TaxRule
-        fields = ('id', 'name', 'rate', 'price_includes_tax', 'eu_reverse_charge', 'home_country')
+        fields = ('id', 'name', 'rate', 'price_includes_tax', 'eu_reverse_charge', 'home_country', 'internal_name', 'keep_gross_if_rate_changes')
 
 
 class EventSettingsSerializer(SettingsSerializer):
@@ -713,7 +713,6 @@ class EventSettingsSerializer(SettingsSerializer):
         'ticket_download_require_validated_email',
         'ticket_secret_length',
         'mail_prefix',
-        'mail_from',
         'mail_from_name',
         'mail_attach_ical',
         'mail_attach_tickets',

src/pretix/api/serializers/item.py

@@ -58,8 +58,9 @@ class InlineItemVariationSerializer(I18nAwareModelSerializer):
     class Meta:
         model = ItemVariation
         fields = ('id', 'value', 'active', 'description',
-                  'position', 'default_price', 'price', 'original_price',
-                  'require_membership', 'require_membership_types', 'require_membership_hidden', 'available_from', 'available_until',
+                  'position', 'default_price', 'price', 'original_price', 'require_approval',
+                  'require_membership', 'require_membership_types',
+                  'require_membership_hidden', 'available_from', 'available_until',
                   'sales_channels', 'hide_without_voucher',)
 
     def __init__(self, *args, **kwargs):
@@ -74,8 +75,9 @@ class ItemVariationSerializer(I18nAwareModelSerializer):
     class Meta:
         model = ItemVariation
         fields = ('id', 'value', 'active', 'description',
-                  'position', 'default_price', 'price', 'original_price',
-                  'require_membership', 'require_membership_types', 'require_membership_hidden', 'available_from', 'available_until',
+                  'position', 'default_price', 'price', 'original_price', 'require_approval',
+                  'require_membership', 'require_membership_types',
+                  'require_membership_hidden', 'available_from', 'available_until',
                   'sales_channels', 'hide_without_voucher',)
 
     def __init__(self, *args, **kwargs):

src/pretix/api/serializers/order.py

@@ -1426,7 +1426,7 @@ class InlineInvoiceLineSerializer(I18nAwareModelSerializer):
 
     class Meta:
         model = InvoiceLine
-        fields = ('position', 'description', 'item', 'variation', 'attendee_name', 'event_date_from',
+        fields = ('position', 'description', 'item', 'variation', 'subevent', 'attendee_name', 'event_date_from',
                   'event_date_to', 'gross_value', 'tax_value', 'tax_rate', 'tax_name', 'fee_type',
                   'fee_internal_type', 'event_location')
 

src/pretix/base/auth.py

@@ -146,7 +146,8 @@ class NativeAuthBackend(BaseAuthBackend):
         d = OrderedDict([
             ('email', forms.EmailField(label=_("E-mail"), max_length=254,
                                        widget=forms.EmailInput(attrs={'autofocus': 'autofocus'}))),
-            ('password', forms.CharField(label=_("Password"), widget=forms.PasswordInput)),
+            ('password', forms.CharField(label=_("Password"), widget=forms.PasswordInput,
+                                         max_length=4096)),
         ])
         return d
 

src/pretix/base/forms/__init__.py

@@ -118,6 +118,27 @@ class SettingsForm(i18nfield.forms.I18nFormMixin, HierarkeyForm):
                 self.cleaned_data[k] = self.initial[k]
         return super().save()
 
+    def clean(self):
+        d = super().clean()
+
+        # There is logic in HierarkeyForm.save() to only persist fields that changed. HierarkeyForm determines if
+        # something changed by comparing `self._s.get(name)` to `value`. This leaves an edge case open for multi-lingual
+        # text fields. On the very first load, the initial value in `self._s.get(name)` will be a LazyGettextProxy-based
+        # string. However, only some of the languages are usually visible, so even if the user does not change anything
+        # at all, it will be considered a changed value and stored. We do not want that, as it makes it very hard to add
+        # languages to an organizer/event later on. So we trick it and make sure nothing gets changed in that situation.
+        for name, field in self.fields.items():
+            if isinstance(field, i18nfield.forms.I18nFormField):
+                value = d.get(name)
+                if not value:
+                    continue
+
+                current = self._s.get(name, as_type=type(value))
+                if name not in self.changed_data:
+                    d[name] = current
+
+        return d
+
     def get_new_filename(self, name: str) -> str:
         from pretix.base.models import Event
 

src/pretix/base/forms/auth.py

@@ -154,6 +154,7 @@ class RegistrationForm(forms.Form):
         widget=forms.PasswordInput(attrs={
             'autocomplete': 'new-password'  # see https://bugs.chromium.org/p/chromium/issues/detail?id=370363#c7
         }),
+        max_length=4096,
         required=True
     )
     password_repeat = forms.CharField(
@@ -161,6 +162,7 @@ class RegistrationForm(forms.Form):
         widget=forms.PasswordInput(attrs={
             'autocomplete': 'new-password'  # see https://bugs.chromium.org/p/chromium/issues/detail?id=370363#c7
         }),
+        max_length=4096,
         required=True
     )
     keep_logged_in = forms.BooleanField(label=_("Keep me logged in"), required=False)
@@ -204,11 +206,13 @@ class PasswordRecoverForm(forms.Form):
     password = forms.CharField(
         label=_('Password'),
         widget=forms.PasswordInput,
+        max_length=4096,
         required=True
     )
     password_repeat = forms.CharField(
         label=_('Repeat password'),
-        widget=forms.PasswordInput
+        widget=forms.PasswordInput,
+        max_length=4096,
     )
 
     def __init__(self, user_id=None, *args, **kwargs):

src/pretix/base/forms/questions.py

@@ -333,23 +333,41 @@ class WrappedPhoneNumberPrefixWidget(PhoneNumberPrefixWidget):
 def guess_country(event):
     # Try to guess the initial country from either the country of the merchant
     # or the locale. This will hopefully save at least some users some scrolling :)
-    locale = get_language_without_region()
     country = event.settings.region or event.settings.invoice_address_from_country
     if not country:
-        valid_countries = countries.countries
-        if '-' in locale:
-            parts = locale.split('-')
-            # TODO: does this actually work?
-            if parts[1].upper() in valid_countries:
-                country = Country(parts[1].upper())
-            elif parts[0].upper() in valid_countries:
-                country = Country(parts[0].upper())
-        else:
-            if locale.upper() in valid_countries:
-                country = Country(locale.upper())
+        country = get_country_by_locale(get_language_without_region())
     return country
 
 
+def get_country_by_locale(locale):
+    country = None
+    valid_countries = countries.countries
+    if '-' in locale:
+        parts = locale.split('-')
+        # TODO: does this actually work?
+        if parts[1].upper() in valid_countries:
+            country = Country(parts[1].upper())
+        elif parts[0].upper() in valid_countries:
+            country = Country(parts[0].upper())
+    else:
+        if locale.upper() in valid_countries:
+            country = Country(locale.upper())
+    return country
+
+
+def guess_phone_prefix(event):
+    with language(get_babel_locale()):
+        country = str(guess_country(event))
+        return get_phone_prefix(country)
+
+
+def get_phone_prefix(country):
+    for prefix, values in _COUNTRY_CODE_TO_REGION_CODE.items():
+        if country in values:
+            return prefix
+    return None
+
+
 class QuestionCheckboxSelectMultiple(forms.CheckboxSelectMultiple):
     option_template_name = 'pretixbase/forms/widgets/checkbox_option_with_links.html'
 
@@ -780,25 +798,26 @@ class BaseQuestionsForm(forms.Form):
                 if q.valid_datetime_max:
                     field.validators.append(MaxDateTimeValidator(q.valid_datetime_max))
             elif q.type == Question.TYPE_PHONENUMBER:
-                with language(get_babel_locale()):
-                    default_country = guess_country(event)
-                    default_prefix = None
-                    for prefix, values in _COUNTRY_CODE_TO_REGION_CODE.items():
-                        if str(default_country) in values:
-                            default_prefix = prefix
+                if initial:
                     try:
-                        initial = PhoneNumber().from_string(initial.answer) if initial else "+{}.".format(default_prefix)
+                        initial = PhoneNumber().from_string(initial.answer)
                     except NumberParseException:
                         initial = None
-                    field = PhoneNumberField(
-                        label=label, required=required,
-                        help_text=help_text,
-                        # We now exploit an implementation detail in PhoneNumberPrefixWidget to allow us to pass just
-                        # a country code but no number as an initial value. It's a bit hacky, but should be stable for
-                        # the future.
-                        initial=initial,
-                        widget=WrappedPhoneNumberPrefixWidget()
-                    )
+
+                if not initial:
+                    phone_prefix = guess_phone_prefix(event)
+                    if phone_prefix:
+                        initial = "+{}.".format(phone_prefix)
+
+                field = PhoneNumberField(
+                    label=label, required=required,
+                    help_text=help_text,
+                    # We now exploit an implementation detail in PhoneNumberPrefixWidget to allow us to pass just
+                    # a country code but no number as an initial value. It's a bit hacky, but should be stable for
+                    # the future.
+                    initial=initial,
+                    widget=WrappedPhoneNumberPrefixWidget()
+                )
             field.question = q
             if answers:
                 # Cache the answer object for later use

src/pretix/base/forms/widgets.py

@@ -86,14 +86,6 @@ class TimePickerWidget(forms.TimeInput):
 
 class UploadedFileWidget(forms.ClearableFileInput):
     def __init__(self, *args, **kwargs):
-        # Browsers can't recognize that the server already has a file uploaded
-        # Don't mark this input as being required if we already have an answer
-        # (this needs to be done via the attrs, otherwise we wouldn't get the "required" star on the field label)
-        attrs = kwargs.get('attrs', {})
-        if kwargs.get('required') and kwargs.get('initial'):
-            attrs.update({'required': None})
-        kwargs.update({'attrs': attrs})
-
         self.position = kwargs.pop('position')
         self.event = kwargs.pop('event')
         self.answer = kwargs.pop('answer')
@@ -125,6 +117,15 @@ class UploadedFileWidget(forms.ClearableFileInput):
                     'answer': self.answer.pk,
                 })
 
+    def get_context(self, name, value, attrs):
+        # Browsers can't recognize that the server already has a file uploaded
+        # Don't mark this input as being required if we already have an answer
+        # (this needs to be done via the attrs, otherwise we wouldn't get the "required" star on the field label)
+        ctx = super().get_context(name, value, attrs)
+        if ctx['widget']['is_initial']:
+            ctx['widget']['attrs']['required'] = False
+        return ctx
+
     def format_value(self, value):
         if self.is_initial(value):
             return self.FakeFile(value, self.position, self.event, self.answer)

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

@@ -23,7 +23,9 @@ from decimal import Decimal
 
 from django.core.management.base import BaseCommand
 from django.db import models
-from django.db.models import Case, F, OuterRef, Q, Subquery, Sum, Value, When
+from django.db.models import (
+    Case, Count, F, OuterRef, Q, Subquery, Sum, Value, When,
+)
 from django.db.models.functions import Coalesce
 from django_scopes import scopes_disabled
 
@@ -45,6 +47,18 @@ class Command(BaseCommand):
                     output_field=models.DecimalField(decimal_places=2, max_digits=10)
                 ), Value(0), output_field=models.DecimalField(decimal_places=2, max_digits=10)
             ),
+            position_cnt=Case(
+                When(Q(status__in=('e', 'c')) | Q(require_approval=True), then=Value(0)),
+                default=Coalesce(
+                    Subquery(
+                        OrderPosition.objects.filter(
+                            order=OuterRef('pk')
+                        ).order_by().values('order').annotate(p=Count('*')).values('p'),
+                        output_field=models.IntegerField()
+                    ), Value(0), output_field=models.IntegerField()
+                ),
+                output_field=models.IntegerField()
+            ),
             fee_total=Coalesce(
                 Subquery(
                     OrderFee.objects.filter(
@@ -61,6 +75,15 @@ class Command(BaseCommand):
                     output_field=models.DecimalField(decimal_places=2, max_digits=10)
                 ), Value(0), output_field=models.DecimalField(decimal_places=2, max_digits=10)
             ),
+            tx_cnt=Coalesce(
+                Subquery(
+                    Transaction.objects.filter(
+                        order=OuterRef('pk'),
+                        item__isnull=False,
+                    ).order_by().values('order').annotate(p=Sum(F('count'))).values('p'),
+                    output_field=models.DecimalField(decimal_places=2, max_digits=10)
+                ), Value(0), output_field=models.DecimalField(decimal_places=2, max_digits=10)
+            ),
         ).annotate(
             correct_total=Case(
                 When(Q(status=Order.STATUS_CANCELED) | Q(status=Order.STATUS_EXPIRED) | Q(require_approval=True),
@@ -70,13 +93,15 @@ class Command(BaseCommand):
             ),
         ).exclude(
             total=F('position_total') + F('fee_total'),
-            tx_total=F('correct_total')
+            tx_total=F('correct_total'),
+            tx_cnt=F('position_cnt')
         ).select_related('event')
         for o in qs:
-            if abs(o.tx_total - o.correct_total) < Decimal('0.00001') and abs(o.position_total + o.fee_total - o.total) < Decimal('0.00001'):
+            if abs(o.tx_total - o.correct_total) < Decimal('0.00001') and abs(o.position_total + o.fee_total - o.total) < Decimal('0.00001') \
+                    and o.tx_cnt == o.position_cnt:
                 # Ignore SQLite which treats Decimals like floats…
                 continue
             print(f"Error in order {o.full_code}: status={o.status}, sum(positions)+sum(fees)={o.position_total + o.fee_total}, "
-                  f"order.total={o.total}, sum(transactions)={o.tx_total}, expected={o.correct_total}")
+                  f"order.total={o.total}, sum(transactions)={o.tx_total}, expected={o.correct_total}, pos_cnt={o.position_cnt}, tx_pos_cnt={o.tx_cnt}")
 
         self.stderr.write(self.style.SUCCESS(f'Check completed.'))

src/pretix/base/migrations/0205_itemvariation_require_approval.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.9 on 2021-12-13 14:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0204_orderposition_backfill_is_bundled'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='itemvariation',
+            name='require_approval',
+            field=models.BooleanField(default=False),
+        ),
+    ]

src/pretix/base/migrations/0206_customer_phone.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.9 on 2022-01-12 10:59
+
+import phonenumber_field.modelfields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0205_itemvariation_require_approval'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='customer',
+            name='phone',
+            field=phonenumber_field.modelfields.PhoneNumberField(max_length=128, null=True, region=None),
+        ),
+    ]

src/pretix/base/migrations/0207_auto_20220119_1427.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.4 on 2022-01-19 14:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0206_customer_phone'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='taxrule',
+            name='internal_name',
+            field=models.CharField(max_length=190, null=True),
+        ),
+        migrations.AddField(
+            model_name='taxrule',
+            name='keep_gross_if_rate_changes',
+            field=models.BooleanField(default=False),
+        ),
+    ]

src/pretix/base/models/customers.py

@@ -29,6 +29,7 @@ from django.db.models import F, Q
 from django.utils.crypto import get_random_string, salted_hmac
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes import ScopedManager, scopes_disabled
+from phonenumber_field.modelfields import PhoneNumberField
 
 from pretix.base.banlist import banned
 from pretix.base.models.base import LoggedModel
@@ -45,6 +46,7 @@ class Customer(LoggedModel):
     organizer = models.ForeignKey(Organizer, related_name='customers', on_delete=models.CASCADE)
     identifier = models.CharField(max_length=190, db_index=True, unique=True)
     email = models.EmailField(db_index=True, null=True, blank=False, verbose_name=_('E-mail'), max_length=190)
+    phone = PhoneNumberField(null=True, blank=True, verbose_name=_('Phone number'))
     password = models.CharField(verbose_name=_('Password'), max_length=128)
     name_cached = models.CharField(max_length=255, verbose_name=_('Full name'), blank=True)
     name_parts = models.JSONField(default=dict)
@@ -87,6 +89,7 @@ class Customer(LoggedModel):
         self.name_parts = {}
         self.name_cached = ''
         self.email = None
+        self.phone = None
         self.save()
         self.all_logentries().update(data={}, shredded=True)
         self.orders.all().update(customer=None)

src/pretix/base/models/event.py

@@ -665,13 +665,13 @@ class Event(EventMixin, LoggedModel):
 
         return locking.LockManager(self)
 
-    def get_mail_backend(self, timeout=None, force_custom=False):
+    def get_mail_backend(self, timeout=None):
         """
         Returns an email server connection, either by using the system-wide connection
         or by returning a custom one based on the event's settings.
         """
 
-        if self.settings.smtp_use_custom or force_custom:
+        if self.settings.smtp_use_custom:
             return get_connection(backend=settings.EMAIL_CUSTOM_SMTP_BACKEND,
                                   host=self.settings.smtp_host,
                                   port=self.settings.smtp_port,

src/pretix/base/models/items.py

@@ -764,6 +764,9 @@ class ItemVariation(models.Model):
     :type default_price: decimal.Decimal
     :param original_price: The item's "original" price. Will not be used for any calculations, will just be shown.
     :type original_price: decimal.Decimal
+    :param require_approval: If set to ``True``, orders containing this variation can only be processed and paid after
+    approval by an administrator
+    :type require_approval: bool
     """
     item = models.ForeignKey(
         Item,
@@ -799,6 +802,13 @@ class ItemVariation(models.Model):
         help_text=_('If set, this will be displayed next to the current price to show that the current price is a '
                     'discounted one. This is just a cosmetic setting and will not actually impact pricing.')
     )
+    require_approval = models.BooleanField(
+        verbose_name=_('Require approval'),
+        default=False,
+        help_text=_('If this variation is part of an order, the order will be put into an "approval" state and '
+                    'will need to be confirmed by you before it can be paid and completed. You can use this e.g. for '
+                    'discounted tickets that are only available to specific groups.'),
+    )
     require_membership = models.BooleanField(
         verbose_name=_('Require a valid membership'),
         default=False,
@@ -832,7 +842,7 @@ class ItemVariation(models.Model):
         blank=True,
     )
     hide_without_voucher = models.BooleanField(
-        verbose_name=_('This variation will only be shown if a voucher matching the product is redeemed.'),
+        verbose_name=_('Show only if a matching voucher is redeemed.'),
         default=False,
         help_text=_('This variation will be hidden from the event page until the user enters a voucher '
                     'that unlocks this variation.')

src/pretix/base/models/orders.py

@@ -950,7 +950,7 @@ class Order(LockModel, LoggedModel):
                   context: Dict[str, Any]=None, log_entry_type: str='pretix.event.order.email.sent',
                   user: User=None, headers: dict=None, sender: str=None, invoices: list=None,
                   auth=None, attach_tickets=False, position: 'OrderPosition'=None, auto_email=True,
-                  attach_ical=False):
+                  attach_ical=False, attach_other_files: list=None):
         """
         Sends an email to the user that placed this order. Basically, this method does two things:
 
@@ -994,7 +994,8 @@ class Order(LockModel, LoggedModel):
                     recipient, subject, template, context,
                     self.event, self.locale, self, headers=headers, sender=sender,
                     invoices=invoices, attach_tickets=attach_tickets,
-                    position=position, auto_email=auto_email, attach_ical=attach_ical
+                    position=position, auto_email=auto_email, attach_ical=attach_ical,
+                    attach_other_files=attach_other_files,
                 )
             except SendMailException:
                 raise
@@ -1441,6 +1442,15 @@ class AbstractPosition(models.Model):
         lines = [r.strip() for r in lines if r]
         return '\n'.join(lines).strip()
 
+    def requires_approval(self, invoice_address=None):
+        if self.item.require_approval:
+            return True
+        if self.variation and self.variation.require_approval:
+            return True
+        if self.item.tax_rule and self.item.tax_rule._require_approval(invoice_address):
+            return True
+        return False
+
 
 class OrderPayment(models.Model):
     """
@@ -2316,7 +2326,7 @@ class OrderPosition(AbstractPosition):
     def send_mail(self, subject: str, template: Union[str, LazyI18nString],
                   context: Dict[str, Any]=None, log_entry_type: str='pretix.event.order.email.sent',
                   user: User=None, headers: dict=None, sender: str=None, invoices: list=None,
-                  auth=None, attach_tickets=False, attach_ical=False):
+                  auth=None, attach_tickets=False, attach_ical=False, attach_other_files: list=None):
         """
         Sends an email to the attendee. Basically, this method does two things:
 
@@ -2357,6 +2367,7 @@ class OrderPosition(AbstractPosition):
                     invoices=invoices,
                     attach_tickets=attach_tickets,
                     attach_ical=attach_ical,
+                    attach_other_files=attach_other_files,
                 )
             except SendMailException:
                 raise

src/pretix/base/models/organizer.py

@@ -191,12 +191,12 @@ class Organizer(LoggedModel):
             e.delete()
         self.teams.all().delete()
 
-    def get_mail_backend(self, timeout=None, force_custom=False):
+    def get_mail_backend(self, timeout=None):
         """
         Returns an email server connection, either by using the system-wide connection
         or by returning a custom one based on the organizer's settings.
         """
-        if self.settings.smtp_use_custom or force_custom:
+        if self.settings.smtp_use_custom:
             return get_connection(backend=settings.EMAIL_CUSTOM_SMTP_BACKEND,
                                   host=self.settings.smtp_host,
                                   port=self.settings.smtp_port,

src/pretix/base/models/tax.py

@@ -81,6 +81,15 @@ class TaxedPrice:
             name=self.name,
         )
 
+    def __eq__(self, other):
+        return (
+            self.gross == other.gross and
+            self.net == other.net and
+            self.tax == other.tax and
+            self.rate == other.rate and
+            self.name == other.name
+        )
+
 
 TAXED_ZERO = TaxedPrice(
     gross=Decimal('0.00'),
@@ -127,8 +136,13 @@ def cc_to_vat_prefix(country_code):
 
 class TaxRule(LoggedModel):
     event = models.ForeignKey('Event', related_name='tax_rules', on_delete=models.CASCADE)
+    internal_name = models.CharField(
+        verbose_name=_('Internal name'),
+        max_length=190,
+        null=True, blank=True,
+    )
     name = I18nCharField(
-        verbose_name=_('Name'),
+        verbose_name=_('Official name'),
         help_text=_('Should be short, e.g. "VAT"'),
         max_length=190,
     )
@@ -141,6 +155,10 @@ class TaxRule(LoggedModel):
         verbose_name=_("The configured product prices include the tax amount"),
         default=True,
     )
+    keep_gross_if_rate_changes = models.BooleanField(
+        verbose_name=_("Keep gross amount constant if the tax rate changes based on the invoice address"),
+        default=False,
+    )
     eu_reverse_charge = models.BooleanField(
         verbose_name=_("Use EU reverse charge taxation rules"),
         default=False,
@@ -198,6 +216,8 @@ class TaxRule(LoggedModel):
             s = _('plus {rate}% {name}').format(rate=self.rate, name=self.name)
         if self.eu_reverse_charge:
             s += ' ({})'.format(_('reverse charge enabled'))
+        if self.internal_name:
+            return f'{self.internal_name} ({s})'
         return str(s)
 
     @property
@@ -211,7 +231,7 @@ class TaxRule(LoggedModel):
             rule = self.get_matching_rule(invoice_address)
             if rule.get('action', 'vat') == 'block':
                 raise self.SaleNotAllowed()
-            if rule.get('action', 'vat') == 'vat' and rule.get('rate') is not None:
+            if rule.get('action', 'vat') in ('vat', 'require_approval') and rule.get('rate') is not None:
                 return Decimal(rule.get('rate'))
         return Decimal(self.rate)
 
@@ -228,13 +248,19 @@ class TaxRule(LoggedModel):
             rate = override_tax_rate
         elif invoice_address:
             adjust_rate = self.tax_rate_for(invoice_address)
-            if (adjust_rate == gross_price_is_tax_rate or force_fixed_gross_price) and base_price_is == 'gross':
+            if (adjust_rate == gross_price_is_tax_rate or force_fixed_gross_price or self.keep_gross_if_rate_changes) and base_price_is == 'gross':
                 rate = adjust_rate
             elif adjust_rate != rate:
-                normal_price = self.tax(base_price, base_price_is, currency, subtract_from_gross=subtract_from_gross)
-                base_price = normal_price.net
-                base_price_is = 'net'
-                subtract_from_gross = Decimal('0.00')
+                if self.keep_gross_if_rate_changes:
+                    normal_price = self.tax(base_price, base_price_is, currency, subtract_from_gross=subtract_from_gross)
+                    base_price = normal_price.gross
+                    base_price_is = 'gross'
+                    subtract_from_gross = Decimal('0.00')
+                else:
+                    normal_price = self.tax(base_price, base_price_is, currency, subtract_from_gross=subtract_from_gross)
+                    base_price = normal_price.net
+                    base_price_is = 'net'
+                    subtract_from_gross = Decimal('0.00')
                 rate = adjust_rate
 
         if rate == Decimal('0.00'):
@@ -337,12 +363,19 @@ class TaxRule(LoggedModel):
 
         return False
 
+    def _require_approval(self, invoice_address):
+        if self._custom_rules:
+            rule = self.get_matching_rule(invoice_address)
+            if rule.get('action', 'vat') == 'require_approval':
+                return True
+        return False
+
     def _tax_applicable(self, invoice_address):
         if self._custom_rules:
             rule = self.get_matching_rule(invoice_address)
             if rule.get('action', 'vat') == 'block':
                 raise self.SaleNotAllowed()
-            return rule.get('action', 'vat') == 'vat'
+            return rule.get('action', 'vat') in ('vat', 'require_approval')
 
         if not self.eu_reverse_charge:
             # No reverse charge rules? Always apply VAT!

src/pretix/base/reldate.py

@@ -273,6 +273,11 @@ class RelativeDateTimeField(forms.MultiValueField):
                 minutes_before=None
             ))
 
+    def has_changed(self, initial, data):
+        if initial is None:
+            initial = self.widget.decompress(initial)
+        return super().has_changed(initial, data)
+
     def clean(self, value):
         if value[0] == 'absolute' and not value[1]:
             raise ValidationError(self.error_messages['incomplete'])

src/pretix/base/services/cart.py

@@ -426,10 +426,10 @@ class CartManager:
                 if not cp.includes_tax:
                     price = self._get_price(cp.item, cp.variation, cp.voucher, cp.price, cp.subevent,
                                             cp_is_net=True, bundled_sum=bundled_sum)
-                    price = TaxedPrice(net=price.net, gross=price.net, rate=0, tax=0, name='')
+                    price = TaxedPrice(net=price.net, gross=price.net, rate=Decimal('0'), tax=Decimal('0'), name='')
                     pbv = self._get_price(cp.item, cp.variation, None, cp.price, cp.subevent,
                                           cp_is_net=True, bundled_sum=bundled_sum)
-                    pbv = TaxedPrice(net=pbv.net, gross=pbv.net, rate=0, tax=0, name='')
+                    pbv = TaxedPrice(net=pbv.net, gross=pbv.net, rate=Decimal('0'), tax=Decimal('0'), name='')
                 else:
                     price = self._get_price(cp.item, cp.variation, cp.voucher, cp.price, cp.subevent,
                                             bundled_sum=bundled_sum)
@@ -1106,10 +1106,11 @@ def update_tax_rates(event: Event, cart_id: str, invoice_address: InvoiceAddress
         rate = pos.item.tax_rule.tax_rate_for(invoice_address)
 
         if pos.tax_rate != rate:
-            current_net = pos.price - pos.tax_value
-            new_gross = pos.item.tax(current_net, base_price_is='net', invoice_address=invoice_address).gross
-            totaldiff += new_gross - pos.price
-            pos.price = new_gross
+            if not pos.item.tax_rule.keep_gross_if_rate_changes:
+                current_net = pos.price - pos.tax_value
+                new_gross = pos.item.tax(current_net, base_price_is='net', invoice_address=invoice_address).gross
+                totaldiff += new_gross - pos.price
+                pos.price = new_gross
             pos.includes_tax = rate != Decimal('0.00')
             pos.override_tax_rate = rate
             pos.save(update_fields=['price', 'includes_tax', 'override_tax_rate'])

src/pretix/base/services/invoices.py

@@ -102,7 +102,7 @@ def build_invoice(invoice: Invoice) -> Invoice:
             payment = ""
         if invoice.event.settings.invoice_include_expire_date and invoice.order.status == Order.STATUS_PENDING:
             if payment:
-                payment += "<br />"
+                payment += "<br /><br />"
             payment += pgettext("invoice", "Please complete your payment before {expire_date}.").format(
                 expire_date=date_format(invoice.order.expires, "SHORT_DATE_FORMAT")
             )

src/pretix/base/services/mail.py

@@ -35,6 +35,7 @@
 import hashlib
 import inspect
 import logging
+import mimetypes
 import os
 import re
 import smtplib
@@ -51,6 +52,7 @@ from bs4 import BeautifulSoup
 from celery import chain
 from celery.exceptions import MaxRetriesExceededError
 from django.conf import settings
+from django.core.files.storage import default_storage
 from django.core.mail import (
     EmailMultiAlternatives, SafeMIMEMultipart, get_connection,
 )
@@ -73,6 +75,7 @@ from pretix.base.services.tasks import TransactionAwareTask
 from pretix.base.services.tickets import get_tickets_for_order
 from pretix.base.signals import email_filter, global_email_filter
 from pretix.celery_app import app
+from pretix.helpers.hierarkey import clean_filename
 from pretix.multidomain.urlreverse import build_absolute_uri
 from pretix.presale.ical import get_ical
 
@@ -94,7 +97,7 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
          context: Dict[str, Any] = None, event: Event = None, locale: str = None, order: Order = None,
          position: OrderPosition = None, *, headers: dict = None, sender: str = None, organizer: Organizer = None,
          customer: Customer = None, invoices: Sequence = None, attach_tickets=False, auto_email=True, user=None,
-         attach_ical=False, attach_cached_files: Sequence = None):
+         attach_ical=False, attach_cached_files: Sequence = None, attach_other_files: list=None):
     """
     Sends out an email to a user. The mail will be sent synchronously or asynchronously depending on the installation.
 
@@ -142,6 +145,8 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
 
     :param attach_cached_files: A list of cached file to attach to this email.
 
+    :param attach_other_files: A list of file paths on our storage to attach.
+
     :raises MailOrderException: on obvious, immediate failures. Not raising an exception does not necessarily mean
         that the email has been sent, just that it has been queued by the email backend.
     """
@@ -212,7 +217,8 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
                 for bcc_mail in settings_holder.settings.mail_bcc.split(','):
                     bcc.append(bcc_mail.strip())
 
-            if settings_holder.settings.mail_from == settings.DEFAULT_FROM_EMAIL and settings_holder.settings.contact_mail and not headers.get('Reply-To'):
+            if settings_holder.settings.mail_from not in (settings.DEFAULT_FROM_EMAIL, settings.MAIL_FROM_ORGANIZERS) \
+                    and settings_holder.settings.contact_mail and not headers.get('Reply-To'):
                 headers['Reply-To'] = settings_holder.settings.contact_mail
 
             prefix = settings_holder.settings.get('mail_prefix')
@@ -301,6 +307,7 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
             organizer=organizer.pk if organizer else None,
             customer=customer.pk if customer else None,
             attach_cached_files=[(cf.id if isinstance(cf, CachedFile) else cf) for cf in attach_cached_files] if attach_cached_files else [],
+            attach_other_files=attach_other_files,
         )
 
         if invoices:
@@ -338,7 +345,8 @@ class CustomEmail(EmailMultiAlternatives):
 def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: str, sender: str,
                    event: int = None, position: int = None, headers: dict = None, bcc: List[str] = None,
                    invoices: List[int] = None, order: int = None, attach_tickets=False, user=None,
-                   organizer=None, customer=None, attach_ical=False, attach_cached_files: List[int] = None) -> bool:
+                   organizer=None, customer=None, attach_ical=False, attach_cached_files: List[int] = None,
+                   attach_other_files: List[str] = None) -> bool:
     email = CustomEmail(subject, body, sender, to=to, bcc=bcc, headers=headers)
     if html is not None:
         html_message = SafeMIMEMultipart(_subtype='related', encoding=settings.DEFAULT_CHARSET)
@@ -455,6 +463,20 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
                         logger.exception('Could not attach invoice to email')
                         pass
 
+        if attach_other_files:
+            for fname in attach_other_files:
+                ftype, _ = mimetypes.guess_type(fname)
+                data = default_storage.open(fname).read()
+                try:
+                    email.attach(
+                        clean_filename(os.path.basename(fname)),
+                        data,
+                        ftype
+                    )
+                except:
+                    logger.exception('Could not attach file to email')
+                    pass
+
         if attach_cached_files:
             for cf in CachedFile.objects.filter(id__in=attach_cached_files):
                 if cf.file:

src/pretix/base/services/notifications.py

@@ -148,7 +148,7 @@ def send_notification_mail(notification: Notification, user: User):
         ),
         'body': body_plain,
         'html': body_html,
-        'sender': settings.MAIL_FROM,
+        'sender': settings.MAIL_FROM_NOTIFICATIONS,
         'headers': {},
         'user': user.pk
     })

src/pretix/base/services/orders.py

@@ -700,7 +700,7 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
                                 invoice_address=address, force_custom_price=True, max_discount=max_discount)
                 changed_prices[cp.pk] = bprice
             else:
-                bundled_sum = 0
+                bundled_sum = Decimal('0.00')
                 if not cp.addon_to_id:
                     for bundledp in cp.addons.all():
                         if bundledp.is_bundled:
@@ -856,7 +856,7 @@ def _create_order(event: Event, email: str, positions: List[CartPosition], now_d
             total=total,
             testmode=True if sales_channel.testmode_supported and event.testmode else False,
             meta_info=json.dumps(meta_info or {}),
-            require_approval=any(p.item.require_approval for p in positions),
+            require_approval=any(p.requires_approval(invoice_address=address) for p in positions),
             sales_channel=sales_channel.identifier,
             customer=customer,
         )
@@ -941,7 +941,10 @@ def _order_placed_email(event: Event, order: Order, pprov: BasePaymentProvider,
             log_entry,
             invoices=[invoice] if invoice and event.settings.invoice_email_attachment else [],
             attach_tickets=True,
-            attach_ical=event.settings.mail_attach_ical
+            attach_ical=event.settings.mail_attach_ical,
+            attach_other_files=[a for a in [
+                event.settings.get('mail_attachment_new_order', as_type=str, default='')[len('file://'):]
+            ] if a],
         )
     except SendMailException:
         logger.exception('Order received email could not be sent')
@@ -958,7 +961,10 @@ def _order_placed_email_attendee(event: Event, order: Order, position: OrderPosi
             invoices=[],
             attach_tickets=True,
             position=position,
-            attach_ical=event.settings.mail_attach_ical
+            attach_ical=event.settings.mail_attach_ical,
+            attach_other_files=[a for a in [
+                event.settings.get('mail_attachment_new_order', as_type=str, default='')[len('file://'):]
+            ] if a],
         )
     except SendMailException:
         logger.exception('Order received email could not be sent to attendee')
@@ -2065,7 +2071,7 @@ class OrderChangeManager:
         split_order.code = None
         split_order.datetime = now()
         split_order.secret = generate_secret()
-        split_order.require_approval = self.order.require_approval and any(p.item.require_approval for p in split_positions)
+        split_order.require_approval = self.order.require_approval and any(p.requires_approval(invoice_address=self._invoice_address) for p in split_positions)
         split_order.save()
         split_order.log_action('pretix.event.order.changed.split_from', user=self.user, auth=self.auth, data={
             'original_order': self.order.code

src/pretix/base/services/quotas.py

@@ -113,10 +113,8 @@ class QuotaAvailability:
         be a few minutes outdated. In this case, you may not rely on the results in the ``count_*`` properties.
         """
         now_dt = now_dt or now()
-        quotas = list(set(self._queue))
-        quotas_original = list(self._queue)
-        self._queue.clear()
-        if not quotas:
+        quota_ids_set = {q.id for q in self._queue}
+        if not quota_ids_set:
             return
 
         if allow_cache:
@@ -129,7 +127,7 @@ class QuotaAvailability:
             elif settings.HAS_REDIS:
                 rc = get_redis_connection("redis")
                 quotas_by_event = defaultdict(list)
-                for q in quotas_original:
+                for q in [_q for _q in self._queue if _q.id in quota_ids_set]:
                     quotas_by_event[q.event_id].append(q)
 
                 for eventid, evquotas in quotas_by_event.items():
@@ -139,16 +137,19 @@ class QuotaAvailability:
                             data = [rv for rv in redisval.decode().split(',')]
                             # Except for some rare situations, we don't want to use cache entries older than 2 minutes
                             if time.time() - int(data[2]) < 120 or allow_cache_stale:
-                                quotas_original.remove(q)
-                                quotas.remove(q)
+                                quota_ids_set.remove(q.id)
                                 if data[1] == "None":
                                     self.results[q] = int(data[0]), None
                                 else:
                                     self.results[q] = int(data[0]), int(data[1])
 
-        if not quotas:
+        if not quota_ids_set:
             return
 
+        quotas = [_q for _q in self._queue if _q.id in quota_ids_set]
+        quotas_original = list(quotas)
+        self._queue.clear()
+
         self._compute(quotas, now_dt)
 
         for q in quotas_original:
@@ -284,15 +285,16 @@ class QuotaAvailability:
         seq = Q(subevent_id__in=subevents)
         if None in subevents:
             seq |= Q(subevent__isnull=True)
+        quota_ids = {q.pk for q in quotas}
         op_lookup = OrderPosition.objects.filter(
             order__status__in=[Order.STATUS_PAID, Order.STATUS_PENDING],
             order__event_id__in=events,
         ).filter(seq).filter(
             Q(
                 Q(variation_id__isnull=True) &
-                Q(item_id__in={i['item_id'] for i in q_items if self._quota_objects[i['quota_id']] in quotas})
+                Q(item_id__in={i['item_id'] for i in q_items if i['quota_id'] in quota_ids})
             ) | Q(
-                variation_id__in={i['itemvariation_id'] for i in q_vars if self._quota_objects[i['quota_id']] in quotas})
+                variation_id__in={i['itemvariation_id'] for i in q_vars if i['quota_id'] in quota_ids})
         ).order_by()
         if any(q.release_after_exit for q in quotas):
             op_lookup = op_lookup.annotate(
@@ -359,6 +361,7 @@ class QuotaAvailability:
             func = 'GREATEST'
 
         subevents = {q.subevent_id for q in quotas}
+        quota_ids = {q.pk for q in quotas}
         seq = Q(subevent_id__in=subevents)
         if None in subevents:
             seq |= Q(subevent__isnull=True)
@@ -370,10 +373,9 @@ class QuotaAvailability:
             Q(
                 Q(
                     Q(variation_id__isnull=True) &
-                    Q(item_id__in={i['item_id'] for i in q_items if self._quota_objects[i['quota_id']] in quotas})
+                    Q(item_id__in={i['item_id'] for i in q_items if i['quota_id'] in quota_ids})
                 ) | Q(
-                    variation_id__in={i['itemvariation_id'] for i in q_vars if
-                                      self._quota_objects[i['quota_id']] in quotas}
+                    variation_id__in={i['itemvariation_id'] for i in q_vars if i['quota_id'] in quota_ids}
                 ) | Q(
                     quota_id__in=[q.pk for q in quotas]
                 )
@@ -398,6 +400,7 @@ class QuotaAvailability:
     def _compute_carts(self, quotas, q_items, q_vars, size_left, now_dt):
         events = {q.event_id for q in quotas}
         subevents = {q.subevent_id for q in quotas}
+        quota_ids = {q.pk for q in quotas}
         seq = Q(subevent_id__in=subevents)
         if None in subevents:
             seq |= Q(subevent__isnull=True)
@@ -413,9 +416,9 @@ class QuotaAvailability:
             Q(
                 Q(
                     Q(variation_id__isnull=True) &
-                    Q(item_id__in={i['item_id'] for i in q_items if self._quota_objects[i['quota_id']] in quotas})
+                    Q(item_id__in={i['item_id'] for i in q_items if i['quota_id'] in quota_ids})
                 ) | Q(
-                    variation_id__in={i['itemvariation_id'] for i in q_vars if self._quota_objects[i['quota_id']] in quotas}
+                    variation_id__in={i['itemvariation_id'] for i in q_vars if i['quota_id'] in quota_ids}
                 )
             )
         ).order_by().values('item_id', 'subevent_id', 'variation_id').annotate(c=Count('*'))
@@ -434,6 +437,7 @@ class QuotaAvailability:
     def _compute_waitinglist(self, quotas, q_items, q_vars, size_left):
         events = {q.event_id for q in quotas}
         subevents = {q.subevent_id for q in quotas}
+        quota_ids = {q.pk for q in quotas}
         seq = Q(subevent_id__in=subevents)
         if None in subevents:
             seq |= Q(subevent__isnull=True)
@@ -444,9 +448,8 @@ class QuotaAvailability:
             Q(
                 Q(
                     Q(variation_id__isnull=True) &
-                    Q(item_id__in={i['item_id'] for i in q_items if self._quota_objects[i['quota_id']] in quotas})
-                ) | Q(variation_id__in={i['itemvariation_id'] for i in q_vars if
-                                        self._quota_objects[i['quota_id']] in quotas})
+                    Q(item_id__in={i['item_id'] for i in q_items if i['quota_id'] in quota_ids})
+                ) | Q(variation_id__in={i['itemvariation_id'] for i in q_vars if i['quota_id'] in quota_ids})
             )
         ).order_by().values('item_id', 'subevent_id', 'variation_id').annotate(c=Count('*'))
         for line in w_lookup:

src/pretix/base/settings.py

@@ -136,11 +136,15 @@ DEFAULTS = {
         'type': int,
         'form_class': forms.IntegerField,
         'serializer_class': serializers.IntegerField,
+        'serializer_kwargs': dict(
+            min_value=1,
+        ),
         'form_kwargs': dict(
             min_value=1,
+            required=True,
             label=_("Maximum number of items per order"),
             help_text=_("Add-on products will not be counted.")
-        )
+        ),
     },
     'display_net_prices': {
         'default': 'False',
@@ -368,11 +372,12 @@ DEFAULTS = {
         'form_class': I18nFormField,
         'serializer_class': I18nField,
         'form_kwargs': dict(
-            label=_("Custom address field"),
+            label=_("Custom recipient field"),
             widget=I18nTextInput,
             help_text=_("If you want to add a custom text field, e.g. for a country-specific registration number, to "
                         "your invoice address form, please fill in the label here. This label will both be used for "
-                        "asking the user to input their details as well as for displaying the value on the invoice. "
+                        "asking the user to input their details as well as for displaying the value on the invoice. It will "
+                        "be shown on the invoice below the headline. "
                         "The field will not be required.")
         )
     },
@@ -440,9 +445,11 @@ DEFAULTS = {
         'type': int,
         'form_class': forms.IntegerField,
         'serializer_class': serializers.IntegerField,
+        'serializer_kwargs': dict(),
         'form_kwargs': dict(
             label=_("Minimum length of invoice number after prefix"),
             help_text=_("The part of your invoice number after your prefix will be filled up with leading zeros up to this length, e.g. INV-001 or INV-00001."),
+            required=True,
         )
     },
     'invoice_numbers_consecutive': {
@@ -506,6 +513,7 @@ DEFAULTS = {
                 MinValueValidator(12),
                 MaxValueValidator(64),
             ],
+            required=True,
             widget=forms.NumberInput(
                 attrs={
                     'min': '12',
@@ -520,9 +528,13 @@ DEFAULTS = {
         'type': int,
         'form_class': forms.IntegerField,
         'serializer_class': serializers.IntegerField,
+        'serializer_kwargs': dict(
+            min_value=0,
+        ),
         'form_kwargs': dict(
             min_value=0,
             label=_("Reservation period"),
+            required=True,
             help_text=_("The number of minutes the items in a user's cart are reserved for this user."),
         )
     },
@@ -577,6 +589,7 @@ DEFAULTS = {
         'form_kwargs': dict(
             label=_("Set payment term"),
             widget=forms.RadioSelect,
+            required=True,
             choices=(
                 ('days', _("in days")),
                 ('minutes', _("in minutes"))
@@ -1091,9 +1104,13 @@ DEFAULTS = {
         'type': int,
         'serializer_class': serializers.IntegerField,
         'form_class': forms.IntegerField,
+        'serializer_kwargs': dict(
+            min_value=1,
+        ),
         'form_kwargs': dict(
             label=_("Waiting list response time"),
             min_value=1,
+            required=True,
             help_text=_("If a ticket voucher is sent to a person on the waiting list, it has to be redeemed within this "
                         "number of hours until it expires and can be re-assigned to the next person on the list."),
             widget=forms.NumberInput(),
@@ -1572,7 +1589,7 @@ DEFAULTS = {
         'type': str
     },
     'mail_from': {
-        'default': settings.MAIL_FROM,
+        'default': settings.MAIL_FROM_ORGANIZERS,
         'type': str,
         'form_class': forms.EmailField,
         'serializer_class': serializers.EmailField,
@@ -1687,6 +1704,30 @@ You can change your order details and view the status of your order at
 Best regards,
 Your {event} team"""))
     },
+    'mail_attachment_new_order': {
+        'default': None,
+        'type': File,
+        'form_class': ExtFileField,
+        'form_kwargs': dict(
+            label=_('Attachment for new orders'),
+            ext_whitelist=(".pdf",),
+            max_size=settings.FILE_UPLOAD_MAX_SIZE_EMAIL_AUTO_ATTACHMENT,
+            help_text=_('This file will be attached to the first email that we send for every new order. Therefore it will be '
+                        'combined with the "Placed order", "Free order", or "Received order" texts from above. It will be sent '
+                        'to both order contacts and attendees. You can use this e.g. to send your terms of service. Do not use '
+                        'it to send non-public information as this file might be sent before payment is confirmed or the order '
+                        'is approved. To avoid this vital email going to spam, you can only upload PDF files of up to {size} MB.').format(
+                size=settings.FILE_UPLOAD_MAX_SIZE_EMAIL_AUTO_ATTACHMENT // (1024 * 1024),
+            )
+        ),
+        'serializer_class': UploadedFileField,
+        'serializer_kwargs': dict(
+            allowed_types=[
+                'application/pdf'
+            ],
+            max_size=settings.FILE_UPLOAD_MAX_SIZE_EMAIL_AUTO_ATTACHMENT,
+        )
+    },
     'mail_send_order_placed_attendee': {
         'type': bool,
         'default': 'False'

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

@@ -0,0 +1,26 @@
+{% extends "error.html" %}
+{% load i18n %}
+{% load rich_text %}
+{% load static %}
+{% block title %}{% trans "Redirect" %}{% endblock %}
+{% block content %}
+<i class="fa fa-link fa-fw big-icon"></i>
+<div class="error-details">
+    <h1>{% trans "Redirect" %}</h1>
+    <h3>
+        {% blocktrans trimmed with host="<strong>"|add:hostname|add:"</strong>"|safe %}
+        The link you clicked on wants to redirect you to a destination on the website {{ host }}.
+        {% endblocktrans %}
+        {% blocktrans trimmed %}
+        Please only proceed if you trust this website to be safe.
+        {% endblocktrans %}
+    </h3>
+    <p>
+        <a href="{{ url }}" class="btn btn-primary btn-lg">
+            {% blocktrans trimmed with host=hostname %}
+            Proceed to {{ host }}
+            {% endblocktrans %}
+        </a>
+    </p>
+</div>
+{% endblock %}

src/pretix/base/views/errors.py

@@ -30,67 +30,85 @@ from django.utils.translation import gettext as _
 from django.views.decorators.csrf import requires_csrf_token
 from sentry_sdk import last_event_id
 
+from pretix.base.i18n import language
+from pretix.base.middleware import get_language_from_request
+
 
 def csrf_failure(request, reason=""):
-    t = get_template('csrffail.html')
-    c = {
-        'reason': reason,
-        'no_referer': reason == REASON_NO_REFERER,
-        'no_referer1': _(
-            "You are seeing this message because this HTTPS site requires a "
-            "'Referer header' to be sent by your Web browser, but none was "
-            "sent. This header is required for security reasons, to ensure "
-            "that your browser is not being hijacked by third parties."),
-        'no_referer2': _(
-            "If you have configured your browser to disable 'Referer' headers, "
-            "please re-enable them, at least for this site, or for HTTPS "
-            "connections, or for 'same-origin' requests."),
-        'no_cookie': reason == REASON_NO_CSRF_COOKIE,
-        'no_cookie1': _(
-            "You are seeing this message because this site requires a CSRF "
-            "cookie when submitting forms. This cookie is required for "
-            "security reasons, to ensure that your browser is not being "
-            "hijacked by third parties."),
-        'no_cookie2': _(
-            "If you have configured your browser to disable cookies, please "
-            "re-enable them, at least for this site, or for 'same-origin' "
-            "requests."),
-    }
-    return HttpResponseForbidden(t.render(c), content_type='text/html')
+    try:
+        locale = get_language_from_request(request)
+    except:
+        locale = "en"
+    with language(locale):  # Middleware might not have run, need to do this manually
+        t = get_template('csrffail.html')
+        c = {
+            'reason': reason,
+            'no_referer': reason == REASON_NO_REFERER,
+            'no_referer1': _(
+                "You are seeing this message because this HTTPS site requires a "
+                "'Referer header' to be sent by your Web browser, but none was "
+                "sent. This header is required for security reasons, to ensure "
+                "that your browser is not being hijacked by third parties."),
+            'no_referer2': _(
+                "If you have configured your browser to disable 'Referer' headers, "
+                "please re-enable them, at least for this site, or for HTTPS "
+                "connections, or for 'same-origin' requests."),
+            'no_cookie': reason == REASON_NO_CSRF_COOKIE,
+            'no_cookie1': _(
+                "You are seeing this message because this site requires a CSRF "
+                "cookie when submitting forms. This cookie is required for "
+                "security reasons, to ensure that your browser is not being "
+                "hijacked by third parties."),
+            'no_cookie2': _(
+                "If you have configured your browser to disable cookies, please "
+                "re-enable them, at least for this site, or for 'same-origin' "
+                "requests."),
+        }
+        return HttpResponseForbidden(t.render(c), content_type='text/html')
 
 
 @requires_csrf_token
 def page_not_found(request, exception):
-    exception_repr = exception.__class__.__name__
-    # Try to get an "interesting" exception message, if any (and not the ugly
-    # Resolver404 dictionary)
     try:
-        message = exception.args[0]
-    except (AttributeError, IndexError):
-        pass
-    else:
-        if isinstance(message, (str, Promise)):
-            exception_repr = str(message)
-    context = {
-        'request_path': request.path,
-        'exception': exception_repr,
-    }
-    template = get_template('404.html')
-    body = template.render(context, request)
-    r = HttpResponseNotFound(body)
-    r.xframe_options_exempt = True
-    return r
+        locale = get_language_from_request(request)
+    except:
+        locale = "en"
+    with language(locale):  # Middleware might not have run, need to do this manually
+        exception_repr = exception.__class__.__name__
+        # Try to get an "interesting" exception message, if any (and not the ugly
+        # Resolver404 dictionary)
+        try:
+            message = exception.args[0]
+        except (AttributeError, IndexError):
+            pass
+        else:
+            if isinstance(message, (str, Promise)):
+                exception_repr = str(message)
+        context = {
+            'request_path': request.path,
+            'exception': exception_repr,
+        }
+        template = get_template('404.html')
+        body = template.render(context, request)
+        r = HttpResponseNotFound(body)
+        r.xframe_options_exempt = True
+        return r
 
 
 @requires_csrf_token
 def server_error(request):
     try:
-        template = loader.get_template('500.html')
-    except TemplateDoesNotExist:
-        return HttpResponseServerError('<h1>Server Error (500)</h1>', content_type='text/html')
-    r = HttpResponseServerError(template.render({
-        'request': request,
-        'sentry_event_id': last_event_id(),
-    }))
-    r.xframe_options_exempt = True
-    return r
+        locale = get_language_from_request(request)
+    except:
+        locale = "en"
+    with language(locale):  # Middleware might not have run, need to do this manually
+        try:
+            template = loader.get_template('500.html')
+        except TemplateDoesNotExist:
+            return HttpResponseServerError('<h1>Server Error (500)</h1>', content_type='text/html')
+        r = HttpResponseServerError(template.render({
+            'request': request,
+            'sentry_event_id': last_event_id(),
+        }))
+        r.xframe_options_exempt = True
+        return r

src/pretix/base/views/redirect.py

@@ -24,6 +24,21 @@ import urllib.parse
 from django.core import signing
 from django.http import HttpResponseBadRequest, HttpResponseRedirect
 from django.urls import reverse
+from django.shortcuts import render
+
+
+def _is_samesite_referer(request):
+    referer = request.META.get('HTTP_REFERER')
+    if referer is None:
+        return False
+
+    referer = urllib.parse.urlparse(referer)
+
+    # Make sure we have a valid URL for Referer.
+    if '' in (referer.scheme, referer.netloc):
+        return False
+
+    return (referer.scheme, referer.netloc) == (request.scheme, request.get_host())
 
 
 def redir_view(request):
@@ -32,6 +47,14 @@ def redir_view(request):
         url = signer.unsign(request.GET.get('url', ''))
     except signing.BadSignature:
         return HttpResponseBadRequest('Invalid parameter')
+
+    if not _is_samesite_referer(request):
+        u = urllib.parse.urlparse(url)
+        return render(request, 'pretixbase/redirect.html', {
+            'hostname': u.hostname,
+            'url': url,
+        })
+
     r = HttpResponseRedirect(url)
     r['X-Robots-Tag'] = 'noindex'
     return r

src/pretix/control/forms/__init__.py

@@ -48,7 +48,7 @@ from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
 from django_scopes.forms import SafeModelMultipleChoiceField
 
-from ...base.forms import I18nModelForm, SecretKeySettingsField
+from ...base.forms import I18nModelForm
 
 # Import for backwards compatibility with okd import paths
 from ...base.forms.widgets import (  # noqa
@@ -373,49 +373,6 @@ class FontSelect(forms.RadioSelect):
     option_template_name = 'pretixcontrol/font_option.html'
 
 
-class SMTPSettingsMixin(forms.Form):
-    smtp_use_custom = forms.BooleanField(
-        label=_("Use custom SMTP server"),
-        help_text=_("All mail related to your event will be sent over the smtp server specified by you."),
-        required=False
-    )
-    smtp_host = forms.CharField(
-        label=_("Hostname"),
-        required=False,
-        widget=forms.TextInput(attrs={'placeholder': 'mail.example.org'})
-    )
-    smtp_port = forms.IntegerField(
-        label=_("Port"),
-        required=False,
-        widget=forms.TextInput(attrs={'placeholder': 'e.g. 587, 465, 25, ...'})
-    )
-    smtp_username = forms.CharField(
-        label=_("Username"),
-        widget=forms.TextInput(attrs={'placeholder': 'myuser@example.org'}),
-        required=False
-    )
-    smtp_password = SecretKeySettingsField(
-        label=_("Password"),
-        required=False,
-    )
-    smtp_use_tls = forms.BooleanField(
-        label=_("Use STARTTLS"),
-        help_text=_("Commonly enabled on port 587."),
-        required=False
-    )
-    smtp_use_ssl = forms.BooleanField(
-        label=_("Use SSL"),
-        help_text=_("Commonly enabled on port 465."),
-        required=False
-    )
-
-    def clean(self):
-        data = super().clean()
-        if data.get('smtp_use_tls') and data.get('smtp_use_ssl'):
-            raise ValidationError(_('You can activate either SSL or STARTTLS security, but not both at the same time.'))
-        return data
-
-
 class ItemMultipleChoiceField(SafeModelMultipleChoiceField):
     def label_from_instance(self, obj):
         return str(obj) if obj.active else mark_safe(f'<strike class="text-muted">{escape(obj)}</strike>')

src/pretix/control/forms/event.py

@@ -43,6 +43,7 @@ from django.core.validators import validate_email
 from django.db.models import Prefetch, Q, prefetch_related_objects
 from django.forms import CheckboxSelectMultiple, formset_factory
 from django.urls import reverse
+from django.utils.functional import cached_property
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from django.utils.timezone import get_current_timezone_name
@@ -63,7 +64,7 @@ from pretix.base.settings import (
     PERSON_NAME_SCHEMES, PERSON_NAME_TITLE_GROUPS, validate_event_settings,
 )
 from pretix.control.forms import (
-    MultipleLanguagesWidget, SlugWidget, SMTPSettingsMixin, SplitDateTimeField,
+    MultipleLanguagesWidget, SlugWidget, SplitDateTimeField,
     SplitDateTimePickerWidget,
 )
 from pretix.control.forms.widgets import Select2
@@ -534,34 +535,39 @@ class EventSettingsForm(SettingsForm):
         'og_image',
     ]
 
+    def _resolve_virtual_keys_input(self, data, prefix=''):
+        # set all dependants of virtual_keys and
+        # delete all virtual_fields to prevent them from being saved
+        for virtual_key in self.virtual_keys:
+            if prefix + virtual_key not in data:
+                continue
+            base_key = prefix + virtual_key.rsplit('_', 2)[0]
+            asked_key = base_key + '_asked'
+            required_key = base_key + '_required'
+
+            if data[prefix + virtual_key] == 'optional':
+                data[asked_key] = True
+                data[required_key] = False
+            elif data[prefix + virtual_key] == 'required':
+                data[asked_key] = True
+                data[required_key] = True
+            # Explicitly check for 'do_not_ask'.
+            # Do not overwrite as default-behaviour when no value for virtual field is transmitted!
+            elif data[prefix + virtual_key] == 'do_not_ask':
+                data[asked_key] = False
+                data[required_key] = False
+
+            # hierarkey.forms cannot handle non-existent keys in cleaned_data => do not delete, but set to None
+            if not prefix:
+                data[virtual_key] = None
+        return data
+
     def clean(self):
         data = super().clean()
         settings_dict = self.event.settings.freeze()
         settings_dict.update(data)
 
-        # set all dependants of virtual_keys and
-        # delete all virtual_fields to prevent them from being saved
-        for virtual_key in self.virtual_keys:
-            if virtual_key not in data:
-                continue
-            base_key = virtual_key.rsplit('_', 2)[0]
-            asked_key = base_key + '_asked'
-            required_key = base_key + '_required'
-
-            if data[virtual_key] == 'optional':
-                data[asked_key] = True
-                data[required_key] = False
-            elif data[virtual_key] == 'required':
-                data[asked_key] = True
-                data[required_key] = True
-            # Explicitly check for 'do_not_ask'.
-            # Do not overwrite as default-behaviour when no value for virtual field is transmitted!
-            elif data[virtual_key] == 'do_not_ask':
-                data[asked_key] = False
-                data[required_key] = False
-
-            # hierarkey.forms cannot handle non-existent keys in cleaned_data => do not delete, but set to None
-            data[virtual_key] = None
+        data = self._resolve_virtual_keys_input(data)
 
         validate_event_settings(self.event, data)
         return data
@@ -621,6 +627,35 @@ class EventSettingsForm(SettingsForm):
             else:
                 self.initial[virtual_key] = 'do_not_ask'
 
+    @cached_property
+    def changed_data(self):
+        data = []
+
+        # We need to resolve the mapping between our "virtual" fields and the "real"fields here, otherwise
+        # they are detected as "changed" on every save even though they aren't.
+        in_data = self._resolve_virtual_keys_input(self.data.copy(), prefix=f'{self.prefix}-' if self.prefix else '')
+
+        for name, field in self.fields.items():
+            prefixed_name = self.add_prefix(name)
+            data_value = field.widget.value_from_datadict(in_data, self.files, prefixed_name)
+            if not field.show_hidden_initial:
+                # Use the BoundField's initial as this is the value passed to
+                # the widget.
+                initial_value = self[name].initial
+            else:
+                initial_prefixed_name = self.add_initial_prefix(name)
+                hidden_widget = field.hidden_widget()
+                try:
+                    initial_value = field.to_python(hidden_widget.value_from_datadict(
+                        self.data, self.files, initial_prefixed_name))
+                except ValidationError:
+                    # Always assume data has changed if validation fails.
+                    data.append(name)
+                    continue
+            if field.has_changed(initial_value, data_value):
+                data.append(name)
+        return data
+
 
 class CancelSettingsForm(SettingsForm):
     auto_fields = [
@@ -830,13 +865,13 @@ def contains_web_channel_validate(val):
         raise ValidationError(_("The online shop must be selected to receive these emails."))
 
 
-class MailSettingsForm(SMTPSettingsMixin, SettingsForm):
+class MailSettingsForm(SettingsForm):
     auto_fields = [
         'mail_prefix',
-        'mail_from',
         'mail_from_name',
         'mail_attach_ical',
         'mail_attach_tickets',
+        'mail_attachment_new_order',
     ]
 
     mail_sales_channel_placed_paid = forms.MultipleChoiceField(
@@ -1179,6 +1214,7 @@ class TaxRuleLineForm(I18nForm):
             ('reverse', _('Reverse charge')),
             ('no', _('No VAT')),
             ('block', _('Sale not allowed')),
+            ('require_approval', _('Order requires approval')),
         ],
     )
     rate = forms.DecimalField(
@@ -1212,7 +1248,7 @@ TaxRuleLineFormSet = formset_factory(
 class TaxRuleForm(I18nModelForm):
     class Meta:
         model = TaxRule
-        fields = ['name', 'rate', 'price_includes_tax', 'eu_reverse_charge', 'home_country']
+        fields = ['name', 'rate', 'price_includes_tax', 'eu_reverse_charge', 'home_country', 'internal_name', 'keep_gross_if_rate_changes']
 
 
 class WidgetCodeForm(forms.Form):

src/pretix/control/forms/item.py

@@ -713,6 +713,7 @@ class ItemVariationForm(I18nModelForm):
             'default_price',
             'original_price',
             'description',
+            'require_approval',
             'require_membership',
             'require_membership_hidden',
             'require_membership_types',

src/pretix/control/forms/mailsetup.py

@@ -0,0 +1,129 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+import ipaddress
+import socket
+
+from django import forms
+from django.conf import settings
+from django.core.exceptions import ValidationError
+from django.utils.translation import gettext_lazy as _
+
+from pretix.base.forms import SecretKeySettingsField, SettingsForm
+
+
+class SMTPMailForm(SettingsForm):
+    mail_from = forms.EmailField(
+        label=_("Sender address"),
+        help_text=_("Sender address for outgoing emails"),
+        required=True,
+    )
+    smtp_host = forms.CharField(
+        label=_("Hostname"),
+        required=True,
+        widget=forms.TextInput(attrs={'placeholder': 'mail.example.org'})
+    )
+    smtp_port = forms.IntegerField(
+        label=_("Port"),
+        required=True,
+        widget=forms.TextInput(attrs={'placeholder': 'e.g. 587, 465, 25, ...'})
+    )
+    smtp_username = forms.CharField(
+        label=_("Username"),
+        widget=forms.TextInput(attrs={'placeholder': 'myuser@example.org'}),
+        required=False
+    )
+    smtp_password = SecretKeySettingsField(
+        label=_("Password"),
+        required=False,
+    )
+    smtp_use_tls = forms.BooleanField(
+        label=_("Use STARTTLS"),
+        help_text=_("Commonly enabled on port 587."),
+        required=False
+    )
+    smtp_use_ssl = forms.BooleanField(
+        label=_("Use SSL"),
+        help_text=_("Commonly enabled on port 465."),
+        required=False
+    )
+
+    def clean(self):
+        data = super().clean()
+        if data.get('smtp_use_tls') and data.get('smtp_use_ssl'):
+            raise ValidationError(_('You can activate either SSL or STARTTLS security, but not both at the same time.'))
+        for k, v in self.fields.items():
+            val = data.get(k)
+            if v._required and not val:
+                self.add_error(k, _('This field is required.'))
+        return data
+
+    def clean_smtp_host(self):
+        v = self.cleaned_data['smtp_host']
+        if not settings.MAIL_CUSTOM_SMTP_ALLOW_PRIVATE_NETWORKS:
+            try:
+                if ipaddress.ip_address(v).is_private:
+                    raise ValidationError(_('You are not allowed to use this mail server, please choose one with a '
+                                            'public IP address instead.'))
+            except ValueError:
+                try:
+                    if ipaddress.ip_address(socket.gethostbyname(v)).is_private:
+                        raise ValidationError(_('You are not allowed to use this mail server, please choose one with a '
+                                                'public IP address instead.'))
+                except OSError:
+                    raise ValidationError(_('We were unable to resolve this hostname.'))
+        return v
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if self.obj.settings.mail_from in (settings.MAIL_FROM, settings.MAIL_FROM_ORGANIZERS):
+            self.initial.pop('mail_from')
+
+        for k, v in self.fields.items():
+            v._required = v.required
+            v.required = False
+            v.widget.is_required = False
+
+
+class SimpleMailForm(SettingsForm):
+    mail_from = forms.EmailField(
+        label=_("Sender address"),
+        help_text=_("Sender address for outgoing emails"),
+        required=True,
+    )
+
+    def clean(self):
+        cleaned_data = super().clean()
+        for k, v in self.fields.items():
+            val = cleaned_data.get(k)
+            if v._required and not val:
+                self.add_error(k, _('This field is required.'))
+        return cleaned_data
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if self.obj.settings.mail_from in (settings.MAIL_FROM, settings.MAIL_FROM_ORGANIZERS):
+            self.initial.pop('mail_from')
+
+        for k, v in self.fields.items():
+            v._required = v.required
+            v.required = False
+            v.widget.is_required = False

src/pretix/control/forms/orders.py

@@ -452,7 +452,7 @@ class OrderPositionChangeForm(forms.Form):
 
     @staticmethod
     def taxrule_label_from_instance(obj):
-        return f"{obj.name} ({obj.rate} %)"
+        return f"{obj.internal_name or obj.name} ({obj.rate} %)"
 
     def __init__(self, *args, **kwargs):
         instance = kwargs.pop('instance')

src/pretix/control/forms/organizer.py

@@ -44,21 +44,23 @@ from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes.forms import SafeModelMultipleChoiceField
 from i18nfield.forms import I18nFormField, I18nTextarea
+from phonenumber_field.formfields import PhoneNumberField
 from pytz import common_timezones
 
 from pretix.api.models import WebHook
 from pretix.api.webhooks import get_all_webhook_events
 from pretix.base.forms import I18nModelForm, PlaceholderValidator, SettingsForm
-from pretix.base.forms.questions import NamePartsFormField
+from pretix.base.forms.questions import (
+    NamePartsFormField, WrappedPhoneNumberPrefixWidget, get_country_by_locale,
+    get_phone_prefix,
+)
 from pretix.base.forms.widgets import SplitDateTimePickerWidget
 from pretix.base.models import (
     Customer, Device, EventMetaProperty, Gate, GiftCard, Membership,
     MembershipType, Organizer, Team,
 )
 from pretix.base.settings import PERSON_NAME_SCHEMES, PERSON_NAME_TITLE_GROUPS
-from pretix.control.forms import (
-    ExtFileField, SMTPSettingsMixin, SplitDateTimeField,
-)
+from pretix.control.forms import ExtFileField, SplitDateTimeField
 from pretix.control.forms.event import (
     SafeEventMultipleChoiceField, multimail_validate,
 )
@@ -354,9 +356,8 @@ class OrganizerSettingsForm(SettingsForm):
         ]
 
 
-class MailSettingsForm(SMTPSettingsMixin, SettingsForm):
+class MailSettingsForm(SettingsForm):
     auto_fields = [
-        'mail_from',
         'mail_from_name',
     ]
 
@@ -535,11 +536,21 @@ class CustomerUpdateForm(forms.ModelForm):
 
     class Meta:
         model = Customer
-        fields = ['is_active', 'name_parts', 'email', 'is_verified', 'locale']
+        fields = ['is_active', 'name_parts', 'email', 'is_verified', 'phone', 'locale']
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        if not self.instance.phone and (self.instance.organizer.settings.region or self.instance.locale):
+            country_code = self.instance.organizer.settings.region or get_country_by_locale(self.instance.locale)
+            phone_prefix = get_phone_prefix(country_code)
+            if phone_prefix:
+                self.initial['phone'] = "+{}.".format(phone_prefix)
 
+        self.fields['phone'] = PhoneNumberField(
+            label=_('Phone'),
+            required=False,
+            widget=WrappedPhoneNumberPrefixWidget()
+        )
         self.fields['name_parts'] = NamePartsFormField(
             max_length=255,
             required=False,

src/pretix/control/middleware.py

@@ -43,7 +43,6 @@ from django.urls import get_script_prefix, resolve, reverse
 from django.utils.encoding import force_str
 from django.utils.translation import gettext as _
 from django_scopes import scope
-from hijack.templatetags.hijack_tags import is_hijacked
 
 from pretix.base.models import Event, Organizer
 from pretix.base.models.auth import SuperuserPermissionSet, User
@@ -183,7 +182,7 @@ class AuditLogMiddleware:
 
     def __call__(self, request):
         if request.path.startswith(get_script_prefix() + 'control') and request.user.is_authenticated:
-            if is_hijacked(request):
+            if getattr(request.user, "is_hijacked", False):
                 hijack_history = request.session.get('hijack_history', False)
                 hijacker = get_object_or_404(User, pk=hijack_history[0])
                 ss = hijacker.get_active_staff_session(request.session.get('hijacker_session'))

src/pretix/control/templates/pretixcontrol/auth/base.html

@@ -1,6 +1,5 @@
 {% load compress %}
 {% load i18n %}
-{% load hijack_tags %}
 {% load static %}
 <!DOCTYPE html>
 <html{% if rtl %} dir="rtl" class="rtl"{% endif %}>
@@ -39,7 +38,7 @@
             </div>
         {% endfor %}
     {% endif %}
-    {% if request|is_hijacked %}
+    {% if request.user.is_hijacked %}
         <div class="impersonate-warning">
             <span class="fa fa-user-secret"></span>
             {% blocktrans with user=request.user%}You are currently working on behalf of {{ user }}.{% endblocktrans %}

src/pretix/control/templates/pretixcontrol/base.html

@@ -1,7 +1,6 @@
 {% load compress %}
 {% load static %}
 {% load i18n %}
-{% load hijack_tags %}
 {% load statici18n %}
 {% load eventsignal %}
 {% load eventurl %}
@@ -351,7 +350,7 @@
                     </ul>
                 </div>
             {% endif %}
-            {% if request|is_hijacked %}
+            {% if request.user.is_hijacked %}
                 <div class="impersonate-warning">
                     <span class="fa fa-user-secret"></span>
                     {% blocktrans with user=request.user%}You are currently working on behalf of {{ user }}.{% endblocktrans %}

src/pretix/control/templates/pretixcontrol/checkin/checkins.html

@@ -74,17 +74,17 @@
                             {{ c.datetime|date:"SHORT_DATETIME_FORMAT" }}
                             {% if c.type == "exit" %}
                                 {% if c.auto_checked_in %}
-                                    <span class="fa fa-fw fa-hourglass-end" data-toggle="tooltip_html"
+                                    <span class="fa fa-fw fa-hourglass-end" data-toggle="tooltip"
                                           title="{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Automatically marked not present: {{ date }}{% endblocktrans %}"></span>
                                 {% endif %}
                             {% elif c.forced and c.successful %}
-                                <span class="fa fa-fw fa-warning" data-toggle="tooltip_html"
+                                <span class="fa fa-fw fa-warning" data-toggle="tooltip"
                                       title="{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Additional entry scan: {{ date }}{% endblocktrans %}"></span>
                             {% elif c.forced and not c.successful %}
                                 <br>
                                 <small class="text-muted">{% trans "Failed in offline mode" %}</small>
                             {% elif c.auto_checked_in %}
-                                <span class="fa fa-fw fa-magic" data-toggle="tooltip_html"
+                                <span class="fa fa-fw fa-magic" data-toggle="tooltip"
                                       title="{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Automatically checked in: {{ date }}{% endblocktrans %}"></span>
                             {% endif %}
                         </td>

src/pretix/control/templates/pretixcontrol/email/email_setup.txt

@@ -0,0 +1,14 @@
+{% load i18n %}{% blocktrans with code=code instance=instance %}Hello,
+
+someone requested to use {{ address }} as a sender address on {{ instance }}.
+This will allow them to send emails that are shown to originate from this email address.
+If that was you, please enter the following confirmation code:
+
+{{ code }}
+
+If this was not requested by you, you can safely ignore this email.
+
+Best regards,
+
+Your {{ instance }} team
+{% endblocktrans %}

src/pretix/control/templates/pretixcontrol/email_setup.html

@@ -0,0 +1,127 @@
+{% extends basetpl %}
+{% load i18n %}
+{% load bootstrap3 %}
+{% load hierarkey_form %}
+{% load static %}
+{% block title %}{% trans "Organizer" %}{% endblock %}
+{% block content %}
+    <h1>{% trans "E-mail sending" %}</h1>
+    <form action="" method="post" class="form-horizontal">
+        {% csrf_token %}
+        <div class="panel-group" id="email">
+            <div class="panel panel-default">
+                <div class="accordion-radio">
+                    <div class="panel-heading">
+                        <p class="panel-title">
+                            <input type="radio" name="mode" value="system"
+                                   data-parent="#email"
+                                   {% if mode == "system" %}checked="checked"{% endif %}
+                                   id="input_mode_system"
+                                   data-toggle="radiocollapse" data-target="#mode_system"/>
+                            <label for="input_mode_system"><strong>{% trans "Use system default" %}</strong></label>
+                        </p>
+                    </div>
+                </div>
+                <div id="mode_system"
+                     class="panel-collapse collapsed {% if mode == "system" %}in{% endif %}">
+                    <div class="panel-body form-horizontal">
+                        <p>
+                            {% blocktrans trimmed %}
+                                E-mails will be sent through the system's default server. They will show the following
+                                sender information:
+                            {% endblocktrans %}
+                        </p>
+                        <dl class="dl-horizontal">
+                            <dt>{% trans "From" context "mail_header" %}</dt>
+                            <dd>{{ object.settings.mail_from_name|default_if_none:object.name }}
+                                &lt;{{ default_sender_address }}&gt;
+                            </dd>
+                            {% if object.settings.contact_mail %}
+                                <dt>{% trans "Reply-To" context "mail_header" %}</dt>
+                                <dd>{{ object.settings.contact_mail }}</dd>
+                            {% endif %}
+                        </dl>
+                    </div>
+                </div>
+            </div>
+            <div class="panel panel-default">
+                <div class="accordion-radio">
+                    <div class="panel-heading">
+                        <p class="panel-title">
+                            <input type="radio" name="mode" value="simple"
+                                   data-parent="#email"
+                                   {% if mode == "simple" %}checked="checked"{% endif %}
+                                   id="input_mode_simple"
+                                   data-toggle="radiocollapse" data-target="#mode_simple"/>
+                            <label for="input_mode_simple"><strong>{% trans "Use system email server with a custom sender address" %}</strong></label>
+                        </p>
+                    </div>
+                </div>
+                <div id="mode_simple"
+                     class="panel-collapse collapsed {% if mode == "simple" %}in{% endif %}">
+                    <div class="panel-body form-horizontal">
+                        <p>
+                            {% blocktrans trimmed %}
+                                E-mails will be sent through the system's default server but with your own sender
+                                address.
+                                This will make your emails look more personalized and coming directly from you, but it
+                                also might require some extra steps to ensure good deliverability.
+                            {% endblocktrans %}
+                        </p>
+                        {% bootstrap_form simple_form layout="control" %}
+                    </div>
+                </div>
+            </div>
+            <div class="panel panel-default">
+                <div class="accordion-radio">
+                    <div class="panel-heading">
+                        <p class="panel-title">
+                            <input type="radio" name="mode" value="smtp"
+                                   data-parent="#email"
+                                   {% if mode == "smtp" %}checked="checked"{% endif %}
+                                   id="input_mode_smtp"
+                                   data-toggle="radiocollapse" data-target="#mode_smtp"/>
+                            <label for="input_mode_smtp"><strong>{% trans "Use a custom SMTP server" %}</strong></label>
+                        </p>
+                    </div>
+                </div>
+                <div id="mode_smtp"
+                     class="panel-collapse collapsed {% if mode == "smtp" %}in{% endif %}">
+                    <div class="panel-body form-horizontal">
+                        <p>
+                            {% blocktrans trimmed %}
+                                For full customization, you can configure your own SMTP server that will be used for
+                                email sending.
+                            {% endblocktrans %}
+                        </p>
+                        {% bootstrap_form smtp_form layout="control" %}
+                    </div>
+                </div>
+            </div>
+            {% if request.event %}
+                <div class="panel panel-default">
+                    <div class="accordion-radio">
+                        <div class="panel-heading">
+                            <p class="panel-title">
+                                <input type="radio" name="mode" value="reset"
+                                       data-parent="#reset"
+                                       id="input_mode_reset"
+                                       data-toggle="radiocollapse" data-target="#mode_reset"/>
+                                <label for="input_mode_reset"><strong>{% trans "Reset to organizer settings" %}</strong></label>
+                            </p>
+                        </div>
+                    </div>
+                    <div id="mode_reset"
+                         class="panel-collapse collapsed {% if mode == "reset" %}in{% endif %}">
+                    </div>
+                </div>
+            {% endif %}
+        </div>
+
+        <div class="form-group submit-group">
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Continue" %}
+            </button>
+        </div>
+    </form>
+{% endblock %}

src/pretix/control/templates/pretixcontrol/email_setup_simple.html

@@ -0,0 +1,79 @@
+{% extends basetpl %}
+{% load i18n %}
+{% load bootstrap3 %}
+{% load hierarkey_form %}
+{% load static %}
+{% block title %}{% trans "Organizer" %}{% endblock %}
+{% block content %}
+    <h1>{% trans "E-mail sending" %}</h1>
+    <form action="" method="post" class="form-horizontal">
+        {% csrf_token %}
+        {% for k, v in request.POST.items %}
+            <input type="hidden" name="{{ k }}" value="{{ v }}">
+        {% endfor %}
+        <input type="hidden" name="state" value="save">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <p class="panel-title">
+                    <strong>{% trans "Use system email server with a custom sender address" %}</strong>
+                </p>
+            </div>
+            <div class="panel-body form-horizontal">
+                {% if spf_warning %}
+                    <div class="alert alert-warning">
+                        <p>
+                            {{ spf_warning }}
+                        </p>
+                        {% if spf_record %}
+                            <p>
+                                {% trans "This is the SPF record we found on your domain:" %}
+                            </p>
+                            <pre><code>{{ spf_record }}</code></pre>
+                            <p>
+                                {% trans "To fix this, include the following part before the last word:" %}
+                            </p>
+                            <pre><code>{{ spf_key }}</code></pre>
+                        {% else %}
+                            <p>
+                                {% trans "Your new SPF record could look like this:" %}
+                            </p>
+                            <pre><code>v=spf1 a mx {{ spf_key }} ~all</code></pre>
+                        {% endif %}
+                        <p>
+                            {% trans "Please keep in mind that updates to DNS might require multiple hours to take effect." %}
+                        </p>
+                    </div>
+                {% elif spf_key %}
+                    <div class="alert alert-success">
+                        {% blocktrans trimmed %}
+                            We found an SPF record on your domain that includes this system. Great!
+                        {% endblocktrans %}
+                    </div>
+                {% endif %}
+                {% if verification %}
+                    <h3>{% trans "Verification" %}</h3>
+                    <p>
+                        {% blocktrans trimmed with recp=recp %}
+                            We've sent an email to {{ recp }} with a confirmation code to verify that this email address
+                            is owned by you. Please enter the verification code below:
+                        {% endblocktrans %}
+                    </p>
+                    <div class="form-group">
+                        <label class="col-md-3 control-label" for="id_verification">
+                            {% trans "Verification code" %}
+                        </label>
+                        <div class="col-md-9">
+                            <input type="text" name="verification" class="form-control">
+                        </div>
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+
+        <div class="form-group submit-group">
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Save" %}
+            </button>
+        </div>
+    </form>
+{% endblock %}

src/pretix/control/templates/pretixcontrol/email_setup_smtp.html

@@ -0,0 +1,42 @@
+{% extends basetpl %}
+{% load i18n %}
+{% load bootstrap3 %}
+{% load hierarkey_form %}
+{% load static %}
+{% block title %}{% trans "Organizer" %}{% endblock %}
+{% block content %}
+    <h1>{% trans "E-mail sending" %}</h1>
+    <form action="" method="post" class="form-horizontal">
+        {% csrf_token %}
+        {% for k, v in request.POST.items %}
+            <input type="hidden" name="{{ k }}" value="{{ v }}">
+        {% endfor %}
+        <input type="hidden" name="state" value="save">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <p class="panel-title">
+                    <strong>{% trans "Use a custom SMTP server" %}</strong>
+                </p>
+            </div>
+            <div class="panel-body form-horizontal">
+                <div class="alert alert-success">
+                    {% blocktrans trimmed %}
+                        A test connection to your SMTP server was successful. You can now save your new settings
+                        to put them in use.
+                    {% endblocktrans %}
+                </div>
+                {% if known_host_problem %}
+                    <div class="alert alert-warning">
+                        {{ known_host_problem }}
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+
+        <div class="form-group submit-group">
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Save" %}
+            </button>
+        </div>
+    </form>
+{% endblock %}

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

@@ -12,16 +12,49 @@
         <div class="tabbed-form">
             <fieldset>
                 <legend>{% trans "General" %}</legend>
+                {% bootstrap_field form.mail_prefix layout="control" %}
+                {% bootstrap_field form.mail_attach_tickets layout="control" %}
+                {% bootstrap_field form.mail_attach_ical layout="control" %}
                 {% url "control:organizer.settings.mail" organizer=request.organizer.slug as org_url %}
-                {% propagated request.event org_url "mail_from" "mail_from_name" "mail_text_signature" "mail_bcc" %}
-                    {% bootstrap_field form.mail_from layout="control" %}
+                {% propagated request.event org_url "mail_from" "smtp_use_custom" "smtp_host" "smtp_port" "smtp_username" "smtp_password" "smtp_use_tls" "smtp_use_ssl" %}
+                    <div class="form-group">
+                        <label class="col-md-3 control-label">
+                            {% trans "Sending method" %}
+                        </label>
+                        <div class="col-md-9 static-form-row-with-btn">
+                            {% if request.event.settings.smtp_use_custom %}
+                                {% trans "Custom SMTP server" %}: {{ request.event.settings.smtp_host }}
+                            {% else %}
+                                {% trans "System-provided email server" %}
+                            {% endif %}
+                            &nbsp;&nbsp;
+                            <a href="{% url "control:event.settings.mail.setup" organizer=request.organizer.slug event=request.event.slug %}"
+                               class="btn btn-default">
+                                <span class="fa fa-edit"></span>
+                                {% trans "Edit" %}
+                            </a>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-3 control-label">
+                            {% trans "Sender address" %}
+                        </label>
+                        <div class="col-md-9 static-form-row-with-btn">
+                            {{ request.event.settings.mail_from }}
+                            &nbsp;&nbsp;
+                            <a href="{% url "control:event.settings.mail.setup" organizer=request.organizer.slug event=request.event.slug %}"
+                               class="btn btn-default">
+                                <span class="fa fa-edit"></span>
+                                {% trans "Edit" %}
+                            </a>
+                        </div>
+                    </div>
+                {% endpropagated %}
+                {% propagated request.event org_url "mail_from_name" "mail_text_signature" "mail_bcc" %}
                     {% bootstrap_field form.mail_from_name layout="control" %}
                     {% bootstrap_field form.mail_text_signature layout="control" %}
                     {% bootstrap_field form.mail_bcc layout="control" %}
                 {% endpropagated %}
-                {% bootstrap_field form.mail_prefix layout="control" %}
-                {% bootstrap_field form.mail_attach_tickets layout="control" %}
-                {% bootstrap_field form.mail_attach_ical layout="control" %}
                 {% bootstrap_field form.mail_sales_channel_placed_paid layout="control" %}
             </fieldset>
             <fieldset>
@@ -47,6 +80,7 @@
             </fieldset>
             <fieldset>
                 <legend>{% trans "E-mail content" %}</legend>
+                <h4>{% trans "Text" %}</h4>
                 <div class="panel-group" id="questions_group">
                     {% blocktrans asvar title_placed_order %}Placed order{% endblocktrans %}
                     {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_placed" title=title_placed_order items="mail_text_order_placed,mail_send_order_placed_attendee,mail_text_order_placed_attendee" exclude="mail_send_order_placed_attendee" %}
@@ -81,27 +115,14 @@
                     {% blocktrans asvar title_require_approval %}Order approval process{% endblocktrans %}
                     {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="ticket_reminder" title=title_require_approval  items="mail_text_order_placed_require_approval,mail_text_order_approved,mail_text_order_approved_free,mail_text_order_denied" %}
                 </div>
-            </fieldset>
-            <fieldset>
-                <legend>{% trans "SMTP settings" %}</legend>
-                {% propagated request.event org_url "smtp_use_custom" "smtp_host" "smtp_port" "smtp_username" "smtp_password" "smtp_use_tls" "smtp_use_ssl" %}
-                    {% bootstrap_field form.smtp_use_custom layout="control" %}
-                    {% bootstrap_field form.smtp_host layout="control" %}
-                    {% bootstrap_field form.smtp_port layout="control" %}
-                    {% bootstrap_field form.smtp_username layout="control" %}
-                    {% bootstrap_field form.smtp_password layout="control" %}
-                    {% bootstrap_field form.smtp_use_tls layout="control" %}
-                    {% bootstrap_field form.smtp_use_ssl layout="control" %}
-                {% endpropagated %}
+                <h4>{% trans "Attachments" %}</h4>
+                {% bootstrap_field form.mail_attachment_new_order layout="control" %}
             </fieldset>
         </div>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}
             </button>
-            <button type="submit" class="btn btn-default btn-save pull-left" name="test" value="1">
-                {% trans "Save and test custom SMTP connection" %}
-            </button>
         </div>
     </form>
 {% endblock %}

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

@@ -24,6 +24,7 @@
                     <fieldset>
                         <legend>{% trans "General" %}</legend>
                         {% bootstrap_field form.name layout="control" %}
+                        {% bootstrap_field form.internal_name layout="control" %}
                         {% bootstrap_field form.rate addon_after="%" layout="control" %}
                         {% bootstrap_field form.price_includes_tax layout="control" %}
                     </fieldset>
@@ -39,6 +40,7 @@
                         </div>
                         {% bootstrap_field form.eu_reverse_charge layout="control" %}
                         {% bootstrap_field form.home_country layout="control" %}
+                        {% bootstrap_field form.keep_gross_if_rate_changes layout="control" %}
                         <h3>{% trans "Custom taxation rules" %}</h3>
                         <div class="alert alert-warning">
                             {% blocktrans trimmed %}

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

@@ -33,7 +33,7 @@
                     <tr>
                         <td>
                             <strong><a href="{% url "control:event.settings.tax.edit" organizer=request.event.organizer.slug event=request.event.slug rule=tr.id %}">
-                                {{ tr.name }}
+                                {{ tr.internal_name|default:tr.name }}
                             </a></strong>
                         </td>
                         <td>

src/pretix/control/templates/pretixcontrol/fragment_quota_box.html

@@ -1,6 +1,6 @@
 {% load i18n %}
 <div class="quotabox availability" data-toggle="tooltip_html" data-placement="top"
-        title="{% trans "Quota:" %} {{ q.name }}<br>{% blocktrans with date=q.cached_availability_time|date:"SHORT_DATETIME_FORMAT" %}Numbers as of {{ date }}{% endblocktrans %}">
+        title="{% trans "Quota:" %} {{ q.name|force_escape|force_escape }}<br>{% blocktrans with date=q.cached_availability_time|date:"SHORT_DATETIME_FORMAT" %}Numbers as of {{ date }}{% endblocktrans %}">
     {% if q.size|default_if_none:"NONE" == "NONE" %}
         <div class="progress">
             <div class="progress-bar progress-bar-success progress-bar-100">

src/pretix/control/templates/pretixcontrol/fragment_quota_box_paid.html

@@ -1,6 +1,6 @@
 {% load i18n %}
 <a class="quotabox" data-toggle="tooltip_html" data-placement="top"
-        title="{% trans "Quota:" %} {{ q.name }}{% if q.cached_avail.1 is not None %}<br>{% blocktrans with num=q.cached_avail.1 %}Currently available: {{ num }}{% endblocktrans %}{% endif %}"
+        title="{% trans "Quota:" %} {{ q.name|force_escape|force_escape }}{% if q.cached_avail.1 is not None %}<br>{% blocktrans with num=q.cached_avail.1 %}Currently available: {{ num }}{% endblocktrans %}{% endif %}"
     href="{% url "control:event.items.quotas.show" event=q.event.slug organizer=q.event.organizer.slug quota=q.pk %}">
     {% if q.size|default_if_none:"NONE" == "NONE" %}
         <div class="progress">

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

@@ -73,6 +73,7 @@
                     {% bootstrap_field form.available_until layout="control" %}
                     {% bootstrap_field form.sales_channels layout="control" %}
                     {% bootstrap_field form.hide_without_voucher layout="control" %}
+                    {% bootstrap_field form.require_approval layout="control" %}
                     {% if form.require_membership %}
                         {% bootstrap_field form.require_membership layout="control" %}
                         <div data-display-dependency="#{{ form.require_membership.id_for_label }}">
@@ -144,6 +145,7 @@
                     {% bootstrap_field formset.empty_form.available_until layout="control" %}
                     {% bootstrap_field formset.empty_form.sales_channels layout="control" %}
                     {% bootstrap_field formset.empty_form.hide_without_voucher layout="control" %}
+                    {% bootstrap_field formset.empty_form.require_approval layout="control" %}
                     {% if formset.empty_form.require_membership %}
                         {% bootstrap_field formset.empty_form.require_membership layout="control" %}
                         <div data-display-dependency="#{{ formset.empty_form.require_membership.id_for_label }}">

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

@@ -145,7 +145,12 @@
                                 <strong>{% trans "Tax rule" %}</strong>
                             </div>
                             <div class="col-sm-5">
-                                {{ position.tax_rule.name }} ({{ position.tax_rule.rate }} %)
+                                {% if position.tax_rule.internal_name %}
+                                    {{ position.tax_rule.internal_name }}
+                                {% else %}
+                                    {{ position.tax_rule.name }}
+                                {% endif %}
+                                ({{ position.tax_rule.rate }} %)
                             </div>
                             <div class="col-sm-4 field-container">
                                 {% bootstrap_field position.form.tax_rule layout='inline' %}

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

@@ -360,19 +360,19 @@
                                 {% if line.checkins.all %}
                                     {% for c in line.all_checkins.all %}
                                         {% if not c.successful %}
-                                            <span class="fa fa-fw fa-exclamation-circle text-danger" data-toggle="tooltip_html" title="{{ c.list.name }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Denied scan: {{ date }}{% endblocktrans %}<br>{{ c.get_error_reason_display }}{% if c.gate %}<br>{{ c.gate }}{% endif %}"></span>
+                                            <span class="fa fa-fw fa-exclamation-circle text-danger" data-toggle="tooltip_html" title="{{ c.list.name|force_escape|force_escape }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Denied scan: {{ date }}{% endblocktrans %}<br>{{ c.get_error_reason_display }}{% if c.gate %}<br>{{ c.gate }}{% endif %}"></span>
                                         {% elif c.type == "exit" %}
                                             {% if c.auto_checked_in %}
-                                                <span class="fa fa-fw text-success fa-hourglass-end" data-toggle="tooltip_html" title="{{ c.list.name }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Automatically marked not present: {{ date }}{% endblocktrans %}"></span>
+                                                <span class="fa fa-fw text-success fa-hourglass-end" data-toggle="tooltip_html" title="{{ c.list.name|force_escape|force_escape }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Automatically marked not present: {{ date }}{% endblocktrans %}"></span>
                                             {% else %}
-                                                <span class="fa fa-fw text-success fa-sign-out" data-toggle="tooltip_html" title="{{ c.list.name }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Exit scan: {{ date }}{% endblocktrans %}{% if c.gate %}<br>{{ c.gate }}{% endif %}"></span>
+                                                <span class="fa fa-fw text-success fa-sign-out" data-toggle="tooltip_html" title="{{ c.list.name|force_escape|force_escape }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Exit scan: {{ date }}{% endblocktrans %}{% if c.gate %}<br>{{ c.gate }}{% endif %}"></span>
                                             {% endif %}
                                         {% elif c.forced %}
-                                            <span class="fa fa-fw fa-warning text-warning" data-toggle="tooltip_html" title="{{ c.list.name }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Additional entry scan: {{ date }}{% endblocktrans %}{% if c.gate %}<br>{{ c.gate }}{% endif %}"></span>
+                                            <span class="fa fa-fw fa-warning text-warning" data-toggle="tooltip_html" title="{{ c.list.name|force_escape|force_escape }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Additional entry scan: {{ date }}{% endblocktrans %}{% if c.gate %}<br>{{ c.gate }}{% endif %}"></span>
                                         {% elif c.auto_checked_in %}
-                                            <span class="fa fa-fw fa-magic text-success" data-toggle="tooltip_html" title="{{ c.list.name }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Automatically checked in: {{ date }}{% endblocktrans %}{% if c.gate %}<br>{{ c.gate }}{% endif %}"></span>
+                                            <span class="fa fa-fw fa-magic text-success" data-toggle="tooltip_html" title="{{ c.list.name|force_escape|force_escape }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Automatically checked in: {{ date }}{% endblocktrans %}{% if c.gate %}<br>{{ c.gate }}{% endif %}"></span>
                                         {% else %}
-                                            <span class="fa fa-fw fa-check text-success" data-toggle="tooltip_html" title="{{ c.list.name }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Entry scan: {{ date }}{% endblocktrans %}{% if c.gate %}<br>{{ c.gate }}{% endif %}"></span>
+                                            <span class="fa fa-fw fa-check text-success" data-toggle="tooltip_html" title="{{ c.list.name|force_escape|force_escape }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Entry scan: {{ date }}{% endblocktrans %}{% if c.gate %}<br>{{ c.gate }}{% endif %}"></span>
                                         {% endif %}
                                     {% endfor %}
                                 {% endif %}

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

@@ -48,6 +48,10 @@
                             </dd>
                             <dt>{% trans "Name" %}</dt>
                             <dd>{{ customer.name }}</dd>
+                        {% if customer.phone %}
+                            <dt>{% trans "Phone" %}</dt>
+                            <dd>{{ customer.phone }}</dd>
+                        {% endif %}
                             <dt>{% trans "Locale" %}</dt>
                             <dd>{{ display_locale }}</dd>
                             <dt>{% trans "Registration date" %}</dt>

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

@@ -57,6 +57,7 @@
                 </div>
                 <form class="" method="post" action="">
                     {% csrf_token %}
+                    <button type="submit" class="hidden">Add</button> <!-- Required because pressing enter in the text fields will submit the first button -->
                     <table class="panel-body table">
                         <thead>
                         <tr>
@@ -101,7 +102,7 @@
                             </td>
                             <td class="text-right form-inline">
                                 <input type="text" class="form-control input-sm" placeholder="{% trans "Value" %}" name="value">
-                                <button class="btn btn-primary">
+                                <button type="submit" class="btn btn-primary">
                                     <span class="fa fa-plus"></span>
                                 </button>
                             </td>

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

@@ -11,13 +11,45 @@
     <h1>{% trans "E-mail settings" %}</h1>
 
     <form action="" method="post" class="form-horizontal" enctype="multipart/form-data"
-            mail-preview-url="{% url "control:organizer.settings.mail.preview" organizer=request.organizer.slug %}">
+          mail-preview-url="{% url "control:organizer.settings.mail.preview" organizer=request.organizer.slug %}">
         {% csrf_token %}
         {% bootstrap_form_errors form %}
         <div class="tabbed-form">
             <fieldset>
                 <legend>{% trans "General" %}</legend>
-                {% bootstrap_field form.mail_from layout="control" %}
+                <div class="form-group">
+                    <label class="col-md-3 control-label">
+                        {% trans "Sending method" %}
+                    </label>
+                    <div class="col-md-9 static-form-row-with-btn">
+                        {% if request.organizer.settings.smtp_use_custom %}
+                            {% trans "Custom SMTP server" %}: {{ request.organizer.settings.smtp_host }}
+                        {% else %}
+                            {% trans "System-provided email server" %}
+                        {% endif %}
+                        &nbsp;&nbsp;
+                        <a href="{% url "control:organizer.settings.mail.setup" organizer=request.organizer.slug %}"
+                           class="btn btn-default">
+                            <span class="fa fa-edit"></span>
+                            {% trans "Edit" %}
+                        </a>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-md-3 control-label">
+                        {% trans "Sender address" %}
+                    </label>
+                    <div class="col-md-9 static-form-row-with-btn">
+                        {{ request.organizer.settings.mail_from }}
+                        &nbsp;&nbsp;
+                        <a href="{% url "control:organizer.settings.mail.setup" organizer=request.organizer.slug %}"
+                           class="btn btn-default">
+                            <span class="fa fa-edit"></span>
+                            {% trans "Edit" %}
+                        </a>
+                    </div>
+                </div>
+
                 {% bootstrap_field form.mail_from_name layout="control" %}
                 {% bootstrap_field form.mail_text_signature layout="control" %}
                 {% bootstrap_field form.mail_bcc layout="control" %}
@@ -35,24 +67,11 @@
                     {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="reset" title=title_reset items="mail_text_customer_reset" %}
                 </div>
             </fieldset>
-            <fieldset>
-                <legend>{% trans "SMTP settings" %}</legend>
-                {% bootstrap_field form.smtp_use_custom layout="control" %}
-                {% bootstrap_field form.smtp_host layout="control" %}
-                {% bootstrap_field form.smtp_port layout="control" %}
-                {% bootstrap_field form.smtp_username layout="control" %}
-                {% bootstrap_field form.smtp_password layout="control" %}
-                {% bootstrap_field form.smtp_use_tls layout="control" %}
-                {% bootstrap_field form.smtp_use_ssl layout="control" %}
-            </fieldset>
         </div>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}
             </button>
-            <button type="submit" class="btn btn-default btn-save pull-left" name="test" value="1">
-                {% trans "Save and test custom SMTP connection" %}
-            </button>
         </div>
     </form>
 {% endblock %}

src/pretix/control/urls.py

@@ -112,6 +112,8 @@ urlpatterns = [
     re_path(r'^organizer/(?P<organizer>[^/]+)/edit$', organizer.OrganizerUpdate.as_view(), name='organizer.edit'),
     re_path(r'^organizer/(?P<organizer>[^/]+)/settings/email$',
             organizer.OrganizerMailSettings.as_view(), name='organizer.settings.mail'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/settings/email/setup$',
+            organizer.MailSettingsSetup.as_view(), name='organizer.settings.mail.setup'),
     re_path(r'^organizer/(?P<organizer>[^/]+)/settings/email/preview$',
             organizer.MailSettingsPreview.as_view(), name='organizer.settings.mail.preview'),
     re_path(r'^organizer/(?P<organizer>[^/]+)/delete$', organizer.OrganizerDelete.as_view(), name='organizer.delete'),
@@ -214,6 +216,7 @@ urlpatterns = [
         re_path(r'^settings/tickets/preview/(?P<output>[^/]+)$', event.TicketSettingsPreview.as_view(),
                 name='event.settings.tickets.preview'),
         re_path(r'^settings/email$', event.MailSettings.as_view(), name='event.settings.mail'),
+        re_path(r'^settings/email/setup$', event.MailSettingsSetup.as_view(), name='event.settings.mail.setup'),
         re_path(r'^settings/email/preview$', event.MailSettingsPreview.as_view(), name='event.settings.mail.preview'),
         re_path(r'^settings/email/layoutpreview$', event.MailSettingsRendererPreview.as_view(),
                 name='event.settings.mail.preview.layout'),

src/pretix/control/views/event.py

@@ -65,9 +65,7 @@ from i18nfield.utils import I18nJSONEncoder
 from pytz import timezone
 
 from pretix.base.channels import get_all_sales_channels
-from pretix.base.email import (
-    get_available_placeholders, test_custom_smtp_backend,
-)
+from pretix.base.email import get_available_placeholders
 from pretix.base.models import Event, LogEntry, Order, TaxRule, Voucher
 from pretix.base.models.event import EventMetaValue
 from pretix.base.services import tickets
@@ -83,6 +81,7 @@ from pretix.control.forms.event import (
     TicketSettingsForm, WidgetCodeForm,
 )
 from pretix.control.permissions import EventPermissionRequiredMixin
+from pretix.control.views.mailsetup import MailSettingsSetupView
 from pretix.control.views.user import RecentAuthenticationRequiredMixin
 from pretix.helpers.database import rolledback_transaction
 from pretix.multidomain.urlreverse import get_event_domain
@@ -639,29 +638,29 @@ class MailSettings(EventSettingsViewMixin, EventSettingsFormView):
                         k: form.cleaned_data.get(k) for k in form.changed_data
                     }
                 )
-
-            if request.POST.get('test', '0').strip() == '1':
-                backend = self.request.event.get_mail_backend(force_custom=True, timeout=10)
-                try:
-                    test_custom_smtp_backend(backend, self.request.event.settings.mail_from)
-                except Exception as e:
-                    messages.warning(self.request, _('An error occurred while contacting the SMTP server: %s') % str(e))
-                else:
-                    if form.cleaned_data.get('smtp_use_custom'):
-                        messages.success(self.request, _('Your changes have been saved and the connection attempt to '
-                                                         'your SMTP server was successful.'))
-                    else:
-                        messages.success(self.request, _('We\'ve been able to contact the SMTP server you configured. '
-                                                         'Remember to check the "use custom SMTP server" checkbox, '
-                                                         'otherwise your SMTP server will not be used.'))
-            else:
-                messages.success(self.request, _('Your changes have been saved.'))
+            messages.success(self.request, _('Your changes have been saved.'))
             return redirect(self.get_success_url())
         else:
             messages.error(self.request, _('We could not save your changes. See below for details.'))
             return self.get(request)
 
 
+class MailSettingsSetup(EventPermissionRequiredMixin, MailSettingsSetupView):
+    permission = 'can_change_event_settings'
+    basetpl = 'pretixcontrol/event/base.html'
+
+    def get_success_url(self) -> str:
+        return reverse('control:event.settings.mail', kwargs={
+            'organizer': self.request.event.organizer.slug,
+            'event': self.request.event.slug
+        })
+
+    def log_action(self, data):
+        self.request.event.log_action(
+            'pretix.event.settings', user=self.request.user, data=data
+        )
+
+
 class MailSettingsPreview(EventPermissionRequiredMixin, View):
     permission = 'can_change_event_settings'
 

src/pretix/control/views/mailsetup.py

@@ -0,0 +1,279 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+import logging
+
+import dns.resolver
+from django.conf import settings
+from django.contrib import messages
+from django.core.mail import get_connection
+from django.shortcuts import redirect
+from django.utils.crypto import get_random_string
+from django.utils.functional import cached_property
+from django.utils.translation import gettext_lazy as _
+from django.views.generic import TemplateView
+
+from pretix.base import email
+from pretix.base.models import Event
+from pretix.base.services.mail import mail
+from pretix.control.forms.filter import OrganizerFilterForm
+from pretix.control.forms.mailsetup import SimpleMailForm, SMTPMailForm
+
+logger = logging.getLogger(__name__)
+
+
+def get_spf_record(hostname):
+    try:
+        r = dns.resolver.Resolver()
+        for resp in r.query(hostname, 'TXT'):
+            data = b''.join(resp.strings).decode()
+            if data.lower().strip().startswith('v=spf1 '):  # RFC7208, section 4.5
+                return data
+    except:
+        logger.exception("Could not fetch SPF record")
+
+
+def _check_spf_record(not_found_lookup_parts, spf_record, depth):
+    if depth > 10:  # prevent infinite loops
+        return
+
+    parts = spf_record.lower().split(" ")  # RFC 7208, section 4.6.1
+
+    for p in parts:
+        try:
+            not_found_lookup_parts.remove(p)
+        except KeyError:
+            pass
+
+    if not not_found_lookup_parts:  # save some DNS requests if we already found everything
+        return
+
+    for p in parts:
+        if p.startswith('include:') or p.startswith('+include:'):
+            _, hostname = p.split(':')
+            rec_record = get_spf_record(hostname)
+            if rec_record:
+                _check_spf_record(not_found_lookup_parts, rec_record, depth + 1)
+
+
+def check_spf_record(lookup, spf_record):
+    """
+    Check that all parts of lookup appear somewhere in the given SPF record, resolving
+    include: directives recursively
+    """
+    not_found_lookup_parts = set(lookup.split(" "))
+    _check_spf_record(not_found_lookup_parts, spf_record, 0)
+    return not not_found_lookup_parts
+
+
+class MailSettingsSetupView(TemplateView):
+    template_name = 'pretixcontrol/email_setup.html'
+    basetpl = None
+
+    @cached_property
+    def object(self):
+        return getattr(self.request, 'event', self.request.organizer)
+
+    @cached_property
+    def smtp_form(self):
+        return SMTPMailForm(
+            obj=self.object,
+            prefix='smtp',
+            data=self.request.POST if (self.request.method == "POST" and self.request.POST.get("mode") == "smtp") else None,
+        )
+
+    @cached_property
+    def simple_form(self):
+        return SimpleMailForm(
+            obj=self.object,
+            prefix='simple',
+            data=self.request.POST if (self.request.method == "POST" and self.request.POST.get("mode") == "simple") else None,
+        )
+
+    def get_context_data(self, **kwargs):
+        ctx = super().get_context_data(**kwargs)
+        ctx['basetpl'] = self.basetpl
+        ctx['object'] = self.object
+        ctx['smtp_form'] = self.smtp_form
+        ctx['simple_form'] = self.simple_form
+        ctx['default_sender_address'] = settings.MAIL_FROM_ORGANIZERS
+        if 'mode' in self.request.POST:
+            ctx['mode'] = self.request.POST.get('mode')
+        elif self.object.settings.smtp_use_custom:
+            ctx['mode'] = 'smtp'
+        elif self.object.settings.mail_from not in (settings.MAIL_FROM_ORGANIZERS, settings.MAIL_FROM):
+            ctx['mode'] = 'simple'
+        else:
+            ctx['mode'] = 'system'
+        return ctx
+
+    @cached_property
+    def filter_form(self):
+        return OrganizerFilterForm(data=self.request.GET, request=self.request)
+
+    def post(self, request, *args, **kwargs):
+        if request.POST.get('mode') == 'system':
+            if isinstance(self.object, Event) and 'mail_from' in self.object.organizer.settings._cache():
+                self.object.settings.mail_from = settings.MAIL_FROM_ORGANIZERS
+            else:
+                del self.object.settings.mail_from
+            self.object.settings.smtp_use_custom = False
+            del self.object.settings.smtp_host
+            del self.object.settings.smtp_port
+            del self.object.settings.smtp_username
+            del self.object.settings.smtp_password
+            del self.object.settings.smtp_use_tls
+            del self.object.settings.smtp_use_ssl
+            messages.success(request, _('Your changes have been saved.'))
+            return redirect(self.get_success_url())
+
+        elif request.POST.get('mode') == 'reset':
+            del self.object.settings.mail_from
+            del self.object.settings.smtp_use_custom
+            del self.object.settings.smtp_host
+            del self.object.settings.smtp_port
+            del self.object.settings.smtp_username
+            del self.object.settings.smtp_password
+            del self.object.settings.smtp_use_tls
+            del self.object.settings.smtp_use_ssl
+            messages.success(request, _('Your changes have been saved.'))
+            return redirect(self.get_success_url())
+
+        elif request.POST.get('mode') == 'simple':
+            if not self.simple_form.is_valid():
+                return super().get(request, *args, **kwargs)
+
+            session_key = f'sender_mail_verification_code_{self.request.path}_{self.simple_form.cleaned_data.get("mail_from")}'
+            allow_save = (
+                (not settings.MAIL_CUSTOM_SENDER_VERIFICATION_REQUIRED or
+                 ('verification' in self.request.POST and self.request.POST.get('verification', '') == self.request.session.get(session_key, None))) and
+                (not settings.MAIL_CUSTOM_SENDER_SPF_STRING or self.request.POST.get('state') == 'save')
+            )
+
+            if allow_save:
+                for k, v in self.simple_form.cleaned_data.items():
+                    self.object.settings.set(k, v)
+                self.log_action(self.simple_form.cleaned_data)
+                if session_key in request.session:
+                    del request.session[session_key]
+                messages.success(request, _('Your changes have been saved.'))
+                return redirect(self.get_success_url())
+
+            spf_warning = None
+            spf_record = None
+            if settings.MAIL_CUSTOM_SENDER_SPF_STRING:
+                hostname = self.simple_form.cleaned_data['mail_from'].split('@')[-1]
+                spf_record = get_spf_record(hostname)
+                if not spf_record:
+                    spf_warning = _(
+                        'We could not find an SPF record set for the domain you are trying to use. You can still '
+                        'proceed, but it will increase the chance of emails going to spam or being rejected. We '
+                        'strongly recommend setting an SPF record on the domain. You can do so through the DNS '
+                        'settings at the provider you registered your domain with.'
+                    )
+                elif not check_spf_record(settings.MAIL_CUSTOM_SENDER_SPF_STRING, spf_record):
+                    spf_warning = _(
+                        'We found an SPF record set for the domain you are trying to use, but it does not include this '
+                        'system\'s email server. This means that there is a very high chance most of the emails will be '
+                        'rejected or marked as spam. You should update the DNS settings of your domain to include '
+                        'this system in the SPF record.'
+                    )
+
+            if settings.MAIL_CUSTOM_SENDER_VERIFICATION_REQUIRED:
+                if 'verification' in self.request.POST:
+                    messages.error(request, _('The verification code was incorrect, please try again.'))
+                else:
+                    self.request.session[session_key] = get_random_string(length=6, allowed_chars='1234567890')
+                    mail(
+                        self.simple_form.cleaned_data.get('mail_from'),
+                        _('Sender address verification'),
+                        'pretixcontrol/email/email_setup.txt',
+                        {
+                            'code': self.request.session[session_key],
+                            'address': self.simple_form.cleaned_data.get('mail_from'),
+                            'instance': settings.PRETIX_INSTANCE_NAME,
+                        },
+                        None,
+                        locale=self.request.LANGUAGE_CODE,
+                        user=self.request.user
+                    )
+
+            return self.response_class(
+                request=self.request,
+                template='pretixcontrol/email_setup_simple.html',
+                context={
+                    'basetpl': self.basetpl,
+                    'object': self.object,
+                    'verification': settings.MAIL_CUSTOM_SENDER_VERIFICATION_REQUIRED,
+                    'spf_warning': spf_warning,
+                    'spf_record': spf_record,
+                    'spf_key': settings.MAIL_CUSTOM_SENDER_SPF_STRING,
+                    'recp': self.simple_form.cleaned_data.get('mail_from')
+                },
+                using=self.template_engine,
+            )
+
+        elif request.POST.get('mode') == 'smtp':
+            if not self.smtp_form.is_valid():
+                return super().get(request, *args, **kwargs)
+
+            if request.POST.get('state') == 'save':
+                for k, v in self.smtp_form.cleaned_data.items():
+                    self.object.settings.set(k, v)
+                self.object.settings.smtp_use_custom = True
+                self.log_action({**self.smtp_form.cleaned_data, 'smtp_use_custom': True})
+                messages.success(request, _('Your changes have been saved.'))
+                return redirect(self.get_success_url())
+            else:
+                backend = get_connection(
+                    backend=settings.EMAIL_CUSTOM_SMTP_BACKEND,
+                    host=self.smtp_form.cleaned_data['smtp_host'],
+                    port=self.smtp_form.cleaned_data['smtp_port'],
+                    username=self.smtp_form.cleaned_data.get('smtp_username', ''),
+                    password=self.smtp_form.cleaned_data.get('smtp_password', ''),
+                    use_tls=self.smtp_form.cleaned_data.get('smtp_use_tls', False),
+                    use_ssl=self.smtp_form.cleaned_data.get('smtp_use_ssl', False),
+                    fail_silently=False,
+                    timeout=10,
+                )
+                try:
+                    email.test_custom_smtp_backend(backend, self.smtp_form.cleaned_data.get('mail_from'))
+                except Exception as e:
+                    messages.error(self.request, _('An error occurred while contacting the SMTP server: %s') % str(e))
+                    return self.get(request, *args, **kwargs)
+
+                return self.response_class(
+                    request=self.request,
+                    template='pretixcontrol/email_setup_smtp.html',
+                    context={
+                        'basetpl': self.basetpl,
+                        'object': self.object,
+                        'known_host_problem': {
+                            'smtp.gmail.com': _(
+                                'We recommend not using Google Mail for transactional emails. If you try sending many '
+                                'emails in a short amount of time, e.g. when sending information to all your ticket '
+                                'buyers, there is a high chance Google will not deliver all of your emails since they '
+                                'impose a maximum number of emails per time period.'
+                            ),
+                        }.get(self.smtp_form.cleaned_data['smtp_host']),
+                    },
+                    using=self.template_engine,
+                )

src/pretix/control/views/organizer.py

@@ -64,7 +64,6 @@ from django.views.generic import (
 from pretix.api.models import WebHook
 from pretix.base.auth import get_auth_backends
 from pretix.base.channels import get_all_sales_channels
-from pretix.base.email import test_custom_smtp_backend
 from pretix.base.i18n import language
 from pretix.base.models import (
     CachedFile, Customer, Device, Gate, GiftCard, Invoice, LogEntry,
@@ -102,6 +101,7 @@ from pretix.control.permissions import (
 )
 from pretix.control.signals import nav_organizer
 from pretix.control.views import PaginationMixin
+from pretix.control.views.mailsetup import MailSettingsSetupView
 from pretix.helpers.dicts import merge_dicts
 from pretix.helpers.urls import build_absolute_uri as build_global_uri
 from pretix.multidomain.urlreverse import build_absolute_uri
@@ -262,22 +262,6 @@ class OrganizerMailSettings(OrganizerSettingsFormView):
                         k: form.cleaned_data.get(k) for k in form.changed_data
                     }
                 )
-
-            if request.POST.get('test', '0').strip() == '1':
-                backend = self.request.organizer.get_mail_backend(force_custom=True, timeout=10)
-                try:
-                    test_custom_smtp_backend(backend, self.request.organizer.settings.mail_from)
-                except Exception as e:
-                    messages.warning(self.request, _('An error occurred while contacting the SMTP server: %s') % str(e))
-                else:
-                    if form.cleaned_data.get('smtp_use_custom'):
-                        messages.success(self.request, _('Your changes have been saved and the connection attempt to '
-                                                         'your SMTP server was successful.'))
-                    else:
-                        messages.success(self.request, _('We\'ve been able to contact the SMTP server you configured. '
-                                                         'Remember to check the "use custom SMTP server" checkbox, '
-                                                         'otherwise your SMTP server will not be used.'))
-            else:
                 messages.success(self.request, _('Your changes have been saved.'))
             return redirect(self.get_success_url())
         else:
@@ -285,6 +269,21 @@ class OrganizerMailSettings(OrganizerSettingsFormView):
             return self.get(request)
 
 
+class MailSettingsSetup(OrganizerPermissionRequiredMixin, MailSettingsSetupView):
+    permission = 'can_change_organizer_settings'
+    basetpl = 'pretixcontrol/base.html'
+
+    def get_success_url(self):
+        return reverse('control:organizer.settings.mail', kwargs={
+            'organizer': self.request.organizer.slug,
+        })
+
+    def log_action(self, data):
+        self.request.organizer.log_action(
+            'pretix.organizer.settings', user=self.request.user, data=data
+        )
+
+
 class MailSettingsPreview(OrganizerPermissionRequiredMixin, View):
     permission = 'can_change_organizer_settings'
 
@@ -490,6 +489,7 @@ class OrganizerCreate(CreateView):
             organizer=form.instance, name=_('Administrators'),
             all_events=True, can_create_events=True, can_change_teams=True, can_manage_gift_cards=True,
             can_change_organizer_settings=True, can_change_event_settings=True, can_change_items=True,
+            can_manage_customers=True,
             can_view_orders=True, can_change_orders=True, can_view_vouchers=True, can_change_vouchers=True
         )
         t.members.add(self.request.user)
@@ -1195,6 +1195,10 @@ class GiftCardDetailView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMi
                         'retry': True,
                     })
                 )
+                t.order.log_action('pretix.event.order.payment.started', {
+                    'local_id': r.local_id,
+                    'provider': r.provider
+                }, user=request.user)
                 try:
                     r.payment_provider.execute_payment(request, r)
                 except PaymentException as e:

src/pretix/control/views/users.py

@@ -20,9 +20,13 @@
 # <https://www.gnu.org/licenses/>.
 #
 import json
+from contextlib import contextmanager
 
 from django.conf import settings
 from django.contrib import messages
+from django.contrib.auth import (
+    BACKEND_SESSION_KEY, get_user_model, load_backend, login,
+)
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse
@@ -30,7 +34,7 @@ from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 from django.views import View
 from django.views.generic import ListView, TemplateView
-from hijack.helpers import login_user, release_hijack
+from hijack import signals
 
 from pretix.base.auth import get_auth_backends
 from pretix.base.models import User
@@ -42,6 +46,25 @@ from pretix.control.views import CreateView, UpdateView
 from pretix.control.views.user import RecentAuthenticationRequiredMixin
 
 
+def get_used_backend(request):
+    # vendored from hijack/views.py
+    backend_str = request.session[BACKEND_SESSION_KEY]
+    backend = load_backend(backend_str)
+    return backend
+
+
+@contextmanager
+def keep_session_age(session):
+    # vendored from hijack/views.py
+    try:
+        session_expiry = session["_session_expiry"]
+    except KeyError:
+        yield
+    else:
+        yield
+        session["_session_expiry"] = session_expiry
+
+
 class UserListView(AdministratorPermissionRequiredMixin, ListView):
     template_name = 'pretixcontrol/users/index.html'
     context_object_name = 'users'
@@ -171,7 +194,28 @@ class UserImpersonateView(AdministratorPermissionRequiredMixin, RecentAuthentica
                                          'other_email': self.object.email
                                      })
         oldkey = request.session.session_key
-        login_user(request, self.object)
+
+        hijacker = request.user
+        hijacked = self.object
+
+        hijack_history = request.session.get("hijack_history", [])
+        hijack_history.append(request.user._meta.pk.value_to_string(hijacker))
+
+        backend = get_used_backend(request)
+        backend = f"{backend.__module__}.{backend.__class__.__name__}"
+
+        with signals.no_update_last_login(), keep_session_age(request.session):
+            login(request, hijacked, backend=backend)
+
+        request.session["hijack_history"] = hijack_history
+
+        signals.hijack_started.send(
+            sender=None,
+            request=request,
+            hijacker=hijacker,
+            hijacked=hijacked,
+        )
+
         request.session['hijacker_session'] = oldkey
         return redirect(reverse('control:index'))
 
@@ -180,8 +224,26 @@ class UserImpersonateStopView(LoginRequiredMixin, View):
 
     def post(self, request, *args, **kwargs):
         impersonated = request.user
+
         hijs = request.session['hijacker_session']
-        release_hijack(request)
+        hijack_history = request.session.get("hijack_history", [])
+        hijacked = request.user
+        user_pk = hijack_history.pop()
+        hijacker = get_object_or_404(get_user_model(), pk=user_pk)
+        backend = get_used_backend(request)
+        backend = f"{backend.__module__}.{backend.__class__.__name__}"
+        with signals.no_update_last_login(), keep_session_age(request.session):
+            login(request, hijacker, backend=backend)
+
+        request.session["hijack_history"] = hijack_history
+
+        signals.hijack_ended.send(
+            sender=None,
+            request=request,
+            hijacker=hijacker,
+            hijacked=hijacked,
+        )
+
         ss = request.user.get_active_staff_session(hijs)
         if ss:
             request.session.save()

src/pretix/helpers/apps.py

@@ -25,3 +25,7 @@ from django.apps import AppConfig
 class PretixHelpersConfig(AppConfig):
     name = 'pretix.helpers'
     label = 'pretixhelpers'
+
+    def ready(self):
+        from .monkeypatching import monkeypatch_all_at_ready
+        monkeypatch_all_at_ready()

src/pretix/helpers/daterange.py

@@ -32,10 +32,11 @@
 # 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 django.template.defaultfilters import date as _date
 from django.utils.html import format_html
 from django.utils.translation import get_language, gettext_lazy as _
 
+from pretix.helpers.templatetags.date_fast import date_fast as _date
+
 
 def daterange(df, dt, as_html=False):
     lng = get_language()

src/pretix/helpers/formats/en/formats.py

@@ -39,3 +39,4 @@ SHORT_DATETIME_FORMAT = 'Y-m-d H:i'
 TIME_FORMAT = 'H:i'
 WEEK_FORMAT = '\\W W, o'
 WEEK_DAY_FORMAT = 'D, M jS'
+SHORT_MONTH_DAY_FORMAT = 'd.m.'

src/pretix/helpers/formats/en_US/formats.py

@@ -26,6 +26,7 @@ SHORT_DATETIME_FORMAT = 'm/d/Y P'
 TIME_FORMAT = 'P'
 WEEK_FORMAT = '\\W W, o'
 WEEK_DAY_FORMAT = 'D, M jS'
+SHORT_MONTH_DAY_FORMAT = 'm/d'
 
 DATE_INPUT_FORMATS = [
     '%m/%d/%Y',

src/pretix/helpers/formats/fr/__init__.py

@@ -0,0 +1,21 @@
+#
+# 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/>.
+#

src/pretix/helpers/formats/fr/formats.py

@@ -0,0 +1,25 @@
+#
+# 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/>.
+#
+
+# Date according to https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+WEEK_FORMAT = '\\S W/o'
+WEEK_DAY_FORMAT = 'D, j.n.'

src/pretix/helpers/hierarkey.py

@@ -0,0 +1,40 @@
+#
+# 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/>.
+#
+
+
+def clean_filename(fname):
+    """
+    hierarkey.forms.SettingsForm appends a random value to every filename. However, it keeps the
+    extension around "twice". This leads to:
+
+    "Terms.pdf" → "Terms.pdf.OybgvyAH.pdf"
+
+    In pretix Hosted, our storage layer also adds a hash of the file to the filename, so we have
+
+    "Terms.pdf" → "Terms.pdf.OybgvyAH.22c0583727d5bc.pdf"
+
+    This function reverses this operation:
+
+    "Terms.pdf.OybgvyAH.22c0583727d5bc.pdf" → "Terms.pdf"
+    """
+    ext = '.' + fname.split('.')[-1]
+    return fname.rsplit(ext + ".", 1)[0] + ext

src/pretix/helpers/monkeypatching.py

@@ -0,0 +1,56 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+from datetime import datetime
+
+
+def monkeypatch_vobject_performance():
+    """
+    This works around a performance issue in the unmaintained vobject library which calls
+    a very expensive function for every event in a calendar. Since the slow function is
+    mostly used to compare timezones to UTC, not to arbitrary other timezones, we can
+    add a few early-out optimizations.
+    """
+
+    from vobject import icalendar
+
+    old_tzinfo_eq = icalendar.tzinfo_eq
+    test_date = datetime(2000, 1, 1)
+
+    def new_tzinfo_eq(tzinfo1, tzinfo2, *args, **kwargs):
+        if tzinfo1 is None:
+            return tzinfo2 is None
+        if tzinfo2 is None:
+            return tzinfo1 is None
+
+        n1 = tzinfo1.tzname(test_date)
+        n2 = tzinfo2.tzname(test_date)
+        if n1 == "UTC" and n2 == "UTC":
+            return True
+        if n1 == "UTC" or n2 == "UTC":
+            return False
+        return old_tzinfo_eq(tzinfo1, tzinfo2, *args, **kwargs)
+
+    icalendar.tzinfo_eq = new_tzinfo_eq
+
+
+def monkeypatch_all_at_ready():
+    monkeypatch_vobject_performance()

src/pretix/helpers/templatetags/date_fast.py

@@ -0,0 +1,61 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+import functools
+
+from django import template
+from django.utils import dateformat
+from django.utils.formats import get_format
+from django.utils.translation import get_language
+
+register = template.Library()
+
+
+@functools.lru_cache(maxsize=32)
+def _get_format(format_type, lang):
+    return get_format(format_type, lang)
+
+
+@register.filter(expects_localtime=True, is_safe=False)
+def date_fast(value, arg=None):
+    """
+    Slightly quicker version of |date if the filter is called a lot. The speedup is achieved through
+    LRU caching for formats.
+
+    Django's built-in |date filter has a caching mechanism if you call it with a named format,
+    i.e. ``|date_fast:"SHORT_DATE_FORMAT"`` will only be ~6% faster than ``|date:"SHORT_DATE_FORMAT"``.
+
+    However, Django's built-in caching has a flaw with unnamed formats, therefore ``|date_fast:"Y-m-d"``
+    will be ~12% faster than ``|date:"Y-m-d"``.
+    """
+    if value in (None, ''):
+        return ''
+
+    lang = get_language()
+    format = _get_format(arg, lang)
+
+    try:
+        return dateformat.format(value, format)
+    except AttributeError:
+        try:
+            return format(value, arg)
+        except AttributeError:
+            return ''

src/pretix/helpers/thumb.py

@@ -173,7 +173,7 @@ def create_thumbnail(sourcename, size):
 
     image = resize_image(image, size)
 
-    if source.name.endswith('.jpg') or source.name.endswith('.jpeg'):
+    if source.name.lower().endswith('.jpg') or source.name.lower().endswith('.jpeg'):
         # Yields better file sizes for photos
         target_ext = 'jpeg'
         quality = 95
@@ -184,6 +184,8 @@ def create_thumbnail(sourcename, size):
     checksum = hashlib.md5(image.tobytes()).hexdigest()
     name = checksum + '.' + size.replace('^', 'c') + '.' + target_ext
     buffer = BytesIO()
+    if image.mode == "P" and source.name.lower().endswith('.png'):
+        image = image.convert('RGBA')
     if image.mode not in ("1", "L", "RGB", "RGBA"):
         image = image.convert('RGB')
     image.save(fp=buffer, format=target_ext.upper(), quality=quality)

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: 2021-11-30 16:13+0000\n"
+"POT-Creation-Date: 2022-01-27 10:02+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/"
@@ -453,15 +453,15 @@ msgstr "البحث في الاستفسارات"
 msgid "Selected only"
 msgstr "المختارة فقط"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:834
+#: pretix/static/pretixcontrol/js/ui/main.js:848
 msgid "Use a different name internally"
 msgstr "قم باستخدم اسم مختلف داخليا"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:870
+#: pretix/static/pretixcontrol/js/ui/main.js:884
 msgid "Click to close"
 msgstr "اضغط لاغلاق الصفحة"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:911
+#: pretix/static/pretixcontrol/js/ui/main.js:925
 msgid "You have unsaved changes!"
 msgstr "لم تقم بحفظ التعديلات!"
 
@@ -535,20 +535,20 @@ msgstr "ستسترد %(currency)%(amount)"
 msgid "Please enter the amount the organizer can keep."
 msgstr "الرجاء إدخال المبلغ الذي يمكن للمنظم الاحتفاظ به."
 
-#: pretix/static/pretixpresale/js/ui/main.js:349
+#: pretix/static/pretixpresale/js/ui/main.js:361
 msgid "Please enter a quantity for one of the ticket types."
 msgstr "الرجاء إدخال عدد لأحد أنواع التذاكر."
 
-#: pretix/static/pretixpresale/js/ui/main.js:385
+#: pretix/static/pretixpresale/js/ui/main.js:397
 msgid "required"
 msgstr "مطلوب"
 
-#: pretix/static/pretixpresale/js/ui/main.js:488
-#: pretix/static/pretixpresale/js/ui/main.js:507
+#: pretix/static/pretixpresale/js/ui/main.js:500
+#: pretix/static/pretixpresale/js/ui/main.js:519
 msgid "Time zone:"
 msgstr "المنطقة الزمنية:"
 
-#: pretix/static/pretixpresale/js/ui/main.js:498
+#: pretix/static/pretixpresale/js/ui/main.js:510
 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: 2021-11-30 16:13+0000\n"
+"POT-Creation-Date: 2022-01-27 10:02+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-"
@@ -438,15 +438,15 @@ msgstr ""
 msgid "Selected only"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:834
+#: pretix/static/pretixcontrol/js/ui/main.js:848
 msgid "Use a different name internally"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:870
+#: pretix/static/pretixcontrol/js/ui/main.js:884
 msgid "Click to close"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:911
+#: pretix/static/pretixcontrol/js/ui/main.js:925
 msgid "You have unsaved changes!"
 msgstr ""
 
@@ -510,22 +510,22 @@ msgstr ""
 msgid "Please enter the amount the organizer can keep."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:349
+#: pretix/static/pretixpresale/js/ui/main.js:361
 msgid "Please enter a quantity for one of the ticket types."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:385
+#: pretix/static/pretixpresale/js/ui/main.js:397
 #, fuzzy
 #| msgid "Cart expired"
 msgid "required"
 msgstr "Cistella expirada"
 
-#: pretix/static/pretixpresale/js/ui/main.js:488
-#: pretix/static/pretixpresale/js/ui/main.js:507
+#: pretix/static/pretixpresale/js/ui/main.js:500
+#: pretix/static/pretixpresale/js/ui/main.js:519
 msgid "Time zone:"
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:498
+#: pretix/static/pretixpresale/js/ui/main.js:510
 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: 2021-11-30 16:13+0000\n"
+"POT-Creation-Date: 2022-01-27 10:02+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/"
@@ -453,15 +453,15 @@ msgstr "Hledaný výraz"
 msgid "Selected only"
 msgstr "Pouze vybrané"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:834
+#: pretix/static/pretixcontrol/js/ui/main.js:848
 msgid "Use a different name internally"
 msgstr "Interně používat jiný název"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:870
+#: pretix/static/pretixcontrol/js/ui/main.js:884
 msgid "Click to close"
 msgstr "Kliknutím zavřete"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:911
+#: pretix/static/pretixcontrol/js/ui/main.js:925
 msgid "You have unsaved changes!"
 msgstr "Máte neuložené změny!"
 
@@ -528,20 +528,20 @@ msgstr "Dostanete %(currency)s %(amount)s zpět"
 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:349
+#: pretix/static/pretixpresale/js/ui/main.js:361
 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:385
+#: pretix/static/pretixpresale/js/ui/main.js:397
 msgid "required"
 msgstr "povinný"
 
-#: pretix/static/pretixpresale/js/ui/main.js:488
-#: pretix/static/pretixpresale/js/ui/main.js:507
+#: pretix/static/pretixpresale/js/ui/main.js:500
+#: pretix/static/pretixpresale/js/ui/main.js:519
 msgid "Time zone:"
 msgstr "Časové pásmo:"
 
-#: pretix/static/pretixpresale/js/ui/main.js:498
+#: pretix/static/pretixpresale/js/ui/main.js:510
 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: 2021-11-30 16:13+0000\n"
+"POT-Creation-Date: 2022-01-27 10:02+0000\n"
 "PO-Revision-Date: 2021-09-13 09:48+0000\n"
 "Last-Translator: Mie Frydensbjerg <mif@aarhus.dk>\n"
 "Language-Team: Danish <https://translate.pretix.eu/projects/pretix/pretix-js/"
@@ -481,15 +481,15 @@ msgstr ""
 msgid "Selected only"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:834
+#: pretix/static/pretixcontrol/js/ui/main.js:848
 msgid "Use a different name internally"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:870
+#: pretix/static/pretixcontrol/js/ui/main.js:884
 msgid "Click to close"
 msgstr "Klik for at lukke"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:911
+#: pretix/static/pretixcontrol/js/ui/main.js:925
 msgid "You have unsaved changes!"
 msgstr "Du har ændringer, der ikke er gemt!"
 
@@ -563,22 +563,22 @@ msgstr "fra %(currency)s %(price)s"
 msgid "Please enter the amount the organizer can keep."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:349
+#: pretix/static/pretixpresale/js/ui/main.js:361
 msgid "Please enter a quantity for one of the ticket types."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:385
+#: pretix/static/pretixpresale/js/ui/main.js:397
 #, fuzzy
 #| msgid "Cart expired"
 msgid "required"
 msgstr "Kurv udløbet"
 
-#: pretix/static/pretixpresale/js/ui/main.js:488
-#: pretix/static/pretixpresale/js/ui/main.js:507
+#: pretix/static/pretixpresale/js/ui/main.js:500
+#: pretix/static/pretixpresale/js/ui/main.js:519
 msgid "Time zone:"
 msgstr "Tidszone:"
 
-#: pretix/static/pretixpresale/js/ui/main.js:498
+#: pretix/static/pretixpresale/js/ui/main.js:510
 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: 2021-11-30 16:13+0000\n"
+"POT-Creation-Date: 2022-01-27 10:02+0000\n"
 "PO-Revision-Date: 2021-10-25 15:40+0000\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: German <https://translate.pretix.eu/projects/pretix/pretix-js/"
@@ -459,15 +459,15 @@ msgstr "Suchbegriff"
 msgid "Selected only"
 msgstr "Nur ausgewählte"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:834
+#: pretix/static/pretixcontrol/js/ui/main.js:848
 msgid "Use a different name internally"
 msgstr "Intern einen anderen Namen verwenden"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:870
+#: pretix/static/pretixcontrol/js/ui/main.js:884
 msgid "Click to close"
 msgstr "Klicken zum Schließen"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:911
+#: pretix/static/pretixcontrol/js/ui/main.js:925
 msgid "You have unsaved changes!"
 msgstr "Sie haben ungespeicherte Änderungen!"
 
@@ -532,20 +532,20 @@ msgstr "Sie erhalten %(currency)s %(amount)s zurück"
 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:349
+#: pretix/static/pretixpresale/js/ui/main.js:361
 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:385
+#: pretix/static/pretixpresale/js/ui/main.js:397
 msgid "required"
 msgstr "verpflichtend"
 
-#: pretix/static/pretixpresale/js/ui/main.js:488
-#: pretix/static/pretixpresale/js/ui/main.js:507
+#: pretix/static/pretixpresale/js/ui/main.js:500
+#: pretix/static/pretixpresale/js/ui/main.js:519
 msgid "Time zone:"
 msgstr "Zeitzone:"
 
-#: pretix/static/pretixpresale/js/ui/main.js:498
+#: pretix/static/pretixpresale/js/ui/main.js:510
 msgid "Your local time:"
 msgstr "Deine lokale Zeit:"
 

src/pretix/locale/de/wordlist.txt

@@ -1,6 +1,7 @@
 2FA
 ABN
 Absenderadresse
+Absenderinformation
 Absendername
 Admin
 Adminbereich
@@ -62,6 +63,7 @@ csv
 Customer
 Debug
 deliverability
+DNS
 Di
 Do
 Doe
@@ -228,6 +230,7 @@ Sofort
 SOFORT
 Sorry
 Source
+SPF
 SSL
 STARTTLS
 Steuerschuldnerschaft
@@ -255,6 +258,7 @@ TODO
 TOTP
 Trace
 Tracking
+transaktionale
 Turnover
 txt
 überbuchen

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: 2021-11-30 16:13+0000\n"
+"POT-Creation-Date: 2022-01-27 10:02+0000\n"
 "PO-Revision-Date: 2021-10-25 15:40+0000\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: German (informal) <https://translate.pretix.eu/projects/"
@@ -458,15 +458,15 @@ msgstr "Suchbegriff"
 msgid "Selected only"
 msgstr "Nur ausgewählte"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:834
+#: pretix/static/pretixcontrol/js/ui/main.js:848
 msgid "Use a different name internally"
 msgstr "Intern einen anderen Namen verwenden"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:870
+#: pretix/static/pretixcontrol/js/ui/main.js:884
 msgid "Click to close"
 msgstr "Klicken zum Schließen"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:911
+#: pretix/static/pretixcontrol/js/ui/main.js:925
 msgid "You have unsaved changes!"
 msgstr "Du hast ungespeicherte Änderungen!"
 
@@ -531,20 +531,20 @@ msgstr "Du erhältst %(currency)s %(amount)s zurück"
 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:349
+#: pretix/static/pretixpresale/js/ui/main.js:361
 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:385
+#: pretix/static/pretixpresale/js/ui/main.js:397
 msgid "required"
 msgstr "verpflichtend"
 
-#: pretix/static/pretixpresale/js/ui/main.js:488
-#: pretix/static/pretixpresale/js/ui/main.js:507
+#: pretix/static/pretixpresale/js/ui/main.js:500
+#: pretix/static/pretixpresale/js/ui/main.js:519
 msgid "Time zone:"
 msgstr "Zeitzone:"
 
-#: pretix/static/pretixpresale/js/ui/main.js:498
+#: pretix/static/pretixpresale/js/ui/main.js:510
 msgid "Your local time:"
 msgstr "Deine lokale Zeit:"
 

src/pretix/locale/de_Informal/wordlist.txt

@@ -1,6 +1,7 @@
 2FA
 ABN
 Absenderadresse
+Absenderinformation
 Absendername
 Admin
 Adminbereich
@@ -62,6 +63,7 @@ csv
 Customer
 Debug
 deliverability
+DNS
 Di
 Do
 Doe
@@ -228,6 +230,7 @@ Sofort
 SOFORT
 Sorry
 Source
+SPF
 SSL
 STARTTLS
 Steuerschuldnerschaft
@@ -255,6 +258,7 @@ TODO
 TOTP
 Trace
 Tracking
+transaktionale
 Turnover
 txt
 überbuchen

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: 2021-11-30 16:13+0000\n"
+"POT-Creation-Date: 2022-01-27 10:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -437,15 +437,15 @@ msgstr ""
 msgid "Selected only"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:834
+#: pretix/static/pretixcontrol/js/ui/main.js:848
 msgid "Use a different name internally"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:870
+#: pretix/static/pretixcontrol/js/ui/main.js:884
 msgid "Click to close"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:911
+#: pretix/static/pretixcontrol/js/ui/main.js:925
 msgid "You have unsaved changes!"
 msgstr ""
 
@@ -505,20 +505,20 @@ msgstr ""
 msgid "Please enter the amount the organizer can keep."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:349
+#: pretix/static/pretixpresale/js/ui/main.js:361
 msgid "Please enter a quantity for one of the ticket types."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:385
+#: pretix/static/pretixpresale/js/ui/main.js:397
 msgid "required"
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:488
-#: pretix/static/pretixpresale/js/ui/main.js:507
+#: pretix/static/pretixpresale/js/ui/main.js:500
+#: pretix/static/pretixpresale/js/ui/main.js:519
 msgid "Time zone:"
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:498
+#: pretix/static/pretixpresale/js/ui/main.js:510
 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: 2021-11-30 16:13+0000\n"
+"POT-Creation-Date: 2022-01-27 10:02+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/"
@@ -495,15 +495,15 @@ msgstr ""
 msgid "Selected only"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:834
+#: pretix/static/pretixcontrol/js/ui/main.js:848
 msgid "Use a different name internally"
 msgstr "Χρησιμοποιήστε διαφορετικό όνομα εσωτερικά"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:870
+#: pretix/static/pretixcontrol/js/ui/main.js:884
 msgid "Click to close"
 msgstr "Κάντε κλικ για να κλείσετε"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:911
+#: pretix/static/pretixcontrol/js/ui/main.js:925
 msgid "You have unsaved changes!"
 msgstr ""
 
@@ -575,22 +575,22 @@ msgstr "απο %(currency)s %(price)s"
 msgid "Please enter the amount the organizer can keep."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:349
+#: pretix/static/pretixpresale/js/ui/main.js:361
 msgid "Please enter a quantity for one of the ticket types."
 msgstr "Εισαγάγετε μια ποσότητα για έναν από τους τύπους εισιτηρίων."
 
-#: pretix/static/pretixpresale/js/ui/main.js:385
+#: pretix/static/pretixpresale/js/ui/main.js:397
 #, fuzzy
 #| msgid "Cart expired"
 msgid "required"
 msgstr "Το καλάθι έληξε"
 
-#: pretix/static/pretixpresale/js/ui/main.js:488
-#: pretix/static/pretixpresale/js/ui/main.js:507
+#: pretix/static/pretixpresale/js/ui/main.js:500
+#: pretix/static/pretixpresale/js/ui/main.js:519
 msgid "Time zone:"
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:498
+#: pretix/static/pretixpresale/js/ui/main.js:510
 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: 2021-11-30 16:13+0000\n"
+"POT-Creation-Date: 2022-01-27 10:02+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-"
@@ -457,15 +457,15 @@ msgstr "Consultar búsqueda"
 msgid "Selected only"
 msgstr "Solamente seleccionados"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:834
+#: pretix/static/pretixcontrol/js/ui/main.js:848
 msgid "Use a different name internally"
 msgstr "Usar un nombre diferente internamente"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:870
+#: pretix/static/pretixcontrol/js/ui/main.js:884
 msgid "Click to close"
 msgstr "Click para cerrar"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:911
+#: pretix/static/pretixcontrol/js/ui/main.js:925
 msgid "You have unsaved changes!"
 msgstr "¡Tienes cambios sin guardar!"
 
@@ -529,20 +529,20 @@ msgstr "Obtienes %(currency)s %(price)s de vuelta"
 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:349
+#: pretix/static/pretixpresale/js/ui/main.js:361
 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:385
+#: pretix/static/pretixpresale/js/ui/main.js:397
 msgid "required"
 msgstr "campo requerido"
 
-#: pretix/static/pretixpresale/js/ui/main.js:488
-#: pretix/static/pretixpresale/js/ui/main.js:507
+#: pretix/static/pretixpresale/js/ui/main.js:500
+#: pretix/static/pretixpresale/js/ui/main.js:519
 msgid "Time zone:"
 msgstr "Zona horaria:"
 
-#: pretix/static/pretixpresale/js/ui/main.js:498
+#: pretix/static/pretixpresale/js/ui/main.js:510
 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: 2021-11-30 16:13+0000\n"
+"POT-Creation-Date: 2022-01-27 10:02+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-"
@@ -456,15 +456,15 @@ msgstr ""
 msgid "Selected only"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:834
+#: pretix/static/pretixcontrol/js/ui/main.js:848
 msgid "Use a different name internally"
 msgstr "Käytä toista nimeä sisäisesti"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:870
+#: pretix/static/pretixcontrol/js/ui/main.js:884
 msgid "Click to close"
 msgstr "Sulje klikkaamalla"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:911
+#: pretix/static/pretixcontrol/js/ui/main.js:925
 msgid "You have unsaved changes!"
 msgstr "Sinulla on tallentamattomia muutoksia!"
 
@@ -528,22 +528,22 @@ msgstr ""
 msgid "Please enter the amount the organizer can keep."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:349
+#: pretix/static/pretixpresale/js/ui/main.js:361
 msgid "Please enter a quantity for one of the ticket types."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:385
+#: pretix/static/pretixpresale/js/ui/main.js:397
 #, fuzzy
 #| msgid "Cart expired"
 msgid "required"
 msgstr "Ostoskori on vanhentunut"
 
-#: pretix/static/pretixpresale/js/ui/main.js:488
-#: pretix/static/pretixpresale/js/ui/main.js:507
+#: pretix/static/pretixpresale/js/ui/main.js:500
+#: pretix/static/pretixpresale/js/ui/main.js:519
 msgid "Time zone:"
 msgstr "Aikavyöhyke:"
 
-#: pretix/static/pretixpresale/js/ui/main.js:498
+#: pretix/static/pretixpresale/js/ui/main.js:510
 msgid "Your local time:"
 msgstr ""