Compare commits

..
Author SHA1 Message Date
Raphael Michel b382f30995 Make it harder for dates way in the past to enter the system
The input components even allow adding setting dates before christus,
but then retrieving the rows back from the DB is impossible:

    File "django/db/models/sql/compiler.py", line 1661, in execute_sql
      return list(result)
    File "django/db/models/sql/compiler.py", line 2171, in cursor_iter
      for rows in iter((lambda: cursor.fetchmany(itersize)), sentinel):
    File "django/db/models/sql/compiler.py", line 2171, in <lambda>
      for rows in iter((lambda: cursor.fetchmany(itersize)), sentinel):
    File "django/db/utils.py", line 98, in inner
      return func(*args, **kwargs)
    ValueError: year -1 is out of range
2026-11-13 10:11:44 +01:00
32 changed files with 209 additions and 545 deletions

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
sphinx==9.0.*
sphinx-rtd-theme~=3.1.0
sphinxcontrib-httpdomain~=2.2.1
sphinxcontrib-httpdomain~=2.1.0
sphinxcontrib-images~=1.0.1
sphinxcontrib-jquery~=4.1
sphinxcontrib-spelling~=8.0.2
+1 -1
View File
@@ -1,7 +1,7 @@
-e ../
sphinx==9.0.*
sphinx-rtd-theme~=3.1.0
sphinxcontrib-httpdomain~=2.2.1
sphinxcontrib-httpdomain~=2.1.0
sphinxcontrib-images~=1.0.1
sphinxcontrib-jquery~=4.1
sphinxcontrib-spelling~=8.0.2
+1 -1
View File
@@ -81,7 +81,7 @@ dependencies = [
"pycountry",
"pycparser==3.12",
"pycryptodome==3.24.*",
"pypdf==6.21.*",
"pypdf==6.20.*",
"python-bidi==0.6.*", # Support for Arabic in reportlab
"python-dateutil==4.0.*",
"pytz",
+1 -1
View File
@@ -27,4 +27,4 @@ class PretixApiConfig(AppConfig):
label = 'pretixapi'
def ready(self):
from . import signals, webhooks # noqa
from . import monkeypatches, signals, webhooks # noqa
+27
View File
@@ -0,0 +1,27 @@
import datetime
from django.db import models
from rest_framework import serializers
from rest_framework.exceptions import ValidationError
class CustomDateField(serializers.DateField):
def to_internal_value(self, value):
val = super().to_internal_value(value)
if val < datetime.date(1900, 1, 1):
raise ValidationError("Do not pass dates before 1900-01-01")
return val
class CustomDateTimeField(serializers.DateTimeField):
def to_internal_value(self, value):
val = super().to_internal_value(value)
if val < datetime.datetime(1900, 1, 1, tzinfo=datetime.timezone.utc):
raise ValidationError("Do not pass dates before 1900-01-01")
return val
serializers.ModelSerializer.serializer_field_mapping.update({
models.DateField: CustomDateField,
models.DateTimeField: CustomDateTimeField,
})
-8
View File
@@ -156,8 +156,6 @@ class ExportFormDataField(serializers.Field):
return JobRunSerializer(exporter=exporter).to_internal_value(data["export_form_data"])
else:
return data['export_form_data']
else: # partial PATCH without export_form_data keeps it unchanged
return self.parent.instance.export_form_data
class ScheduledExportSerializer(serializers.ModelSerializer):
@@ -190,12 +188,6 @@ class ScheduledExportSerializer(serializers.ModelSerializer):
raise ValidationError('Please enter less than 25 recipients.')
return d
def validate(self, attrs):
attrs = super().validate(attrs)
if self.instance and self.instance.pk and 'export_identifier' in attrs and self.instance.export_identifier != attrs['export_identifier']:
raise ValidationError({"export_identifier": "export_identifier cannot be changed for existing exports."})
return attrs
class ScheduledEventExportSerializer(ScheduledExportSerializer):
-2
View File
@@ -197,8 +197,6 @@ class ReusableMediaSerializer(I18nAwareModelSerializer):
'linked_giftcard',
'info',
'notes',
# When adding fields, check if they should be hidden in ReusableMediaViewSet
# for cross-organizer lookups
)
-1
View File
@@ -117,7 +117,6 @@ class TransmissionInfoSerializer(serializers.Serializer):
super().__init__(*args, **kwargs)
for k, v in transmission_type.invoice_address_form_fields.items():
self.fields[k] = form_field_to_serializer_field(v)
self.fields[k].required = False # invoice_address_form_fields_required is checked by parent serializer
class InvoiceAddressSerializer(I18nAwareModelSerializer):
+31 -42
View File
@@ -272,8 +272,6 @@ class ScheduledEventExportViewSet(ScheduledExportersViewSet):
perm_holder = self.request.auth if isinstance(self.request.auth, (TeamAPIToken, Device)) else self.request.user
if not perm_holder.has_event_permission(self.request.organizer, self.request.event, exporter.get_required_event_permission()):
raise PermissionDenied("No permission to edit exports you could not run.")
# An additional check for the new config, such as on organizer level, is not necessary. Since the event is
# fixed and the export_identifier is read-only, the update cannot include a meaningful change of permissions.
serializer.save(event=self.request.event)
serializer.instance.compute_next_run()
@@ -346,40 +344,6 @@ class ScheduledOrganizerExportViewSet(ScheduledExportersViewSet):
))
return {e.identifier: e for e in exporters}
def _check_permission_for_export(self, identifier, form_data):
perm_holder = (
self.request.auth if isinstance(self.request.auth, (Device, TeamAPIToken)) else self.request.user
)
exporter = self.exporters.get(identifier)
if not exporter:
raise PermissionDenied("No access to exporter.")
if isinstance(exporter, OrganizerLevelExportMixin):
if not perm_holder.has_organizer_permission(
self.request.organizer, exporter.get_required_organizer_permission(), request=self.request,
):
raise PermissionDenied("No permission to edit exports you could not run.")
else:
if form_data.get("all_events", False):
if isinstance(self.request.auth, Device):
if not self.request.auth.all_events:
raise PermissionDenied("No permission to edit exports you could not run.")
elif isinstance(self.request.auth, TeamAPIToken):
if not self.request.auth.team.all_events:
raise PermissionDenied("No permission to edit exports you could not run.")
elif self.request.user.is_authenticated:
if not self.request.user.teams.filter(
TeamQuerySet.event_permission_q(exporter.get_required_event_permission()),
all_events=True,
).exists():
raise PermissionDenied("No permission to edit exports you could not run.")
else:
events_selected = form_data.get("events", [])
events_permission = set(perm_holder.get_events_with_permission(
exporter.get_required_event_permission(), request=self.request
).values_list("pk", flat=True))
if not all(e in events_permission for e in events_selected):
raise PermissionDenied("No permission to edit exports you could not run.")
@transaction.atomic()
def perform_update(self, serializer):
if not self.request.user.is_authenticated or self.request.user != serializer.instance.owner:
@@ -387,12 +351,37 @@ class ScheduledOrganizerExportViewSet(ScheduledExportersViewSet):
# user B has settings permission (= they can see the export configuration), but not enough permission
# to run the export themselves. Without this check, user B could modify the export and add themselves
# as a recipient. Thereby, user B would gain access to data they can't have.
self._check_permission_for_export(serializer.instance.export_identifier, serializer.instance.export_form_data)
# After we checked that the API user can work with the original export, we also need to check that they can
# work with the changed export, otherwise they could change e.g. from "some events" to "all events" and add
# themselves as a recipient.
if serializer.validated_data.get('export_form_data') is not None:
self._check_permission_for_export(serializer.instance.export_identifier, serializer.validated_data['export_form_data'])
exporter = self.exporters.get(serializer.instance.export_identifier)
if not exporter:
raise PermissionDenied("No access to exporter.")
perm_holder = (self.request.auth if isinstance(self.request.auth, (Device, TeamAPIToken))
else self.request.user)
if isinstance(exporter, OrganizerLevelExportMixin):
if not perm_holder.has_organizer_permission(
self.request.organizer, exporter.get_required_organizer_permission(), request=self.request,
):
raise PermissionDenied("No permission to edit exports you could not run.")
else:
if serializer.instance.export_form_data.get("all_events", False):
if isinstance(self.request.auth, Device):
if not self.request.auth.all_events:
raise PermissionDenied("No permission to edit exports you could not run.")
elif isinstance(self.request.auth, TeamAPIToken):
if not self.request.auth.team.all_events:
raise PermissionDenied("No permission to edit exports you could not run.")
elif self.request.user.is_authenticated:
if not self.request.user.teams.filter(
TeamQuerySet.event_permission_q(exporter.get_required_event_permission()),
all_events=True,
).exists():
raise PermissionDenied("No permission to edit exports you could not run.")
else:
events_selected = serializer.instance.export_form_data.get("events", [])
events_permission = set(perm_holder.get_events_with_permission(
exporter.get_required_event_permission(), request=self.request
).values_list("pk", flat=True))
if not all(e in events_permission for e in events_selected):
raise PermissionDenied("No permission to edit exports you could not run.")
serializer.save(organizer=self.request.organizer)
serializer.instance.compute_next_run()
+2 -11
View File
@@ -183,18 +183,9 @@ class ReusableMediaViewSet(viewsets.ModelViewSet):
type=s.validated_data["type"],
identifier=s.validated_data["identifier"],
)
m.customer = None # not relevant for cross-organizer
s = self.get_serializer(m)
data = s.data
# Remove fields that are not relevant for cross-organizer usage
data["customer"] = None
data["linked_orderposition"] = None
data["linked_orderpositions"] = []
data["info"] = {}
data["notes"] = None
data["claim_token"] = None
data["label"] = None
return Response({"result": data})
return Response({"result": s.data})
except ReusableMedium.DoesNotExist:
mt = MEDIA_TYPES.get(s.validated_data["type"])
if mt:
+2
View File
@@ -424,6 +424,8 @@ class SplitDateTimeField(forms.SplitDateTimeField):
return None
if data_list[1] in self.empty_values:
raise ValidationError(self.error_messages['invalid_date'], code='invalid_date')
if data_list[0] < datetime.date(1900, 1, 1):
raise ValidationError(self.error_messages['invalid_date'], code='invalid_date')
result = datetime.datetime.combine(*data_list)
return from_current_timezone(result)
return None
@@ -23,7 +23,6 @@
<link rel="manifest" href="{% url "site.webmanifest" %}">
<link rel="mask-icon" href="{% static "pretixbase/img/icons/safari-pinned-tab.svg" %}" color="#3b1c4a">
<meta name="theme-color" content="#3b1c4a">
<script type="text/javascript" src="{% static "pretixbase/js/csrfcookieretry.js" %}"></script>
</head>
<body>
<div class="container">
@@ -44,7 +44,7 @@
{% endblocktrans %}
</div>
{% endif %}
{% if not request.event.has_subevents and object.hidden_if_item_available and object.hidden_if_item_available.check_quotas.0 == 100 and object.hidden_if_item_available.is_available %}
{% if not request.event.has_subevents and object.hidden_if_item_available and object.hidden_if_item_available.check_quotas.0 == 100 %}
<div class="alert alert-warning">
{% blocktrans trimmed %}
This product is currently not being shown since you configured below that it should only be visible
+2 -3
View File
@@ -256,9 +256,8 @@ def reorder_discounts(request, organizer, event):
ids = json.loads(request.body.decode('utf-8'))['ids']
except (JSONDecodeError, KeyError, ValueError):
return HttpResponseBadRequest("expected JSON: {ids:[]}")
ids = [int(i) for i in ids if isinstance(i, int) or i.isdigit()]
input_discounts = list(request.event.discounts.filter(id__in=ids))
input_discounts = list(request.event.discounts.filter(id__in=[i for i in ids if i.isdigit()]))
if len(input_discounts) != len(ids):
raise Http404(_("Some of the provided object ids are invalid."))
@@ -267,7 +266,7 @@ def reorder_discounts(request, organizer, event):
raise Http404(_("Not all discounts have been selected."))
for c in input_discounts:
pos = ids.index(c.pk)
pos = ids.index(str(c.pk))
if pos != c.position: # Save unneccessary UPDATE queries
c.position = pos
c.save(update_fields=['position'])
+5 -15
View File
@@ -2124,7 +2124,7 @@ class ExportView(OrganizerPermissionRequiredMixin, ExportMixin, ListView):
@transaction.atomic()
def post(self, request, *args, **kwargs):
if request.POST.get("schedule") == "save":
if self.scheduled and self.scheduled.pk and not self.has_permission_to_edit_scheduled(self.scheduled.export_form_data):
if self.scheduled and self.scheduled.pk and not self.has_permission_to_edit_scheduled():
messages.error(
self.request,
_(
@@ -2143,16 +2143,6 @@ class ExportView(OrganizerPermissionRequiredMixin, ExportMixin, ListView):
)
return super().get(request, *args, **kwargs)
elif self.exporter.form.is_valid() and self.rrule_form.is_valid() and self.schedule_form.is_valid():
if self.scheduled and self.scheduled.pk and not self.has_permission_to_edit_scheduled(self.exporter.form.cleaned_data):
messages.error(
self.request,
_(
"This report runs with the permissions of a different user and you do not have access to all "
"events, therefore you cannot change it to cover additional events."
)
)
return super().get(request, *args, **kwargs)
self.schedule_form.instance.export_identifier = self.exporter.identifier
self.schedule_form.instance.export_form_data = self.exporter.form.cleaned_data
self.schedule_form.instance.schedule_rrule = str(self.rrule_form.to_rrule())
@@ -2234,7 +2224,7 @@ class ExportView(OrganizerPermissionRequiredMixin, ExportMixin, ListView):
def get_queryset(self):
return self.get_scheduled_queryset()
def has_permission_to_edit_scheduled(self, export_form_data):
def has_permission_to_edit_scheduled(self):
# Exports can be edited by
# - their owner
# - any staff session user
@@ -2259,7 +2249,7 @@ class ExportView(OrganizerPermissionRequiredMixin, ExportMixin, ListView):
self.request.organizer, self.exporter.get_required_organizer_permission(), request=self.request
)
else:
if export_form_data.get("all_events", False):
if self.scheduled.export_form_data.get("all_events", False):
# Test scenario 1/2 in test_organizer_edit_restrictions
return self.request.user.teams.filter(
TeamQuerySet.event_permission_q(self.exporter.get_required_event_permission()),
@@ -2267,7 +2257,7 @@ class ExportView(OrganizerPermissionRequiredMixin, ExportMixin, ListView):
).exists()
else:
# Test scenario 3/4 in test_organizer_edit_restrictions
events_selected = export_form_data.get("events", [])
events_selected = self.scheduled.export_form_data.get("events", [])
events_permission = set(self.request.user.get_events_with_permission(
self.exporter.get_required_event_permission(), request=self.request,
).values_list("pk", flat=True))
@@ -2295,7 +2285,7 @@ class ExportView(OrganizerPermissionRequiredMixin, ExportMixin, ListView):
ctx['rrule_form'] = self.rrule_form
ctx['scheduled_copy_from'] = self.scheduled_copy_from
if self.scheduled and self.scheduled.pk and not self.has_permission_to_edit_scheduled(self.scheduled.export_form_data) and self.exporter:
if self.scheduled and self.scheduled.pk and not self.has_permission_to_edit_scheduled() and self.exporter:
ctx['no_save'] = True
for f in self.exporter.form.fields.values():
f.disabled = True
+7 -6
View File
@@ -5,7 +5,7 @@ msgstr ""
"Project-Id-Version: 1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-10-28 10:48+0000\n"
"PO-Revision-Date: 2026-11-06 22:00+0000\n"
"PO-Revision-Date: 2026-10-28 11:13+0000\n"
"Last-Translator: Raphael Michel <michel@rami.io>\n"
"Language-Team: German <https://translate.pretix.eu/projects/pretix/pretix/"
"de/>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 2026.11.1\n"
"X-Generator: Weblate 2026.10.1\n"
"X-Poedit-Bookmarks: -1,-1,904,-1,-1,-1,-1,-1,-1,-1\n"
#: pretix/_base_settings.py
@@ -12572,16 +12572,17 @@ msgid ""
msgstr ""
"Hallo {name},\n"
"\n"
"Sie haben angefragt, Ihre E-Mail-Adresse für Ihr Kundenkonto bei {organizer} "
"zu ändern.\n"
"vielen Dank für Ihre Anmeldung für ein Kundenkonto bei {organizer}!\n"
"\n"
"Um dies zu bestätigen, klicken Sie bitte hier:\n"
"Um Ihr Kundenkonto zu aktivieren und ein Passwort zu wählen, klicken Sie "
"bitte hier:\n"
"\n"
"{url}\n"
"\n"
"Dieser Link ist gültig für einen Tag.\n"
"\n"
"Wenn Sie dies nicht angefragt haben, können Sie diese E-Mail ignorieren.\n"
"Wenn Sie sich nicht selbst angemeldet haben, können Sie diese E-Mail "
"ignorieren.\n"
"\n"
"Viele Grüße\n"
"\n"
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: 1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-10-28 10:48+0000\n"
"PO-Revision-Date: 2026-11-06 22:00+0000\n"
"PO-Revision-Date: 2026-10-28 11:13+0000\n"
"Last-Translator: Raphael Michel <michel@rami.io>\n"
"Language-Team: German (informal) <https://translate.pretix.eu/projects/"
"pretix/pretix/de_Informal/>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 2026.11.1\n"
"X-Generator: Weblate 2026.10.1\n"
#: pretix/_base_settings.py
msgid "English"
@@ -12552,16 +12552,17 @@ msgid ""
msgstr ""
"Hallo {name},\n"
"\n"
"du hast angefragt, die E-Mail-Adresse für dein Kundenkonto bei {organizer} "
"zu ändern.\n"
"vielen Dank für deine Anmeldung für ein Kundenkonto bei {organizer}!\n"
"\n"
"Um die Änderung zu bestätigen, klicke bitte hier:\n"
"Um dein Kundenkonto zu aktivieren und ein Passwort zu wählen, klicke bitte "
"hier:\n"
"\n"
"{url}\n"
"\n"
"Dieser Link ist gültig für einen Tag.\n"
"\n"
"Wenn du dies nicht angefordert hast, kannst du diese E-Mail ignorieren.\n"
"Wenn du dich nicht selbst angemeldet hast, kannst du diese E-Mail "
"ignorieren.\n"
"\n"
"Viele Grüße\n"
"\n"
+52 -114
View File
@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-10-28 10:48+0000\n"
"PO-Revision-Date: 2026-11-15 23:00+0000\n"
"Last-Translator: Ikuisuus <kkujala@paivola.fi>\n"
"PO-Revision-Date: 2025-10-04 10:10+0000\n"
"Last-Translator: Sebastian Bożek <sebastian@log-mar.pl>\n"
"Language-Team: Finnish <https://translate.pretix.eu/projects/pretix/pretix/"
"fi/>\n"
"Language: fi\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 2026.11.2\n"
"X-Generator: Weblate 5.13.3\n"
#: pretix/_base_settings.py
msgid "English"
@@ -57,7 +57,7 @@ msgstr "tšekki"
#: pretix/_base_settings.py
msgid "Croatian"
msgstr "kroatia"
msgstr "Kroatia"
#: pretix/_base_settings.py
msgid "Danish"
@@ -89,11 +89,11 @@ msgstr "kreikka"
#: pretix/_base_settings.py
msgid "Hebrew"
msgstr "Heprea"
msgstr ""
#: pretix/_base_settings.py
msgid "Hungarian"
msgstr "Unkari"
msgstr ""
#: pretix/_base_settings.py
msgid "Indonesian"
@@ -149,11 +149,11 @@ msgstr "espanja"
#: pretix/_base_settings.py
msgid "Spanish (Latin America)"
msgstr "Espanja (Etelä-Afrikka)"
msgstr ""
#: pretix/_base_settings.py
msgid "Thai"
msgstr "Thai"
msgstr ""
#: pretix/_base_settings.py
msgid "Turkish"
@@ -297,16 +297,22 @@ msgid "The bundled item must not have bundles on its own."
msgstr "Niputettavalla tuotteella ei saa olla nippuja."
#: pretix/api/serializers/item.py
#, fuzzy
#| msgid "The payment is too late to be accepted."
msgid "The program start must not be empty."
msgstr "Ohjelman alku ei voi olla tyhjä."
msgstr "Maksu on liian myöhässä hyväksyttäväksi."
#: pretix/api/serializers/item.py
#, fuzzy
#| msgid "The payment is too late to be accepted."
msgid "The program end must not be empty."
msgstr "Ohjelman loppu ei saa olla tyhjä."
msgstr "Maksu on liian myöhässä hyväksyttäväksi."
#: pretix/api/serializers/item.py pretix/base/models/items.py
#, fuzzy
#| msgid "The maximum count needs to be greater than the minimum count."
msgid "The program end must not be before the program start."
msgstr "Ohjelma ei voi päättyä ennen kuin se alkaa."
msgstr "Enimmäismäärän on oltava suurempi kuin vähimmäismäärä."
#: pretix/api/serializers/item.py pretix/base/models/items.py
#, fuzzy
@@ -614,8 +620,6 @@ msgid ""
"This includes related events like creation, deletion, opening or closing of "
"quotas. No webhook is sent for changes to the resulting availability."
msgstr ""
"Tämä sisältää toiminnot kuten luonti, poisto, kiintiöiden avaamiset tai "
"sulkemiset. Aiheutuneista muutoksista ei lähetetä Webhook pyyntöä."
#: pretix/api/webhooks.py
msgid "Shop taken live"
@@ -666,8 +670,6 @@ msgid ""
"Only includes explicit changes to the voucher, not e.g. an increase of the "
"number of redemptions."
msgstr ""
"Sisältää vain varsinaiset muutokset kuponkiin, ei esimerkiksi lisäyksiä "
"lunastuskertoihin."
#: pretix/api/webhooks.py
#, fuzzy
@@ -848,7 +850,6 @@ msgid ""
"Field \"{field_name}\" does not exist. Please check your {provider_name} "
"settings."
msgstr ""
"Kenttä {field_name} ei ole olemassa. Tarkista {provider_name} asetukset."
#: pretix/base/datasync/datasync.py
#, python-brace-format
@@ -856,8 +857,6 @@ msgid ""
"Field \"{field_name}\" requires {required_input}, but only got "
"{available_inputs}. Please check your {provider_name} settings."
msgstr ""
"Kenttä {field_name} vaatii {required_input}, mutta sai vain "
"{available_inputs}. Tarkista {provider_name} asetukset."
#: pretix/base/datasync/datasync.py
#, python-brace-format
@@ -865,8 +864,6 @@ msgid ""
"Please update value mapping for field \"{field_name}\" - option \"{val}\" "
"not assigned"
msgstr ""
"Päivitä arvot kenttään {field_name} - vaihtoehdon {val} arvoa ei ole "
"määritetty"
#: pretix/base/datasync/sourcefields.py
#, fuzzy
@@ -897,7 +894,7 @@ msgstr "Tuotetiedot"
#: pretix/control/templates/pretixcontrol/order/index.html
#: pretix/presale/templates/pretixpresale/event/order.html
msgid "Order details"
msgstr "Tilauksen yksityiskohdat"
msgstr ""
#: pretix/base/datasync/sourcefields.py pretix/base/modelimport_orders.py
#: pretix/control/forms/filter.py
@@ -1307,7 +1304,7 @@ msgstr "Asiakkaat"
#: pretix/presale/templates/pretixpresale/organizers/customer_memberships.html
#: pretix/presale/views/customer.py
msgid "Memberships"
msgstr "Jäsenyydet"
msgstr ""
#: pretix/base/exporters/customers.py pretix/base/models/customers.py
#: pretix/control/templates/pretixcontrol/organizers/customer.html
@@ -2228,10 +2225,6 @@ msgid ""
"contain at least one position of this product. The order totals etc. still "
"include all products contained in the order."
msgstr ""
"Mikäli mitään ei valita, kaikki tuotteet sisällytetään. Tilaukset "
"sisältyvät, mikäli niissä on edes yksi valittu tuote. Tilauksen kokonaisarvo "
"ja muut vastaavat. yhä sisältävät kaikki tuotteet, jotka sisältyivät tähän "
"tilaukseen."
#: pretix/base/exporters/orderlist.py pretix/base/exporters/waitinglist.py
#: pretix/control/forms/event.py pretix/control/forms/organizer.py
@@ -3103,7 +3096,7 @@ msgstr "Sähköpostiosoite"
#: pretix/base/forms/auth.py pretix/control/forms/orders.py
#: pretix/control/templates/pretixcontrol/shredder/download.html
msgid "Confirmation code"
msgstr "Varmistuskoodi"
msgstr ""
#: pretix/base/forms/questions.py
#, fuzzy
@@ -3123,12 +3116,11 @@ msgid ""
"The field \"%(label)s\" may not contain special characters such as "
"\"%(chars)s\"."
msgstr ""
"Kenttä \"%(label)s\" ei saisi sisältää erikoismerkkejä kuten \"%(chars)s\"."
#: pretix/base/forms/questions.py
#, python-format
msgid "The field \"%(label)s\" may not contain an URL (%(url)s)."
msgstr "Kenttä \"%(label)s\" ei saisi sisältää URL-osoitetta %(url)s."
msgstr ""
#: pretix/base/forms/questions.py
msgctxt "phonenumber"
@@ -3194,7 +3186,7 @@ msgstr "Syötä lyhyempi nimi."
#: pretix/base/forms/questions.py
#, python-brace-format
msgid "Please enter a date and time between {min} and {max}."
msgstr "Syötä päivämäärä ja aika väliltä {min} ja {max}."
msgstr ""
#: pretix/base/forms/questions.py
#, fuzzy, python-brace-format
@@ -3417,7 +3409,7 @@ msgstr "Sähköpostiosoite vahvistettu"
#: pretix/base/invoicing/email.py
msgid "PDF via email"
msgstr "PDF sähköpostilla"
msgstr ""
#: pretix/base/invoicing/national.py
msgctxt "italian_invoice"
@@ -3859,7 +3851,7 @@ msgstr "Löytyi useita vastaavia päivämääriä."
#: pretix/base/modelimport_orders.py
msgid "Grouping"
msgstr "Ryhmittely"
msgstr ""
#: pretix/base/modelimport_orders.py
msgid ""
@@ -3878,9 +3870,6 @@ msgid ""
"The date can be specified through its full name, full date and time, or "
"internal ID, provided only one date in the system matches the input."
msgstr ""
"Päivään voi viitata sen koko nimellä, täydellä päivämääräällä ja ajalla tai "
"sisäisellä ID:llä, kunhan vain yksi päivämäärä järjestelmässä vastaa "
"syötteeseen."
#: pretix/base/modelimport_orders.py pretix/presale/views/waiting.py
msgctxt "subevent"
@@ -3891,8 +3880,6 @@ msgstr "Sinun täytyy valita päivämäärä."
msgid ""
"The product can be specified by its internal ID, full name or internal name."
msgstr ""
"Tuotteen voi tunnistaa sen sisäisellä ID:llä, koko nimellä tai sisäisellä "
"nimellä."
#: pretix/base/modelimport_orders.py pretix/base/modelimport_vouchers.py
msgid "No matching product was found."
@@ -3910,7 +3897,7 @@ msgstr "Tuotevariaatio"
#: pretix/base/modelimport_orders.py
msgid "The variation can be specified by its internal ID or full name."
msgstr "Variaatioon voi viitata sen sisäisellä ID:llä tai koko nimellä."
msgstr ""
#: pretix/base/modelimport_orders.py pretix/base/modelimport_vouchers.py
msgid "No matching variation was found."
@@ -3936,7 +3923,7 @@ msgstr "Syötä kelvollinen maatunnus."
#: pretix/base/modelimport_orders.py
msgid "The state can be specified by its short form or full name."
msgstr "Tilaan voi viitata sen lyhyellä muodolla tai koko nimellä."
msgstr ""
#: pretix/base/modelimport_orders.py
msgid "States are not supported for this country."
@@ -3982,7 +3969,7 @@ msgstr "Syötä kelvollinen kielikoodi."
msgid ""
"The sales channel can be specified by it's internal identifier or its full "
"name."
msgstr "Myyntikanavaan voi viitata sen sisäisellä ID:llä tai koko nimellä."
msgstr ""
#: pretix/base/modelimport_orders.py
msgid "Please enter a valid sales channel."
@@ -3990,7 +3977,7 @@ msgstr "Syötä kelvollinen myyntikanava."
#: pretix/base/modelimport_orders.py
msgid "The seat needs to be specified by its internal ID."
msgstr "Paikkaan täytyy viitata sen sisäisellä ID:llä."
msgstr ""
#: pretix/base/modelimport_orders.py pretix/base/modelimport_vouchers.py
msgid "Multiple matching seats were found."
@@ -4494,7 +4481,6 @@ msgstr "Erota useat arvot välilyönneillä"
#: pretix/base/models/datasync.py
msgid "Temporary error, auto-retry limit exceeded"
msgstr ""
"Väliaikainen virhe, automattisten uudelleen yritysten limiitti on ylitetty"
#: pretix/base/models/datasync.py
#, fuzzy
@@ -4508,7 +4494,7 @@ msgstr ""
#: pretix/base/models/datasync.py
msgid "System error, needs manual intervention"
msgstr "Systeemivirhe, vattii manuaalista korjaamista"
msgstr ""
#: pretix/base/models/devices.py pretix/base/models/items.py
msgid "Internal identifier"
@@ -4773,15 +4759,13 @@ msgstr "Valinnainen. Tuotteita ei myydä ennen tätä."
#: pretix/base/models/event.py
msgid "This event is remote or partially remote."
msgstr "Tämä tapahtuma järjestetään joko osittain tai kokonaan etänä."
msgstr ""
#: pretix/base/models/event.py
msgid ""
"This will be used to let users know if the event is in a different timezone, "
"and to let us calculate the local time of a user."
msgstr ""
"Tätä käytetään kertoakseen käyttäjille jos tapahtuma on eri aikavyöhykkeellä "
"ja mahdollistetaan käyttäjän paikallisen ajankohdan laskeminen."
#: pretix/base/models/event.py pretix/base/models/organizer.py
#: pretix/control/navigation.py
@@ -5077,7 +5061,7 @@ msgstr "Puuttuva summa"
#: pretix/base/models/invoices.py
msgid "currently being transmitted"
msgstr "Siirretään parasta aikaa"
msgstr ""
#: pretix/base/models/invoices.py
#, fuzzy
@@ -5100,7 +5084,7 @@ msgstr "tuntematon"
#: pretix/base/models/invoices.py
msgid "not transmitted due to test mode"
msgstr "ei välitetty testimoodin vuoksi"
msgstr ""
#: pretix/base/models/invoices.py
#, python-format
@@ -8356,8 +8340,6 @@ msgid ""
"Includes the ability to give someone (including oneself) additional "
"permissions."
msgstr ""
"Sisältää mahdollisuuden antaa jollekulle (itsesi mukaanlukien) lisää "
"oikeuksia."
#: pretix/base/permissions.py pretix/control/navigation.py
msgid "Devices"
@@ -8368,8 +8350,6 @@ msgid ""
"Includes the ability to give access to events and data oneself does not have "
"access to."
msgstr ""
"Sisältää mahdollisuuden antaa oikeuksia tapahtumiin ja dataan henkilöllä ei "
"ole vielä oikeuksia."
#: pretix/base/permissions.py
#, fuzzy
@@ -8380,7 +8360,7 @@ msgstr "Istumajärjestys"
#: pretix/base/permissions.py pretix/control/navigation.py
#: pretix/control/templates/pretixcontrol/organizers/outgoing_mails.html
msgid "Outgoing emails"
msgstr "Lähtevät viestit"
msgstr ""
#: pretix/base/plugins.py
#: pretix/control/templates/pretixcontrol/event/quick_setup.html
@@ -8389,19 +8369,19 @@ msgstr "Ominaisuudet"
#: pretix/base/plugins.py
msgid "Integrations"
msgstr "Integraatiot"
msgstr ""
#: pretix/base/plugins.py
msgid "Customizations"
msgstr "Kustomoinnit"
msgstr ""
#: pretix/base/plugins.py
msgid "Output and export formats"
msgstr "Ulostulon ja vientien formaatit"
msgstr ""
#: pretix/base/plugins.py
msgid "API features"
msgstr "API ominaisuudet"
msgstr ""
#: pretix/base/reldate.py
msgid "Event start"
@@ -8463,7 +8443,6 @@ msgstr "Ei asetettu"
#, python-brace-format
msgid "A relative date cannot be expressed as \"before\" for \"{}\""
msgstr ""
"Suhteellista päivämäärää ei voida ilmaista muodossa \"Ennen\" \"{}\" varten"
#: pretix/base/reldate.py
#, python-brace-format
@@ -8499,7 +8478,7 @@ msgstr "Tapahtuma peruttu"
#: pretix/base/services/cancelevent.py
msgid "Confirm event cancellation and bulk refund"
msgstr "Vahvista tapahtuman peruminen ja rahojen palauttaminen massana"
msgstr ""
#: pretix/base/services/cart.py pretix/base/services/modelimport.py
#: pretix/base/services/orders.py
@@ -8533,8 +8512,6 @@ msgid ""
"Some products can no longer be purchased and have been removed from your "
"cart for the following reason: %s"
msgstr ""
"Joitain tuotteista ei voida enää ostaa ja ne on poistettu ostoskoristasi "
"seuraavasta syystä: %s"
#: pretix/base/services/cart.py
msgid ""
@@ -9415,7 +9392,7 @@ msgstr "Kuponkia ei voi luoda ilman koodia."
#, python-brace-format
msgid ""
"Voucher codes must be unique. Code \"{code}\" already exists in this import."
msgstr "Kuponkikoodien täytyy olla uniikkeja. Koodi \"{code}\" on jo olemassa."
msgstr ""
#: pretix/base/services/modelimport.py
#, python-brace-format
@@ -9424,19 +9401,13 @@ msgid ""
msgid_plural ""
"Voucher codes must be unique. Import contains existing voucher codes {code}."
msgstr[0] ""
"Kuponkikoodien tulee olla uniikkeja. Tuoduissa tiedoissa on mukana olemassa "
"oleva kuponkikoodi {code}."
msgstr[1] ""
"Kuponkikoodien tulee olla uniikkeja. Tuoduissa tiedoissa on mukana olemassa "
"olevia kuponkikoodeja {code}."
#: pretix/base/services/modelimport.py
msgid ""
"Vouchers could not be imported, probably due to a voucher code already being "
"in use."
msgstr ""
"Kuponkeja ei voitu tuoda, todennäköisesti koska kupongin koodi on jo "
"käytössä."
#: pretix/base/services/orders.py
msgid ""
@@ -9915,19 +9886,17 @@ msgstr "Kuponki on lähetetty {recipient}."
#: pretix/base/settings.py
msgid "Compute taxes for every line individually"
msgstr "Laske verot jokaiselle riville yksittäin"
msgstr ""
#: pretix/base/settings.py
msgid "Compute taxes based on net total"
msgstr "Laske verot kokonaissumman perusteella"
msgstr ""
#: pretix/base/settings.py
msgid ""
"For business customers, compute taxes based on net total. For individuals, "
"use line-based rounding"
msgstr ""
"Lasket verot nettosumman pohjalta yritysasiakkaille. Käytä rivipohjaista "
"pyöristystä yksityishenkilöille"
#: pretix/base/settings.py
msgid "Compute taxes based on net total with stable gross prices"
@@ -9963,7 +9932,7 @@ msgstr ""
#: pretix/base/settings.py
msgid "Require login to access order confirmation pages"
msgstr "Vaadi kirjautumista tilausvahvistus sivuille pääsyyn"
msgstr ""
#: pretix/base/settings.py
msgid ""
@@ -9972,10 +9941,6 @@ msgid ""
"placing an order, the restriction only becomes active after the customer "
"account is activated."
msgstr ""
"Jos tämä on päällä, käyttäjien, jotka olivat kirjautuneena ostoksen aikana, "
"täytyy kirjautua sisään myös päästäkseen käsiksi tilausvahvistukseensa. Jos "
"käyttäjätili on luotu tilauksen yhteydessä, rajoite astuu voimaan vasta kun "
"käyttäjätili on aktivoitu."
#: pretix/base/settings.py
msgid "Match orders based on email address"
@@ -10177,7 +10142,7 @@ msgstr "Vaaditaan puhelinnumero tilausta kohden"
#: pretix/base/settings.py
msgid "Rounding of taxes"
msgstr "Verojen pyöristys"
msgstr ""
#: pretix/base/settings.py
msgid ""
@@ -10185,10 +10150,6 @@ msgid ""
"for tax reporting, you need to make sure to account for possible rounding "
"differences if your external system rounds differently than pretix."
msgstr ""
"Huomaa, että jos siirrät myyntidataa Pretixistä ulkoiseen järjestelmään "
"verojen ilmoittamista varten, on hyvä varmistaa mahdollisten pyöristys "
"erojen käsittely mikäli ulkoinen järjestelmäsi pyöristää eri tavalla kuin "
"Pretix."
#: pretix/base/settings.py
msgid "Ask for invoice address"
@@ -10332,9 +10293,6 @@ msgid ""
"ID in all countries. VAT ID will be required for all business addresses in "
"the selected countries."
msgstr ""
"Veronumero on vapaaehtoinen oletusarvoisesti, koska kaikkilla yrityksillä ei "
"ole veronumeroa kaikissa maissa. Veronumero vaaditaan kaikilta yritys "
"osoitteilta valituissa maissa."
#: pretix/base/settings.py
msgid "Invoice address explanation"
@@ -10490,12 +10448,12 @@ msgstr ""
#: pretix/base/settings.py
msgid "No dates match your criteria."
msgstr "Yksikään päivämäärä ei vastaa kriteereitäsi."
msgstr ""
#: pretix/base/settings.py
msgctxt "subevents"
msgid "Text for empty date results"
msgstr "Teksti tyhjille päivämäärätuloksille"
msgstr ""
#: pretix/base/settings.py
msgctxt "subevents"
@@ -10506,11 +10464,6 @@ msgid ""
"touch with you to arrange further dates. We do not recommend more than one "
"or two sentences."
msgstr ""
"Tämä teksti näytetään jos kalenteri tai päivämäärälista on tyhjä. "
"Esimerkiksi jos kuukausi ei vastaa päivämäärää tai käyttäjän valitsema "
"filtteriin vastaamia tuloksia ei löydy. Voit käyttää tätä mainostamaan "
"tapoja ottaa yhteyttä teihin tulevien päivämäärien sopimiseksi. Emme "
"suosittele enempää kuin yhtä tai kahta lausetta."
#: pretix/base/settings.py
msgid "Guidance text"
@@ -10695,9 +10648,6 @@ msgid ""
"their order without selecting a payment method. This is useful whenever "
"orders are not created by the same person who is making the payment."
msgstr ""
"Jos maksun viivästäminen on sallittu myyntikanavassa, asiakkaat voivat "
"asettaa tilauksen valitsematta maksutapaa. Tämä on kätevää kun tilaukset "
"eivät ole saman henkilön tekemiä, joka maksaa tilauksen."
#: pretix/base/settings.py
msgid "Show start date"
@@ -10781,13 +10731,10 @@ msgid ""
"Automatic based on ticket-specific validity, membership validity, event "
"series date, or event date"
msgstr ""
"Automaattinen perustuen lippukohtaiseen voimassaoloon, jäsenyyden voimassa "
"oloon, tapahtumasarjan päivämäärään tai tapahtuman päivämäärään"
#: pretix/base/settings.py
msgid "Automatic, but prefer invoice date over event date"
msgstr ""
"Automaattinen, mutta suosi laskun päivämäärää tapahtuman päivämäärän sijaan"
#: pretix/base/settings.py
#, fuzzy
@@ -10808,8 +10755,6 @@ msgid ""
"This controls what dates are shown on the invoice, but is especially "
"important for electronic invoicing."
msgstr ""
"Tämä kontrolloi mitkä päivämäärät näytetään laskulla ja on erityisen tärkeä "
"sähköisessä laskutuksessa."
#: pretix/base/settings.py
msgid "Automatically cancel and reissue invoice on address changes"
@@ -10988,12 +10933,6 @@ msgid ""
"page. Note that pretix still is a system built around events and the date "
"may still show up in other places."
msgstr ""
"Jätä tämä laatikko valitsematta vain jos myyt jotain millä ei ole erillistä "
"päivää, kuten lahjakortti tai lippu, jonka voi käyttää koska tahansa. "
"Järjestelmä lakkaa näyttämästä tapahtuma päivää joissain paikoissa kuten "
"tapahtuman aloitussivulla. Huomaathan että Pretix on silti järjestelmä, joka "
"on rakennettu tapahtumien ympärille ja päivämäärä saatetaan silti näyttää "
"muissa paikoissa."
#: pretix/base/settings.py
msgid "Show event end date"
@@ -13289,7 +13228,7 @@ msgstr "Sinun on vaadittava laskuosoitteet yritysten nimille."
#: pretix/base/settings.py
#, python-brace-format
msgid "VAT-ID is not supported for \"{}\"."
msgstr "Veronumeroa ei tueta \"{}\" varten."
msgstr ""
#: pretix/base/settings.py
msgid "The last payment date cannot be before the end of presale."
@@ -13548,7 +13487,7 @@ msgstr ""
#: pretix/base/templates/pretixbase/email/cancel_confirm.txt
msgid "You requested to cancel an event that involves a large bulk refund:"
msgstr "Pyyntösi perua tapahtuma, joka sisältää suuren massapalautuksen:"
msgstr ""
#: pretix/base/templates/pretixbase/email/cancel_confirm.txt
#, fuzzy
@@ -13558,7 +13497,7 @@ msgstr "Hyvitettävä summa"
#: pretix/base/templates/pretixbase/email/cancel_confirm.txt
msgid "To confirm, paste the following code into the cancellation form:"
msgstr "Vahvistaaksesi kopioi seuraava koodi peruutus lomakkeelle:"
msgstr ""
#: pretix/base/templates/pretixbase/email/cancel_confirm.txt
#, python-format
@@ -13566,7 +13505,6 @@ msgid ""
"Don't share this code with anyone. The %(instance)s team will never ask you "
"for it."
msgstr ""
"Älä jaa tätä koodia kenellekää. %(instance)s tiimi ei koskaan kysy sitä."
#: pretix/base/templates/pretixbase/email/cancel_confirm.txt
#: pretix/base/templates/pretixbase/email/export_failed.txt
@@ -13575,8 +13513,6 @@ msgid ""
"Thanks, \n"
"The %(instance)s Team"
msgstr ""
"Kiitos, \n"
"%(instance)s tiimi"
#: pretix/base/templates/pretixbase/email/email_footer.html
#, python-format
@@ -13622,8 +13558,10 @@ msgstr "Vaihda asetuksia"
#: pretix/base/templates/pretixbase/email/notification.html
#: pretix/base/templates/pretixbase/email/notification.txt
#, fuzzy
#| msgid "Click here disable all notifications immediately."
msgid "Disable all notifications"
msgstr "Poista kaikki ilmoitukset käytöstä"
msgstr "Klikkaa tästä poista kaikki ilmoitukset käytöstä välittömästi."
#: pretix/base/templates/pretixbase/email/order_details.html
msgid ""
@@ -13673,7 +13611,7 @@ msgstr "Saat tämän sähköpostiviestin, koska olet tehnyt {event}tilauksen."
#: pretix/presale/templates/pretixpresale/organizers/customer_memberships.html
#: pretix/presale/templates/pretixpresale/organizers/customer_orders.html
msgid "Details"
msgstr "Yksityiskohdat"
msgstr ""
#: pretix/base/templates/pretixbase/email/order_details.html
#: pretix/presale/templates/pretixpresale/event/base.html
+17 -28
View File
@@ -27,7 +27,6 @@ from decimal import Decimal
from django import forms
from django.db.models import F, Sum
from django.db.models.aggregates import Min
from django.db.models.functions import Coalesce
from django.utils.formats import date_format
from django.utils.html import escape
@@ -42,8 +41,7 @@ from reportlab.platypus import (
from pretix.base.exporter import BaseExporter
from pretix.base.models import (
GiftCardTransaction, Order, OrderFee, OrderPayment, OrderRefund,
Transaction,
GiftCardTransaction, OrderFee, OrderPayment, OrderRefund, Transaction,
)
from pretix.base.templatetags.money import money_filter, tax_rate_format
from pretix.base.timeframes import (
@@ -118,34 +116,25 @@ class ReportExporter(ReportlabExportMixin, BaseExporter):
dt_start, df_end = resolve_timeframe_to_datetime_start_inclusive_end_exclusive(
now(), form_data["date_range"], self.timezone
)
else:
dt_start = Order.objects.filter(
event__in=self.events,
).aggregate(min_datetime=Min('datetime'))['min_datetime']
df_end = now()
if dt_start:
filters.append(
"{label}: {value}{hint}".format(
label=_("Begin"),
value=date_format(
if dt_start:
filters.append(
_("Begin")
+ ": "
+ date_format(
dt_start.astimezone(self.timezone), "SHORT_DATETIME_FORMAT"
),
hint="" if form_data["date_range"] else " ({})".format(_("first order received"))
)
)
)
if df_end:
filters.append(
_("End")
+ ": "
+ date_format(
(df_end - datetime.timedelta.resolution).astimezone(
self.timezone
),
"SHORT_DATETIME_FORMAT",
if df_end:
filters.append(
_("End")
+ ": "
+ date_format(
(df_end - datetime.timedelta.resolution).astimezone(
self.timezone
),
"SHORT_DATETIME_FORMAT",
)
)
)
if not form_data["no_testmode"]:
filters.append(_("Report includes test orders which may be deleted later!"))
-7
View File
@@ -75,7 +75,6 @@ class AuthenticationForm(forms.Form):
'unverified': _("You have not yet activated your account and set a password. Please click the link in the "
"email we sent you. In case you cannot find it, click \"Forgot your password?\" to receive "
"a new email."),
'rate_limit': _("For security reasons, please wait 5 minutes before you try again."),
}
def __init__(self, request=None, *args, **kwargs):
@@ -94,12 +93,6 @@ class AuthenticationForm(forms.Form):
email = self.cleaned_data.get('email')
password = self.cleaned_data.get('password')
if rate_limit("customer_login", include_ip_from_request=self.request, max_num=10, expire_time=300):
raise forms.ValidationError(
self.error_messages['rate_limit'],
code='rate_limit',
)
if email is not None and password:
try:
u = self.request.organizer.customers.get(email=email.lower(), provider__isnull=True)
@@ -44,6 +44,7 @@
{% else %}
<meta property="og:url" content="{% abseventurl request.event "presale:event.index" %}" />
{% endif %}
<script type="text/javascript" src="{% static "pretixpresale/js/csrfcookieretry.js" %}"></script>
{% endblock %}
{% block content %}
@@ -23,6 +23,10 @@
{% endif %}
{% trans "Order details" %}
{% endblock %}
{% block custom_header %}
{{ block.super }}
<script type="text/javascript" src="{% static "pretixpresale/js/csrfcookieretry.js" %}"></script>
{% endblock %}
{% block content %}
{% if "thanks" in request.GET or "paid" in request.GET %}
<div class="thank-you">
@@ -23,5 +23,4 @@
<script type="text/javascript" src="{% static "pretixbase/js/addressform.js" %}"></script>
<script type="text/javascript" src="{% static "pretixbase/js/deanonymize_email.js" %}"></script>
<script type="text/javascript" src="{% static "pretixbase/js/errors.js" %}"></script>
<script type="text/javascript" src="{% static "pretixbase/js/csrfcookieretry.js" %}"></script>
{% endcompress %}
@@ -1,76 +0,0 @@
document.addEventListener('DOMContentLoaded', () => {
const COOKIE_NAME = window.location.protocol === 'https:' ? '__Host-pretix_csrftoken' : 'pretix_csrftoken'
const RELOAD_FLAG = 'csrfReloadPerformed'
const REASON_PARAM = 'csrf_reload'
const CHARS = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
// reimplementation of CSRFMiddlewares _unmask_cipher_token()
const unmask = (token) => {
if (!token || token.length !== 64) return token || null
let secret = ''
for (let i = 0; i < 32; i++) {
const m = CHARS.indexOf(token[i])
const c = CHARS.indexOf(token[32 + i])
if (m < 0 || c < 0) return null
secret += CHARS[(c - m + CHARS.length) % CHARS.length]
}
return secret
}
const url = new URL(location.href)
// remove reason after reload to avoid re-reports
if (url.searchParams.has(REASON_PARAM)) {
url.searchParams.delete(REASON_PARAM)
history.replaceState(history.state, '', url)
}
const readCookieSecrets = () => document.cookie
.split('; ')
.filter((c) => c.startsWith(COOKIE_NAME + '='))
.map((c) => unmask(c.slice(COOKIE_NAME.length + 1)))
// a deletion only hits the variant whose attributes it matches
const EXPIRE = `${COOKIE_NAME}=; Path=/; Secure; Max-Age=0`
const deleteUnpartitioned = () => {
document.cookie = EXPIRE
}
const deletePartitioned = () => {
document.cookie = `${EXPIRE}; Partitioned`
}
const field = document.querySelector('input[name="csrfmiddlewaretoken"]')
const pageSecret = field ? unmask(field.value) : null
// bail if there is no pageSecret
if (!pageSecret) return
const check = (secrets) => {
if (secrets.length === 0) return 'no_cookie'
if (secrets.length > 1) return 'duplicate_cookie'
if (!secrets[0]) return 'invalid_cookie'
if (pageSecret !== null && pageSecret !== secrets[0]) return 'mismatch'
return null
}
let cookieSecrets = readCookieSecrets()
let reason = check(cookieSecrets)
if (reason === 'duplicate_cookie') {
// drop the unpartitioned cookie, keep the partitioned one, maybe this fixes all issues
deleteUnpartitioned()
cookieSecrets = readCookieSecrets()
if (check(cookieSecrets)) {
reason = 'duplicate_cookie'
} else {
reason = null
}
}
if (reason && !sessionStorage.getItem(RELOAD_FLAG)) {
sessionStorage.setItem(RELOAD_FLAG, '1')
deleteUnpartitioned()
deletePartitioned()
url.searchParams.set(REASON_PARAM, reason)
location.href = url.href
} else if (!reason && sessionStorage.getItem(RELOAD_FLAG)) {
sessionStorage.removeItem(RELOAD_FLAG)
}
})
@@ -166,6 +166,8 @@ let form_handlers = function (el) {
if ($(this).is('[data-min]')) {
opts['minDate'] = $(this).attr('data-min')
opts['viewDate'] = $(this).attr('data-min')
} else {
opts['minDate'] = '1900-01-01'
}
if ($(this).is('[data-max]')) {
opts['maxDate'] = $(this).attr('data-max')
@@ -0,0 +1,15 @@
document.addEventListener('DOMContentLoaded', () => {
const COOKIE_NAME = '__Host-pretix_csrftoken'
const RELOAD_FLAG = 'csrfReloadPerformed'
const hasCookie = document.cookie
.split('; ')
.some((c) => c.startsWith(COOKIE_NAME + '='))
if (!hasCookie && !sessionStorage.getItem(RELOAD_FLAG)) {
sessionStorage.setItem(RELOAD_FLAG, '1')
location.reload()
} else if (hasCookie && sessionStorage.getItem(RELOAD_FLAG)) {
sessionStorage.removeItem(RELOAD_FLAG)
}
})
@@ -54,6 +54,8 @@ let form_handlers = function (el) {
if ($(this).is('[data-min]')) {
opts['minDate'] = $(this).attr('data-min')
opts['viewDate'] = $(this).attr('data-min')
} else {
opts['minDate'] = '1900-01-01'
}
if ($(this).is('[data-max]')) {
opts['maxDate'] = $(this).attr('data-max')
+26
View File
@@ -365,6 +365,32 @@ def test_event_create(team, token_client, organizer, event, meta_prop):
assert resp.status_code == 400
assert resp.content.decode() == '{"slug":["This slug has already been used for a different event."]}'
resp = token_client.post(
'/api/v1/organizers/{}/events/'.format(organizer.slug),
{
"name": {
"de": "Demo Konference 2020 Test",
"en": "Demo Conference 2020 Test"
},
"live": False,
"currency": "EUR",
"date_from": "1817-12-27T10:00:00Z",
"date_to": "1817-12-28T10:00:00Z",
"date_admission": None,
"is_public": False,
"presale_start": None,
"presale_end": None,
"location": None,
"slug": "newslug",
"meta_data": {
"type": "Conference"
}
},
format='json'
)
assert resp.status_code == 400
assert resp.content.decode() == '{"date_from":["Do not pass dates before 1900-01-01"],"date_to":["Do not pass dates before 1900-01-01"]}'
resp = token_client.post(
'/api/v1/organizers/{}/events/'.format(organizer.slug),
{
-114
View File
@@ -469,22 +469,6 @@ def test_event_scheduled_export_update_token(token_client, organizer, event, use
assert created.export_form_data == {"_format": "xlsx", "date_range": "month_this", "items": []}
@pytest.mark.django_db
def test_event_scheduled_export_update_identifier_readonly(token_client, organizer, event, user, event_scheduled_export):
resp = token_client.patch(
'/api/v1/organizers/{}/events/{}/scheduled_exports/{}/'.format(
organizer.slug, event.slug, event_scheduled_export.pk,
),
data={
"export_identifier": "transactions",
"export_form_data": {"_format": "xlsx", "date_range": "month_this"},
},
format='json'
)
assert resp.status_code == 400
assert resp.data == {"export_identifier": ["export_identifier cannot be changed for existing exports."]}
@pytest.fixture
def org_scheduled_export(organizer, user):
e = organizer.scheduled_exports.create(
@@ -653,23 +637,6 @@ def test_org_scheduled_export_update_token(token_client, organizer, user, org_sc
assert created.timezone == "America/New_York"
@pytest.mark.django_db
def test_org_scheduled_export_update_identifier_readonly(token_client, organizer, user, org_scheduled_export):
resp = token_client.patch(
'/api/v1/organizers/{}/scheduled_exports/{}/'.format(
organizer.slug, org_scheduled_export.pk,
),
data={
"export_identifier": "transactions",
"export_form_data": {"_format": "xlsx", "date_range": "month_this"},
"timezone": "America/New_York"
},
format='json'
)
assert resp.status_code == 400
assert resp.data == {"export_identifier": ["export_identifier cannot be changed for existing exports."]}
@pytest.mark.django_db
def test_org_scheduled_export_validate_identifier(user_client, organizer, user):
resp = user_client.post(
@@ -1045,87 +1012,6 @@ def _get_and_patch_event_export(client, scheduled, can_see=True, can_edit=True):
return True
@pytest.mark.django_db(transaction=True)
def test_organizer_edit_restrictions_event_expansion(client, event, organizer, user, team):
# This tests the prevention of a possible privilege escalation where user A creates a scheduled export and
# user B has settings permission (= they can see the export configuration), and enough permission
# to run the export themselves, but not enough permission to add events. Without this check, user B could
# modify the export and add themselves as a recipient. Thereby, user B would gain access to data they can't have.
user1_client = APIClient()
user1_client.force_authenticate(user=user)
user2 = User.objects.create_user("dummy2@dummy.dummy", "dummy")
user2_client = APIClient()
user2_client.force_authenticate(user=user2)
event1 = event
event2 = Event.objects.create(
organizer=organizer, name="Dummy", slug="dummy2",
date_from=now(), plugins="pretix.plugins.banktransfer,pretix.plugins.stripe,tests.testdummy"
)
# Team 1 has access only to one event
team1 = team
team1.all_organizer_permissions = False
team1.all_event_permissions = False
team1.all_events = False
team1.limit_organizer_permissions = {"organizer.settings.general:write": True}
team1.limit_event_permissions = {"event.orders:read": True, "event.settings.general:write": True}
team1.save()
team1.limit_events.add(event1)
team1.members.add(user)
# Team 2 has full admin access
team2 = organizer.teams.create(
all_organizer_permissions=True, all_event_permissions=True, all_events=True,
)
team2.members.add(user2)
s1 = ScheduledOrganizerExport.objects.create(
organizer=organizer,
owner=user2,
export_identifier="dummy_orders",
export_form_data={"all_events": False, "events": [event1.pk]},
mail_subject="Test",
mail_template="Test",
locale="en",
schedule_rrule="DTSTART:20230118T000000\nRRULE:FREQ=DAILY;INTERVAL=1;WKST=MO",
schedule_rrule_time=time(2, 30, 0)
)
# User 1 can change …
response = user1_client.patch(
'/api/v1/organizers/{}/scheduled_exports/{}/'.format("dummy", s1.pk),
data={"mail_subject": "Hello"},
format='json',
)
assert response.status_code == 200
# … but not expand scope
response = user1_client.patch(
'/api/v1/organizers/{}/scheduled_exports/{}/'.format("dummy", s1.pk),
data={"export_form_data": {"all_events": False, "events": [event1.slug, event2.slug], "_format": "xlsx", "date_range": "year_this", "items": []}},
format='json',
)
assert response.status_code == 400
response = user1_client.patch(
'/api/v1/organizers/{}/scheduled_exports/{}/'.format("dummy", s1.pk),
data={"export_form_data": {"all_events": True, "events": [], "_format": "xlsx", "date_range": "year_this", "items": []}},
format='json',
)
assert response.status_code == 403
# User 2 can expand
response = user2_client.patch(
'/api/v1/organizers/{}/scheduled_exports/{}/'.format("dummy", s1.pk),
data={"export_form_data": {"all_events": True, "events": [], "_format": "xlsx", "date_range": "year_this", "items": []}},
format='json',
)
assert response.status_code == 200
response = user2_client.patch(
'/api/v1/organizers/{}/scheduled_exports/{}/'.format("dummy", s1.pk),
data={"export_form_data": {"all_events": False, "events": [event1.slug, event2.slug], "_format": "xlsx", "date_range": "year_this", "items": []}},
format='json',
)
assert response.status_code == 200
@pytest.mark.django_db(transaction=True)
def test_event_edit_restrictions(client, event, organizer, user, team):
# This tests the prevention of a possible privilege escalation where user A creates a scheduled export and
+1
View File
@@ -333,6 +333,7 @@ def test_order_update_transmission_validation(token_client, organizer, event, or
assert resp.status_code == 400
assert resp.data == {"invoice_address": {"transmission_info": {
"transmission_it_sdi_pec": ["Enter a valid email address.", "Enter a valid email address."],
"transmission_it_sdi_recipient_code": ["This field is required."]
}}}
resp = token_client.patch(
+1 -12
View File
@@ -696,7 +696,7 @@ def test_medium_autocreate_giftcard(token_client, organizer, team):
@pytest.mark.django_db
def test_medium_lookup_cross_organizer(token_client, organizer, customer, organizer2, org2_event, medium2, giftcard2):
def test_medium_lookup_cross_organizer(token_client, organizer, organizer2, org2_event, medium2, giftcard2):
with scopes_disabled():
o = Order.objects.create(
code='FOO', event=org2_event, email='dummy@dummy.test',
@@ -708,12 +708,7 @@ def test_medium_lookup_cross_organizer(token_client, organizer, customer, organi
personalized=True)
op = o.positions.create(item=ticket, price=Decimal("14"))
medium2.linked_orderpositions.add(op)
medium2.customer = customer
medium2.linked_giftcard = giftcard2
medium2.claim_token = "1234"
medium2.info = {"foo": "bar"}
medium2.notes = "Internal notes"
medium2.label = "Max Muster"
medium2.save()
resp = token_client.post(
@@ -760,9 +755,3 @@ def test_medium_lookup_cross_organizer(token_client, organizer, customer, organi
assert resp.data["result"]["organizer"] == "partner"
assert resp.data["result"]["linked_giftcard"] is not None
assert resp.data["result"]["linked_orderposition"] is None
assert resp.data["result"]["linked_orderpositions"] == []
assert resp.data["result"]["customer"] is None
assert resp.data["result"]["info"] == {}
assert resp.data["result"]["notes"] is None
assert resp.data["result"]["claim_token"] is None
assert resp.data["result"]["label"] is None
-93
View File
@@ -506,99 +506,6 @@ def test_organizer_edit_restrictions(client, env):
assert _can_see_but_not_edit_org_export(client, user1, s2)
def _patch_org_export(client, user, scheduled, data):
client.login(email=user.email, password="dummy")
response = client.get("/control/organizer/dummy/export/")
assert f"export/{scheduled.pk}/delete".encode() in response.content
response = client.get(f"/control/organizer/dummy/export/?identifier={scheduled.export_identifier}&scheduled={scheduled.pk}")
if response.status_code == 404:
return False
assert response.status_code == 200
doc = BeautifulSoup(response.content, "lxml")
form_data = extract_form_fields(doc.select("form[data-asynctask]")[0])
form_data["schedule"] = "save"
for k, v in data.items():
if v is None:
form_data.pop(k, None)
else:
form_data[k] = v
response = client.post(f"/control/organizer/dummy/export/?identifier={scheduled.export_identifier}&scheduled={scheduled.pk}",
data=form_data, follow=True)
assert response.status_code == 200
return b"alert-success" in response.content and b"therefore you cannot" not in response.content
@pytest.mark.django_db(transaction=True)
def test_organizer_edit_restrictions_event_expansion(client, env):
# This tests the prevention of a possible privilege escalation where user A creates a scheduled export and
# user B has settings permission (= they can see the export configuration), and enough permission
# to run the export themselves, but not enough permission to add events. Without this check, user B could
# modify the export and add themselves as a recipient. Thereby, user B would gain access to data they can't have.
user = env[1]
user2 = User.objects.create_user("dummy2@dummy.dummy", "dummy")
event1 = env[0]
event2 = Event.objects.create(
organizer=env[0].organizer, name="Dummy", slug="dummy2",
date_from=now(), plugins="pretix.plugins.banktransfer,pretix.plugins.stripe,tests.testdummy"
)
# Team 1 has access only to one event
team1 = env[2]
team1.all_organizer_permissions = False
team1.all_event_permissions = False
team1.all_events = False
team1.limit_organizer_permissions = {"organizer.settings.general:write": True}
team1.limit_event_permissions = {"event.orders:read": True, "event.settings.general:write": True}
team1.save()
team1.limit_events.add(event1)
team1.members.add(user)
# Team 2 has full admin access
team2 = env[0].organizer.teams.create(
all_organizer_permissions=True, all_event_permissions=True, all_events=True,
)
team2.members.add(user2)
s1 = ScheduledOrganizerExport.objects.create(
organizer=env[0].organizer,
owner=user2,
export_identifier="dummy_orders",
export_form_data={"all_events": False, "events": [event1.pk]},
mail_subject="Test",
mail_template="Test",
locale="en",
schedule_rrule="DTSTART:20230118T000000\nRRULE:FREQ=DAILY;INTERVAL=1;WKST=MO",
schedule_rrule_time=datetime.time(2, 30, 0)
)
# User 1 can change …
assert _patch_org_export(
client, user, s1,
{"schedule-mail_subject": "Hello"},
)
# … but not expand scope
assert not _patch_org_export(
client, user, s1,
{"dummy_orders-events": [event1.pk, event2.pk]},
)
assert not _patch_org_export(
client, user, s1,
{"dummy_orders-all_events": "on", "dummy_orders-events": None},
)
# User 2 can expand
assert _patch_org_export(
client, user2, s1,
{"dummy_orders-all_events": "on", "dummy_orders-events": None},
)
assert _patch_org_export(
client, user2, s1,
{"dummy_orders-events": [event1.pk, event2.pk]},
)
def _can_see_but_not_edit_event_export(client, user, scheduled):
client.login(email=user.email, password="dummy")