Compare commits

...

56 Commits

Author SHA1 Message Date
Richard Schreiber
e54837c532 remove print statement 2023-08-23 09:51:12 +02:00
Raphael Michel
bc49f0f7f1 Fix cache invalidation 2023-08-23 09:47:05 +02:00
Raphael Michel
3e122e0270 Fix quota cache mixup 2023-08-22 13:00:16 +02:00
Raphael Michel
e8ea6e0f5c Item creation: Fix failing test 2023-08-22 12:59:57 +02:00
Raphael Michel
e94e5be878 Item creation: Fix bug in copying meta data 2023-08-22 11:32:43 +02:00
Richard Schreiber
1073ea626e Banktransfer: make row-headers sticky (Z#23127000) (#3537) 2023-08-22 10:53:26 +02:00
Raphael Michel
23ab8df443 Translations: Add Welsh 2023-08-22 10:53:15 +02:00
Kian Cross
d6caf01a38 Add warning about configuration of Celery in development mode to docs (#3525) 2023-08-22 10:44:11 +02:00
Raphael Michel
1424ae78e9 Revert accidental change 2023-08-22 10:20:19 +02:00
Raphael Michel
827382edc3 Bump redis to 4.6.* 2023-08-22 09:43:21 +02:00
Maurice Kaag
85482bc939 Translations: Update French
Currently translated at 100.0% (5400 of 5400 strings)

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

powered by weblate
2023-08-22 09:20:21 +02:00
Felix Hartnagel
42ce545f2f Translations: Update German (informal) (de_Informal)
Currently translated at 100.0% (5400 of 5400 strings)

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

powered by weblate
2023-08-22 09:20:21 +02:00
Raphael Michel
e49bc5d78d Item creation: Fix crash (PRETIXEU-8VE) 2023-08-22 09:14:23 +02:00
Richard Schreiber
6e7a32ef2a Vouchers: improve batch-select UI 2023-08-22 09:11:14 +02:00
Raphael Michel
37df7a6313 Allow PDF variables to provide a bulk evaluation method (second try at #3517) (#3535) 2023-08-21 17:59:55 +02:00
Raphael Michel
d5951415a4 Item creation: Fix saving meta data (#3534) 2023-08-21 16:21:17 +02:00
Raphael Michel
691159ed83 Check-in list: Fix ordering by seat 2023-08-21 15:41:50 +02:00
Raphael Michel
18f517af44 Waiting list: Extend compatibility note 2023-08-21 14:52:39 +02:00
Raphael Michel
89ba2da7e7 QR code generator for voucher URLs and general URLs (#3518)
* QR code generator: Allow other URLs to be used (e.g. for plugins)

* Add QR code to voucher URL view

* Fix allowed_hosts

---------

Co-authored-by: Richard Schreiber <schreiber@rami.io>
2023-08-17 10:10:27 +02:00
Raphael Michel
c1c47e50c3 Voucher redemption: Display event title in some cases (#3519)
* Voucher redemption: Display event title in some cases (Z#23127871)

* Remove unnecessary "with" statement

* fix indentation

---------

Co-authored-by: Richard Schreiber <schreiber@rami.io>
2023-08-17 09:17:47 +02:00
Richard Schreiber
f262cd632c Chekout: make disabling sneak-peek more robust (#3527) 2023-08-16 15:02:02 +02:00
Richard Schreiber
8d58294af1 Fix typeahead item variations order_by 2023-08-16 10:01:27 +02:00
Richard Schreiber
ddc94a8a16 Revert "Allow PDF variables to provide a bulk evaluation method (#3517)"
This reverts commit 6ada83df9a.
2023-08-14 15:11:13 +02:00
Raphael Michel
83811c0343 Fix minor CSS issue in button groups 2023-08-10 14:12:19 +02:00
Raphael Michel
b2c05a72e5 Voucher list: Fix ordering by product 2023-08-10 11:29:10 +02:00
Martin Gross
8c56a23562 Add logentry plain for pretix.giftcards.acceptance.acceptor.removed 2023-08-10 11:21:54 +02:00
Raphael Michel
53e1d9c6c4 Tests: Fix improper cleanup of SITE_URL 2023-08-10 11:20:26 +02:00
Mira
6250ab2165 Bank transfer: Allow customer to send latest invoice via email (Z#207218) (#3511)
Co-authored-by: Raphael Michel <michel@rami.io>
2023-08-09 18:23:45 +02:00
Raphael Michel
6ada83df9a Allow PDF variables to provide a bulk evaluation method (#3517) 2023-08-09 18:22:56 +02:00
Raphael Michel
cfd6376936 Fix transaction view after Django upgrade 2023-08-09 17:11:20 +02:00
Raphael Michel
edb0cd0941 Update STORAGES in docker settings 2023-08-09 15:01:21 +02:00
Raphael Michel
88ac407cf3 Cart: Disable sneak peek on very small carts (#3512) 2023-08-09 14:53:50 +02:00
dependabot[bot]
5ba56fb5ac Bump @babel/core from 7.22.5 to 7.22.9 in /src/pretix/static/npm_dir (#3501)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-08-09 14:53:34 +02:00
Raphael Michel
b51c9f7552 Upgrade to Django 4.2 (#3497) 2023-08-09 14:47:41 +02:00
Ronan LE MEILLAT
0853296663 Translations: Update French
Currently translated at 99.9% (5398 of 5400 strings)

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

powered by weblate
2023-08-09 14:47:26 +02:00
Raphael Michel
721e7549bc Remove forgotten debug statement 2023-08-09 10:34:24 +02:00
Martin Gross
aee86de330 Import: Allow to import "False"-value (Z#23127414) (#3505) 2023-08-08 15:36:51 +02:00
Raphael Michel
756a4355d1 Use newer postgres version for test 2023-08-08 15:32:02 +02:00
Mira
5119bbd0b1 Docs: Update i18n.rst (fix dead link) (#3513) 2023-08-08 15:04:51 +02:00
Raphael Michel
728bd74e28 Organizer settings: Move save button to the left 2023-08-07 17:44:52 +02:00
Mira
015ffeecbf Main menu: Add load indicator to event selector (#3508) 2023-08-07 14:25:50 +02:00
Raphael Michel
0365f6d9fc Order change manager: Set new expiry date if splitted order is pending (#3509) 2023-08-07 14:13:44 +02:00
Raphael Michel
e208a79c32 Docs: Update implementation docs for URL routing (#3510) 2023-08-07 14:13:19 +02:00
ticketflock
0037d37960 Translations: Add English (Old) 2023-08-07 14:04:34 +02:00
ticketflock
50d9b1e4a3 Translations: Add English (Middle) 2023-08-07 14:04:34 +02:00
Patrizia Cotza
7919d012e6 Translations: Update Spanish
Currently translated at 58.5% (3159 of 5400 strings)

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

powered by weblate
2023-08-07 14:04:34 +02:00
Ronan LE MEILLAT
327f95a9cc Translations: Update French
Currently translated at 100.0% (212 of 212 strings)

Translation: pretix/pretix (JavaScript parts)
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix-js/fr/

powered by weblate
2023-08-07 14:04:34 +02:00
Ronan LE MEILLAT
98946ded4b Translations: Update French
Currently translated at 99.9% (5398 of 5400 strings)

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

powered by weblate
2023-08-07 14:04:34 +02:00
Ronan LE MEILLAT
cf47b69bd3 Translations: Update French
Currently translated at 99.3% (5366 of 5400 strings)

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

powered by weblate
2023-08-07 14:04:34 +02:00
Raphael Michel
fa5c69ce0a Translations: Update German (informal) (de_Informal)
Currently translated at 100.0% (5400 of 5400 strings)

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

powered by weblate
2023-08-07 14:04:34 +02:00
Raphael Michel
39d85fc112 Event creation: Fix rare crash (PRETIXEU-8RD) 2023-08-07 09:47:14 +02:00
Mira
23e222bf13 Sidebar dropdown: remove menu load delay 2023-08-03 14:28:59 +02:00
Raphael Michel
cb068b029f Wallet detection: Fix race condition 2023-07-28 17:31:47 +02:00
Raphael Michel
9e95f3be1b Wallet detection: Extend CSP header for google pay 2023-07-28 16:49:11 +02:00
Raphael Michel
401c02865b Voucher form: Sort quotas by date 2023-07-28 16:29:03 +02:00
Raphael Michel
062450002d Bump to 2023.8.0.dev0 2023-07-28 09:30:04 +02:00
78 changed files with 86899 additions and 751 deletions

View File

@@ -35,7 +35,7 @@ jobs:
- uses: actions/checkout@v2
- uses: harmon758/postgresql-action@v1
with:
postgresql version: '11'
postgresql version: '15'
postgresql db: 'pretix'
postgresql user: 'postgres'
postgresql password: 'postgres'

View File

@@ -1,4 +1,4 @@
from pretix.settings import *
LOGGING['handlers']['mail_admins']['include_html'] = True
STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'
STORAGES["staticfiles"]["BACKEND"] = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'

View File

@@ -37,7 +37,7 @@ you to execute a piece of code with a different locale:
This is very useful e.g. when sending an email to a user that has a different language than the user performing the
action that causes the mail to be sent.
.. _translation features: https://docs.djangoproject.com/en/1.9/topics/i18n/translation/
.. _translation features: https://docs.djangoproject.com/en/4.2/topics/i18n/translation/
.. _GNU gettext: https://www.gnu.org/software/gettext/
.. _strings: https://django-i18nfield.readthedocs.io/en/latest/strings.html
.. _database fields: https://django-i18nfield.readthedocs.io/en/latest/quickstart.html

View File

@@ -15,25 +15,33 @@ and the admin panel is available at ``https://pretix.eu/control/event/bigorg/awe
If the organizer now configures a custom domain like ``tickets.bigorg.com``, his event will
from now on be available on ``https://tickets.bigorg.com/awesomecon/``. The former URL at
``pretix.eu`` will redirect there. However, the admin panel will still only be available
on ``pretix.eu`` for convenience and security reasons.
``pretix.eu`` will redirect there. It's also possible to do this for just an event, in which
case the event will be available on ``https://tickets.awesomecon.org/``.
However, the admin panel will still only be available on ``pretix.eu`` for convenience and security reasons.
URL routing
-----------
The hard part about implementing this URL routing in Django is that
``https://pretix.eu/bigorg/awesomecon/`` contains two parameters of nearly arbitrary content
and ``https://tickets.bigorg.com/awesomecon/`` contains only one. The only robust way to do
this is by having *separate* URL configuration for those two cases. In pretix, we call the
former our ``maindomain`` config and the latter our ``subdomain`` config. For pretix's core
modules we do some magic to avoid duplicate configuration, but for a fairly simple plugin with
only a handful of routes, we recommend just configuring the two URL sets separately.
and ``https://tickets.bigorg.com/awesomecon/`` contains only one and ``https://tickets.awesomecon.org/`` does not contain any.
The only robust way to do this is by having *separate* URL configuration for those three cases.
In pretix, we therefore do not have a global URL configuration, but three, living in the following modules:
- ``pretix.multidomain.maindomain_urlconf``
- ``pretix.multidomain.organizer_domain_urlconf``
- ``pretix.multidomain.event_domain_urlconf``
We provide some helper utilities to work with these to avoid duplicate configuration of the individual URLs.
The file ``urls.py`` inside your plugin package will be loaded and scanned for URL configuration
automatically and should be provided by any plugin that provides any view.
However, unlike plain Django, we look not only for a ``urlpatterns`` attribute on the module but support other
attributes like ``event_patterns`` and ``organizer_patterns`` as well.
A very basic example that provides one view in the admin panel and one view in the frontend
could look like this::
For example, for a simple plugin that adds one URL to the backend and one event-level URL to the frontend, you can
create the following configuration in your ``urls.py``::
from django.urls import re_path
@@ -52,7 +60,7 @@ could look like this::
As you can see, the view in the frontend is not included in the standard Django ``urlpatterns``
setting but in a separate list with the name ``event_patterns``. This will automatically prepend
the appropriate parameters to the regex (e.g. the event or the event and the organizer, depending
on the called domain).
on the called domain). For organizer-level views, ``organizer_patterns`` works the same way.
If you only provide URLs in the admin area, you do not need to provide a ``event_patterns`` attribute.
@@ -71,11 +79,16 @@ is a python method that emulates a behavior similar to ``reverse``:
.. autofunction:: pretix.multidomain.urlreverse.eventreverse
If you need to communicate the URL externally, you can use a different method to ensure that it is always an absolute URL:
.. autofunction:: pretix.multidomain.urlreverse.build_absolute_uri
In addition, there is a template tag that works similar to ``url`` but takes an event or organizer object
as its first argument and can be used like this::
{% load eventurl %}
<a href="{% eventurl request.event "presale:event.checkout" step="payment" %}">Pay</a>
<a href="{% abseventurl request.event "presale:event.checkout" step="payment" %}">Pay</a>
Implementation details

View File

@@ -96,6 +96,20 @@ http://localhost:8000/control/ for the admin view.
port (for example because you develop on `pretixdroid`_), you can check
`Django's documentation`_ for more options.
When running the local development webserver, ensure Celery is not configured
in ``pretix.cfg``. i.e., you should remove anything such as::
[celery]
backend=redis://redis:6379/2
broker=redis://redis:6379/2
If you choose to use Celery for development, you must also start a Celery worker
process::
celery -A pretix.celery_app worker -l info
However, beware that code changes will not auto-reload within Celery.
.. _`checksandtests`:
Code checks and unit tests

View File

@@ -36,7 +36,7 @@ dependencies = [
"css-inline==0.8.*",
"defusedcsv>=1.1.0",
"dj-static",
"Django==4.1.*",
"Django==4.2.*",
"django-bootstrap3==23.1.*",
"django-compressor==4.3.*",
"django-countries==7.5.*",
@@ -90,7 +90,7 @@ dependencies = [
"pytz-deprecation-shim==0.1.*",
"pyuca",
"qrcode==7.4.*",
"redis==4.5.*,>=4.5.4",
"redis==4.6.*",
"reportlab==4.0.*",
"requests==2.31.*",
"sentry-sdk==1.15.*",
@@ -112,6 +112,7 @@ memcached = ["pylibmc"]
dev = [
"coverage",
"coveralls",
"fakeredis==2.18.*",
"flake8==6.0.*",
"freezegun",
"isort==5.12.*",

View File

@@ -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__ = "2023.7.0"
__version__ = "2023.8.0.dev0"

View File

@@ -196,7 +196,14 @@ STATICFILES_DIRS = [
STATICI18N_ROOT = os.path.join(BASE_DIR, "pretix/static")
STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'
STORAGES = {
"default": {
"BACKEND": "django.core.files.storage.FileSystemStorage",
},
"staticfiles": {
"BACKEND": "django.contrib.staticfiles.storage.ManifestStaticFilesStorage",
},
}
# if os.path.exists(os.path.join(DATA_DIR, 'static')):
# STATICFILES_DIRS.insert(0, os.path.join(DATA_DIR, 'static'))

View File

@@ -27,6 +27,7 @@ from decimal import Decimal
import pycountry
from django.conf import settings
from django.core.files import File
from django.db import models
from django.db.models import F, Q
from django.utils.encoding import force_str
from django.utils.timezone import now
@@ -372,11 +373,15 @@ class PdfDataSerializer(serializers.Field):
self.context['vars_images'] = get_images(self.context['event'])
for k, f in self.context['vars'].items():
try:
res[k] = f['evaluate'](instance, instance.order, ev)
except:
logger.exception('Evaluating PDF variable failed')
res[k] = '(error)'
if 'evaluate_bulk' in f:
# Will be evaluated later by our list serializers
res[k] = (f['evaluate_bulk'], instance)
else:
try:
res[k] = f['evaluate'](instance, instance.order, ev)
except:
logger.exception('Evaluating PDF variable failed')
res[k] = '(error)'
if not hasattr(ev, '_cached_meta_data'):
ev._cached_meta_data = ev.meta_data
@@ -429,6 +434,38 @@ class PdfDataSerializer(serializers.Field):
return res
class OrderPositionListSerializer(serializers.ListSerializer):
def to_representation(self, data):
# We have a custom implementation of this method because PdfDataSerializer() might keep some elements unevaluated
# with a (callable, input) tuple. We'll loop over these entries and evaluate them bulk-wise to save on SQL queries.
if isinstance(self.parent, OrderSerializer) and isinstance(self.parent.parent, OrderListSerializer):
# Do not execute our custom code because it will be executed by OrderListSerializer later for the
# full result set.
return super().to_representation(data)
iterable = data.all() if isinstance(data, models.Manager) else data
data = []
evaluate_queue = defaultdict(list)
for item in iterable:
entry = self.child.to_representation(item)
if "pdf_data" in entry:
for k, v in entry["pdf_data"].items():
if isinstance(v, tuple) and callable(v[0]):
evaluate_queue[v[0]].append((v[1], entry, k))
data.append(entry)
for func, entries in evaluate_queue.items():
results = func([item for (item, entry, k) in entries])
for (item, entry, k), result in zip(entries, results):
entry["pdf_data"][k] = result
return data
class OrderPositionSerializer(I18nAwareModelSerializer):
checkins = CheckinSerializer(many=True, read_only=True)
answers = AnswerSerializer(many=True)
@@ -440,6 +477,7 @@ class OrderPositionSerializer(I18nAwareModelSerializer):
attendee_name = serializers.CharField(required=False)
class Meta:
list_serializer_class = OrderPositionListSerializer
model = OrderPosition
fields = ('id', 'order', 'positionid', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts',
'company', 'street', 'zipcode', 'city', 'country', 'state', 'discount',
@@ -468,6 +506,20 @@ class OrderPositionSerializer(I18nAwareModelSerializer):
def validate(self, data):
raise TypeError("this serializer is readonly")
def to_representation(self, data):
if isinstance(self.parent, (OrderListSerializer, OrderPositionListSerializer)):
# Do not execute our custom code because it will be executed by OrderListSerializer later for the
# full result set.
return super().to_representation(data)
entry = super().to_representation(data)
if "pdf_data" in entry:
for k, v in entry["pdf_data"].items():
if isinstance(v, tuple) and callable(v[0]):
entry["pdf_data"][k] = v[0]([v[1]])[0]
return entry
class RequireAttentionField(serializers.Field):
def to_representation(self, instance: OrderPosition):
@@ -613,6 +665,34 @@ class OrderURLField(serializers.URLField):
})
class OrderListSerializer(serializers.ListSerializer):
def to_representation(self, data):
# We have a custom implementation of this method because PdfDataSerializer() might keep some elements
# unevaluated with a (callable, input) tuple. We'll loop over these entries and evaluate them bulk-wise to
# save on SQL queries.
iterable = data.all() if isinstance(data, models.Manager) else data
data = []
evaluate_queue = defaultdict(list)
for item in iterable:
entry = self.child.to_representation(item)
for p in entry.get("positions", []):
if "pdf_data" in p:
for k, v in p["pdf_data"].items():
if isinstance(v, tuple) and callable(v[0]):
evaluate_queue[v[0]].append((v[1], p, k))
data.append(entry)
for func, entries in evaluate_queue.items():
results = func([item for (item, entry, k) in entries])
for (item, entry, k), result in zip(entries, results):
entry["pdf_data"][k] = result
return data
class OrderSerializer(I18nAwareModelSerializer):
invoice_address = InvoiceAddressSerializer(allow_null=True)
positions = OrderPositionSerializer(many=True, read_only=True)
@@ -627,6 +707,7 @@ class OrderSerializer(I18nAwareModelSerializer):
class Meta:
model = Order
list_serializer_class = OrderListSerializer
fields = (
'code', 'status', 'testmode', 'secret', 'email', 'phone', 'locale', 'datetime', 'expires', 'payment_date',
'payment_provider', 'fees', 'total', 'comment', 'custom_followup_at', 'invoice_address', 'positions', 'downloads',

View File

@@ -166,7 +166,6 @@ class InitializeView(APIView):
device.software_brand = serializer.validated_data.get('software_brand')
device.software_version = serializer.validated_data.get('software_version')
device.info = serializer.validated_data.get('info')
print(serializer.validated_data, request.data)
device.rsa_pubkey = serializer.validated_data.get('rsa_pubkey')
device.api_token = generate_api_token()
device.save()

View File

@@ -271,6 +271,8 @@ class SecurityMiddleware(MiddlewareMixin):
(url.url_name == "event.checkout" and url.kwargs['step'] == "payment")
):
h['script-src'].append('https://pay.google.com')
h['frame-src'].append('https://pay.google.com')
h['connect-src'].append('https://google.com/pay')
if settings.LOG_CSP:
h['report-uri'] = ["/csp_report/"]
if 'Content-Security-Policy' in resp:

View File

@@ -97,7 +97,7 @@ def _transactions_mark_order_dirty(order_id, using=None):
if getattr(dirty_transactions, 'order_ids', None) is None:
dirty_transactions.order_ids = set()
if _check_for_dirty_orders not in [func for savepoint_id, func in conn.run_on_commit]:
if _check_for_dirty_orders not in [func for (savepoint_id, func, *__) in conn.run_on_commit]:
transaction.on_commit(_check_for_dirty_orders, using)
dirty_transactions.order_ids.clear() # This is necessary to clean up after old threads with rollbacked transactions

View File

@@ -43,6 +43,7 @@ from typing import Optional, Tuple
from zoneinfo import ZoneInfo
import dateutil.parser
import django_redis
from dateutil.tz import datetime_exists
from django.conf import settings
from django.core.exceptions import ValidationError
@@ -57,7 +58,6 @@ from django.utils.functional import cached_property
from django.utils.timezone import is_naive, make_aware, now
from django.utils.translation import gettext_lazy as _, pgettext_lazy
from django_countries.fields import Country
from django_redis import get_redis_connection
from django_scopes import ScopedManager
from i18nfield.fields import I18nCharField, I18nTextField
@@ -1910,8 +1910,13 @@ class Quota(LoggedModel):
def rebuild_cache(self, now_dt=None):
if settings.HAS_REDIS:
rc = get_redis_connection("redis")
rc.hdel(f'quotas:{self.event_id}:availabilitycache', str(self.pk))
rc = django_redis.get_redis_connection("redis")
p = rc.pipeline()
p.hdel(f'quotas:{self.event_id}:availabilitycache', str(self.pk))
p.hdel(f'quotas:{self.event_id}:availabilitycache:nocw', str(self.pk))
p.hdel(f'quotas:{self.event_id}:availabilitycache:igcl', str(self.pk))
p.hdel(f'quotas:{self.event_id}:availabilitycache:nocw:igcl', str(self.pk))
p.execute()
self.availability(now_dt=now_dt)
def availability(

View File

@@ -88,9 +88,7 @@ class LogEntry(models.Model):
class Meta:
ordering = ('-datetime', '-id')
index_together = [
['datetime', 'id']
]
indexes = [models.Index(fields=["datetime", "id"])]
def display(self):
from ..signals import logentry_display

View File

@@ -121,7 +121,10 @@ class ReusableMedium(LoggedModel):
class Meta:
unique_together = (("identifier", "type", "organizer"),)
index_together = (("identifier", "type", "organizer"), ("updated", "id"))
indexes = [
models.Index(fields=("identifier", "type", "organizer")),
models.Index(fields=("updated", "id")),
]
ordering = "identifier", "type", "organizer"

View File

@@ -270,9 +270,9 @@ class Order(LockModel, LoggedModel):
verbose_name = _("Order")
verbose_name_plural = _("Orders")
ordering = ("-datetime", "-pk")
index_together = [
["datetime", "id"],
["last_modified", "id"],
indexes = [
models.Index(fields=["datetime", "id"]),
models.Index(fields=["last_modified", "id"]),
]
def __str__(self):
@@ -1676,7 +1676,7 @@ class OrderPayment(models.Model):
"""
Marks the order as failed and sets info to ``info``, but only if the order is in ``created`` or ``pending``
state. This is equivalent to setting ``state`` to ``OrderPayment.PAYMENT_STATE_FAILED`` and logging a failure,
but it adds strong database logging since we do not want to report a failure for an order that has just
but it adds strong database locking since we do not want to report a failure for an order that has just
been marked as paid.
:param send_mail: Whether an email should be sent to the user about this event (default: ``True``).
"""
@@ -2756,8 +2756,8 @@ class Transaction(models.Model):
class Meta:
ordering = 'datetime', 'pk'
index_together = [
['datetime', 'id']
indexes = [
models.Index(fields=['datetime', 'id'])
]
def save(self, *args, **kwargs):

View File

@@ -805,7 +805,7 @@ class QuestionColumn(ImportColumn):
return self.q.clean_answer(value)
def assign(self, value, order, position, invoice_address, **kwargs):
if value:
if value is not None:
if not hasattr(order, '_answers'):
order._answers = []
if isinstance(value, QuestionOption):

View File

@@ -108,7 +108,10 @@ DEFAULT_VARIABLES = OrderedDict((
("positionid", {
"label": _("Order position number"),
"editor_sample": "1",
"evaluate": lambda orderposition, order, event: str(orderposition.positionid)
"evaluate": lambda orderposition, order, event: str(orderposition.positionid),
# There is no performance gain in using evaluate_bulk here, but we want to make sure it is used somewhere
# in core to make sure we notice if the implementation of the API breaks.
"evaluate_bulk": lambda orderpositions: [str(p.positionid) for p in orderpositions],
}),
("order_positionid", {
"label": _("Order code and position number"),

View File

@@ -2476,6 +2476,11 @@ class OrderChangeManager:
split_order.status = Order.STATUS_PAID
else:
split_order.status = Order.STATUS_PENDING
if self.order.status == Order.STATUS_PAID:
split_order.set_expires(
now(),
list(set(p.subevent_id for p in split_positions))
)
split_order.save()
if offset_amount > Decimal('0.00'):

View File

@@ -24,13 +24,13 @@ import time
from collections import Counter, defaultdict
from itertools import zip_longest
import django_redis
from django.conf import settings
from django.db import models
from django.db.models import (
Case, Count, F, Func, Max, OuterRef, Q, Subquery, Sum, Value, When,
)
from django.utils.timezone import now
from django_redis import get_redis_connection
from pretix.base.models import (
CartPosition, Checkin, Order, OrderPosition, Quota, Voucher,
@@ -102,6 +102,12 @@ class QuotaAvailability:
self.count_waitinglist = defaultdict(int)
self.count_cart = defaultdict(int)
self._cache_key_suffix = ""
if not self._count_waitinglist:
self._cache_key_suffix += ":nocw"
if self._ignore_closed:
self._cache_key_suffix += ":igcl"
self.sizes = {}
def queue(self, *quota):
@@ -121,17 +127,14 @@ class QuotaAvailability:
if self._full_results:
raise ValueError("You cannot combine full_results and allow_cache.")
elif not self._count_waitinglist:
raise ValueError("If you set allow_cache, you need to set count_waitinglist.")
elif settings.HAS_REDIS:
rc = get_redis_connection("redis")
rc = django_redis.get_redis_connection("redis")
quotas_by_event = defaultdict(list)
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():
d = rc.hmget(f'quotas:{eventid}:availabilitycache', [str(q.pk) for q in evquotas])
d = rc.hmget(f'quotas:{eventid}:availabilitycache{self._cache_key_suffix}', [str(q.pk) for q in evquotas])
for redisval, q in zip(d, evquotas):
if redisval is not None:
data = [rv for rv in redisval.decode().split(',')]
@@ -164,12 +167,12 @@ class QuotaAvailability:
if not settings.HAS_REDIS or not quotas:
return
rc = get_redis_connection("redis")
rc = django_redis.get_redis_connection("redis")
# We write the computed availability to redis in a per-event hash as
#
# quota_id -> (availability_state, availability_number, timestamp).
#
# We store this in a hash instead of inidividual values to avoid making two many redis requests
# We store this in a hash instead of individual values to avoid making too many redis requests
# which would introduce latency.
# The individual entries in the hash are "valid" for 120 seconds. This means in a typical peak scenario with
@@ -179,16 +182,16 @@ class QuotaAvailability:
# these quotas. We choose 10 seconds since that should be well above the duration of a write.
lock_name = '_'.join([str(p) for p in sorted([q.pk for q in quotas])])
if rc.exists(f'quotas:availabilitycachewrite:{lock_name}'):
if rc.exists(f'quotas:availabilitycachewrite:{lock_name}{self._cache_key_suffix}'):
return
rc.setex(f'quotas:availabilitycachewrite:{lock_name}', '1', 10)
rc.setex(f'quotas:availabilitycachewrite:{lock_name}{self._cache_key_suffix}', '1', 10)
update = defaultdict(list)
for q in quotas:
update[q.event_id].append(q)
for eventid, quotas in update.items():
rc.hmset(f'quotas:{eventid}:availabilitycache', {
rc.hmset(f'quotas:{eventid}:availabilitycache{self._cache_key_suffix}', {
str(q.id): ",".join(
[str(i) for i in self.results[q]] +
[str(int(time.time()))]
@@ -197,7 +200,7 @@ class QuotaAvailability:
# To make sure old events do not fill up our redis instance, we set an expiry on the cache. However, we set it
# on 7 days even though we mostly ignore values older than 2 monites. The reasoning is that we have some places
# where we set allow_cache_stale and use the old entries anyways to save on performance.
rc.expire(f'quotas:{eventid}:availabilitycache', 3600 * 24 * 7)
rc.expire(f'quotas:{eventid}:availabilitycache{self._cache_key_suffix}', 3600 * 24 * 7)
# We used to also delete item_quota_cache:* from the event cache here, but as the cache
# gets more complex, this does not seem worth it. The cache is only present for up to

View File

@@ -683,12 +683,16 @@ dictionaries as values that contain keys like in the following example::
"product": {
"label": _("Product name"),
"editor_sample": _("Sample product"),
"evaluate": lambda orderposition, order, event: str(orderposition.item)
"evaluate": lambda orderposition, order, event: str(orderposition.item),
"evaluate_bulk": lambda orderpositions: [str(op.item) for op in orderpositions],
}
}
The ``evaluate`` member will be called with the order position, order and event as arguments. The event might
also be a subevent, if applicable.
The ``evaluate_bulk`` member is optional but can significantly improve performance in some situations because you
can perform database fetches in bulk instead of single queries for every position.
"""

View File

@@ -1732,8 +1732,8 @@ class CheckinListAttendeeFilterForm(FilterForm):
'-timestamp': (OrderBy(F('last_entry'), nulls_last=True, descending=True), '-order__code'),
'item': ('item__name', 'variation__value', 'order__code'),
'-item': ('-item__name', '-variation__value', '-order__code'),
'seat': ('seat__sorting_rank', 'seat__guid'),
'-seat': ('-seat__sorting_rank', '-seat__guid'),
'seat': ('seat__sorting_rank', 'seat__seat_guid'),
'-seat': ('-seat__sorting_rank', '-seat__seat_guid'),
'date': ('subevent__date_from', 'subevent__id', 'order__code'),
'-date': ('-subevent__date_from', 'subevent__id', '-order__code'),
'name': {'_order': F('display_name').asc(nulls_first=True),
@@ -1940,7 +1940,7 @@ class VoucherFilterForm(FilterForm):
'item__category__position',
'item__category',
'item__position',
'item__variation__position',
'variation__position',
'quota__name',
),
'subevent': 'subevent__date_from',
@@ -1950,7 +1950,7 @@ class VoucherFilterForm(FilterForm):
'-item__category__position',
'-item__category',
'-item__position',
'-item__variation__position',
'-variation__position',
'-quota__name',
)
}

View File

@@ -461,11 +461,6 @@ class ItemCreateForm(I18nModelForm):
)
if self.cleaned_data.get('copy_from'):
for mv in self.cleaned_data['copy_from'].meta_values.all():
mv.pk = None
mv.item = instance
mv.save(force_insert=True)
for question in self.cleaned_data['copy_from'].questions.all():
question.items.add(instance)
question.log_action('pretix.event.question.changed', user=self.user, data={

View File

@@ -341,6 +341,7 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
'pretix.giftcards.acceptance.added': _('Gift card acceptance for another organizer has been added.'),
'pretix.giftcards.acceptance.removed': _('Gift card acceptance for another organizer has been removed.'),
'pretix.giftcards.acceptance.acceptor.invited': _('A new gift card acceptor has been invited.'),
'pretix.giftcards.acceptance.acceptor.removed': _('A gift card acceptor has been removed.'),
'pretix.giftcards.acceptance.issuer.removed': _('A gift card issuer has been removed or declined.'),
'pretix.giftcards.acceptance.issuer.accepted': _('A new gift card issuer has been accepted.'),
'pretix.webhook.created': _('The webhook has been created.'),

View File

@@ -0,0 +1,27 @@
{% load i18n %}
<ul class="dropdown-menu dropdown-menu-right">
<li>
<a href="{% url "control:event.qrcode" event=request.event.slug organizer=request.organizer.slug filetype="png" %}{% if url %}?url={{ url|urlencode }}{% endif %}"
target="_blank" download>
{% blocktrans with filetype="PNG" %}Download QR code as {{ filetype }} image{% endblocktrans %}
</a>
</li>
<li>
<a href="{% url "control:event.qrcode" event=request.event.slug organizer=request.organizer.slug filetype="svg" %}{% if url %}?url={{ url|urlencode }}{% endif %}"
target="_blank" download>
{% blocktrans with filetype="SVG" %}Download QR code as {{ filetype }} image{% endblocktrans %}
</a>
</li>
<li>
<a href="{% url "control:event.qrcode" event=request.event.slug organizer=request.organizer.slug filetype="jpeg" %}{% if url %}?url={{ url|urlencode }}{% endif %}"
target="_blank" download>
{% blocktrans with filetype="JPG" %}Download QR code as {{ filetype }} image{% endblocktrans %}
</a>
</li>
<li>
<a href="{% url "control:event.qrcode" event=request.event.slug organizer=request.organizer.slug filetype="gif" %}{% if url %}?url={{ url|urlencode }}{% endif %}"
target="_blank" download>
{% blocktrans with filetype="GIF" %}Download QR code as {{ filetype }} image{% endblocktrans %}
</a>
</li>
</ul>

View File

@@ -27,28 +27,7 @@
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{% trans "Create QR code" %}" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-qrcode" aria-hidden="true"></i>
</button>
<ul class="dropdown-menu dropdown-menu-right">
<li>
<a href="{% url "control:event.qrcode" event=request.event.slug organizer=request.organizer.slug filetype="png" %}" target="_blank" download>
{% blocktrans with filetype="PNG" %}Download QR code as {{ filetype }} image{% endblocktrans %}
</a>
</li>
<li>
<a href="{% url "control:event.qrcode" event=request.event.slug organizer=request.organizer.slug filetype="svg" %}" target="_blank" download>
{% blocktrans with filetype="SVG" %}Download QR code as {{ filetype }} image{% endblocktrans %}
</a>
</li>
<li>
<a href="{% url "control:event.qrcode" event=request.event.slug organizer=request.organizer.slug filetype="jpeg" %}" target="_blank" download>
{% blocktrans with filetype="JPG" %}Download QR code as {{ filetype }} image{% endblocktrans %}
</a>
</li>
<li>
<a href="{% url "control:event.qrcode" event=request.event.slug organizer=request.organizer.slug filetype="gif" %}" target="_blank" download>
{% blocktrans with filetype="GIF" %}Download QR code as {{ filetype }} image{% endblocktrans %}
</a>
</li>
</ul>
{% include "pretixcontrol/event/fragment_qr_dropdown.html" with url=0 %}
</div>
<div class="clearfix"></div>
</div>

View File

@@ -337,7 +337,7 @@
<div class="alert alert-info">
{% blocktrans trimmed %}
The waiting list currently is not compatible with some advanced features of pretix such as
add-on products or product bundles.
hidden products, add-on products or product bundles.
{% endblocktrans %}
</div>
<div class="alert alert-info">

View File

@@ -69,7 +69,7 @@
<td></td>
<td class="text-right flip">
<strong>
{{ sums.count }}
{{ sums.sum_count }}
</strong>
</td>
<td></td>

View File

@@ -295,6 +295,11 @@
{% bootstrap_field sform.invoice_regenerate_allowed layout="control" %}
</fieldset>
</div>
<div class="form-group submit-group">
<button type="submit" class="btn btn-primary btn-save">
{% trans "Save" %}
</button>
</div>
</div>
<div class="col-xs-12 col-lg-2">
<div class="panel panel-default">
@@ -307,10 +312,5 @@
</div>
</div>
</div>
<div class="form-group submit-group">
<button type="submit" class="btn btn-primary btn-save">
{% trans "Save" %}
</button>
</div>
</form>
{% endblock %}

View File

@@ -42,10 +42,18 @@
<div class="form-group">
<label class="col-md-3 control-label" for="id_url">{% trans "Voucher link" %}</label>
<div class="col-md-9">
<input type="text" name="url"
value="{% abseventurl request.event "presale:event.redeem" %}?voucher={{ voucher.code|urlencode }}{% if voucher.subevent_id %}&subevent={{ voucher.subevent_id }}{% endif %}"
class="form-control"
id="id_url" readonly>
<div class="input-group">
<input type="text" name="url"
value="{{ url }}"
class="form-control"
id="id_url" readonly>
<div class="input-group-btn">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" title="{% trans "Create QR code" %}" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-qrcode" aria-hidden="true"></i>
</button>
{% include "pretixcontrol/event/fragment_qr_dropdown.html" with url=url %}
</div>
</div>
</div>
</div>
{% endif %}

View File

@@ -96,7 +96,9 @@
<tr>
<th>
{% if "can_change_vouchers" in request.eventpermset %}
<input type="checkbox" data-toggle-table />
<label aria-label="{% trans "select all rows for batch-operation" %}" class="batch-select-label">
<input type="checkbox" data-toggle-table />
</label>
{% endif %}
</th>
<th>
@@ -139,7 +141,9 @@
<tr>
<td>
{% if "can_change_vouchers" in request.eventpermset %}
<input type="checkbox" name="voucher" class="" value="{{ v.pk }}"/>
<label aria-label="{% trans "select row for batch-operation" %}" class="batch-select-label">
<input type="checkbox" name="voucher" class="batch-select-checkbox" value="{{ v.pk }}"/>
</label>
{% endif %}
</td>
<td>
@@ -194,9 +198,12 @@
</table>
</div>
{% if "can_change_vouchers" in request.eventpermset %}
<button type="submit" class="btn btn-default btn-save" name="action" value="delete">
{% trans "Delete selected" %}
</button>
<div class="batch-select-actions">
<button type="submit" class="btn btn-danger" name="action" value="delete">
<i class="fa fa-trash" aria-hidden="true"></i>
{% trans "Delete selected" %}
</button>
</div>
{% endif %}
</form>
{% include "pretixcontrol/pagination.html" %}

View File

@@ -40,7 +40,7 @@ from collections import OrderedDict
from decimal import Decimal
from io import BytesIO
from itertools import groupby
from urllib.parse import urlsplit
from urllib.parse import urlparse, urlsplit
from zoneinfo import ZoneInfo
import bleach
@@ -50,6 +50,7 @@ from django.apps import apps
from django.conf import settings
from django.contrib import messages
from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import PermissionDenied
from django.core.files import File
from django.db import transaction
from django.db.models import ProtectedError
@@ -61,6 +62,7 @@ from django.http import (
from django.shortcuts import get_object_or_404, redirect
from django.urls import reverse
from django.utils.functional import cached_property
from django.utils.http import url_has_allowed_host_and_scheme
from django.utils.timezone import now
from django.utils.translation import gettext, gettext_lazy as _, gettext_noop
from django.views.generic import FormView, ListView
@@ -783,8 +785,8 @@ class MailSettingsRendererPreview(MailSettingsPreview):
return ctx
def get(self, request, *args, **kwargs):
v = str(request.event.settings.mail_text_order_payment_failed)
v = format_map(v, self.placeholders('mail_text_order_payment_failed'))
v = str(request.event.settings.mail_text_order_placed)
v = format_map(v, self.placeholders('mail_text_order_placed'))
renderers = request.event.get_html_mail_renderers()
if request.GET.get('renderer') in renderers:
with rolledback_transaction():
@@ -1530,6 +1532,12 @@ class EventQRCode(EventPermissionRequiredMixin, View):
def get(self, request, *args, filetype, **kwargs):
url = build_absolute_uri(request.event, 'presale:event.index')
if "url" in request.GET:
if url_has_allowed_host_and_scheme(request.GET["url"], allowed_hosts=[urlparse(url).netloc]):
url = request.GET["url"]
else:
raise PermissionDenied("Untrusted URL")
qr = qrcode.QRCode(
version=1,
error_correction=qrcode.constants.ERROR_CORRECT_M,

View File

@@ -1188,30 +1188,46 @@ class MetaDataEditorMixin:
@cached_property
def meta_forms(self):
if hasattr(self, 'object') and self.object:
if getattr(self, 'object', None):
val_instances = {
v.property_id: v for v in self.object.meta_values.all()
}
else:
val_instances = {}
if getattr(self, 'copy_from', None):
defaults = {
v.property_id: v.value for v in self.copy_from.meta_values.all()
}
else:
defaults = {}
formlist = []
for p in self.request.event.item_meta_properties.all():
formlist.append(self._make_meta_form(p, val_instances))
formlist.append(self._make_meta_form(p, val_instances, defaults))
return formlist
def _make_meta_form(self, p, val_instances):
def _make_meta_form(self, p, val_instances, defaults):
return self.meta_form(
prefix='prop-{}'.format(p.pk),
property=p,
instance=val_instances.get(p.pk, self.meta_model(property=p, item=self.object)),
instance=val_instances.get(
p.pk,
self.meta_model(
property=p,
item=self.object if getattr(self, 'object', None) else None,
value=defaults.get(p.pk, None)
)
),
data=(self.request.POST if self.request.method == "POST" else None)
)
def save_meta(self):
for f in self.meta_forms:
if f.cleaned_data.get('value'):
if not f.instance.item_id:
f.instance.item = self.object
f.save()
elif f.instance and f.instance.pk:
f.instance.delete()
@@ -1257,6 +1273,7 @@ class ItemCreate(EventPermissionRequiredMixin, MetaDataEditorMixin, CreateView):
messages.success(self.request, _('Your changes have been saved.'))
ret = super().form_valid(form)
self.save_meta()
form.instance.log_action('pretix.event.item.added', user=self.request.user, data={
k: (form.cleaned_data.get(k).name
if isinstance(form.cleaned_data.get(k), File)
@@ -1283,6 +1300,14 @@ class ItemCreate(EventPermissionRequiredMixin, MetaDataEditorMixin, CreateView):
ctx['meta_forms'] = self.meta_forms
return ctx
def post(self, request, *args, **kwargs):
self.object = None
form = self.get_form()
if form.is_valid() and all([f.is_valid() for f in self.meta_forms]):
return self.form_valid(form)
else:
return self.form_invalid(form)
class ItemUpdateGeneral(ItemDetailMixin, EventPermissionRequiredMixin, MetaDataEditorMixin, UpdateView):
form_class = ItemUpdateForm

View File

@@ -418,7 +418,7 @@ class OrderTransactions(OrderView):
'item', 'variation', 'subevent'
).order_by('datetime')
ctx['sums'] = self.order.transactions.aggregate(
count=Sum('count'),
sum_count=Sum('count'),
full_price=Sum(F('count') * F('price')),
full_tax_value=Sum(F('count') * F('tax_value')),
)

View File

@@ -546,7 +546,7 @@ def variations_select2(request, **kwargs):
F('item__category__position').asc(nulls_first=True),
'item__category_id',
'item__position',
'item__pk'
'item__pk',
'position',
'value'
).select_related('item')
@@ -718,7 +718,7 @@ def itemvarquota_select2(request, **kwargs):
itemqs = request.event.items.prefetch_related('variations').filter(
Q(name__icontains=i18ncomp(query)) | Q(internal_name__icontains=query)
)
quotaqs = request.event.quotas.filter(quotaf).select_related('subevent')
quotaqs = request.event.quotas.filter(quotaf).select_related('subevent').order_by('-subevent__date_from', 'name')
more = False
else:
if page == 1:
@@ -727,7 +727,7 @@ def itemvarquota_select2(request, **kwargs):
)
else:
itemqs = request.event.items.none()
quotaqs = request.event.quotas.filter(name__icontains=query).select_related('subevent')
quotaqs = request.event.quotas.filter(name__icontains=query).select_related('subevent').order_by('-subevent__date_from', 'name')
total = quotaqs.count()
pagesize = 20
offset = (page - 1) * pagesize

View File

@@ -34,6 +34,7 @@
# License for the specific language governing permissions and limitations under the License.
import io
from urllib.parse import urlencode
import bleach
from defusedcsv import csv
@@ -75,6 +76,7 @@ from pretix.control.views import PaginationMixin
from pretix.helpers.compat import CompatDeleteView
from pretix.helpers.format import format_map
from pretix.helpers.models import modelcopy
from pretix.multidomain.urlreverse import build_absolute_uri
class VoucherList(PaginationMixin, EventPermissionRequiredMixin, ListView):
@@ -315,6 +317,13 @@ class VoucherUpdate(EventPermissionRequiredMixin, UpdateView):
expires__gte=now()
).count()
ctx['redeemed_in_carts'] = redeemed_in_carts
url_params = {
'voucher': self.object.code
}
if self.object.subevent_id:
url_params['subevent'] = self.object.subevent_id
ctx['url'] = build_absolute_uri(self.request.event, "presale:event.redeem") + "?" + urlencode(url_params)
return ctx

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: 1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-27 11:49+0000\n"
"PO-Revision-Date: 2023-07-27 11:58+0000\n"
"Last-Translator: Raphael Michel <michel@rami.io>\n"
"PO-Revision-Date: 2023-08-16 22:00+0000\n"
"Last-Translator: Felix Hartnagel <felix@fhcom.de>\n"
"Language-Team: German (informal) <https://translate.pretix.eu/projects/"
"pretix/pretix/de_Informal/>\n"
"Language: de_Informal\n"
@@ -16172,7 +16172,7 @@ msgstr "Kontoeinstellungen"
#: pretix/presale/templates/pretixpresale/fragment_login_status.html:13
#: pretix/presale/templates/pretixpresale/fragment_login_status.html:14
msgid "Log out"
msgstr "Anmelden"
msgstr "Abmelden"
#: pretix/control/templates/pretixcontrol/base.html:245
msgid "Organizer account"
@@ -31019,7 +31019,7 @@ msgstr ""
#: pretix/presale/templates/pretixpresale/event/order.html:43
msgid "Please note that we still await your payment to complete the process."
msgstr ""
"Bitte beachten Sie, dass wir noch deine Zahlung erwarten, um den Prozess "
"Bitte beachte, dass wir noch deine Zahlung erwarten, um den Prozess "
"abzuschließen."
#: pretix/presale/templates/pretixpresale/event/order.html:55

File diff suppressed because it is too large Load Diff

View File

@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-27 11:49+0000\n"
"PO-Revision-Date: 2023-07-13 07:22+0000\n"
"Last-Translator: Martin Gross <gross@rami.io>\n"
"PO-Revision-Date: 2023-08-02 02:00+0000\n"
"Last-Translator: Patrizia Cotza <str.cotza@gmail.com>\n"
"Language-Team: Spanish <https://translate.pretix.eu/projects/pretix/pretix/"
"es/>\n"
"Language: es\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 4.17\n"
"X-Generator: Weblate 4.18.2\n"
#: pretix/_base_settings.py:78
msgid "English"
@@ -2435,6 +2435,8 @@ msgstr "Disponibilidad de cuotas"
msgid ""
"Download a spreadsheet of all quotas including their current availability."
msgstr ""
"Descargar un archivo Excel con todas las cuotas incluyendo su disponibilidad "
"actual."
#: pretix/base/exporters/orderlist.py:1082
#: pretix/control/templates/pretixcontrol/items/quotas.html:45
@@ -2499,6 +2501,7 @@ msgstr "Tarjeta de regalo"
#: pretix/base/exporters/orderlist.py:1132
msgid "Download a spreadsheet of all gift card transactions."
msgstr ""
"Descargar una hoja de cálculo con todas las transacciones de tarjeta regalo."
#: pretix/base/exporters/orderlist.py:1160
#: pretix/base/exporters/orderlist.py:1207
@@ -2571,6 +2574,8 @@ msgstr "Redenciones de tarjetas de regalo"
msgid ""
"Download a spreadsheet of all payments or refunds that involve gift cards."
msgstr ""
"Descargar una hoja de cálculo con todos los pagos y devoluciones que "
"contienen tarjetas regalo."
#: pretix/base/exporters/orderlist.py:1207
#: pretix/control/templates/pretixcontrol/giftcards/payment.html:16
@@ -2777,6 +2782,8 @@ msgid ""
"Due to technical reasons you cannot set inputs, that need to be masked (e.g. "
"passwords), to %(value)s."
msgstr ""
"Por razones técnicas, no puedes introducir datos que deben estar ocultos ("
"ej. contraseñas) en el campo %(value)s."
#: pretix/base/forms/auth.py:57 pretix/base/forms/auth.py:168
msgid "Keep me logged in"
@@ -2848,6 +2855,8 @@ msgid ""
"You uploaded an image in landscape orientation. Please upload an image in "
"portrait orientation."
msgstr ""
"Has cargado una imagen con formato horizontal. Por favor sube una imagen en "
"vertical."
#: pretix/base/forms/questions.py:471
msgid "Please upload an image where the width is 3/4 of the height."
@@ -2870,6 +2879,8 @@ msgid ""
"If you keep this empty, the ticket will be valid starting at the time of "
"purchase."
msgstr ""
"Si mantienes este campo vacío, la entrada será válida empezando en el "
"momento de la compra."
#: pretix/base/forms/questions.py:664 pretix/base/forms/questions.py:992
msgid "Street and Number"
@@ -2885,6 +2896,8 @@ msgid ""
"Optional, but depending on the country you reside in we might need to charge "
"you additional taxes if you do not enter it."
msgstr ""
"Opcional, pero dependiendo de tu país de residencia, es posible que haya que "
"aplicar cargos adicionales si no nos facilitas tu dirección."
#: pretix/base/forms/questions.py:1033 pretix/base/forms/questions.py:1039
msgid "If you are registered in Switzerland, you can enter your UID instead."
@@ -2895,6 +2908,8 @@ msgid ""
"Optional, but it might be required for you to claim tax benefits on your "
"invoice depending on your and the sellers country of residence."
msgstr ""
"Opcional, pero puede que sea necesario si aplican beneficios fiscales en tu "
"factura dependiendo del país de residencia del vendedor."
#: pretix/base/forms/questions.py:1129
msgid "You need to provide a company name."
@@ -2927,7 +2942,7 @@ msgstr "La contraseña actual que ingresó no es correcta."
#: pretix/base/forms/user.py:58
msgid "Please choose a password different to your current one."
msgstr ""
msgstr "Elige una contraseña diferente a la actual."
#: pretix/base/forms/user.py:63 pretix/presale/forms/customer.py:373
#: pretix/presale/forms/customer.py:442
@@ -3139,7 +3154,7 @@ msgstr "Monto"
#, python-brace-format
msgctxt "invoice"
msgid "Single price: {net_price} net / {gross_price} gross"
msgstr ""
msgstr "Precio único: {net_price} neto / {gross_price} bruto"
#: pretix/base/invoice.py:659
#, fuzzy, python-brace-format
@@ -3236,7 +3251,7 @@ msgstr "Por favor, seleccione una cuota."
#: pretix/base/media.py:61
msgid "Barcode / QR-Code"
msgstr ""
msgstr "Código de barras / Código QR"
#: pretix/base/media.py:77
#: pretix/control/templates/pretixcontrol/organizers/edit.html:237
@@ -3435,7 +3450,7 @@ msgstr "Tipo de ticket no está permitido"
#: pretix/base/models/checkin.py:351
msgid "Ticket code is ambiguous on list"
msgstr ""
msgstr "El código de la entrada es ambiguo en la lista"
#: pretix/base/models/checkin.py:352
#, fuzzy
@@ -3486,6 +3501,8 @@ msgid ""
"The identifier may only contain letters, numbers, dots, dashes, and "
"underscores. It must start and end with a letter or number."
msgstr ""
"El identificador solo puede contener letras, números, puntos, y barras "
"bajas. Tiene que empezar y terminar con una letra o un número."
#: pretix/base/models/customers.py:299 pretix/base/models/orders.py:1392
#: pretix/base/models/orders.py:2971 pretix/base/settings.py:1093
@@ -3501,7 +3518,7 @@ msgstr "Seleccione país"
#: pretix/base/models/customers.py:370
msgctxt "openidconnect"
msgid "Confidential"
msgstr ""
msgstr "Confidencial"
#: pretix/base/models/customers.py:371
#, fuzzy
@@ -3520,7 +3537,7 @@ msgstr "Código de transacción"
#: pretix/base/models/customers.py:378
msgctxt "openidconnect"
msgid "Implicit"
msgstr ""
msgstr "Implícito"
#: pretix/base/models/customers.py:382
msgid "OpenID Connect access (required)"
@@ -3572,7 +3589,7 @@ msgstr "Este identificador ya se utiliza para una pregunta diferente."
#: pretix/control/templates/pretixcontrol/organizers/gates.html:16
#: pretix/plugins/checkinlists/exporters.py:671
msgid "Gate"
msgstr ""
msgstr "Puerta"
#: pretix/base/models/devices.py:132
#: pretix/control/templates/pretixcontrol/organizers/devices.html:83
@@ -3964,7 +3981,7 @@ msgstr "Parametrizaciones adicionales"
#: pretix/base/models/exports.py:61 pretix/base/models/exports.py:66
#: pretix/base/models/exports.py:71
msgid "You can specify multiple recipients separated by commas."
msgstr ""
msgstr "Puedes especificar múltiples destinatarios separados por comas."
#: pretix/base/models/exports.py:64
#, fuzzy
@@ -4006,6 +4023,7 @@ msgstr "Hora de inicio del evento"
#: pretix/base/models/exports.py:86
msgid "The actual start time might be delayed depending on system load."
msgstr ""
"La hora de inicio real puede atrasarse dependiendo de la carga del sistema."
#: pretix/base/models/fields.py:33
msgid "No value can contain the delimiter character."
@@ -4417,11 +4435,11 @@ msgstr "minutos"
#: pretix/base/models/items.py:626
msgid "Hours"
msgstr ""
msgstr "Horas"
#: pretix/base/models/items.py:630
msgid "Days"
msgstr ""
msgstr "Días"
#: pretix/base/models/items.py:634
#, fuzzy
@@ -4453,7 +4471,7 @@ msgstr "El elemento seleccionado no pertenece a este evento."
#: pretix/base/models/items.py:650
msgid "Reusable media policy"
msgstr ""
msgstr "Condiciones de utilización de imágenes"
#: pretix/base/models/items.py:652
msgid ""
@@ -5142,7 +5160,7 @@ msgstr "Tarjeta de crédito"
#: pretix/base/models/memberships.py:44
msgid "Membership is transferable"
msgstr ""
msgstr "La suscripción es transferible"
#: pretix/base/models/memberships.py:45
msgid ""
@@ -5152,7 +5170,7 @@ msgstr ""
#: pretix/base/models/memberships.py:50
msgid "Parallel usage is allowed"
msgstr ""
msgstr "El uso paralelo está permitido"
#: pretix/base/models/memberships.py:51
msgid ""
@@ -5235,7 +5253,7 @@ msgstr ""
#: pretix/base/models/orders.py:234
msgid "We'll show you this order to be due for a follow-up on this day."
msgstr ""
msgstr "Te mostraremos esta compra en el seguimiento de ese día."
#: pretix/base/models/orders.py:240
msgid ""
@@ -5414,7 +5432,7 @@ msgstr "Tarifa de cancelación"
#: pretix/base/models/orders.py:2132
msgid "Insurance fee"
msgstr ""
msgstr "Prima de seguro"
#: pretix/base/models/orders.py:2133
msgid "Other fees"
@@ -5615,7 +5633,7 @@ msgstr ""
#: pretix/base/models/tax.py:168
msgid "Official name"
msgstr ""
msgstr "Nombre oficial"
#: pretix/base/models/tax.py:169
msgid "Should be short, e.g. \"VAT\""
@@ -5698,7 +5716,7 @@ msgstr ""
#: pretix/base/models/tax.py:372
msgctxt "invoice"
msgid "VAT liability rests with the service recipient."
msgstr ""
msgstr "La responsabilidad del IVA es del destinatario del servicio."
#: pretix/base/models/vouchers.py:171
msgid "No effect"
@@ -5985,7 +6003,7 @@ msgstr "Debe elegir el producto \"{prod}\" para este asiento."
#: pretix/base/models/vouchers.py:500
#, python-brace-format
msgid "The seat \"{id}\" is already sold or currently blocked."
msgstr ""
msgstr "El puesto\"{id}\" ya se ha vendido o está bloqueado."
#: pretix/base/models/waitinglist.py:64
msgid "On waiting list since"
@@ -6507,7 +6525,7 @@ msgstr "Habilitar método de pago"
#: pretix/base/payment.py:441
msgid "Share this link with customers who should use this payment method."
msgstr ""
msgstr "Comparte este link con clientes que deben usar este método de pago."
#: pretix/base/payment.py:487
msgctxt "invoice"
@@ -6948,7 +6966,7 @@ msgstr "Dirección de facturación empresa"
#: pretix/base/pdf.py:339
msgid "Sesame Street 42"
msgstr ""
msgstr "Calle Sésamo 42"
#: pretix/base/pdf.py:344
#, fuzzy
@@ -7331,6 +7349,8 @@ msgid ""
"All payments for this event need to be confirmed already, so no new orders "
"can be created."
msgstr ""
"Todos los pagos de este evento tienen que estar ya confirmados, por lo que "
"no se pueden crear nuevos pedidos."
#: pretix/base/services/cart.py:136
msgid ""
@@ -7579,12 +7599,12 @@ msgstr "Razón desconocida"
#: pretix/base/services/checkin.py:246
#, python-brace-format
msgid "Only allowed before {datetime}"
msgstr ""
msgstr "Solo está permitido antes del {datetime}"
#: pretix/base/services/checkin.py:248
#, python-brace-format
msgid "Only allowed after {datetime}"
msgstr ""
msgstr "Solo está permitido después de {datetime}"
#: pretix/base/services/checkin.py:251
msgid "Ticket type not allowed"
@@ -7653,22 +7673,22 @@ msgstr "Domingo"
#: pretix/base/services/checkin.py:307
#, python-brace-format
msgid "{variable} is not {value}"
msgstr ""
msgstr "{variable} no es {value}"
#: pretix/base/services/checkin.py:309
#, python-brace-format
msgid "Maximum {variable} exceeded"
msgstr ""
msgstr "Máximo {variable} superado"
#: pretix/base/services/checkin.py:311
#, python-brace-format
msgid "Minimum {variable} exceeded"
msgstr ""
msgstr "Mínimo {variable} superado"
#: pretix/base/services/checkin.py:313
#, python-brace-format
msgid "{variable} is {value}"
msgstr ""
msgstr "{variable} es {value}"
#: pretix/base/services/checkin.py:763
msgid "This order position has been canceled."
@@ -7831,7 +7851,7 @@ msgstr "Product de Ejemplo A"
#: pretix/base/services/invoices.py:519
#, python-brace-format
msgid "New invoice: {number}"
msgstr ""
msgstr "Nueva factura: {number}"
#: pretix/base/services/invoices.py:521
#, python-brace-format
@@ -7843,6 +7863,13 @@ msgid ""
"We are sending this email because you configured us to do so in your event "
"settings."
msgstr ""
"Hola,\n"
"\n"
"Una nueva factura para tu pedido {order} de {event} se ha creado, la puedes "
"encontrar adjunta.\n"
"\n"
"Te estamos enviando este email porque lo has configurado así en la página de "
"configuración del evento."
#: pretix/base/services/mail.py:266
#, fuzzy, python-brace-format
@@ -10051,17 +10078,7 @@ msgstr ""
"su equipo {event}"
#: pretix/base/settings.py:2108
#, fuzzy, python-brace-format
#| msgid ""
#| "Hello,\n"
#| "\n"
#| "your order {code} for {event} has been canceled.\n"
#| "\n"
#| "You can view the details of your order at\n"
#| "{url}\n"
#| "\n"
#| "Best regards, \n"
#| "Your {event} team"
#, python-brace-format
msgid ""
"Hello {attendee_name},\n"
"\n"
@@ -10073,15 +10090,15 @@ msgid ""
"Best regards, \n"
"Your {event} team"
msgstr ""
"Hola, \n"
"Hola, {attendee_name}: \n"
"\n"
"su pedido {code} para {event} ha sido cancelado. \n"
"Te has registrado correctamente para {event}. \n"
"\n"
"Puede ver los detalles de su pedido en\n"
"Puedes ver el estado y los detalles de tu entrada aquí:\n"
"{url}. \n"
"\n"
"Saludos cordiales, \n"
"su equipo {event}"
"El equipo {event}"
#: pretix/base/settings.py:2128
#, python-brace-format
@@ -10621,19 +10638,7 @@ msgid "Order approved and confirmed: {code}"
msgstr "Pedido aprobado y confirmado: {code}"
#: pretix/base/settings.py:2462
#, fuzzy, python-brace-format
#| msgid ""
#| "Hello,\n"
#| "\n"
#| "your order for {event} was successful. As you only ordered free "
#| "products,\n"
#| "no payment is required.\n"
#| "\n"
#| "You can change your order details and view the status of your order at\n"
#| "{url}\n"
#| "\n"
#| "Best regards, \n"
#| "Your {event} team"
#, python-brace-format
msgid ""
"Hello,\n"
"\n"
@@ -10648,15 +10653,15 @@ msgid ""
msgstr ""
"Hola, \n"
"\n"
"su pedido para {event} fue un exitoso. Como sólo ha pedido productos "
"gratuitos , \n"
"no se requiere ningún pago. \n"
"se ha aprobado tu pedido para {event} y te damos la bienvenida a nuestro "
"evento. Como solo ha pedido productos gratuitos, no se requiere ningún pago. "
"\n"
"\n"
"Puede cambiar los detalles de su pedido y ver el estado del mismo en\n"
"{url}\n"
"\n"
"Saludos cordiales, \n"
"su equipo {event}"
"El equipo de {event}"
#: pretix/base/settings.py:2495
#, python-brace-format
@@ -10717,17 +10722,7 @@ msgid "Your ticket is ready for download: {code}"
msgstr "Su ticket está listo para descargar: {code}"
#: pretix/base/settings.py:2536
#, fuzzy, python-brace-format
#| msgid ""
#| "Hello {attendee_name},\n"
#| "\n"
#| "you are registered for {event}.\n"
#| "\n"
#| "If you did not do so already, you can download your ticket here:\n"
#| "{url}\n"
#| "\n"
#| "Best regards, \n"
#| "Your {event} team"
#, python-brace-format
msgid ""
"Hello {attendee_name},\n"
"\n"
@@ -10739,11 +10734,11 @@ msgid ""
"Best regards, \n"
"Your {event} team"
msgstr ""
"Hola {attendee_name},\n"
"Hola, {attendee_name}:\n"
"\n"
"está registrado en {event}.\n"
"\n"
"Si aún no lo ha hecho, puede descargar su entrada aquí :\n"
"Si aún no lo ha hecho, puede descargar su entrada aquí:\n"
"{url} \n"
"\n"
"Saludos cordiales, \n"
@@ -12453,10 +12448,8 @@ msgid "Ask for {fields}, display like {example}"
msgstr "Pregunta por {fields}, despliega como {example}"
#: pretix/control/forms/event.py:634 pretix/control/forms/organizer.py:454
#, fuzzy
#| msgid "Free price input"
msgid "Free text input"
msgstr "Entrada de precio gratuita"
msgstr "Entrada de texto libre"
#: pretix/control/forms/event.py:666
#, fuzzy
@@ -12733,10 +12726,8 @@ msgid "Subject for approved free order"
msgstr "Pedido aprobado"
#: pretix/control/forms/event.py:1233
#, fuzzy
#| msgid "Approved order"
msgid "Text for approved free order"
msgstr "Pedido aprobado"
msgstr "Texto aprobado"
#: pretix/control/forms/event.py:1236 pretix/control/forms/event.py:1254
#, fuzzy
@@ -14259,7 +14250,7 @@ msgstr "ticket secreto:"
#: pretix/control/forms/orders.py:458
msgid "Validity start"
msgstr ""
msgstr "Incio de validez"
#: pretix/control/forms/orders.py:463
#, fuzzy
@@ -14410,10 +14401,8 @@ msgid "Keep a fixed cancellation fee per ticket"
msgstr "Mantener una tarifa de cancelación fija"
#: pretix/control/forms/orders.py:828
#, fuzzy
#| msgid "Generate tickets for non-admission products"
msgid "Free tickets and add-on products are not counted"
msgstr "Generar tickets para productos no admitidos"
msgstr "Las entradas gratuitas en productos complementarios no contabilizan"
#: pretix/control/forms/orders.py:838
#, fuzzy
@@ -14607,29 +14596,23 @@ msgid "Gift card value"
msgstr "Tarjeta de regalo"
#: pretix/control/forms/organizer.py:700
#, fuzzy
#| msgid "This ticket has already been redeemed."
msgid "An medium with this type and identifier is already registered."
msgstr "Este ticket ya ha sido canjeado."
msgstr "Un medio con este tipo y este identificador ya ha sido registrado."
#: pretix/control/forms/organizer.py:801
#, fuzzy
#| msgid "This ticket has already been redeemed."
msgid "An account with this customer ID is already registered."
msgstr "Este ticket ya ha sido canjeado."
msgstr "Una cuenta con este identificador de usuario ya está registrado."
#: pretix/control/forms/organizer.py:802 pretix/presale/forms/customer.py:439
#, fuzzy
#| msgid "This ticket has already been redeemed."
msgid "An account with this email address is already registered."
msgstr "Este ticket ya ha sido canjeado."
msgstr "Una cuenta con esta dirección de correo ya está registrada."
#: pretix/control/forms/organizer.py:818
#: pretix/control/templates/pretixcontrol/organizers/customer.html:60
#: pretix/presale/forms/customer.py:156 pretix/presale/forms/customer.py:472
#: pretix/presale/templates/pretixpresale/organizers/customer_profile.html:32
msgid "Phone"
msgstr ""
msgstr "Teléfono"
#: pretix/control/forms/organizer.py:925
#, fuzzy
@@ -14655,7 +14638,7 @@ msgstr "Clave Secreta"
#: pretix/control/forms/organizer.py:937
msgctxt "sso_oidc"
msgid "Scope"
msgstr ""
msgstr "Alcance"
#: pretix/control/forms/organizer.py:938
msgctxt "sso_oidc"
@@ -14665,7 +14648,7 @@ msgstr ""
#: pretix/control/forms/organizer.py:942
msgctxt "sso_oidc"
msgid "User ID field"
msgstr ""
msgstr "Campo identificador del usuario"
#: pretix/control/forms/organizer.py:943
msgctxt "sso_oidc"
@@ -17064,6 +17047,8 @@ msgid ""
"We've detected that you are using <strong>Microsoft Internet Explorer</"
"strong>."
msgstr ""
"Hemos detectado que estás usando <strong> Microsoft Internet Explorer "
"</strong>."
#: pretix/control/templates/pretixcontrol/base.html:328
msgid ""
@@ -17141,6 +17126,8 @@ msgid ""
"For security reasons, please change your password before you continue. "
"Afterwards you will be redirected to your original destination."
msgstr ""
"Por motivos de seguridad, por favor cambia tu contraseña antes de continuar. "
"Serás redirigido después a la página de origen."
#: pretix/control/templates/pretixcontrol/base.html:446
#, python-format
@@ -17329,7 +17316,7 @@ msgstr "Resultado"
#: pretix/control/templates/pretixcontrol/boxoffice/payment.html:108
msgid "Cash"
msgstr ""
msgstr "Efectivo"
#: pretix/control/templates/pretixcontrol/checkin/checkins.html:9
#: pretix/control/templates/pretixcontrol/checkin/checkins.html:41
@@ -20839,7 +20826,7 @@ msgstr "No hay solicitudes registradas todavía."
#: pretix/control/templates/pretixcontrol/oauth/app_register.html:4
#: pretix/control/templates/pretixcontrol/oauth/app_register.html:6
msgid "Register a new application"
msgstr "Registrar una nueva aplicación"
msgstr "Hacer un nuevo registro"
#: pretix/control/templates/pretixcontrol/oauth/app_rollkeys.html:4
#: pretix/control/templates/pretixcontrol/oauth/app_rollkeys.html:6
@@ -22706,7 +22693,7 @@ msgstr "Crear varias fechas"
#: pretix/control/templates/pretixcontrol/subevents/bulk_edit.html:13
#, python-format
msgid "%(number)s selected"
msgstr ""
msgstr "%(number)s selecionado"
#: pretix/control/templates/pretixcontrol/organizers/device_bulk_edit.html:36
#: pretix/control/templates/pretixcontrol/organizers/device_edit.html:24
@@ -26928,10 +26915,8 @@ msgid "The device has been removed."
msgstr "El dispositivo ha sido retirado."
#: pretix/control/views/user.py:449
#, fuzzy
#| msgid "This ticket has already been redeemed."
msgid "This security device is already registered."
msgstr "Este ticket ya ha sido canjeado."
msgstr "Este dispositivo ya está registrado."
#: pretix/control/views/user.py:471 pretix/control/views/user.py:532
msgid "A new two-factor authentication device has been added to your account."
@@ -28815,6 +28800,8 @@ msgid ""
"After placing your order, you will be able to select your desired payment "
"method, including PayPal."
msgstr ""
"Después de hacer el pedido, podrás elegir el método de pago preferido, "
"incluyendo PayPal."
#: pretix/plugins/paypal2/templates/pretixplugins/paypal2/checkout_payment_form.html:5
msgid ""
@@ -29843,10 +29830,8 @@ msgid "Blocked Seats"
msgstr ""
#: pretix/plugins/statistics/templates/pretixplugins/statistics/index.html:86
#, fuzzy
#| msgid "Free order"
msgid "Free Seats"
msgstr "Pedido gratuito"
msgstr "Asiento gratuito"
#: pretix/plugins/statistics/templates/pretixplugins/statistics/index.html:94
#, fuzzy
@@ -31066,6 +31051,8 @@ msgid ""
"An account with this email address is already registered. Please try to log "
"in or reset your password instead."
msgstr ""
"Una cuenta con esta dirección de correo ya está registrada. Puedes entrar o "
"recuperar la contraseña."
#: pretix/presale/forms/customer.py:189
#, python-brace-format
@@ -31707,7 +31694,7 @@ msgstr "cantidad mínima a pedir: %(num)s"
#: pretix/presale/templates/pretixpresale/event/voucher.html:354
msgctxt "price"
msgid "free"
msgstr ""
msgstr "gratis"
#: pretix/presale/templates/pretixpresale/event/fragment_addon_choice.html:77
#: pretix/presale/templates/pretixpresale/event/fragment_product_list.html:51
@@ -32400,7 +32387,7 @@ msgstr ""
#: pretix/presale/templates/pretixpresale/event/fragment_subevent_calendar.html:22
#: pretix/presale/templates/pretixpresale/organizers/calendar.html:24
msgid "Select month to show"
msgstr ""
msgstr "Seleccione un mes a mostrar"
#: pretix/presale/templates/pretixpresale/event/fragment_subevent_calendar.html:32
#: pretix/presale/templates/pretixpresale/event/fragment_subevent_calendar_week.html:36
@@ -32423,7 +32410,7 @@ msgstr ""
#: pretix/presale/templates/pretixpresale/event/fragment_subevent_calendar_week.html:22
#: pretix/presale/templates/pretixpresale/organizers/calendar_week.html:26
msgid "Select week to show"
msgstr ""
msgstr "Selecciona semana a mostrar"
#: pretix/presale/templates/pretixpresale/event/fragment_subevent_calendar_week.html:43
#, python-format
@@ -32779,6 +32766,7 @@ msgstr "Cambiar detalles"
msgid ""
"You need to select a payment method above before you can request an invoice."
msgstr ""
"Es necesario seleccionar un método de pago antes de solicitar una factura."
#: pretix/presale/templates/pretixpresale/event/order.html:267
#: pretix/presale/templates/pretixpresale/event/order.html:274
@@ -33141,6 +33129,8 @@ msgid ""
"Please select the desired changes to your ticket. Note that you can only "
"perform changes that do not change the total price of the ticket."
msgstr ""
"Selecciona los cambios que quieres hacer en tu entrada. Ten en cuenta que "
"solo puedes hacer cambios que no cambien el valor total de la entrada."
#: pretix/presale/templates/pretixpresale/event/position_change_confirm.html:19
#, fuzzy
@@ -33702,7 +33692,7 @@ msgstr "No se ha encontrado el organizador seleccionado."
msgid ""
"Your selected payment method can only be used for a payment of at least "
"{amount}."
msgstr ""
msgstr "El método de pago solo se puede usar para un pago de mínimo {amount}."
#: pretix/presale/views/cart.py:183
msgid "Please enter positive numbers only."
@@ -33981,6 +33971,8 @@ msgid ""
"Thank you very much! We will assign your spot on the waiting list to someone "
"else."
msgstr ""
"¡Muchas gracias! Le asignaremos tu puesto en la lista de espera a otra "
"persona."
#: pretix/presale/views/widget.py:341
#, fuzzy
@@ -34001,7 +33993,7 @@ msgstr "de %(start_date)s"
#: pretix/settings.py:710
msgid "User profile only"
msgstr ""
msgstr "Solo perfil de usuario"
#: pretix/settings.py:711
msgid "Read access"

View File

@@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: 1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-27 11:49+0000\n"
"PO-Revision-Date: 2023-07-22 21:00+0000\n"
"Last-Translator: Ronan LE MEILLAT <ronan.le_meillat@highcanfly.club>\n"
"PO-Revision-Date: 2023-08-16 22:00+0000\n"
"Last-Translator: Maurice Kaag <maurice@kaag.me>\n"
"Language-Team: French <https://translate.pretix.eu/projects/pretix/pretix/fr/"
">\n"
"Language: fr\n"
@@ -13,7 +13,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 4.17\n"
"X-Generator: Weblate 4.18.2\n"
#: pretix/_base_settings.py:78
msgid "English"
@@ -247,9 +247,7 @@ msgstr ""
#: pretix/api/serializers/item.py:185 pretix/control/forms/item.py:1084
msgid "The bundled item must not have bundles on its own."
msgstr ""
"Un forfait ne doit pas contenir des produits, qui sont eux-mêmes des "
"forfaits."
msgstr "Un produit groupé ne doit pas contenir des produits groupés."
#: pretix/api/serializers/item.py:262
msgid ""
@@ -1666,7 +1664,7 @@ msgstr "Nécessite une attention particulière"
#: pretix/base/exporters/items.py:91 pretix/base/models/items.py:553
#: pretix/base/models/items.py:1018
msgid "Original price"
msgstr "Facture originale"
msgstr "Prix d'origine"
#: pretix/base/exporters/items.py:92 pretix/base/models/items.py:565
msgid "This product is a gift card"
@@ -3097,7 +3095,7 @@ msgstr "Annulation"
#: pretix/base/invoice.py:620 pretix/base/invoice.py:628
msgctxt "invoice"
msgid "Description"
msgstr "Déscription"
msgstr "Description"
#: pretix/base/invoice.py:621 pretix/base/invoice.py:629
msgctxt "invoice"
@@ -6227,24 +6225,18 @@ msgid "Ambiguous option selected."
msgstr "Option ambiguë sélectionnée."
#: pretix/base/orderimport.py:845
#, fuzzy
#| msgid "No matching seat was found."
msgid "No matching customer was found."
msgstr "Aucun siège correspondant na été trouvé."
msgstr "Aucun client correspondant na été trouvé."
#: pretix/base/payment.py:86
#, fuzzy
#| msgid "Apply"
msgctxt "payment"
msgid "Apple Pay"
msgstr "Appliquer"
msgstr "Apple Pay"
#: pretix/base/payment.py:87
#, fuzzy
#| msgid "Android (Google Play)"
msgctxt "payment"
msgid "Google Pay"
msgstr "Android (Google Play)"
msgstr "Google Pay"
#: pretix/base/payment.py:256
#: pretix/presale/templates/pretixpresale/event/order.html:115
@@ -6811,16 +6803,12 @@ msgid "List of Add-Ons"
msgstr "Liste des Addons"
#: pretix/base/pdf.py:364
#, fuzzy
#| msgid ""
#| "Add-on 1\n"
#| "Add-on 2"
msgid ""
"Add-on 1\n"
"2x Add-on 2"
msgstr ""
"Add-on 1\n"
"Add-on 2"
"2x Add-on 2"
#: pretix/base/pdf.py:370 pretix/control/forms/filter.py:1275
#: pretix/control/forms/filter.py:1277
@@ -8229,16 +8217,14 @@ msgid "Gift card currency"
msgstr "Devise de la carte-cadeau"
#: pretix/base/settings.py:277
#, fuzzy
#| msgid ""
#| "Automatically create a new gift card if a previously unknown chip is seen"
msgid "Automatically create a new gift card if a new chip is encoded"
msgstr ""
"Créer automatiquement une nouvelle carte-cadeau si une puce inconnue est vue"
"Créer automatiquement une nouvelle carte-cadeau si une nouvelle puce est "
"encodée"
#: pretix/base/settings.py:299
msgid "Use UID protection feature of NFC chip"
msgstr ""
msgstr "Utiliser la fonction de protection UID de la puce NFC"
#: pretix/base/settings.py:313
msgid "Maximum number of items per order"
@@ -8753,10 +8739,8 @@ msgstr ""
"commandés par d'autres personnes."
#: pretix/base/settings.py:942
#, fuzzy
#| msgid "Expiration date"
msgid "Expiration delay"
msgstr "Date d'expiration"
msgstr "Délai dexpiration"
#: pretix/base/settings.py:943
msgid ""
@@ -8766,6 +8750,11 @@ msgid ""
"beyond the \"last date of payments\" configured above, which is always "
"enforced."
msgstr ""
"La commande nexpirera réellement que ce nombre de jours après la date d"
"expiration communiquée au client. Si vous sélectionnez « Ne terminez les "
"conditions de paiement que les jours de semaine » ci-dessus, cela sera "
"également respecté. Cependant, cela ne retardera pas au-delà de la « "
"dernière date de paiement » configurée ci-dessus, qui est toujours appliquée."
#: pretix/base/settings.py:964
msgid "Hide \"payment pending\" state on customer-facing pages"
@@ -10186,25 +10175,12 @@ msgstr ""
"Votre équipe {event}"
#: pretix/base/settings.py:2349
#, fuzzy, python-brace-format
#| msgid "Payment received for your order: {code}"
#, python-brace-format
msgid "Payment failed for your order: {code}"
msgstr "Paiement reçu pour votre commande: {code}"
msgstr "Paiement échoué pour votre commande: {code}"
#: pretix/base/settings.py:2353
#, fuzzy, python-brace-format
#| msgid ""
#| "Hello,\n"
#| "\n"
#| "we did not yet receive a full payment for your order for {event}.\n"
#| "Please keep in mind that we only guarantee your order if we receive\n"
#| "your payment before {expire_date}.\n"
#| "\n"
#| "You can view the payment information and the status of your order at\n"
#| "{url}\n"
#| "\n"
#| "Best regards, \n"
#| "Your {event} team"
#, python-brace-format
msgid ""
"Hello,\n"
"\n"
@@ -10222,18 +10198,18 @@ msgid ""
msgstr ""
"Bonjour\n"
"\n"
"Nous navons pas encore reçu le paiement intégral de votre commande de "
"{event}.\n"
"Veuillez garder à lesprit que nous ne garantissons votre commande que si "
"nous recevons\n"
"votre paiement avant {expire_date}.\n"
"Votre tentative de paiement pour votre commande pour {event} a échoué.\n"
"\n"
"Vous pouvez consulter les informations de paiement et létat de votre "
"commande à ladresse\n"
"Votre commande est toujours valide et vous pouvez essayer de payer à nouveau "
"en utilisant le même mode de paiement ou un mode de paiement différent. "
"Veuillez effectuer votre paiement avant {expire_date}.\n"
"\n"
"Vous pouvez réessayer le paiement et consulter létat de votre commande à l"
"adresse\n"
"{url}\n"
"\n"
"Sinceres salutations \n"
"Votre {event} équipe"
"Votre équipe {event}"
#: pretix/base/settings.py:2367
#, python-brace-format
@@ -11154,7 +11130,7 @@ msgstr "Degré (après le nom)"
#: pretix/base/settings.py:3577
msgctxt "person_name_sample"
msgid "MA"
msgstr ""
msgstr "MA"
#: pretix/base/settings.py:3684 pretix/control/forms/event.py:217
msgid ""
@@ -11195,7 +11171,7 @@ msgstr ""
#: pretix/base/settings.py:3720
msgid "This needs to be disabled if other NFC-based types are active."
msgstr ""
msgstr "Cela doit être désactivé si dautres types NFC sont actifs."
#: pretix/base/shredder.py:74 pretix/base/shredder.py:77
msgid "Your event needs to be over to use this feature."
@@ -14920,10 +14896,8 @@ msgid "The medium has been connected to a new ticket."
msgstr "Le média a été connecté à un nouveau ticket."
#: pretix/control/logdisplay.py:371
#, fuzzy
#| msgid "The medium has been connected to a new ticket."
msgid "The medium has been connected to a new gift card."
msgstr "Le média a été connecté à un nouveau ticket."
msgstr "Le média a été connecté à une nouvelle carte cadeau."
#: pretix/control/logdisplay.py:372 pretix/control/logdisplay.py:413
msgid "Sending of an email has failed."
@@ -15193,12 +15167,9 @@ msgstr ""
"l'utilisateur."
#: pretix/control/logdisplay.py:436
#, fuzzy
#| msgid ""
#| "An email has been sent to notify the user that payment has been received."
msgid "An email has been sent to notify the user that the payment failed."
msgstr ""
"Un mail a été envoyé pour informer l'utilisateur que le paiement a été reçu."
"Un mail a été envoyé pour informer l'utilisateur que le paiement a échoué."
#: pretix/control/logdisplay.py:437
#, python-brace-format
@@ -18023,7 +17994,7 @@ msgstr "Contenu de l' e-mail"
#: pretix/control/templates/pretixcontrol/event/mail.html:90
msgid "Placed order"
msgstr "Ordre placé"
msgstr "Commande placée"
#: pretix/control/templates/pretixcontrol/event/mail.html:93
msgid "Paid order"
@@ -18044,10 +18015,8 @@ msgid "Payment reminder"
msgstr "Rappel de paiement"
#: pretix/control/templates/pretixcontrol/event/mail.html:108
#, fuzzy
#| msgid "Payment fee"
msgid "Payment failed"
msgstr "Frais de paiement"
msgstr "Paiement échoué"
#: pretix/control/templates/pretixcontrol/event/mail.html:111
msgid "Waiting list notification"
@@ -18102,8 +18071,6 @@ msgid "Deadlines"
msgstr "Échéances"
#: pretix/control/templates/pretixcontrol/event/payment.html:68
#, fuzzy
#| msgid "days"
msgctxt "unit"
msgid "days"
msgstr "jours"
@@ -22176,6 +22143,10 @@ msgid ""
"made by NXP. This provides a higher level of security than other approaches, "
"but requires all chips to be encoded prior to use."
msgstr ""
"Ce type de support ne fonctionne quavec des puces NFC du type Mifare "
"Ultralight AES fabriquées par NXP. Cela fournit un niveau de sécurité plus "
"élevé que les autres approches, mais nécessite que toutes les puces soient "
"encodées avant utilisation."
#: pretix/control/templates/pretixcontrol/organizers/export.html:64
msgid "Run export now and download result"
@@ -24255,19 +24226,15 @@ msgid ""
"For safety reasons, the waiting list does not run if the quota is set to "
"unlimited."
msgstr ""
"Pour des raisons de sécurité, la liste dattente ne fonctionne pas si le "
"quota est fixé sur illimité."
#: pretix/control/templates/pretixcontrol/waitinglist/index.html:219
#, fuzzy
#| msgid "Quota name"
msgid "Quota unlimited"
msgstr "Nom du quota"
msgstr "Quota illimité"
#: pretix/control/templates/pretixcontrol/waitinglist/index.html:225
#, fuzzy, python-format
#| msgid ""
#| "\n"
#| " Waiting, product %(num)sx available\n"
#| " "
#, python-format
msgid ""
"\n"
" Waiting, product %(num)sx "
@@ -24275,8 +24242,9 @@ msgid ""
" "
msgstr ""
"\n"
" En attente, produit %(num)sx disponible\n"
" "
" En attente, produit %(num)sx "
"disponible\n"
" "
#: pretix/control/templates/pretixcontrol/waitinglist/index.html:231
msgid "Waiting, product unavailable"
@@ -25047,13 +25015,6 @@ msgid "The selected product has been deactivated."
msgstr "Le produit sélectionné a été désactivé."
#: pretix/control/views/mailsetup.py:195
#, fuzzy
#| msgid ""
#| "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."
msgid ""
"We could not find an SPF record set for the domain you are trying to use. "
"This means that there is a very high change most of the emails will be "
@@ -25062,11 +25023,11 @@ msgid ""
"registered your domain with."
msgstr ""
"Nous navons pas pu trouver de jeu denregistrements SPF pour le domaine que "
"vous essayez dutiliser. Vous pouvez toujours continuer, mais cela "
"augmentera les chances que les e-mails soient envoyés au spam ou rejetés. "
"Nous vous recommandons vivement de définir un enregistrement SPF sur le "
"domaine. Vous pouvez le faire via les paramètres DNS du fournisseur auprès "
"duquel vous avez enregistré votre domaine."
"vous essayez dutiliser. Cela signifie quil y a un changement très élevé, "
"la plupart des e-mails seront rejetés ou marqués comme spam. Nous vous "
"recommandons vivement de définir un enregistrement SPF sur le domaine. Vous "
"pouvez le faire via les paramètres DNS du fournisseur auprès duquel vous "
"avez enregistré votre domaine."
#: pretix/control/views/mailsetup.py:202
msgid ""
@@ -28160,9 +28121,6 @@ msgid "Restrict to event dates starting before"
msgstr "Limiter aux dates dévénements commençant avant"
#: pretix/plugins/sendmail/forms.py:170
#, fuzzy
#| msgctxt "sendmail_from"
#| msgid "Send to"
msgctxt "sendmail_form"
msgid "Send to"
msgstr "Envoyer à"
@@ -28177,9 +28135,6 @@ msgid "Filter check-in status"
msgstr "Filtrer le statut d'enregistrement"
#: pretix/plugins/sendmail/forms.py:189
#, fuzzy
#| msgctxt "sendmail_from"
#| msgid "Restrict to recipients without check-in"
msgctxt "sendmail_form"
msgid "Restrict to recipients without check-in"
msgstr "Restreindre aux destinataires sans enregistrement"
@@ -28233,17 +28188,11 @@ msgid "pending with payment overdue"
msgstr "en attente avec retard"
#: pretix/plugins/sendmail/forms.py:258
#, fuzzy
#| msgctxt "sendmail_from"
#| msgid "Restrict to orders with status"
msgctxt "sendmail_form"
msgid "Restrict to orders with status"
msgstr "Restreindre aux commandes avec statut"
#: pretix/plugins/sendmail/forms.py:283 pretix/plugins/sendmail/forms.py:287
#, fuzzy
#| msgctxt "sendmail_from"
#| msgid "Restrict to recipients with check-in on list"
msgctxt "sendmail_form"
msgid "Restrict to recipients with check-in on list"
msgstr "Restreindre aux destinataires avec enregistrement sur la liste"
@@ -28314,9 +28263,6 @@ msgid "Limit products"
msgstr "Limiter les produits"
#: pretix/plugins/sendmail/models.py:218
#, fuzzy
#| msgctxt "sendmail_from"
#| msgid "Restrict to orders with status"
msgid "Restrict to orders with status"
msgstr "Restreindre aux commandes avec statut"
@@ -28880,7 +28826,7 @@ msgstr ""
#: pretix/plugins/stripe/payment.py:296
msgid "Check for Apple Pay/Google Pay"
msgstr ""
msgstr "Vérifier Apple Pay/Google Pay"
#: pretix/plugins/stripe/payment.py:300
msgid ""
@@ -28890,6 +28836,11 @@ msgid ""
"take into consideration if Google Pay/Apple Pay has been disabled in the "
"Stripe Dashboard."
msgstr ""
"pretix tentera de vérifier si le navigateur Web du client prend en charge "
"les méthodes de paiement basées sur le portefeuille comme Apple Pay ou "
"Google Pay et les affichera bien en évidence avec le mode de paiement par "
"carte de crédit. Cette détection ne prend pas en compte si Google Pay/Apple "
"Pay a été désactivé dans le tableau de bord Stripe."
#: pretix/plugins/stripe/payment.py:309
msgid "Statement descriptor postfix"
@@ -28939,38 +28890,32 @@ msgid "Bancontact"
msgstr "Bancontact"
#: pretix/plugins/stripe/payment.py:357
#, fuzzy
#| msgid "Disable SEPA Direct Debit"
msgid "SEPA Direct Debit"
msgstr "Désactiver le prélèvement SEPA"
msgstr "Prélèvement SEPA"
#: pretix/plugins/stripe/payment.py:362
#, fuzzy
#| msgid ""
#| "Despite the name, Sofort payments via Stripe are <strong>not</strong> "
#| "processed instantly but might take up to <strong>14 days</strong> to be "
#| "confirmed in some cases. Please only activate this payment method if your "
#| "payment term allows for this lag."
msgid ""
"SEPA Direct Debit payments via Stripe are <strong>not</strong> processed "
"instantly but might take up to <strong>14 days</strong> to be confirmed in "
"some cases. Please only activate this payment method if your payment term "
"allows for this lag."
msgstr ""
"Malgré leur nom, les paiements Sofort via Stripe <strong>ne sont pas</"
"strong> traités instantanément, mais peuvent prendre jusquà <strong>14 "
"jours</strong> pour être confirmés dans certains cas. Veuillez nactiver ce "
"mode de paiement que si votre délai de paiement le permet."
"Les paiements par prélèvement SEPA via Stripe ne sont <strong>pas</strong> "
"traités instantanément, mais peuvent prendre jusquà <strong>14 jours</"
"strong> pour être confirmés dans certains cas. Veuillez nactiver ce mode de "
"paiement que si votre délai de paiement le permet."
#: pretix/plugins/stripe/payment.py:370
msgid "SEPA Creditor Mandate Name"
msgstr ""
msgstr "Nom du mandat du créancier SEPA"
#: pretix/plugins/stripe/payment.py:372
msgid ""
"Please provide your SEPA Creditor Mandate Name, that will be displayed to "
"the user."
msgstr ""
"Veuillez fournir votre nom de mandat de créancier SEPA, qui sera affiché à "
"lutilisateur."
#: pretix/plugins/stripe/payment.py:383
msgid "SOFORT"
@@ -29081,44 +29026,32 @@ msgid "Credit card"
msgstr "Carte de crédit"
#: pretix/plugins/stripe/payment.py:1157
#, fuzzy
#| msgid "EPS via Stripe"
msgid "SEPA Debit via Stripe"
msgstr "EPS via Stripe"
msgstr "Prélèvement SEPA via Stripe"
#: pretix/plugins/stripe/payment.py:1158
msgid "SEPA Debit"
msgstr ""
msgstr "Débit SEPA"
#: pretix/plugins/stripe/payment.py:1197
#, fuzzy
#| msgid "Account holder"
msgid "Account Holder Name"
msgstr "Titulaire du compte"
#: pretix/plugins/stripe/payment.py:1202
#, fuzzy
#| msgid "Account holder"
msgid "Account Holder Street"
msgstr "Titulaire du compte"
msgstr "Rue du titulaire du compte"
#: pretix/plugins/stripe/payment.py:1214
#, fuzzy
#| msgid "Account holder"
msgid "Account Holder Postal Code"
msgstr "Titulaire du compte"
msgstr "Code postal du titulaire du compte"
#: pretix/plugins/stripe/payment.py:1226
#, fuzzy
#| msgid "Account holder"
msgid "Account Holder City"
msgstr "Titulaire du compte"
msgstr "Ville du titulaire du compte"
#: pretix/plugins/stripe/payment.py:1238
#, fuzzy
#| msgid "Account holder"
msgid "Account Holder Country"
msgstr "Titulaire du compte"
msgstr "Pays du titulaire du compte"
#: pretix/plugins/stripe/payment.py:1282
msgid "giropay via Stripe"
@@ -29289,22 +29222,18 @@ msgid "Card type"
msgstr "Type de carte"
#: pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_confirm.html:14
#, fuzzy
#| msgid "The total amount will be withdrawn from your credit card."
msgid "The total amount will be withdrawn from your bank account."
msgstr "Le montant total sera prélevé sur votre carte de crédit."
msgstr "Le montant total sera prélevé sur votre compte bancaire."
#: pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_confirm.html:18
#: pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_form_sepadirectdebit.html:20
msgid "Banking Institution"
msgstr ""
msgstr "Établissement bancaire"
#: pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_confirm.html:20
#: pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_form_sepadirectdebit.html:22
#, fuzzy
#| msgid "Account holder"
msgid "Account number"
msgstr "Titulaire du compte"
msgstr "Numéro de compte"
#: pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_confirm.html:24
#: pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_form_simple.html:4
@@ -29353,28 +29282,20 @@ msgstr ""
"serveurs."
#: pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_form_sepadirectdebit.html:10
#, fuzzy
#| msgid "For a credit card payment, please turn on JavaScript."
msgid "For a SEPA Debit payment, please turn on JavaScript."
msgstr "Pour un paiement par carte de crédit, veuillez activer JavaScript."
msgstr "Pour un paiement par prélèvement SEPA, veuillez activer JavaScript."
#: pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_form_sepadirectdebit.html:16
#, fuzzy
#| msgid ""
#| "You already entered a card number that we will use to charge the payment "
#| "amount."
msgid ""
"You already entered a bank account that we will use to charge the payment "
"amount."
msgstr ""
"Vous avez déjà entré un numéro de carte que nous utiliserons pour débiter le "
"Vous avez déjà saisi un compte bancaire que nous utiliserons pour débiter le "
"montant du paiement."
#: pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_form_sepadirectdebit.html:27
#, fuzzy
#| msgid "Use a different card"
msgid "Use a different account"
msgstr "Utiliser une autre carte"
msgstr "Utiliser un autre compte"
#: pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_form_sepadirectdebit.html:51
#, python-format
@@ -29390,6 +29311,18 @@ msgid ""
"statement that you can obtain from your bank. You agree to receive "
"notifications for future debits up to 2 days before they occur."
msgstr ""
"En fournissant vos informations de paiement et en confirmant ce paiement, "
"vous autorisez (A) %(sepa_creditor_name)s et Stripe, notre prestataire de "
"services de paiement et/ou PPRO, son prestataire de services local, à "
"envoyer des instructions à votre banque pour débiter votre compte et (B) "
"votre banque à débiter votre compte conformément à ces instructions. Dans le "
"cadre de vos droits, vous avez droit à un remboursement de votre banque "
"selon les termes et conditions de votre accord avec votre banque. Un "
"remboursement doit être demandé dans un délai de 8 semaines à compter de la "
"date à laquelle votre compte a été débité. Vos droits sont expliqués dans "
"une déclaration que vous pouvez obtenir auprès de votre banque. Vous "
"acceptez de recevoir des notifications pour les débits futurs jusquà 2 "
"jours avant quils ne se produisent."
#: pretix/plugins/stripe/templates/pretixplugins/stripe/control.html:6
msgid "Charge ID"

View File

@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: French\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-21 11:46+0000\n"
"PO-Revision-Date: 2023-07-19 17:00+0000\n"
"PO-Revision-Date: 2023-08-02 02:00+0000\n"
"Last-Translator: Ronan LE MEILLAT <ronan.le_meillat@highcanfly.club>\n"
"Language-Team: French <https://translate.pretix.eu/projects/pretix/pretix-js/"
"fr/>\n"
@@ -16,7 +16,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 4.17\n"
"X-Generator: Weblate 4.18.2\n"
#: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:56
#: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:62
@@ -63,7 +63,7 @@ msgstr "iDEAL"
#: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:42
msgid "SEPA Direct Debit"
msgstr "Débit direct SEPA"
msgstr "Prélèvement SEPA"
#: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:43
msgid "Bancontact"
@@ -679,10 +679,8 @@ msgid "Your local time:"
msgstr "Votre heure locale:"
#: pretix/static/pretixpresale/js/walletdetection.js:39
#, fuzzy
#| msgid "Apple Pay"
msgid "Google Pay"
msgstr "Apple Pay"
msgstr "Google Pay"
#: pretix/static/pretixpresale/js/widget/widget.js:17
msgctxt "widget"

View File

@@ -77,6 +77,8 @@ def get_event_domain(event, fallback=False, return_info=False):
def get_organizer_domain(organizer):
assert isinstance(organizer, Organizer)
if not organizer.pk:
return None
domain = getattr(organizer, '_cached_domain', None) or organizer.cache.get('domain')
if domain is None:
domains = organizer.domains.filter(event__isnull=True)
@@ -126,7 +128,7 @@ def eventreverse(obj, name, kwargs=None):
:param kwargs: A dictionary of additional keyword arguments that should be used. You do not
need to provide the organizer or event slug here, it will be added automatically as
needed.
:returns: An absolute URL (including scheme and host) as a string
:returns: An absolute or relative URL as a string
"""
from pretix.multidomain import (
event_domain_urlconf, maindomain_urlconf, organizer_domain_urlconf,
@@ -175,6 +177,17 @@ def eventreverse(obj, name, kwargs=None):
def build_absolute_uri(obj, urlname, kwargs=None):
"""
Works similar to ``eventreverse`` but always returns an absolute URL.
:param obj: An ``Event`` or ``Organizer`` object
:param name: The name of the URL route
:type name: str
:param kwargs: A dictionary of additional keyword arguments that should be used. You do not
need to provide the organizer or event slug here, it will be added automatically as
needed.
:returns: An absolute URL (including scheme and host) as a string
"""
reversedurl = eventreverse(obj, urlname, kwargs)
if '://' in reversedurl:
return reversedurl

View File

@@ -535,9 +535,11 @@ class BankTransfer(BasePaymentProvider):
'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),
'has_invoices': payment.order.invoices.exists(),
'invoice_email_enabled': self.settings.get('invoice_email', as_type=bool),
}
ctx['any_barcodes'] = ctx['swiss_qrbill'] or ctx['eu_barcodes']
return template.render(ctx)
return template.render(ctx, request=request)
def payment_control_render(self, request: HttpRequest, payment: OrderPayment) -> str:
warning = None

View File

@@ -11,10 +11,10 @@
<span class="icon icon-upload"></span> {% trans "Continue" %}
</button>
<div class="flipped-scroll-wrapper clearfix">
<table class="table table-condensed flipped-scroll-inner">
<table class="table table-condensed table-th-sticky-horizontal flipped-scroll-inner">
<thead>
<tr>
<th>{% trans "Date" %}</th>
<th scope="row">{% trans "Date" %}</th>
{% for col in rows.0 %}
<th>
<input type="radio" name="date" value="{{ forloop.counter0 }}"/>
@@ -22,7 +22,7 @@
{% endfor %}
</tr>
<tr>
<th>{% trans "Amount" %}</th>
<th scope="row">{% trans "Amount" %}</th>
{% for col in rows.0 %}
<th>
<input type="radio" name="amount" value="{{ forloop.counter0 }}" required="required"/>
@@ -30,7 +30,7 @@
{% endfor %}
</tr>
<tr>
<th>{% trans "Reference" %}</th>
<th scope="row">{% trans "Reference" %}</th>
{% for col in rows.0 %}
<th>
<input type="checkbox" name="reference" value="{{ forloop.counter0 }}"/>
@@ -38,7 +38,7 @@
{% endfor %}
</tr>
<tr>
<th>{% trans "Payer" %}</th>
<th scope="row">{% trans "Payer" %}</th>
{% for col in rows.0 %}
<th>
<input type="checkbox" name="payer" value="{{ forloop.counter0 }}"/>
@@ -46,7 +46,7 @@
{% endfor %}
</tr>
<tr>
<th>
<th scope="row">
{% trans "IBAN" %}
<label for="id_iban_clear">
<span class="btn btn-default btn-sm fa fa-close"></span>
@@ -62,7 +62,7 @@
{% endfor %}
</tr>
<tr>
<th>
<th scope="row">
{% trans "BIC" %}
<label for="id_bic_clear">
<span class="btn btn-default btn-sm fa fa-close"></span>

View File

@@ -7,6 +7,7 @@
{% load money %}
{% load unidecode %}
{% load rich_text %}
{% load eventurl %}
{% if pending_description %}
{{ pending_description|rich_text }}
@@ -103,3 +104,28 @@ SCT
{% if swiss_qrbill %}
<link rel="stylesheet" href="{% static "pretixplugins/banktransfer/swisscross.css" %}">
{% endif %}
{% if invoice_email_enabled and has_invoices %}
<form method="post" action="{% eventurl event "plugins:banktransfer:mail_invoice" order=order.code secret=order.secret %}">
{% csrf_token %}
<p>
{% blocktrans trimmed %}
To send the invoice directly to your accounting department, please enter their email address:
{% endblocktrans %}
</p>
<div class="row">
<div class="col-md-9 col-xs-12">
<label for="mail_invoice_email" class="sr-only">{% trans "Invoice recipient email" %}:</label>
<input type="email" name="email" id="mail_invoice_email" class="form-control" value="" required
placeholder="{% trans "Email address" %}" />
</div>
<div class="col-md-3 col-xs-12">
<button class="btn btn-default btn-block">
<span class="fa fa-envelope-o" aria-hidden="true"></span>
{% trans "Send invoice via email" %}
</button>
</div>
</div>
</form>
<hr>
{% endif %}

View File

@@ -19,13 +19,19 @@
# You should have received a copy of the GNU Affero General Public License along with this program. If not, see
# <https://www.gnu.org/licenses/>.
#
from django.urls import re_path
from django.urls import include, re_path
from pretix.api.urls import orga_router
from pretix.plugins.banktransfer.api import BankImportJobViewSet
from . import views
event_patterns = [
re_path(r'^banktransfer/', include([
re_path(r'^(?P<order>[^/][^w]+)/(?P<secret>[A-Za-z0-9]+)/mail-invoice/$', views.SendInvoiceMailView.as_view(), name='mail_invoice'),
])),
]
urlpatterns = [
re_path(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/import/',
views.OrganizerImportView.as_view(),

View File

@@ -44,14 +44,18 @@ from typing import Set
from django import forms
from django.contrib import messages
from django.core.exceptions import ValidationError
from django.core.validators import validate_email
from django.db import transaction
from django.db.models import Count, Q, QuerySet
from django.http import FileResponse, JsonResponse
from django.http import FileResponse, Http404, JsonResponse
from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse
from django.utils.decorators import method_decorator
from django.utils.functional import cached_property
from django.utils.timezone import now
from django.utils.translation import gettext as _
from django.views.decorators.clickjacking import xframe_options_exempt
from django.views.generic import DetailView, FormView, ListView, View
from django.views.generic.detail import SingleObjectMixin
from localflavor.generic.forms import BICFormField, IBANFormField
@@ -75,6 +79,8 @@ from pretix.plugins.banktransfer.refund_export import (
build_sepa_xml, get_refund_export_csv,
)
from pretix.plugins.banktransfer.tasks import process_banktransfers
from pretix.presale.views import EventViewMixin
from pretix.presale.views.order import OrderDetailMixin
logger = logging.getLogger('pretix.plugins.banktransfer')
@@ -886,3 +892,36 @@ class OrganizerSepaXMLExportView(OrganizerPermissionRequiredMixin, OrganizerDeta
organizer=self.request.organizer,
pk=self.kwargs.get('id')
)
@method_decorator(xframe_options_exempt, 'dispatch')
class SendInvoiceMailView(EventViewMixin, OrderDetailMixin, View):
def post(self, request, *args, **kwargs):
if not self.order:
raise Http404(_('Unknown order code or not authorized to access this order.'))
try:
validate_email(request.POST['email'])
except ValidationError:
messages.error(request, _('Please enter a valid email address.'))
return redirect(self.get_order_url())
last_payment = self.order.payments.last()
if (not last_payment
or last_payment.provider != BankTransfer.identifier
or last_payment.state != OrderPayment.PAYMENT_STATE_CREATED):
messages.error(request, _('No pending bank transfer payment found. Maybe the order has been paid already?'))
return redirect(self.get_order_url())
if not last_payment.payment_provider.settings.get('invoice_email', as_type=bool):
messages.error(request, _('Sending invoices via email is disabled by the event organizer.'))
return redirect(self.get_order_url())
last_invoice = self.order.invoices.last()
if not last_invoice:
messages.error(request, _('No invoice found, please request an invoice first.'))
return redirect(self.get_order_url())
provider = last_payment.payment_provider
provider.send_invoice_to_alternate_email(self.order, last_invoice, request.POST['email'])
messages.success(request, _('Sending the latest invoice via e-mail to {email}.').format(email=request.POST['email']))
return redirect(self.get_order_url())

View File

@@ -0,0 +1,66 @@
{% load i18n %}
{% load eventurl %}
{% if ev.location and show_location %}
<div class="info-row">
<span class="fa fa-map-marker fa-fw" aria-hidden="true" title="{% trans "Where does the event happen?" %}"></span>
<p><span class="sr-only">{% trans "Where does the event happen?" %}</span>
{{ ev.location|linebreaksbr }}
</p>
</div>
{% endif %}
{% if ev.settings.show_dates_on_frontpage %}
<div class="info-row">
<span class="fa fa-clock-o fa-fw" aria-hidden="true" title="{% trans "When does the event happen?" %}"></span>
<p><span class="sr-only">{% trans "When does the event happen?" %}</span>
{{ ev.get_date_range_display_as_html }}
{% if event.settings.show_times %}
<br>
<span data-time="{{ ev.date_from.isoformat }}" data-timezone="{{ request.event.timezone }}">
{% with time_human=ev.date_from|date:"TIME_FORMAT" time_24=ev.date_from|time:"H:i" %}
{% blocktrans trimmed with time='<time datetime="'|add:time_24|add:'">'|add:time_human|add:"</time>"|safe %}
Begin: {{ time }}
{% endblocktrans %}
{% endwith %}
</span>
{% if event.settings.show_date_to and ev.date_to %}
<br>
<span data-time="{{ ev.date_to.isoformat }}" data-timezone="{{ request.event.timezone }}">
{% with time_human=ev.date_to|date:"TIME_FORMAT" time_24=ev.date_to|time:"H:i" %}
{% blocktrans trimmed with time='<time datetime="'|add:time_24|add:'">'|add:time_human|add:"</time>"|safe %}
End: {{ time }}
{% endblocktrans %}
{% endwith %}
</span>
{% endif %}
{% endif %}
{% if ev.date_admission %}
<br>
{% if ev.date_admission|date:"SHORT_DATE_FORMAT" == ev.date_from|date:"SHORT_DATE_FORMAT" %}
<span data-time="{{ ev.date_admission.isoformat }}" data-timezone="{{ request.event.timezone }}">
{% with time_human=ev.date_admission|date:"TIME_FORMAT" time_24=ev.date_admission|time:"H:i" %}
{% blocktrans trimmed with time='<time datetime="'|add:time_24|add:'">'|add:time_human|add:"</time>"|safe %}
Admission: {{ time }}
{% endblocktrans %}
{% endwith %}
</span>
{% else %}
<span data-time="{{ ev.date_admission.isoformat }}" data-timezone="{{ request.event.timezone }}">
{% with datetime_human=ev.date_admission|date:"SHORT_DATETIME_FORMAT" datetime_iso=ev.date_admission|time:"Y-m-d H:i" %}
{% blocktrans trimmed with datetime='<time datetime="'|add:datetime_iso|add:'">'|add:datetime_human|add:"</time>"|safe %}
Admission: {{ datetime }}
{% endblocktrans %}
{% endwith %}
</span>
{% endif %}
{% endif %}
<br>
{% if subevent %}
<a href="{% eventurl event "presale:event.ical.download" subevent=subevent.pk %}">
{% else %}
<a href="{% eventurl event "presale:event.ical.download" %}">
{% endif %}
{% trans "Add to Calendar" %}
</a>
</p>
</div>
{% endif %}

View File

@@ -162,73 +162,8 @@
{% endif %}
{% if not cart_namespace or subevent %}
<div>
{% if ev.location %}
<div class="info-row">
<span class="fa fa-map-marker fa-fw" aria-hidden="true" title="{% trans "Where does the event happen?" %}"></span>
<p><span class="sr-only">{% trans "Where does the event happen?" %}</span>
{{ ev.location|linebreaksbr }}
</p>
</div>
{% endif %}
{% if ev.settings.show_dates_on_frontpage %}
<div class="info-row">
<span class="fa fa-clock-o fa-fw" aria-hidden="true" title="{% trans "When does the event happen?" %}"></span>
<p><span class="sr-only">{% trans "When does the event happen?" %}</span>
{{ ev.get_date_range_display_as_html }}
{% if event.settings.show_times %}
<br>
<span data-time="{{ ev.date_from.isoformat }}" data-timezone="{{ request.event.timezone }}">
{% with time_human=ev.date_from|date:"TIME_FORMAT" time_24=ev.date_from|time:"H:i" %}
{% blocktrans trimmed with time='<time datetime="'|add:time_24|add:'">'|add:time_human|add:"</time>"|safe %}
Begin: {{ time }}
{% endblocktrans %}
{% endwith %}
</span>
{% if event.settings.show_date_to and ev.date_to %}
<br>
<span data-time="{{ ev.date_to.isoformat }}" data-timezone="{{ request.event.timezone }}">
{% with time_human=ev.date_to|date:"TIME_FORMAT" time_24=ev.date_to|time:"H:i" %}
{% blocktrans trimmed with time='<time datetime="'|add:time_24|add:'">'|add:time_human|add:"</time>"|safe %}
End: {{ time }}
{% endblocktrans %}
{% endwith %}
</span>
{% endif %}
{% endif %}
{% if ev.date_admission %}
<br>
{% if ev.date_admission|date:"SHORT_DATE_FORMAT" == ev.date_from|date:"SHORT_DATE_FORMAT" %}
<span data-time="{{ ev.date_admission.isoformat }}" data-timezone="{{ request.event.timezone }}">
{% with time_human=ev.date_admission|date:"TIME_FORMAT" time_24=ev.date_admission|time:"H:i" %}
{% blocktrans trimmed with time='<time datetime="'|add:time_24|add:'">'|add:time_human|add:"</time>"|safe %}
Admission: {{ time }}
{% endblocktrans %}
{% endwith %}
</span>
{% else %}
<span data-time="{{ ev.date_admission.isoformat }}" data-timezone="{{ request.event.timezone }}">
{% with datetime_human=ev.date_admission|date:"SHORT_DATETIME_FORMAT" datetime_iso=ev.date_admission|time:"Y-m-d H:i" %}
{% blocktrans trimmed with datetime='<time datetime="'|add:datetime_iso|add:'">'|add:datetime_human|add:"</time>"|safe %}
Admission: {{ datetime }}
{% endblocktrans %}
{% endwith %}
</span>
{% endif %}
{% endif %}
<br>
{% if subevent %}
<a href="{% eventurl event "presale:event.ical.download" subevent=subevent.pk %}">
{% else %}
<a href="{% eventurl event "presale:event.ical.download" %}">
{% endif %}
{% trans "Add to Calendar" %}
</a>
</p>
</div>
{% endif %}
{% include "pretixpresale/event/fragment_event_info.html" with event=request.event subevent=subevent ev=ev show_location=True %}
</div>
{% eventsignal event "pretix.presale.signals.front_page_top" request=request subevent=subevent %}
{% endif %}

View File

@@ -13,63 +13,28 @@
{% include "pretixpresale/event/fragment_cart_box.html" with open=request.GET.show_cart %}
{% endif %}
<h2>{% trans "Voucher redemption" %}</h2>
{% if subevent %}
<h2>{% trans "Voucher redemption" %}</h2>
{% if request.GET.subevent and subevent.pk|stringformat:"i" != request.GET.subevent %}
<div class="alert alert-warning">
{% trans "This voucher is valid only for the following specific date and time." %}
</div>
{% endif %}
<h3>{{ subevent.name }}</h3>
{% with ev=subevent %}
<div class="info-row">
<span class="fa fa-clock-o fa-fw" aria-hidden="true"></span>
<p>
{{ ev.get_date_range_display_as_html }}
{% if event.settings.show_times %}
<br>
{% with time_human=ev.date_from|date:"TIME_FORMAT" time_24=ev.date_from|time:"H:i" %}
{% blocktrans trimmed with time='<time datetime="'|add:time_24|add:'">'|add:time_human|add:"</time>"|safe %}
Begin: {{ time }}
{% endblocktrans %}
{% endwith %}
{% if event.settings.show_date_to and ev.date_to %}
<br>
{% with time_human=ev.date_to|date:"TIME_FORMAT" time_24=ev.date_to|time:"H:i" %}
{% blocktrans trimmed with time='<time datetime="'|add:time_24|add:'">'|add:time_human|add:"</time>"|safe %}
End: {{ time }}
{% endblocktrans %}
{% endwith %}
{% endif %}
{% endif %}
{% if ev.date_admission %}
<br>
{% if ev.date_admission|date:"SHORT_DATE_FORMAT" == ev.date_from|date:"SHORT_DATE_FORMAT" %}
{% with time_human=ev.date_admission|date:"TIME_FORMAT" time_24=ev.date_admission|time:"H:i" %}
{% blocktrans trimmed with time='<time datetime="'|add:time_24|add:'">'|add:time_human|add:"</time>"|safe %}
Admission: {{ time }}
{% endblocktrans %}
{% endwith %}
{% else %}
{% with datetime_human=ev.date_admission|date:"SHORT_DATETIME_FORMAT" datetime_iso=ev.date_admission|time:"Y-m-d H:i" %}
{% blocktrans trimmed with datetime='<time datetime="'|add:datetime_iso|add:'">'|add:datetime_human|add:"</time>"|safe %}
Admission: {{ datetime }}
{% endblocktrans %}
{% endwith %}
{% endif %}
{% endif %}
<br>
{% if subevent %}
<a href="{% eventurl event "presale:event.ical.download" subevent=subevent.pk %}">
{% else %}
<a href="{% eventurl event "presale:event.ical.download" %}">
{% endif %}
{% trans "Add to Calendar" %}
</a>
</p>
</div>
{% endwith %}
{% include "pretixpresale/event/fragment_event_info.html" with event=request.event subevent=subevent ev=subevent show_location=True %}
{% else %}
{% if event_logo and event_logo_show_title %}
<h2 class="content-header">
{{ event.name }}
{% if request.event.settings.show_dates_on_frontpage %}
<small>{{ event.get_date_range_display_as_html }}</small>
{% endif %}
</h2>
{% include "pretixpresale/event/fragment_event_info.html" with event=request.event subevent=None ev=request.event show_location=True %}
<h3>{% trans "Voucher redemption" %}</h3>
{% else %}
<h2>{% trans "Voucher redemption" %}</h2>
{% endif %}
{% endif %}
<p>

View File

@@ -80,7 +80,15 @@
"DATE_INPUT_FORMATS": [
"%Y-%m-%d",
"%m/%d/%Y",
"%m/%d/%y"
"%m/%d/%y",
"%b %d %Y",
"%b %d, %Y",
"%d %b %Y",
"%d %b, %Y",
"%B %d %Y",
"%B %d, %Y",
"%d %B %Y",
"%d %B, %Y"
],
"DECIMAL_SEPARATOR": ".",
"FIRST_DAY_OF_WEEK": 0,

View File

@@ -8,7 +8,7 @@
"name": "pretix",
"version": "0.0.0",
"dependencies": {
"@babel/core": "^7.22.5",
"@babel/core": "^7.22.9",
"@babel/preset-env": "^7.22.9",
"@rollup/plugin-babel": "^6.0.3",
"@rollup/plugin-node-resolve": "^15.1.0",
@@ -50,25 +50,25 @@
}
},
"node_modules/@babel/core": {
"version": "7.22.5",
"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz",
"integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==",
"version": "7.22.9",
"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz",
"integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==",
"dependencies": {
"@ampproject/remapping": "^2.2.0",
"@babel/code-frame": "^7.22.5",
"@babel/generator": "^7.22.5",
"@babel/helper-compilation-targets": "^7.22.5",
"@babel/helper-module-transforms": "^7.22.5",
"@babel/helpers": "^7.22.5",
"@babel/parser": "^7.22.5",
"@babel/generator": "^7.22.9",
"@babel/helper-compilation-targets": "^7.22.9",
"@babel/helper-module-transforms": "^7.22.9",
"@babel/helpers": "^7.22.6",
"@babel/parser": "^7.22.7",
"@babel/template": "^7.22.5",
"@babel/traverse": "^7.22.5",
"@babel/traverse": "^7.22.8",
"@babel/types": "^7.22.5",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
"json5": "^2.2.2",
"semver": "^6.3.0"
"semver": "^6.3.1"
},
"engines": {
"node": ">=6.9.0"
@@ -98,9 +98,9 @@
}
},
"node_modules/@babel/generator": {
"version": "7.22.5",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.5.tgz",
"integrity": "sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==",
"version": "7.22.9",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz",
"integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==",
"dependencies": {
"@babel/types": "^7.22.5",
"@jridgewell/gen-mapping": "^0.3.2",
@@ -308,21 +308,21 @@
}
},
"node_modules/@babel/helper-module-transforms": {
"version": "7.22.5",
"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz",
"integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==",
"version": "7.22.9",
"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
"integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
"dependencies": {
"@babel/helper-environment-visitor": "^7.22.5",
"@babel/helper-module-imports": "^7.22.5",
"@babel/helper-simple-access": "^7.22.5",
"@babel/helper-split-export-declaration": "^7.22.5",
"@babel/helper-validator-identifier": "^7.22.5",
"@babel/template": "^7.22.5",
"@babel/traverse": "^7.22.5",
"@babel/types": "^7.22.5"
"@babel/helper-split-export-declaration": "^7.22.6",
"@babel/helper-validator-identifier": "^7.22.5"
},
"engines": {
"node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0"
}
},
"node_modules/@babel/helper-optimise-call-expression": {
@@ -447,12 +447,12 @@
}
},
"node_modules/@babel/helpers": {
"version": "7.22.5",
"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz",
"integrity": "sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==",
"version": "7.22.6",
"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz",
"integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==",
"dependencies": {
"@babel/template": "^7.22.5",
"@babel/traverse": "^7.22.5",
"@babel/traverse": "^7.22.6",
"@babel/types": "^7.22.5"
},
"engines": {
@@ -473,9 +473,9 @@
}
},
"node_modules/@babel/parser": {
"version": "7.22.5",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz",
"integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==",
"version": "7.22.7",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
"integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==",
"bin": {
"parser": "bin/babel-parser.js"
},
@@ -1631,17 +1631,17 @@
}
},
"node_modules/@babel/traverse": {
"version": "7.22.5",
"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz",
"integrity": "sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==",
"version": "7.22.8",
"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz",
"integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==",
"dependencies": {
"@babel/code-frame": "^7.22.5",
"@babel/generator": "^7.22.5",
"@babel/generator": "^7.22.7",
"@babel/helper-environment-visitor": "^7.22.5",
"@babel/helper-function-name": "^7.22.5",
"@babel/helper-hoist-variables": "^7.22.5",
"@babel/helper-split-export-declaration": "^7.22.5",
"@babel/parser": "^7.22.5",
"@babel/helper-split-export-declaration": "^7.22.6",
"@babel/parser": "^7.22.7",
"@babel/types": "^7.22.5",
"debug": "^4.1.0",
"globals": "^11.1.0"
@@ -4160,25 +4160,25 @@
"integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ=="
},
"@babel/core": {
"version": "7.22.5",
"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz",
"integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==",
"version": "7.22.9",
"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz",
"integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==",
"requires": {
"@ampproject/remapping": "^2.2.0",
"@babel/code-frame": "^7.22.5",
"@babel/generator": "^7.22.5",
"@babel/helper-compilation-targets": "^7.22.5",
"@babel/helper-module-transforms": "^7.22.5",
"@babel/helpers": "^7.22.5",
"@babel/parser": "^7.22.5",
"@babel/generator": "^7.22.9",
"@babel/helper-compilation-targets": "^7.22.9",
"@babel/helper-module-transforms": "^7.22.9",
"@babel/helpers": "^7.22.6",
"@babel/parser": "^7.22.7",
"@babel/template": "^7.22.5",
"@babel/traverse": "^7.22.5",
"@babel/traverse": "^7.22.8",
"@babel/types": "^7.22.5",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
"json5": "^2.2.2",
"semver": "^6.3.0"
"semver": "^6.3.1"
},
"dependencies": {
"json5": {
@@ -4194,9 +4194,9 @@
}
},
"@babel/generator": {
"version": "7.22.5",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.5.tgz",
"integrity": "sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==",
"version": "7.22.9",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz",
"integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==",
"requires": {
"@babel/types": "^7.22.5",
"@jridgewell/gen-mapping": "^0.3.2",
@@ -4355,18 +4355,15 @@
}
},
"@babel/helper-module-transforms": {
"version": "7.22.5",
"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz",
"integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==",
"version": "7.22.9",
"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
"integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
"requires": {
"@babel/helper-environment-visitor": "^7.22.5",
"@babel/helper-module-imports": "^7.22.5",
"@babel/helper-simple-access": "^7.22.5",
"@babel/helper-split-export-declaration": "^7.22.5",
"@babel/helper-validator-identifier": "^7.22.5",
"@babel/template": "^7.22.5",
"@babel/traverse": "^7.22.5",
"@babel/types": "^7.22.5"
"@babel/helper-split-export-declaration": "^7.22.6",
"@babel/helper-validator-identifier": "^7.22.5"
}
},
"@babel/helper-optimise-call-expression": {
@@ -4452,12 +4449,12 @@
}
},
"@babel/helpers": {
"version": "7.22.5",
"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz",
"integrity": "sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==",
"version": "7.22.6",
"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz",
"integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==",
"requires": {
"@babel/template": "^7.22.5",
"@babel/traverse": "^7.22.5",
"@babel/traverse": "^7.22.6",
"@babel/types": "^7.22.5"
}
},
@@ -4472,9 +4469,9 @@
}
},
"@babel/parser": {
"version": "7.22.5",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz",
"integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q=="
"version": "7.22.7",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
"integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q=="
},
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
"version": "7.22.5",
@@ -5227,17 +5224,17 @@
}
},
"@babel/traverse": {
"version": "7.22.5",
"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz",
"integrity": "sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==",
"version": "7.22.8",
"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz",
"integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==",
"requires": {
"@babel/code-frame": "^7.22.5",
"@babel/generator": "^7.22.5",
"@babel/generator": "^7.22.7",
"@babel/helper-environment-visitor": "^7.22.5",
"@babel/helper-function-name": "^7.22.5",
"@babel/helper-hoist-variables": "^7.22.5",
"@babel/helper-split-export-declaration": "^7.22.5",
"@babel/parser": "^7.22.5",
"@babel/helper-split-export-declaration": "^7.22.6",
"@babel/parser": "^7.22.7",
"@babel/types": "^7.22.5",
"debug": "^4.1.0",
"globals": "^11.1.0"

View File

@@ -4,7 +4,7 @@
"private": true,
"scripts": {},
"dependencies": {
"@babel/core": "^7.22.5",
"@babel/core": "^7.22.9",
"@babel/preset-env": "^7.22.9",
"@rollup/plugin-babel": "^6.0.3",
"@rollup/plugin-node-resolve": "^15.1.0",

View File

@@ -4,9 +4,20 @@ setup_collapsible_details = function (el) {
el.find('details.sneak-peek:not([open])').each(function() {
this.open = true;
var $elements = $("> :not(summary)", this).show().filter(':not(.sneak-peek-trigger)').attr('aria-hidden', 'true');
var $elements = $("> :not(summary)", this).show().filter(':not(.sneak-peek-trigger)');
var container = this;
if (Array.prototype.reduce.call($elements, function (h, e) {
return h + $(e).outerHeight();
}, 0) < 200) {
$(".sneak-peek-trigger", this).remove();
$(container).removeClass('sneak-peek');
container.style.removeProperty('height');
return;
}
$elements.attr('aria-hidden', 'true');
var trigger = $('summary, .sneak-peek-trigger button', container);
function onclick(e) {
e.preventDefault();

View File

@@ -1,7 +1,7 @@
/*global $,u2f */
$(function () {
$('.sidebar .dropdown, ul.navbar-nav .dropdown, .navbar-events-collapse').on('shown.bs.collapse shown.bs.dropdown', function () {
$(this).parent().find("input").val("").change().focus();
$(this).parent().find("input").val("").trigger('forceRunQuery').focus();
});
$('.dropdown-menu .form-box input').click(function (e) {
e.stopPropagation();
@@ -11,11 +11,22 @@ $(function () {
var $container = $(this);
var $query = $(this).find('[data-typeahead-query]').length ? $(this).find('[data-typeahead-query]') : $($(this).attr("data-typeahead-field"));
$container.find("li:not(.query-holder)").remove();
var lastQuery = "";
var lastQuery = null;
var runQueryTimeout = null;
var loadIndicatorTimeout = null;
function showLoadIndicator() {
$container.find("li:not(.query-holder)").remove();
$container.append("<li class='loading'><span class='fa fa-4x fa-cog fa-spin'></span></li>");
$container.toggleClass('focused', $query.is(":focus") && $container.children().length > 0);
}
function runQuery() {
lastQuery = $query.val();
var thisQuery = $query.val();
if (thisQuery === lastQuery) return;
lastQuery = $query.val();
window.clearTimeout(loadIndicatorTimeout)
loadIndicatorTimeout = window.setTimeout(showLoadIndicator, 80)
$.getJSON(
$container.attr("data-source") + "?query=" + encodeURIComponent($query.val()) + (typeof $container.attr("data-organizer") !== "undefined" ? "&organizer=" + $container.attr("data-organizer") : ""),
function (data) {
@@ -23,107 +34,74 @@ $(function () {
// Lost race condition
return;
}
window.clearTimeout(loadIndicatorTimeout);
$container.find("li:not(.query-holder)").remove();
$.each(data.results, function (i, res) {
let $linkContent = $("<div>");
if (res.type === "organizer") {
$container.append(
$("<li>").append(
$("<a>").attr("href", res.url).append(
$("<div>").append(
$("<span>").addClass("event-name-full").append(
$("<span>").addClass("fa fa-users fa-fw")
).append(" ").append($("<div>").text(res.name).html())
)
).on("mousedown", function (event) {
if ($(this).length) {
location.href = $(this).attr("href");
}
$(this).parent().addClass("active");
event.preventDefault();
event.stopPropagation();
})
)
);
$linkContent.append(
$("<span>").addClass("event-name-full").append(
$("<span>").addClass("fa fa-users fa-fw")
).append(" ").append($("<div>").text(res.name).html())
)
} else if (res.type === "order" || res.type === "voucher") {
$container.append(
$("<li>").append(
$("<a>").attr("href", res.url).append(
$("<div>").append(
$("<span>").addClass("event-name-full").append($("<div>").text(res.title).html())
).append(
$("<span>").addClass("event-organizer").append(
$("<span>").addClass("fa fa-calendar fa-fw")
).append(" ").append($("<div>").text(res.event).html())
)
).on("mousedown", function (event) {
if ($(this).length) {
location.href = $(this).attr("href");
}
$(this).parent().addClass("active");
event.preventDefault();
event.stopPropagation();
})
)
);
$linkContent.append(
$("<span>").addClass("event-name-full").append($("<div>").text(res.title).html())
).append(
$("<span>").addClass("event-organizer").append(
$("<span>").addClass("fa fa-calendar fa-fw")
).append(" ").append($("<div>").text(res.event).html())
)
} else if (res.type === "user") {
$container.append(
$("<li>").append(
$("<a>").attr("href", res.url).append(
$("<div>").append(
$("<span>").addClass("event-name-full").append(
$("<span>").addClass("fa fa-user fa-fw")
).append(" ").append($("<div>").text(res.name).html())
)
).on("mousedown", function (event) {
if ($(this).length) {
location.href = $(this).attr("href");
}
$(this).parent().addClass("active");
event.preventDefault();
event.stopPropagation();
})
)
);
$linkContent.append(
$("<span>").addClass("event-name-full").append(
$("<span>").addClass("fa fa-user fa-fw")
).append(" ").append($("<div>").text(res.name).html())
)
} else {
$container.append(
$("<li>").append(
$("<a>").attr("href", res.url).append(
$("<div>").append(
$("<span>").addClass("event-name-full").append($("<div>").text(res.name).html())
).append(
$("<span>").addClass("event-organizer").append(
$("<span>").addClass("fa fa-users fa-fw")
).append(" ").append($("<div>").text(res.organizer).html())
).append(
$("<span>").addClass("event-daterange").append(
$("<span>").addClass("fa fa-calendar fa-fw")
).append(" ").append(res.date_range)
)
).on("mousedown", function (event) {
if ($(this).length) {
location.href = $(this).attr("href");
}
$(this).parent().addClass("active");
event.preventDefault();
event.stopPropagation();
})
)
);
$linkContent.append(
$("<span>").addClass("event-name-full").append($("<div>").text(res.name).html())
).append(
$("<span>").addClass("event-organizer").append(
$("<span>").addClass("fa fa-users fa-fw")
).append(" ").append($("<div>").text(res.organizer).html())
).append(
$("<span>").addClass("event-daterange").append(
$("<span>").addClass("fa fa-calendar fa-fw")
).append(" ").append(res.date_range)
)
}
$container.append(
$("<li>").append(
$("<a>").attr("href", res.url).append(
$linkContent
).on("mousedown", function (event) {
if ($(this).length) {
location.href = $(this).attr("href");
}
$(this).parent().addClass("active");
event.preventDefault();
event.stopPropagation();
})
)
);
});
$container.toggleClass('focused', $query.is(":focus") && $container.children().length > 0);
}
);
}
$query.on("change", function () {
$query.on("forceRunQuery", function () {
runQuery();
});
$query.on("input", function () {
if ($container.attr("data-typeahead-field") && $query.val() === "") {
$container.removeClass('focused');
$container.find("li:not(.query-holder)").remove();
lastQuery = null;
return;
}
if (runQueryTimeout != null) {
window.clearTimeout(runQueryTimeout)
}
window.clearTimeout(runQueryTimeout)
runQueryTimeout = window.setTimeout(runQuery, 250)
});
$query.on("keydown", function (event) {
@@ -177,8 +155,6 @@ $(function () {
event.preventDefault();
event.stopPropagation();
return true;
} else {
$(this).change();
}
});
});

View File

@@ -243,7 +243,7 @@ div.mail-preview {
}
}
.input-group-btn .btn {
padding-bottom: 7px;
padding-bottom: 8px;
}
.reldatetime {
input[type=text], select {

View File

@@ -412,6 +412,11 @@ body.loading #wrapper {
white-space: nowrap;
overflow: hidden;
}
.loading {
padding: 10px;
text-align: center;
color: lightgrey;
}
}
.sidebar-content {
@@ -808,7 +813,11 @@ tbody[data-dnd-url] {
tbody th {
background: $table-bg-hover;
}
.table-th-sticky-horizontal th[scope=row] {
position: sticky;
left: 0;
background: linear-gradient(0deg, rgba(255,255,255,1) 0%, rgba(255,255,255,1) 96%, rgba(255,255,255,0) 100%);;
}
.large-link-group {
a.list-group-item {
&::before {

View File

@@ -54,10 +54,10 @@ $(function () {
wallets.forEach(function(wallet) {
const labels = $('[data-wallets*='+wallet+'] + label strong, [data-wallets*='+wallet+'] + strong')
.append('<span class="wallet wallet-loading"> <i aria-hidden="true" class="fa fa-cog fa-spin"></i></span>')
.append('<span class="wallet wallet-loading" data-wallet="'+wallet+'"> <i aria-hidden="true" class="fa fa-cog fa-spin"></i></span>')
walletdetection[wallet]()
.then(function(result) {
const spans = labels.find(".wallet-loading:nth-of-type(1)");
const spans = labels.find(".wallet-loading[data-wallet=" + wallet + "]");
if (result) {
spans.removeClass('wallet-loading').hide().text(', ' + walletdetection.name_map[wallet]).fadeIn(300);
} else {
@@ -65,7 +65,7 @@ $(function () {
}
})
.catch(function(result) {
labels.find(".wallet-loading:nth-of-type(1)").remove();
labels.find(".wallet-loading[data-wallet=" + wallet + "]").remove();
})
});
});

View File

@@ -21,6 +21,7 @@
#
from contextlib import contextmanager
import fakeredis
from pytest_mock import MockFixture
@@ -34,3 +35,7 @@ def mocker_context():
result = MockFixture(FakePytestConfig())
yield result
result.stopall()
def get_redis_connection(alias="default", write=True):
return fakeredis.FakeStrictRedis(server=fakeredis.FakeServer.get_server("127.0.0.1:None:v(7, 0)", (7, 0)))

View File

@@ -42,7 +42,7 @@ EMAIL_BACKEND = EMAIL_CUSTOM_SMTP_BACKEND = 'django.core.mail.backends.locmem.Em
COMPRESS_ENABLED = COMPRESS_OFFLINE = False
COMPRESS_CACHE_BACKEND = 'testcache'
STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage'
STORAGES["staticfiles"]["BACKEND"] = 'django.contrib.staticfiles.storage.StaticFilesStorage'
PRETIX_INSTANCE_NAME = 'pretix.eu'
COMPRESS_PRECOMPILERS_ORIGINAL = COMPRESS_PRECOMPILERS

View File

@@ -21,6 +21,8 @@ addopts = --reruns 3 -rw
filterwarnings =
error
ignore:The 'warn' method is deprecated:DeprecationWarning
ignore::django.utils.deprecation.RemovedInDjango51Warning:django.core.files.storage
ignore:.*index_together.*:django.utils.deprecation.RemovedInDjango51Warning:
ignore::DeprecationWarning:mt940
ignore::DeprecationWarning:cbor2
ignore::DeprecationWarning:markdown
@@ -35,6 +37,7 @@ filterwarnings =
ignore::ResourceWarning
ignore:django.contrib.staticfiles.templatetags.static:DeprecationWarning
ignore::DeprecationWarning:compressor
ignore:.*FakeStrictRedis.hmset.*:DeprecationWarning:
ignore:pkg_resources is deprecated as an API:
ignore:.*pkg_resources.declare_namespace.*:

View File

@@ -1794,6 +1794,8 @@ def test_pdf_data(token_client, organizer, event, order, django_assert_max_num_q
))
assert resp.status_code == 200
assert resp.data['positions'][0].get('pdf_data')
assert resp.data['positions'][0]['pdf_data']['positionid'] == '1'
assert resp.data['positions'][0]['pdf_data']['order'] == order.code
resp = token_client.get('/api/v1/organizers/{}/events/{}/orders/{}/'.format(
organizer.slug, event.slug, order.code
))
@@ -1807,6 +1809,8 @@ def test_pdf_data(token_client, organizer, event, order, django_assert_max_num_q
))
assert resp.status_code == 200
assert resp.data['results'][0]['positions'][0].get('pdf_data')
assert resp.data['results'][0]['positions'][0]['pdf_data']['positionid'] == '1'
assert resp.data['results'][0]['positions'][0]['pdf_data']['order'] == order.code
resp = token_client.get('/api/v1/organizers/{}/events/{}/orders/'.format(
organizer.slug, event.slug
))
@@ -1820,6 +1824,8 @@ def test_pdf_data(token_client, organizer, event, order, django_assert_max_num_q
))
assert resp.status_code == 200
assert resp.data['results'][0].get('pdf_data')
assert resp.data['results'][0]['pdf_data']['positionid'] == '1'
assert resp.data['results'][0]['pdf_data']['order'] == order.code
resp = token_client.get('/api/v1/organizers/{}/events/{}/orderpositions/'.format(
organizer.slug, event.slug
))
@@ -1834,6 +1840,8 @@ def test_pdf_data(token_client, organizer, event, order, django_assert_max_num_q
))
assert resp.status_code == 200
assert resp.data.get('pdf_data')
assert resp.data['pdf_data']['positionid'] == '1'
assert resp.data['pdf_data']['order'] == order.code
resp = token_client.get('/api/v1/organizers/{}/events/{}/orderpositions/{}/'.format(
organizer.slug, event.slug, posid
))

View File

@@ -940,8 +940,8 @@ def test_rules_reasoning_prefer_number_over_date(event, position, clist):
@pytest.mark.django_db(transaction=True)
def test_position_queries(django_assert_num_queries, position, clist):
with django_assert_num_queries(12 if 'sqlite' in settings.DATABASES['default']['ENGINE'] else 11) as captured:
def test_position_queries(django_assert_max_num_queries, position, clist):
with django_assert_max_num_queries(13) as captured:
perform_checkin(position, clist, {})
if 'sqlite' not in settings.DATABASES['default']['ENGINE']:
assert any('FOR UPDATE' in s['sql'] for s in captured)

View File

@@ -38,10 +38,10 @@ class I18nStringTest(TestCase):
'en': 'Hello'
}
s = LazyI18nString(data)
translation.activate('en')
self.assertEqual(str(s), 'Hello')
translation.activate('de')
self.assertEqual(str(s), 'Hallo')
with translation.override('en'):
self.assertEqual(str(s), 'Hello')
with translation.override('de'):
self.assertEqual(str(s), 'Hallo')
def test_similar_translations(self):
data = {
@@ -50,57 +50,57 @@ class I18nStringTest(TestCase):
'de-informal': 'Du'
}
s = LazyI18nString(data)
translation.activate('de')
self.assertEqual(str(s), 'Sie')
translation.activate('de-informal')
self.assertEqual(str(s), 'Du')
with translation.override('de'):
self.assertEqual(str(s), 'Sie')
with translation.override('de-informal'):
self.assertEqual(str(s), 'Du')
data = {
'en': 'You',
'de-informal': 'Du'
}
s = LazyI18nString(data)
translation.activate('de')
self.assertEqual(str(s), 'Du')
translation.activate('de-informal')
self.assertEqual(str(s), 'Du')
with translation.override('de'):
self.assertEqual(str(s), 'Du')
with translation.override('de-informal'):
self.assertEqual(str(s), 'Du')
data = {
'en': 'You',
'de': 'Sie'
}
s = LazyI18nString(data)
translation.activate('de')
self.assertEqual(str(s), 'Sie')
translation.activate('de-informal')
self.assertEqual(str(s), 'Sie')
with translation.override('de'):
self.assertEqual(str(s), 'Sie')
with translation.override('de-informal'):
self.assertEqual(str(s), 'Sie')
def test_missing_default_translation(self):
data = {
'de': 'Hallo',
}
s = LazyI18nString(data)
translation.activate('en')
self.assertEqual(str(s), 'Hallo')
translation.activate('de')
self.assertEqual(str(s), 'Hallo')
with translation.override('en'):
self.assertEqual(str(s), 'Hallo')
with translation.override('de'):
self.assertEqual(str(s), 'Hallo')
def test_missing_translation(self):
data = {
'en': 'Hello',
}
s = LazyI18nString(data)
translation.activate('en')
self.assertEqual(str(s), 'Hello')
translation.activate('de')
self.assertEqual(str(s), 'Hello')
with translation.override('en'):
self.assertEqual(str(s), 'Hello')
with translation.override('de'):
self.assertEqual(str(s), 'Hello')
def test_legacy_string(self):
s = LazyI18nString("Hello")
translation.activate('en')
self.assertEqual(str(s), 'Hello')
translation.activate('de')
self.assertEqual(str(s), 'Hello')
with translation.override('en'):
self.assertEqual(str(s), 'Hello')
with translation.override('de'):
self.assertEqual(str(s), 'Hello')
def test_none(self):
s = LazyI18nString(None)
@@ -124,10 +124,10 @@ class I18nFieldTest(TestCase):
obj = ItemCategory.objects.create(event=self.event, name="Hello")
obj = ItemCategory.objects.get(id=obj.id)
self.assertIsInstance(obj.name, LazyI18nString)
translation.activate('en')
self.assertEqual(str(obj.name), "Hello")
translation.activate('de')
self.assertEqual(str(obj.name), "Hello")
with translation.override('en'):
self.assertEqual(str(obj.name), "Hello")
with translation.override('de'):
self.assertEqual(str(obj.name), "Hello")
def test_save_load_cycle_i18n_string(self):
obj = ItemCategory.objects.create(event=self.event,
@@ -139,7 +139,7 @@ class I18nFieldTest(TestCase):
))
obj = ItemCategory.objects.get(id=obj.id)
self.assertIsInstance(obj.name, LazyI18nString)
translation.activate('en')
self.assertEqual(str(obj.name), "Hello")
translation.activate('de')
self.assertEqual(str(obj.name), "Hallo")
with translation.override('en'):
self.assertEqual(str(obj.name), "Hello")
with translation.override('de'):
self.assertEqual(str(obj.name), "Hallo")

View File

@@ -98,6 +98,7 @@ class BaseQuotaTestCase(TestCase):
self.var3 = ItemVariation.objects.create(item=self.item3, value='Fancy')
@pytest.mark.usefixtures("fakeredis_client")
class QuotaTestCase(BaseQuotaTestCase):
@classscope(attr='o')
def test_available(self):
@@ -434,6 +435,62 @@ class QuotaTestCase(BaseQuotaTestCase):
self.assertEqual(self.var1.check_quotas(), (Quota.AVAILABILITY_ORDERED, 0))
self.assertEqual(self.var1.check_quotas(count_waitinglist=False), (Quota.AVAILABILITY_OK, 1))
@classscope(attr='o')
def test_waitinglist_cache_separation(self):
self.quota.items.add(self.item1)
self.quota.size = 1
self.quota.save()
WaitingListEntry.objects.create(
event=self.event, item=self.item1, email='foo@bar.com'
)
# Check that there is no "cache mixup" even across multiple runs
qa = QuotaAvailability(count_waitinglist=False)
qa.queue(self.quota)
qa.compute()
assert qa.results[self.quota] == (Quota.AVAILABILITY_OK, 1)
qa = QuotaAvailability(count_waitinglist=True)
qa.queue(self.quota)
qa.compute(allow_cache=True)
assert qa.results[self.quota] == (Quota.AVAILABILITY_ORDERED, 0)
qa = QuotaAvailability(count_waitinglist=True)
qa.queue(self.quota)
qa.compute(allow_cache=True)
assert qa.results[self.quota] == (Quota.AVAILABILITY_ORDERED, 0)
qa = QuotaAvailability(count_waitinglist=False)
qa.queue(self.quota)
qa.compute()
assert qa.results[self.quota] == (Quota.AVAILABILITY_OK, 1)
# Rebuild cache required
self.quota.size = 5
self.quota.save()
qa = QuotaAvailability(count_waitinglist=True)
qa.queue(self.quota)
qa.compute(allow_cache=True)
assert qa.results[self.quota] == (Quota.AVAILABILITY_ORDERED, 0)
qa = QuotaAvailability(count_waitinglist=False)
qa.queue(self.quota)
qa.compute(allow_cache=True)
assert qa.results[self.quota] == (Quota.AVAILABILITY_OK, 1)
self.quota.rebuild_cache()
qa = QuotaAvailability(count_waitinglist=True)
qa.queue(self.quota)
qa.compute(allow_cache=True)
assert qa.results[self.quota] == (Quota.AVAILABILITY_OK, 4)
qa = QuotaAvailability(count_waitinglist=False)
qa.queue(self.quota)
qa.compute(allow_cache=True)
assert qa.results[self.quota] == (Quota.AVAILABILITY_OK, 5)
@classscope(attr='o')
def test_waitinglist_variation_fulfilled(self):
self.quota.variations.add(self.var1)

View File

@@ -71,6 +71,7 @@ def inputfile_factory():
'I': 'Foo',
'J': '2021-06-28 11:00:00',
'K': '06221/32177-50',
'L': 'True'
},
{
'A': 'Daniel',
@@ -84,6 +85,7 @@ def inputfile_factory():
'I': 'Bar',
'J': '2021-06-28 11:00:00',
'K': '+4962213217750',
'L': 'False',
},
{},
{
@@ -98,10 +100,11 @@ def inputfile_factory():
'I': 'Foo,Bar',
'J': '2021-06-28 11:00:00',
'K': '',
'L': '',
},
]
f = StringIO()
w = csv.DictWriter(f, ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K'], dialect=csv.excel)
w = csv.DictWriter(f, ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L'], dialect=csv.excel)
w.writeheader()
w.writerows(d)
f.seek(0)
@@ -795,22 +798,37 @@ def test_import_question_validate(user, event, item):
@scopes_disabled()
def test_import_question_valid(user, event, item):
settings = dict(DEFAULT_SETTINGS)
q = event.questions.create(question='Foo', type=Question.TYPE_CHOICE_MULTIPLE)
o1 = q.options.create(answer='Foo', identifier='Foo')
o2 = q.options.create(answer='Bar', identifier='Bar')
q1 = event.questions.create(question='Foo', type=Question.TYPE_CHOICE_MULTIPLE)
o1 = q1.options.create(answer='Foo', identifier='Foo')
o2 = q1.options.create(answer='Bar', identifier='Bar')
q2 = event.questions.create(question='Boolean', type=Question.TYPE_BOOLEAN)
settings['item'] = 'static:{}'.format(item.pk)
settings['attendee_email'] = 'csv:C'
settings['question_{}'.format(q.pk)] = 'csv:I'
settings['question_{}'.format(q1.pk)] = 'csv:I'
settings['question_{}'.format(q2.pk)] = 'csv:L'
import_orders.apply(
args=(event.pk, inputfile_factory().id, settings, 'en', user.pk)
).get()
assert QuestionAnswer.objects.filter(question=q).count() == 3
assert QuestionAnswer.objects.filter(question=q1).count() == 3
a1 = OrderPosition.objects.get(attendee_email='schneider@example.org').answers.first()
assert a1.question == q
assert a1.question == q1
assert list(a1.options.all()) == [o1]
a3 = OrderPosition.objects.get(attendee_email__isnull=True).answers.first()
assert a3.question == q
assert a3.question == q1
assert set(a3.options.all()) == {o1, o2}
# Boolean question: One True, One False, one empty == 2 Question answers
assert QuestionAnswer.objects.filter(question=q2).count() == 2
a4 = OrderPosition.objects.get(attendee_email='schneider@example.org').answers.last()
assert a4.question == q2
assert a4.answer == 'True'
a5 = OrderPosition.objects.get(attendee_email='daniel@example.org').answers.last()
assert a5.question == q2
assert a5.answer == 'False'
a6 = OrderPosition.objects.get(attendee_email__isnull=True).answers
assert a6.count() == 1
assert a6.first().question == q1
assert a6.last().question == q1
# TODO: validate question

View File

@@ -2228,6 +2228,7 @@ class OrderChangeManagerTests(TestCase):
@classscope(attr='o')
def test_split_and_change_higher(self):
self.order.status = Order.STATUS_PAID
self.order.expires = now() - timedelta(days=1)
self.order.save()
self.order.payments.create(
provider='manual',
@@ -2247,6 +2248,7 @@ class OrderChangeManagerTests(TestCase):
assert not self.order.fees.exists()
assert self.order.status == Order.STATUS_PAID
assert self.order.pending_sum == Decimal('0.00')
assert self.order.expires < now()
r = self.order.refunds.last()
assert r.provider == 'offsetting'
assert r.amount == Decimal('23.00')
@@ -2255,6 +2257,7 @@ class OrderChangeManagerTests(TestCase):
# New order
assert self.op2.order != self.order
o2 = self.op2.order
assert o2.expires > now()
assert o2.total == Decimal('42.00')
assert o2.status == Order.STATUS_PENDING
assert o2.positions.count() == 1

View File

@@ -22,9 +22,14 @@
import inspect
import pytest
from django.test import override_settings
from django.utils import translation
from django_scopes import scopes_disabled
from fakeredis import FakeConnection
from xdist.dsession import DSession
from pretix.testutils.mock import get_redis_connection
CRASHED_ITEMS = set()
@@ -68,3 +73,43 @@ def pytest_fixture_setup(fixturedef, request):
else:
with scopes_disabled():
yield
@pytest.fixture(autouse=True)
def reset_locale():
translation.activate("en")
@pytest.fixture
def fakeredis_client(monkeypatch):
with override_settings(
HAS_REDIS=True,
REAL_CACHE_USED=True,
CACHES={
'redis': {
'BACKEND': 'django.core.cache.backends.redis.RedisCache',
'LOCATION': 'redis://127.0.0.1',
'OPTIONS': {
'connection_class': FakeConnection
}
},
'redis_session': {
'BACKEND': 'django.core.cache.backends.redis.RedisCache',
'LOCATION': 'redis://127.0.0.1',
'OPTIONS': {
'connection_class': FakeConnection
}
},
'default': {
'BACKEND': 'django.core.cache.backends.redis.RedisCache',
'LOCATION': 'redis://127.0.0.1',
'OPTIONS': {
'connection_class': FakeConnection
}
},
}
):
redis = get_redis_connection("default", True)
redis.flushall()
monkeypatch.setattr('django_redis.get_redis_connection', get_redis_connection, raising=False)
yield redis

View File

@@ -640,7 +640,10 @@ class ItemsTest(ItemFormTest):
prop = self.event1.item_meta_properties.create(name="Foo")
self.item2.meta_values.create(property=prop, value="Bar")
doc = self.get_doc('/control/event/%s/%s/items/add?copy_from=%d' % (self.orga1.slug, self.event1.slug, self.item2.pk))
data = extract_form_fields(doc.select("form")[0])
self.client.post('/control/event/%s/%s/items/add' % (self.orga1.slug, self.event1.slug), {
**data,
'name_0': 'Intermediate',
'default_price': '23.00',
'tax_rate': '19.00',

View File

@@ -20,19 +20,19 @@
# <https://www.gnu.org/licenses/>.
#
from django import urls
from django.conf import settings
from django.test import override_settings
from pretix.helpers.urls import build_absolute_uri
def test_site_url_domain():
settings.SITE_URL = 'https://example.com'
assert build_absolute_uri('control:auth.login') == 'https://example.com/control/login'
with override_settings(SITE_URL='https://example.com'):
assert build_absolute_uri('control:auth.login') == 'https://example.com/control/login'
def test_site_url_subpath():
settings.SITE_URL = 'https://example.com/presale'
old_prefix = urls.get_script_prefix()
urls.set_script_prefix('/presale/')
assert build_absolute_uri('control:auth.login') == 'https://example.com/presale/control/login'
urls.set_script_prefix(old_prefix)
with override_settings(SITE_URL='https://example.com/presale'):
old_prefix = urls.get_script_prefix()
urls.set_script_prefix('/presale/')
assert build_absolute_uri('control:auth.login') == 'https://example.com/presale/control/login'
urls.set_script_prefix(old_prefix)

View File

@@ -20,7 +20,6 @@
# <https://www.gnu.org/licenses/>.
#
import pytest
from django.conf import settings
from django.test.utils import override_settings
from django.utils.timezone import now
@@ -36,7 +35,6 @@ def env():
date_from=now(), live=True
)
event.get_cache().clear()
settings.SITE_URL = 'http://example.com'
return o, event

View File

@@ -20,7 +20,6 @@
# <https://www.gnu.org/licenses/>.
#
import pytest
from django.conf import settings
from django.utils.timezone import now
from pretix.base.models import Event, Organizer
@@ -33,7 +32,6 @@ def event():
organizer=o, name='MRMCD2015', slug='2015',
date_from=now(),
)
settings.SITE_URL = 'http://example.com'
return event

View File

@@ -20,7 +20,6 @@
# <https://www.gnu.org/licenses/>.
#
import pytest
from django.conf import settings
from django.template import Context, Template, TemplateSyntaxError
from django.urls import NoReverseMatch
from django.utils.timezone import now
@@ -36,7 +35,6 @@ def env():
organizer=o, name='MRMCD2015', slug='2015',
date_from=now()
)
settings.SITE_URL = 'http://example.com'
event.get_cache().clear()
return o, event

View File

@@ -20,7 +20,6 @@
# <https://www.gnu.org/licenses/>.
#
import pytest
from django.conf import settings
from django.test import override_settings
from django.utils.timezone import now
from django_scopes import scopes_disabled
@@ -38,7 +37,6 @@ def env():
organizer=o, name='MRMCD2015', slug='2015',
date_from=now()
)
settings.SITE_URL = 'http://example.com'
event.get_cache().clear()
return o, event
@@ -99,7 +97,6 @@ def test_event_org_domain_keep_port(env):
@pytest.mark.django_db
def test_event_org_domain_keep_scheme(env):
with override_settings(SITE_URL='https://example.com'):
settings.SITE_URL = 'https://example.com'
KnownDomain.objects.create(domainname='foobar', organizer=env[0])
assert eventreverse(env[1], 'presale:event.index') == 'https://foobar/2015/'

View File

@@ -0,0 +1,91 @@
#
# This file is part of pretix (Community Edition).
#
# Copyright (C) 2014-2020 Raphael Michel and contributors
# Copyright (C) 2020-2021 rami.io GmbH and contributors
#
# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
# Public License as published by the Free Software Foundation in version 3 of the License.
#
# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
# this file, see <https://pretix.eu/about/en/license>.
#
# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
# details.
#
# You should have received a copy of the GNU Affero General Public License along with this program. If not, see
# <https://www.gnu.org/licenses/>.
#
# This file is based on an earlier version of pretix which was released under the Apache License 2.0. The full text of
# the Apache License 2.0 can be obtained at <http://www.apache.org/licenses/LICENSE-2.0>.
#
# This file may have since been changed and any changes are released under the terms of AGPLv3 as described above. A
# full history of changes and contributors is available at <https://github.com/pretix/pretix>.
#
# This file contains Apache-licensed contributions copyrighted by: Flavia Bastos
#
# Unless required by applicable law or agreed to in writing, software distributed under the Apache License 2.0 is
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations under the License.
from django.core import mail as djmail
from django_countries.fields import Country
from django_scopes import scopes_disabled
from tests.presale.test_orders import BaseOrdersTest
from pretix.base.models import InvoiceAddress, OrderPayment
from pretix.base.services.invoices import generate_invoice
class BanktransferOrdersTest(BaseOrdersTest):
def test_unknown_order(self):
response = self.client.post(
'/%s/%s/banktransfer/ABCDE/123/mail-invoice/' % (self.orga.slug, self.event.slug)
)
assert response.status_code == 404
response = self.client.post(
'/%s/%s/banktransfer/%s/123/mail-invoice/' % (self.orga.slug, self.event.slug, self.not_my_order.code)
)
assert response.status_code == 404
def test_order_with_no_invoice(self):
djmail.outbox = []
response = self.client.post(
'/%s/%s/banktransfer/%s/%s/mail-invoice/' % (
self.orga.slug, self.event.slug, self.order.code, self.order.secret),
{'email': 'test@example.org'}
)
assert response.status_code == 302
from django.contrib.messages import get_messages
messages = list(get_messages(response.wsgi_request))
assert len(messages) == 1
assert str(messages[0]) == 'No pending bank transfer payment found. Maybe the order has been paid already?'
assert len(djmail.outbox) == 0
def test_valid_order(self):
with scopes_disabled():
self.event.settings.set('payment_banktransfer_invoice_email', True)
self.order.payments.create(provider='banktransfer', state=OrderPayment.PAYMENT_STATE_CREATED,
amount=self.order.total)
InvoiceAddress.objects.create(order=self.order, company="Sample company", country=Country('NZ'))
generate_invoice(self.order)
djmail.outbox = []
response = self.client.post(
'/%s/%s/banktransfer/%s/%s/mail-invoice/' % (
self.orga.slug, self.event.slug, self.order.code, self.order.secret),
{'email': 'test@example.org'}
)
assert response.status_code == 302
from django.contrib.messages import get_messages
messages = list(get_messages(response.wsgi_request))
assert len(messages) == 1
assert str(messages[0]) == 'Sending the latest invoice via e-mail to test@example.org.'
assert len(djmail.outbox) == 1

View File

@@ -582,7 +582,6 @@ class WidgetCartTest(CartTestMixin, TestCase):
response = self.client.get('/%s/%s/widget/product_list' % (self.orga.slug, self.event.slug))
data = json.loads(response.content.decode())
settings.SITE_URL = 'http://example.com'
assert data == {
'list_type': 'list',
'name': '30C3',
@@ -610,7 +609,6 @@ class WidgetCartTest(CartTestMixin, TestCase):
self.event.subevents.create(name="Hidden", active=True, is_public=False, date_from=now() + datetime.timedelta(days=3))
response = self.client.get('/%s/%s/widget/product_list?style=calendar' % (self.orga.slug, self.event.slug))
settings.SITE_URL = 'http://example.com'
data = json.loads(response.content.decode())
assert data == {
'list_type': 'calendar',
@@ -686,7 +684,6 @@ class WidgetCartTest(CartTestMixin, TestCase):
self.event.subevents.create(name="Hidden", active=True, is_public=False, date_from=now() + datetime.timedelta(days=3))
response = self.client.get('/%s/%s/widget/product_list?style=week' % (self.orga.slug, self.event.slug))
settings.SITE_URL = 'http://example.com'
data = json.loads(response.content.decode())
assert data == {
'list_type': 'week',
@@ -730,7 +727,6 @@ class WidgetCartTest(CartTestMixin, TestCase):
self.event.subevents.create(name="Disabled", active=False, date_from=now() + datetime.timedelta(days=3))
self.event.subevents.create(name="Hidden", active=True, is_public=False, date_from=now() + datetime.timedelta(days=3))
settings.SITE_URL = 'http://example.com'
response = self.client.get('/%s/widget/product_list' % (self.orga.slug,))
data = json.loads(response.content.decode())
assert data == {
@@ -773,7 +769,6 @@ class WidgetCartTest(CartTestMixin, TestCase):
self.event.subevents.create(name="Hidden", active=True, is_public=False, date_from=now() + datetime.timedelta(days=3))
response = self.client.get('/%s/widget/product_list?style=calendar' % (self.orga.slug,))
settings.SITE_URL = 'http://example.com'
data = json.loads(response.content.decode())
assert data == {
'date': '2019-01-01',