fix bulk devices and subevents as well

Fix subevent dropdown in check-in filter-form
2022-09-27 09:45:25 +02:00 · 2022-09-27 08:49:03 +02:00
78 changed files with 7408 additions and 7867 deletions
--- a/src/pretix/init.py
+++ b/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.13.1"
+__version__ = "4.13.0.dev0"
--- a/src/pretix/base/services/mail.py
+++ b/src/pretix/base/services/mail.py
@@ -506,7 +506,7 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
                else:
                    # Most likely some other kind of temporary failure, retry again (but pretty soon)
                    max_retries = 5
-                    retry_after = [10, 30, 60, 300, 900, 900][self.request.retries]
+                    retry_after = [10, 30, 60, 300, 900][self.request.retries]

                try:
                    self.retry(max_retries=max_retries, countdown=retry_after)
@@ -567,7 +567,7 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
        except Exception as e:
            if isinstance(e, (smtplib.SMTPServerDisconnected, smtplib.SMTPConnectError, ssl.SSLError, OSError)):
                try:
-                    self.retry(max_retries=5, countdown=[10, 30, 60, 300, 900, 900][self.request.retries])
+                    self.retry(max_retries=5, countdown=[10, 30, 60, 300, 900][self.request.retries])
                except MaxRetriesExceededError:
                    if log_target:
                        log_target.log_action(
--- a/src/pretix/helpers/countries.py
+++ b/src/pretix/helpers/countries.py
@@ -23,8 +23,7 @@ import pyuca
 from babel.core import Locale
 from django.core.cache import cache
 from django.utils import translation
-from django.utils.encoding import force_str
-from django_countries import Countries, CountryTuple
+from django_countries import Countries
 from django_countries.fields import CountryField
 from phonenumbers.data import _COUNTRY_CODE_TO_REGION_CODE

@@ -61,22 +60,6 @@ class CachedCountries(Countries):
        cache.set(cache_key, val, 3600 * 24 * 30)
        yield from val

-    def translate_pair(self, code: str, name=None):
-        # We need to temporarily override this function until
-        # https://github.com/SmileyChris/django-countries/issues/364
-        # is fixed
-        if name is None:
-            name = self.countries[code]
-        if isinstance(name, dict):
-            if "names" in name:
-                country_name: str = name["names"][0]
-            else:
-                country_name = name["name"]
-        else:
-            country_name = name
-        country_name = force_str(country_name)
-        return CountryTuple(code, country_name)
-

 class FastCountryField(CountryField):
    def __init__(self, *args, **kwargs):
--- a/src/pretix/locale/ar/LC_MESSAGES/django.po
+++ b/src/pretix/locale/ar/LC_MESSAGES/django.po
--- a/src/pretix/locale/ar/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/ar/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2021-09-15 11:22+0000\n"
 "Last-Translator: Mohamed Tawfiq <mtawfiq@wafyapp.com>\n"
 "Language-Team: Arabic <https://translate.pretix.eu/projects/pretix/pretix-js/"
--- a/src/pretix/locale/ca/LC_MESSAGES/django.po
+++ b/src/pretix/locale/ca/LC_MESSAGES/django.po
--- a/src/pretix/locale/ca/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/ca/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2020-12-19 07:00+0000\n"
 "Last-Translator: albert <albert.serra.monner@gmail.com>\n"
 "Language-Team: Catalan <https://translate.pretix.eu/projects/pretix/pretix-"
--- a/src/pretix/locale/cs/LC_MESSAGES/django.po
+++ b/src/pretix/locale/cs/LC_MESSAGES/django.po
--- a/src/pretix/locale/cs/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/cs/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2021-12-06 23:00+0000\n"
 "Last-Translator: Ondřej Sokol <osokol@treesoft.cz>\n"
 "Language-Team: Czech <https://translate.pretix.eu/projects/pretix/pretix-js/"
--- a/src/pretix/locale/da/LC_MESSAGES/django.po
+++ b/src/pretix/locale/da/LC_MESSAGES/django.po
--- a/src/pretix/locale/da/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/da/LC_MESSAGES/djangojs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2022-04-01 13:36+0000\n"
 "Last-Translator: Anna-itk <abc@aarhus.dk>\n"
 "Language-Team: Danish <https://translate.pretix.eu/projects/pretix/pretix-js/"
--- a/src/pretix/locale/de/LC_MESSAGES/django.po
+++ b/src/pretix/locale/de/LC_MESSAGES/django.po
--- a/src/pretix/locale/de/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/de/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2022-07-26 08:58+0000\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: German <https://translate.pretix.eu/projects/pretix/pretix-js/"
--- a/src/pretix/locale/de_Informal/LC_MESSAGES/django.po
+++ b/src/pretix/locale/de_Informal/LC_MESSAGES/django.po
--- a/src/pretix/locale/de_Informal/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/de_Informal/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2022-07-26 08:58+0000\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: German (informal) <https://translate.pretix.eu/projects/"
--- a/src/pretix/locale/django.pot
+++ b/src/pretix/locale/django.pot
--- a/src/pretix/locale/djangojs.pot
+++ b/src/pretix/locale/djangojs.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
--- a/src/pretix/locale/el/LC_MESSAGES/django.po
+++ b/src/pretix/locale/el/LC_MESSAGES/django.po
--- a/src/pretix/locale/el/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/el/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2019-10-03 19:00+0000\n"
 "Last-Translator: Chris Spy <chrispiropoulou@hotmail.com>\n"
 "Language-Team: Greek <https://translate.pretix.eu/projects/pretix/pretix-js/"
--- a/src/pretix/locale/es/LC_MESSAGES/django.po
+++ b/src/pretix/locale/es/LC_MESSAGES/django.po
--- a/src/pretix/locale/es/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/es/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2021-11-25 21:00+0000\n"
 "Last-Translator: Ismael Menéndez Fernández <ismael.menendez@balidea.com>\n"
 "Language-Team: Spanish <https://translate.pretix.eu/projects/pretix/pretix-"
--- a/src/pretix/locale/fi/LC_MESSAGES/django.po
+++ b/src/pretix/locale/fi/LC_MESSAGES/django.po
--- a/src/pretix/locale/fi/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/fi/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2021-11-10 05:00+0000\n"
 "Last-Translator: Jaakko Rinta-Filppula <jaakko@r-f.fi>\n"
 "Language-Team: Finnish <https://translate.pretix.eu/projects/pretix/pretix-"
--- a/src/pretix/locale/fr/LC_MESSAGES/django.po
+++ b/src/pretix/locale/fr/LC_MESSAGES/django.po
--- a/src/pretix/locale/fr/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/fr/LC_MESSAGES/djangojs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: French\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2022-04-07 10:40+0000\n"
 "Last-Translator: Eva-Maria Obermann <obermann@rami.io>\n"
 "Language-Team: French <https://translate.pretix.eu/projects/pretix/pretix-js/"
--- a/src/pretix/locale/gl/LC_MESSAGES/django.po
+++ b/src/pretix/locale/gl/LC_MESSAGES/django.po
--- a/src/pretix/locale/gl/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/gl/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2022-02-22 22:00+0000\n"
 "Last-Translator: Ismael Menéndez Fernández <ismael.menendez@balidea.com>\n"
 "Language-Team: Galician <https://translate.pretix.eu/projects/pretix/pretix-"
--- a/src/pretix/locale/he/LC_MESSAGES/django.po
+++ b/src/pretix/locale/he/LC_MESSAGES/django.po
--- a/src/pretix/locale/he/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/he/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2021-09-24 13:54+0000\n"
 "Last-Translator: ofirtro <ofir.tro@gmail.com>\n"
 "Language-Team: Hebrew <https://translate.pretix.eu/projects/pretix/pretix-js/"
--- a/src/pretix/locale/hu/LC_MESSAGES/django.po
+++ b/src/pretix/locale/hu/LC_MESSAGES/django.po
--- a/src/pretix/locale/hu/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/hu/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2020-01-24 08:00+0000\n"
 "Last-Translator: Prokaj Miklós <mixolid0@gmail.com>\n"
 "Language-Team: Hungarian <https://translate.pretix.eu/projects/pretix/pretix-"
--- a/src/pretix/locale/it/LC_MESSAGES/django.po
+++ b/src/pretix/locale/it/LC_MESSAGES/django.po
--- a/src/pretix/locale/it/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/it/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2022-05-08 19:00+0000\n"
 "Last-Translator: Emanuele Signoretta <signorettae@gmail.com>\n"
 "Language-Team: Italian <https://translate.pretix.eu/projects/pretix/pretix-"
--- a/src/pretix/locale/ja/LC_MESSAGES/django.po
+++ b/src/pretix/locale/ja/LC_MESSAGES/django.po
--- a/src/pretix/locale/ja/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/ja/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2022-03-15 00:00+0000\n"
 "Last-Translator: Yuriko Matsunami <y.matsunami@enobyte.com>\n"
 "Language-Team: Japanese <https://translate.pretix.eu/projects/pretix/pretix-"
--- a/src/pretix/locale/lv/LC_MESSAGES/django.po
+++ b/src/pretix/locale/lv/LC_MESSAGES/django.po
--- a/src/pretix/locale/lv/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/lv/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2022-04-06 03:00+0000\n"
 "Last-Translator: Liga V <lerning_by_dreaming@gmx.de>\n"
 "Language-Team: Latvian <https://translate.pretix.eu/projects/pretix/pretix-"
--- a/src/pretix/locale/nb_NO/LC_MESSAGES/django.po
+++ b/src/pretix/locale/nb_NO/LC_MESSAGES/django.po
--- a/src/pretix/locale/nb_NO/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/nb_NO/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2022-06-20 02:00+0000\n"
 "Last-Translator: fyksen <fredrik@fyksen.me>\n"
 "Language-Team: Norwegian Bokmål <https://translate.pretix.eu/projects/pretix/"
--- a/src/pretix/locale/nl/LC_MESSAGES/django.po
+++ b/src/pretix/locale/nl/LC_MESSAGES/django.po
--- a/src/pretix/locale/nl/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/nl/LC_MESSAGES/djangojs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2021-10-29 02:00+0000\n"
 "Last-Translator: Maarten van den Berg <maartenberg1@gmail.com>\n"
 "Language-Team: Dutch <https://translate.pretix.eu/projects/pretix/pretix-js/"
--- a/src/pretix/locale/nl_BE/LC_MESSAGES/django.po
+++ b/src/pretix/locale/nl_BE/LC_MESSAGES/django.po
--- a/src/pretix/locale/nl_BE/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/nl_BE/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
--- a/src/pretix/locale/nl_Informal/LC_MESSAGES/django.po
+++ b/src/pretix/locale/nl_Informal/LC_MESSAGES/django.po
--- a/src/pretix/locale/nl_Informal/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/nl_Informal/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2021-08-05 04:00+0000\n"
 "Last-Translator: Maarten van den Berg <maartenberg1@gmail.com>\n"
 "Language-Team: Dutch (informal) <https://translate.pretix.eu/projects/pretix/"
--- a/src/pretix/locale/pl/LC_MESSAGES/django.po
+++ b/src/pretix/locale/pl/LC_MESSAGES/django.po
--- a/src/pretix/locale/pl/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/pl/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2019-09-24 19:00+0000\n"
 "Last-Translator: Serge Bazanski <q3k@hackerspace.pl>\n"
 "Language-Team: Polish <https://translate.pretix.eu/projects/pretix/pretix-js/"
--- a/src/pretix/locale/pl_Informal/LC_MESSAGES/django.po
+++ b/src/pretix/locale/pl_Informal/LC_MESSAGES/django.po
--- a/src/pretix/locale/pl_Informal/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/pl_Informal/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
--- a/src/pretix/locale/pt/LC_MESSAGES/django.po
+++ b/src/pretix/locale/pt/LC_MESSAGES/django.po
--- a/src/pretix/locale/pt/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/pt/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
--- a/src/pretix/locale/pt_BR/LC_MESSAGES/django.po
+++ b/src/pretix/locale/pt_BR/LC_MESSAGES/django.po
--- a/src/pretix/locale/pt_BR/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/pt_BR/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2019-03-19 09:00+0000\n"
 "Last-Translator: Vitor Reis <vitor.reis7@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://translate.pretix.eu/projects/"
--- a/src/pretix/locale/pt_PT/LC_MESSAGES/django.po
+++ b/src/pretix/locale/pt_PT/LC_MESSAGES/django.po
--- a/src/pretix/locale/pt_PT/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/pt_PT/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2020-10-27 06:00+0000\n"
 "Last-Translator: David Vaz <davidmgvaz@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) <https://translate.pretix.eu/projects/"
--- a/src/pretix/locale/ro/LC_MESSAGES/django.po
+++ b/src/pretix/locale/ro/LC_MESSAGES/django.po
--- a/src/pretix/locale/ro/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/ro/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2022-04-29 04:00+0000\n"
 "Last-Translator: Edd28 <chitu_edy@yahoo.com>\n"
 "Language-Team: Romanian <https://translate.pretix.eu/projects/pretix/pretix-"
--- a/src/pretix/locale/ru/LC_MESSAGES/django.po
+++ b/src/pretix/locale/ru/LC_MESSAGES/django.po
--- a/src/pretix/locale/ru/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/ru/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2021-08-09 13:10+0000\n"
 "Last-Translator: Svyatoslav <slava@digitalarthouse.eu>\n"
 "Language-Team: Russian <https://translate.pretix.eu/projects/pretix/pretix-"
--- a/src/pretix/locale/si/LC_MESSAGES/django.po
+++ b/src/pretix/locale/si/LC_MESSAGES/django.po
--- a/src/pretix/locale/si/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/si/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
--- a/src/pretix/locale/sl/LC_MESSAGES/django.po
+++ b/src/pretix/locale/sl/LC_MESSAGES/django.po
--- a/src/pretix/locale/sl/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/sl/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2019-08-27 08:00+0000\n"
 "Last-Translator: Bostjan Marusic <bostjan@brokenbones.si>\n"
 "Language-Team: Slovenian <https://translate.pretix.eu/projects/pretix/pretix-"
--- a/src/pretix/locale/sv/LC_MESSAGES/django.po
+++ b/src/pretix/locale/sv/LC_MESSAGES/django.po
--- a/src/pretix/locale/sv/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/sv/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2022-03-03 07:00+0000\n"
 "Last-Translator: MaLund13 <mart.lund13@gmail.com>\n"
 "Language-Team: Swedish <https://translate.pretix.eu/projects/pretix/pretix-"
--- a/src/pretix/locale/tr/LC_MESSAGES/django.po
+++ b/src/pretix/locale/tr/LC_MESSAGES/django.po
--- a/src/pretix/locale/tr/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/tr/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2018-09-03 06:36+0000\n"
 "Last-Translator: Yunus Fırat Pişkin <firat.piskin@idvlabs.com>\n"
 "Language-Team: Turkish <https://translate.pretix.eu/projects/pretix/pretix-"
--- a/src/pretix/locale/uk/LC_MESSAGES/django.po
+++ b/src/pretix/locale/uk/LC_MESSAGES/django.po
--- a/src/pretix/locale/uk/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/uk/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2022-05-10 02:00+0000\n"
 "Last-Translator: Iryna N <in380@nyu.edu>\n"
 "Language-Team: Ukrainian <https://translate.pretix.eu/projects/pretix/pretix-"
--- a/src/pretix/locale/vi/LC_MESSAGES/django.po
+++ b/src/pretix/locale/vi/LC_MESSAGES/django.po
--- a/src/pretix/locale/vi/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/vi/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
--- a/src/pretix/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/src/pretix/locale/zh_Hans/LC_MESSAGES/django.po
--- a/src/pretix/locale/zh_Hans/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/zh_Hans/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-29 09:24+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2021-12-03 08:37+0000\n"
 "Last-Translator: ExtremeX-BB <qq754163444@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://translate.pretix.eu/projects/"
--- a/src/pretix/plugins/banktransfer/payment.py
+++ b/src/pretix/plugins/banktransfer/payment.py
@@ -316,11 +316,9 @@ class BankTransfer(BasePaymentProvider):
            'amount': payment.amount,
            'settings': self.settings,
            'swiss_qrbill': self.swiss_qrbill(payment),
-            'eu_barcodes': self.event.currency == 'EUR',
            'pending_description': self.settings.get('pending_description', as_type=LazyI18nString),
            'details': self.settings.get('bank_details', as_type=LazyI18nString),
        }
-        ctx['any_barcodes'] = ctx['swiss_qrbill'] or ctx['eu_barcodes']
        return template.render(ctx)

    def payment_control_render(self, request: HttpRequest, payment: OrderPayment) -> str:
--- a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/pending.html
+++ b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/pending.html
@@ -41,16 +41,14 @@
            {% trans "After you sent the bank transfer, you can close this window. We will send you an email as soon as we received your payment." %}
        </p>
    </div>
-    {% if settings.bank_details_type == "sepa" and any_barcodes %}
+    {% if settings.bank_details_type == "sepa" %}
        <div class="col-md-6 col-sm-6 hidden-xs text-center js-only blank-after">
            <ul class="nav nav-tabs" id="banktransfer_qrcodes_tabs" role="tablist">
                {% if swiss_qrbill %}
                    <li class="active"><a href="#banktransfer_qrcodes_qrbill" role="tab" id="banktransfer_qrcodes_qrbill_tab" data-toggle="tab" aria-controls="banktransfer_qrcodes_qrbill" aria-expanded="true">QR-bill</a></li>
                {% endif %}
-                {% if eu_barcodes %}
-                    <li {% if not swiss_qrbill %}class="active"{% endif %}><a href="#banktransfer_qrcodes_girocode" role="tab" id="banktransfer_qrcodes_girocode_tab" data-toggle="tab" aria-controls="banktransfer_qrcodes_girocode" aria-expanded="{% if swiss_qrbill %}false{% else %}true{% endif %}">EPC-QR</a></li>
-                    <li class=""><a href="#banktransfer_qrcodes_bezahlcode" role="tab" id="banktransfer_qrcodes_bezahlcode_tab" data-toggle="tab" aria-controls="banktransfer_qrcodes_bezahlcode" aria-expanded="false">BezahlCode</a></li>
-                {% endif %}
+                <li {% if not swiss_qrbill %}class="active"{% endif %}><a href="#banktransfer_qrcodes_girocode" role="tab" id="banktransfer_qrcodes_girocode_tab" data-toggle="tab" aria-controls="banktransfer_qrcodes_girocode" aria-expanded="{% if swiss_qrbill %}false{% else %}true{% endif %}">EPC-QR</a></li>
+                <li class=""><a href="#banktransfer_qrcodes_bezahlcode" role="tab" id="banktransfer_qrcodes_bezahlcode_tab" data-toggle="tab" aria-controls="banktransfer_qrcodes_bezahlcode" aria-expanded="false">BezahlCode</a></li>
            </ul>
            <div class="tab-content" id="banktransfer_qrcodes_tabs_content">
                {% if swiss_qrbill %}
@@ -64,13 +62,12 @@
                        </p>
                    </div>
                {% endif %}
-                {% if eu_barcodes %}
-                    <div id="banktransfer_qrcodes_girocode" class="tab-pane fade {% if not swiss_qrbill %}active in{% endif %}" role="tabpanel" aria-labelledby="banktransfer_qrcodes_girocode_tab">
-                        <p class="small">
-                            {% trans "Scan the qr-code with your banking app" %}
-                        </p>
-                        <p>
-                            <script type="text/plain" data-size="150" data-replace-with-qr data-desc="{% trans 'Scan this image with your banking app’s QR-Reader to start the payment process.' %}">BCD
+                <div id="banktransfer_qrcodes_girocode" class="tab-pane fade {% if not swiss_qrbill %}active in{% endif %}" role="tabpanel" aria-labelledby="banktransfer_qrcodes_girocode_tab">
+                    <p class="small">
+                        {% trans "Scan the qr-code with your banking app" %}
+                    </p>
+                    <p>
+                    <script type="text/plain" data-size="150" data-replace-with-qr data-desc="{% trans 'Scan this image with your banking app’s QR-Reader to start the payment process.' %}">BCD
 002
 2
 SCT
@@ -82,20 +79,19 @@ SCT

 {{ code }}

-</script>
-                        </p>
-                    </div>
-                    <div id="banktransfer_qrcodes_bezahlcode" class="tab-pane fade" role="tabpanel" aria-labelledby="banktransfer_qrcodes_bezahlcode_tab">
-                        <p class="small">
-                            {% trans "Scan the qr-code with your banking app" %}
-                        </p>
-                        <p>
-                            <a aria-label="{% trans "Open BezahlCode in your banking app to start the payment process." %}" href="bank://singlepaymentsepa?name={{ settings.bank_details_sepa_name|urlencode }}&iban={{ settings.bank_details_sepa_iban }}&bic={{ settings.bank_details_sepa_bic }}&amount={{ amount|commadecimal }}&reason={{ code }}&currency={{ event.currency }}">
-                                <script type="text/plain" data-size="150" data-replace-with-qr data-desc="{% trans 'Scan this image with your banking app’s QR-Reader to start the payment process.' %}">bank://singlepaymentsepa?name={{ settings.bank_details_sepa_name|urlencode }}&iban={{ settings.bank_details_sepa_iban }}&bic={{ settings.bank_details_sepa_bic }}&amount={{ amount|commadecimal }}&reason={{ code }}&currency={{ event.currency }}</script>
-                            </a>
-                        </p>
-                    </div>
-                {% endif %}
+            </script>
+                    </p>
+                </div>
+                <div id="banktransfer_qrcodes_bezahlcode" class="tab-pane fade" role="tabpanel" aria-labelledby="banktransfer_qrcodes_bezahlcode_tab">
+                    <p class="small">
+                        {% trans "Scan the qr-code with your banking app" %}
+                    </p>
+                    <p>
+                        <a aria-label="{% trans "Open BezahlCode in your banking app to start the payment process." %}" href="bank://singlepaymentsepa?name={{ settings.bank_details_sepa_name|urlencode }}&iban={{ settings.bank_details_sepa_iban }}&bic={{ settings.bank_details_sepa_bic }}&amount={{ amount|commadecimal }}&reason={{ code }}&currency={{ event.currency }}">
+                        <script type="text/plain" data-size="150" data-replace-with-qr data-desc="{% trans 'Scan this image with your banking app’s QR-Reader to start the payment process.' %}">bank://singlepaymentsepa?name={{ settings.bank_details_sepa_name|urlencode }}&iban={{ settings.bank_details_sepa_iban }}&bic={{ settings.bank_details_sepa_bic }}&amount={{ amount|commadecimal }}&reason={{ code }}&currency={{ event.currency }}</script>
+                        </a>
+                    </p>
+                </div>
            </div>
        </div>
    {% endif %}
--- a/src/pretix/plugins/paypal2/views.py
+++ b/src/pretix/plugins/paypal2/views.py
@@ -240,13 +240,13 @@ def isu_return(request, *args, **kwargs):
            if response.result.tracking_id != request.session['payment_paypal_isu_tracking_id']:
                messages.error(request, _('An error occurred returning from PayPal: session parameter not matching. Please try again.'))
                logger.exception('PayPal2 - tracking_id not matching session.payment_paypal_isu_tracking_id')
-            elif request.GET.get("isEmailConfirmed") == "false":  # Yes - literal!
-                messages.error(
-                    request,
-                    _('The e-mail address on your PayPal account has not yet been confirmed. You will need to do '
-                      'this before you can start accepting payments.')
-                )
            else:
+                if request.GET.get("isEmailConfirmed") == "false":  # Yes - literal!
+                    messages.warning(
+                        request,
+                        _('The e-mail address on your PayPal account has not yet been confirmed. You will need to do '
+                          'this before you can start accepting payments.')
+                    )
                messages.success(
                    request,
                    _('Your PayPal account is now connected to pretix. You can change the settings in detail below.')
--- a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
+++ b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
@@ -400,7 +400,7 @@
            <div role="cell" class="totalprice price">
                <strong>{{ cart.total|money:event.currency }}</strong>

-                {% if not event.settings.display_net_prices and cart.tax_total %}
+                {% if not event.settings.display_net_prices and cart.tax_total and not editable %}
                    <small class="text-muted">
                        {% blocktrans trimmed with tax_sum=cart.tax_total|money:event.currency %}
                            incl. {{ tax_sum }} taxes
--- a/src/pretix/static/pretixcontrol/scss/main.scss
+++ b/src/pretix/static/pretixcontrol/scss/main.scss
@@ -110,9 +110,6 @@ h1 .btn-sm {
 .container-fluid > .alert:first-child {
    margin-top: 20px;
 }
-.alert h2 {
-    margin-top: 0;
-}

 .flipped-scroll-wrapper {
    overflow-y: auto;
Author	SHA1	Message	Date
Richard Schreiber	3a35497993	fix bulk devices and subevents as well	2022-09-27 09:45:25 +02:00
Richard Schreiber	a285b3bca5	Fix subevent dropdown in check-in filter-form	2022-09-27 08:49:03 +02:00