- {% block body %}{% endblock %}
-
-
- {% block comments %}{% endblock %}
-
-
- {{ title|striptags|e }}{{ titlesuffix }}
+ {%- endblock -%}
-{%- macro script() %}
-
+ {#- CSS #}
+ {%- for css_file in css_files %}
+ {%- if css_file|attr("filename") %}
+ {{ css_tag(css_file) }}
+ {%- else %}
+
+ {%- endif %}
+ {%- endfor %}
+
+ {#
+ "extra_css_files" is an undocumented Read the Docs theme specific option.
+ There is no need to check for ``|attr("filename")`` here because it's always a string.
+ Note that this option should be removed in favor of regular ``html_css_files``:
+ https://www.sphinx-doc.org/en/master/usage/configuration.html#confval-html_css_files
+ #}
+ {%- for css_file in extra_css_files %}
+
+ {%- endfor -%}
+
+ {#- FAVICON #}
+ {%- if favicon_url %}
+
+ {%- endif %}
+
+ {#- CANONICAL URL (deprecated) #}
+ {%- if theme_canonical_url and not pageurl %}
+
+ {%- endif -%}
+
+ {#- CANONICAL URL #}
+ {%- if pageurl %}
+
+ {%- endif -%}
+
+ {#- JAVASCRIPTS #}
+ {%- block scripts %}
+ {%- if not embedded %}
{%- for scriptfile in script_files %}
-
+ {{ js_tag(scriptfile) }}
{%- endfor %}
-{%- endmacro %}
+
-{%- macro css() %}
-
-
- {%- for cssfile in css_files %}
-
- {%- endfor %}
-{%- endmacro %}
+ {%- if READTHEDOCS or DEBUG %}
+
+ {%- endif %}
-
-
-
- {{ metatags }}
- {%- block htmltitle %}
- {{ title|striptags|e }}{{ titlesuffix }}
- {%- endblock %}
- {{ css() }}
- {%- if not embedded %}
- {{ script() }}
+ {#- OPENSEARCH #}
{%- if use_opensearch %}
{%- endif %}
- {%- if favicon %}
-
- {%- endif %}
- {%- if theme_canonical_url %}
-
- {%- endif %}
- {%- endif %}
-{%- block linktags %}
+ {%- endif %}
+ {%- endblock %}
+
+ {%- block linktags %}
{%- if hasdoc('about') %}
{%- endif %}
@@ -143,67 +93,135 @@
{%- if hasdoc('copyright') %}
{%- endif %}
-
- {%- if parents %}
-
- {%- endif %}
{%- if next %}
{%- endif %}
{%- if prev %}
{%- endif %}
-{%- endblock %}
-{%- block extrahead %} {% endblock %}
-
-
-{%- block header %}{% endblock %}
-
-{%- block relbar1 %}{{ relbar() }}{% endblock %}
-
-{%- block content %}
- {%- block sidebar1 %} {# possible location for sidebar #} {% endblock %}
-
-
- {% include "breadcrumbs.html" %}
-
{% include "versions.html" %}
- {% if not embedded %}
-
-
- {%- for scriptfile in script_files %}
-
- {%- endfor %}
-
- {% endif %}
-
{# RTD hosts this file, so just load on non RTD builds #}
{% if not READTHEDOCS %}
@@ -214,7 +198,7 @@
{% if theme_sticky_navigation %}
{% endif %}
diff --git a/doc/_themes/pretix_theme/layout_old.html b/doc/_themes/pretix_theme/layout_old.html
index 9f2d1999b6..4d14790dbd 100644
--- a/doc/_themes/pretix_theme/layout_old.html
+++ b/doc/_themes/pretix_theme/layout_old.html
@@ -1,136 +1,86 @@
-{#
- basic/layout.html
- ~~~~~~~~~~~~~~~~~
-
- Master layout template for Sphinx themes.
-
- :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
- :license: BSD, see LICENSE for details.
-#}
-{%- block doctype -%}
-
-{%- endblock %}
-{%- set reldelim1 = reldelim1 is not defined and ' »' or reldelim1 %}
-{%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %}
-{%- set render_sidebar = (not embedded) and (not theme_nosidebar|tobool) and
- (sidebars != []) %}
+{# TEMPLATE VAR SETTINGS #}
{%- set url_root = pathto('', 1) %}
-{# XXX necessary? #}
{%- if url_root == '#' %}{% set url_root = '' %}{% endif %}
{%- if not embedded and docstitle %}
{%- set titlesuffix = " — "|safe + docstitle|e %}
{%- else %}
{%- set titlesuffix = "" %}
{%- endif %}
+{%- set lang_attr = 'en' if language == None else (language | replace('_', '-')) %}
-{%- macro relbar() %}
-
-{%- endmacro %}
+{# Build sphinx_version_info tuple from sphinx_version string in pure Jinja #}
+{%- set (_ver_major, _ver_minor) = (sphinx_version.split('.') | list)[:2] | map('int') -%}
+{%- set sphinx_version_info = (_ver_major, _ver_minor, -1) -%}
-{%- macro sidebar() %}
- {%- if render_sidebar %}
-
-
- {% include "footer.html" %}
+
+ {%- block content %}
+ {%- if theme_style_external_links|tobool %}
+
-
+ {%- else %}
+
-
+ {%- endif %}
+ {% include "breadcrumbs.html" %}
+
+ {%- endblock %}
+ {%- block document %}
+
+ {%- endblock %}
+ {% include "footer.html" %}
+
+ {% block body %}{% endblock %}
+
+ {%- if self.comments()|trim %}
+
+ {%- block comments %}{% endblock %}
+
+ {%- endif%}
+
-
- {%- endif %}
-{%- endmacro %}
+
+= (7, 2) %} data-content_root="{{ content_root }}"{% endif %}>
+
+
+ {%- if READTHEDOCS and not embedded %}
+
+ {%- endif %}
+ {{- metatags }}
+
+ {%- block htmltitle %}
+
- {%- block sidebarlogo %}
- {%- if logo %}
-
- {%- endif %}
- {%- endblock %}
- {%- if sidebars != None %}
- {#- new style sidebar: explicitly include/exclude templates #}
- {%- for sidebartemplate in sidebars %}
- {%- include sidebartemplate %}
- {%- endfor %}
- {%- else %}
- {#- old style sidebars: using blocks -- should be deprecated #}
- {%- block sidebartoc %}
- {%- include "localtoc.html" %}
- {%- endblock %}
- {%- block sidebarrel %}
- {%- include "relations.html" %}
- {%- endblock %}
- {%- block sidebarsourcelink %}
- {%- include "sourcelink.html" %}
- {%- endblock %}
- {%- if customsidebar %}
- {%- include customsidebar %}
- {%- endif %}
- {%- block sidebarsearch %}
- {%- include "searchbox.html" %}
- {%- endblock %}
- {%- endif %}
-
-
- {%- block document %}
-
-{%- endblock %}
+
-{%- block relbar2 %}{{ relbar() }}{% endblock %}
+ {%- block extrabody %} {% endblock %}
+
- {%- if render_sidebar %}
-
{%- endblock %}
+ {%- block extrahead %} {% endblock %}
+
- {%- block sidebar2 %}{{ sidebar() }}{% endblock %}
-
-
- {%- endif %}
-
- {%- endif %}
-
- {% block body %} {% endblock %}
-
- {%- if render_sidebar %}
-
+ {#- SIDE NAV, TOGGLES ON MOBILE #}
+
+
+
+
+ {#- MOBILE NAV, TRIGGLES SIDE NAV ON TOGGLE #}
+ {#- Translators: This is an ARIA section label for the navigation menu that is visible when viewing the page on mobile devices -#}
+
+
+ [^/]+)/(?P[^/]+)')
def download(self, *args, **kwargs):
cf = get_object_or_404(CachedFile, id=kwargs['cfid'])
+ if not cf.allowed_for_session(self.request, "exporters-api"):
+ return Response(
+ {'status': 'failed', 'message': 'Unknown file ID or export failed'},
+ status=status.HTTP_410_GONE
+ )
if cf.file:
resp = ChunkBasedFileResponse(cf.file.file, content_type=cf.type)
resp['Content-Disposition'] = 'attachment; filename="{}"'.format(cf.filename).encode("ascii", "ignore")
@@ -109,7 +114,8 @@ class ExportersMixin:
serializer = JobRunSerializer(exporter=instance, data=self.request.data, **self.get_serializer_kwargs())
serializer.is_valid(raise_exception=True)
- cf = CachedFile(web_download=False)
+ cf = CachedFile(web_download=True)
+ cf.bind_to_session(self.request, "exporters-api")
cf.date = now()
cf.expires = now() + timedelta(hours=24)
cf.save()
diff --git a/src/pretix/api/views/item.py b/src/pretix/api/views/item.py
index 6e0336c0c0..a84fa589ac 100644
--- a/src/pretix/api/views/item.py
+++ b/src/pretix/api/views/item.py
@@ -40,7 +40,7 @@ from django_filters.rest_framework import DjangoFilterBackend, FilterSet
from django_scopes import scopes_disabled
from rest_framework import viewsets
from rest_framework.decorators import action
-from rest_framework.exceptions import PermissionDenied
+from rest_framework.exceptions import PermissionDenied, ValidationError
from rest_framework.response import Response
from pretix.api.pagination import TotalOrderingFilter
@@ -293,6 +293,8 @@ class ItemProgramTimeViewSet(viewsets.ModelViewSet):
return get_object_or_404(Item, pk=self.kwargs['item'], event=self.request.event)
def get_queryset(self):
+ if self.request.event.has_subevents:
+ raise ValidationError('You cannot use program times on an event series.')
return self.item.program_times.all()
def get_serializer_context(self):
@@ -565,7 +567,7 @@ class QuotaViewSet(ConditionalListView, viewsets.ModelViewSet):
write_permission = 'can_change_items'
def get_queryset(self):
- return self.request.event.quotas.all()
+ return self.request.event.quotas.select_related('subevent').prefetch_related('items', 'variations').all()
def list(self, request, *args, **kwargs):
queryset = self.filter_queryset(self.get_queryset()).distinct()
diff --git a/src/pretix/api/views/organizer.py b/src/pretix/api/views/organizer.py
index f600086e1c..f084a16794 100644
--- a/src/pretix/api/views/organizer.py
+++ b/src/pretix/api/views/organizer.py
@@ -721,7 +721,7 @@ class MembershipViewSet(viewsets.ModelViewSet):
def get_queryset(self):
return Membership.objects.filter(
customer__organizer=self.request.organizer
- )
+ ).select_related('customer')
def get_serializer_context(self):
ctx = super().get_serializer_context()
diff --git a/src/pretix/api/views/voucher.py b/src/pretix/api/views/voucher.py
index c0c0c10169..2d6243b248 100644
--- a/src/pretix/api/views/voucher.py
+++ b/src/pretix/api/views/voucher.py
@@ -19,6 +19,7 @@
# You should have received a copy of the GNU Affero General Public License along with this program. If not, see
#
'.join([ str(_('Optional, but depending on the country you reside in we might need to charge you ' 'additional taxes if you do not enter it.')), - str(_('If you are registered in Switzerland, you can enter your UID instead.')), ]) else: self.fields['vat_id'].help_text = '
'.join([ str(_('Optional, but it might be required for you to claim tax benefits on your invoice ' 'depending on your and the seller’s country of residence.')), - str(_('If you are registered in Switzerland, you can enter your UID instead.')), ]) transmission_type_choices = [ @@ -1358,13 +1362,24 @@ class BaseInvoiceAddressForm(forms.ModelForm): "transmission method.")} ) + vat_id_applicable = ( + 'vat_id' in self.fields and + data.get('is_business') and + ask_for_vat_id(data.get('country')) + ) + vat_id_required = vat_id_applicable and str(data.get('country')) in self.event.settings.invoice_address_vatid_required_countries + if vat_id_required and not data.get('vat_id'): + raise ValidationError({ + "vat_id": _("This field is required.") + }) + if self.validate_vat_id and self.instance.vat_id_validated and 'vat_id' not in self.changed_data: - pass - elif self.validate_vat_id and data.get('is_business') and ask_for_vat_id(data.get('country')) and data.get('vat_id'): + pass # Skip re-validation if it is validated + elif self.validate_vat_id and vat_id_applicable: try: normalized_id = validate_vat_id(data.get('vat_id'), str(data.get('country'))) self.instance.vat_id_validated = True - self.instance.vat_id = normalized_id + self.instance.vat_id = data['vat_id'] = normalized_id except VATIDFinalError as e: if self.all_optional: self.instance.vat_id_validated = False @@ -1372,6 +1387,9 @@ class BaseInvoiceAddressForm(forms.ModelForm): else: raise ValidationError({"vat_id": e.message}) except VATIDTemporaryError as e: + # We couldn't check it online, but we can still normalize it + normalized_id = normalize_vat_id(data.get('vat_id'), str(data.get('country'))) + self.instance.vat_id = data['vat_id'] = normalized_id self.instance.vat_id_validated = False if self.request and self.vat_warning: messages.warning(self.request, e.message) diff --git a/src/pretix/base/forms/user.py b/src/pretix/base/forms/user.py index e3083322de..773f952203 100644 --- a/src/pretix/base/forms/user.py +++ b/src/pretix/base/forms/user.py @@ -89,8 +89,6 @@ class User2FADeviceAddForm(forms.Form): class UserPasswordChangeForm(forms.Form): error_messages = { - 'pw_current': _("Please enter your current password if you want to change your email address " - "or password."), 'pw_current_wrong': _("The current password you entered was not correct."), 'pw_mismatch': _("Please enter the same password twice"), 'rate_limit': _("For security reasons, please wait 5 minutes before you try again."), @@ -103,19 +101,19 @@ class UserPasswordChangeForm(forms.Form): attrs={'autocomplete': 'username'}, )) old_pw = forms.CharField(max_length=255, - required=False, + required=True, label=_("Your current password"), widget=forms.PasswordInput( attrs={'autocomplete': 'current-password'}, )) new_pw = forms.CharField(max_length=255, - required=False, + required=True, label=_("New password"), widget=forms.PasswordInput( attrs={'autocomplete': 'new-password'}, )) new_pw_repeat = forms.CharField(max_length=255, - required=False, + required=True, label=_("Repeat new password"), widget=forms.PasswordInput( attrs={'autocomplete': 'new-password'}, @@ -130,7 +128,7 @@ class UserPasswordChangeForm(forms.Form): def clean_old_pw(self): old_pw = self.cleaned_data.get('old_pw') - if old_pw and settings.HAS_REDIS: + if settings.HAS_REDIS: from django_redis import get_redis_connection rc = get_redis_connection("redis") cnt = rc.incr('pretix_pwchange_%s' % self.user.pk) @@ -141,7 +139,7 @@ class UserPasswordChangeForm(forms.Form): code='rate_limit', ) - if old_pw and not check_password(old_pw, self.user.password): + if not check_password(old_pw, self.user.password): raise forms.ValidationError( self.error_messages['pw_current_wrong'], code='pw_current_wrong', @@ -151,17 +149,22 @@ class UserPasswordChangeForm(forms.Form): def clean_new_pw(self): password1 = self.cleaned_data.get('new_pw', '') - if password1 and validate_password(password1, user=self.user) is not None: + if validate_password(password1, user=self.user) is not None: raise forms.ValidationError( _(password_validators_help_texts()), code='pw_invalid' ) + if self.user.check_password(password1): + raise forms.ValidationError( + self.error_messages['pw_equal'], + code='pw_equal', + ) return password1 def clean_new_pw_repeat(self): password1 = self.cleaned_data.get('new_pw') password2 = self.cleaned_data.get('new_pw_repeat') - if password1 and password1 != password2: + if password1 != password2: raise forms.ValidationError( self.error_messages['pw_mismatch'], code='pw_mismatch' diff --git a/src/pretix/base/invoicing/pdf.py b/src/pretix/base/invoicing/pdf.py index a97d713744..2eed2f8e33 100644 --- a/src/pretix/base/invoicing/pdf.py +++ b/src/pretix/base/invoicing/pdf.py @@ -32,7 +32,6 @@ from itertools import groupby from typing import Tuple import bleach -import vat_moss.exchange_rates from bidi import get_display from django.contrib.staticfiles import finders from django.db.models import Sum @@ -47,7 +46,6 @@ from reportlab.lib.styles import ParagraphStyle, StyleSheet1 from reportlab.lib.units import mm from reportlab.pdfbase import pdfmetrics from reportlab.pdfbase.pdfmetrics import stringWidth -from reportlab.pdfbase.ttfonts import TTFont from reportlab.pdfgen.canvas import Canvas from reportlab.platypus import ( BaseDocTemplate, Flowable, Frame, KeepTogether, NextPageTemplate, @@ -60,7 +58,8 @@ from pretix.base.services.currencies import SOURCE_NAMES from pretix.base.signals import register_invoice_renderers from pretix.base.templatetags.money import money_filter from pretix.helpers.reportlab import ( - FontFallbackParagraph, ThumbnailingImageReader, reshaper, + FontFallbackParagraph, ThumbnailingImageReader, register_ttf_font_if_new, + reshaper, ) from pretix.presale.style import get_fonts @@ -235,25 +234,25 @@ class BaseReportlabInvoiceRenderer(BaseInvoiceRenderer): """ Register fonts with reportlab. By default, this registers the OpenSans font family """ - pdfmetrics.registerFont(TTFont('OpenSans', finders.find('fonts/OpenSans-Regular.ttf'))) - pdfmetrics.registerFont(TTFont('OpenSansIt', finders.find('fonts/OpenSans-Italic.ttf'))) - pdfmetrics.registerFont(TTFont('OpenSansBd', finders.find('fonts/OpenSans-Bold.ttf'))) - pdfmetrics.registerFont(TTFont('OpenSansBI', finders.find('fonts/OpenSans-BoldItalic.ttf'))) + register_ttf_font_if_new('OpenSans', finders.find('fonts/OpenSans-Regular.ttf')) + register_ttf_font_if_new('OpenSansIt', finders.find('fonts/OpenSans-Italic.ttf')) + register_ttf_font_if_new('OpenSansBd', finders.find('fonts/OpenSans-Bold.ttf')) + register_ttf_font_if_new('OpenSansBI', finders.find('fonts/OpenSans-BoldItalic.ttf')) pdfmetrics.registerFontFamily('OpenSans', normal='OpenSans', bold='OpenSansBd', italic='OpenSansIt', boldItalic='OpenSansBI') for family, styles in get_fonts(event=self.event, pdf_support_required=True).items(): - pdfmetrics.registerFont(TTFont(family, finders.find(styles['regular']['truetype']))) + register_ttf_font_if_new(family, finders.find(styles['regular']['truetype'])) if family == self.event.settings.invoice_renderer_font: self.font_regular = family if 'bold' in styles: self.font_bold = family + ' B' if 'italic' in styles: - pdfmetrics.registerFont(TTFont(family + ' I', finders.find(styles['italic']['truetype']))) + register_ttf_font_if_new(family + ' I', finders.find(styles['italic']['truetype'])) if 'bold' in styles: - pdfmetrics.registerFont(TTFont(family + ' B', finders.find(styles['bold']['truetype']))) + register_ttf_font_if_new(family + ' B', finders.find(styles['bold']['truetype'])) if 'bolditalic' in styles: - pdfmetrics.registerFont(TTFont(family + ' B I', finders.find(styles['bolditalic']['truetype']))) + register_ttf_font_if_new(family + ' B I', finders.find(styles['bolditalic']['truetype'])) def _normalize(self, text): # reportlab does not support unicode combination characters @@ -1059,7 +1058,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer): def fmt(val): try: - return vat_moss.exchange_rates.format(val, self.invoice.foreign_currency_display) + return money_filter(val, self.invoice.foreign_currency_display) except ValueError: return localize(val) + ' ' + self.invoice.foreign_currency_display diff --git a/src/pretix/base/invoicing/peppol.py b/src/pretix/base/invoicing/peppol.py index c8a28752a9..a4d43c50d3 100644 --- a/src/pretix/base/invoicing/peppol.py +++ b/src/pretix/base/invoicing/peppol.py @@ -19,8 +19,11 @@ # You should have received a copy of the GNU Affero General Public License along with this program. If not, see #
'voucher_list', ['voucher_list'], lambda voucher_list: ' \n'.join(voucher_list), - ' 68CYU2H6ZTP3WLK5\n 7MB94KKPVEPSMVF2' + '68CYU2H6ZTP3WLK5 \n7MB94KKPVEPSMVF2', + inline=False, ), - SimpleFunctionalTextPlaceholder( + MarkdownTextPlaceholder( # join vouchers with two spaces at end of line so markdown-parser inserts a
'voucher_url_list', ['event', 'voucher_list'], lambda event, voucher_list: ' \n'.join([ @@ -638,6 +671,7 @@ def base_placeholders(sender, **kwargs): ) + '?voucher=' + c for c in ['68CYU2H6ZTP3WLK5', '7MB94KKPVEPSMVF2'] ]), + inline=False, ), SimpleFunctionalTextPlaceholder( 'url', ['event', 'voucher_list'], lambda event, voucher_list: build_absolute_uri(event, 'presale:event.index', kwargs={ @@ -656,13 +690,13 @@ def base_placeholders(sender, **kwargs): 'comment', ['comment'], lambda comment: comment, _('An individual text with a reason can be inserted here.'), ), - SimpleFunctionalTextPlaceholder( + MarkdownTextPlaceholder( 'payment_info', ['order', 'payments'], _placeholder_payments, - _('The amount has been charged to your card.'), + _('The amount has been charged to your card.'), inline=False, ), - SimpleFunctionalTextPlaceholder( + MarkdownTextPlaceholder( 'payment_info', ['payment_info'], lambda payment_info: payment_info, - _('Please transfer money to this bank account: 9999-9999-9999-9999'), + _('Please transfer money to this bank account: 9999-9999-9999-9999'), inline=False, ), SimpleFunctionalTextPlaceholder( 'attendee_name', ['position'], lambda position: position.attendee_name, @@ -719,13 +753,13 @@ def base_placeholders(sender, **kwargs): )) for k, v in sender.meta_data.items(): - ph.append(SimpleFunctionalTextPlaceholder( + ph.append(MarkdownTextPlaceholder( 'meta_%s' % k, ['event'], lambda event, k=k: event.meta_data[k], - v + v, inline=True, )) - ph.append(SimpleFunctionalTextPlaceholder( + ph.append(MarkdownTextPlaceholder( 'meta_%s' % k, ['event_or_subevent'], lambda event_or_subevent, k=k: event_or_subevent.meta_data[k], - v + v, inline=True, )) return ph @@ -753,7 +787,7 @@ def get_available_placeholders(event, base_parameters, rich=False): if not isinstance(val, (list, tuple)): val = [val] for v in val: - if isinstance(v, BaseRichTextPlaceholder) and not rich: + if isinstance(v, BaseRichTextPlaceholder) and not rich and not v.allowed_in_plain_content: continue if all(rp in base_parameters for rp in v.required_context): params[v.identifier] = v @@ -767,7 +801,11 @@ def get_sample_context(event, context_parameters, rich=True): sample = v.render_sample(event) if isinstance(sample, PlainHtmlAlternativeString): context_dict[k] = PlainHtmlAlternativeString( - sample.plain, + '<{el} class="placeholder" title="{title}">{plain}'.format( + el='span', + title=lbl, + plain=escape(sample.plain), + ), '<{el} class="placeholder placeholder-html" title="{title}">{html}'.format( el='div' if sample.is_block else 'span', title=lbl, @@ -775,13 +813,13 @@ def get_sample_context(event, context_parameters, rich=True): ) ) elif str(sample).strip().startswith('* ') or str(sample).startswith(' '): - context_dict[k] = '
+ MIT License
+ """
+ if not vat_id:
+ return None
+
+ if not isinstance(vat_id, str):
+ raise TypeError('VAT ID is not a string')
+
+ if len(vat_id) < 3:
+ raise ValueError('VAT ID must be at least three character long')
+
+ # Normalize the ID for simpler regexes
+ vat_id = re.sub('\\s+', '', vat_id)
+ vat_id = vat_id.replace('-', '')
+ vat_id = vat_id.replace('.', '')
+ vat_id = vat_id.upper()
+
+ # Clean the different shapes a number can take in Switzerland depending on purpse
+ if country_code == "CH":
+ vat_id = re.sub('[^A-Z0-9]', '', vat_id.replace('HR', '').replace('MWST', ''))
+
+ # Fix people using GR prefix for Greece
+ if vat_id[0:2] == "GR" and country_code == "GR":
+ vat_id = "EL" + vat_id[2:]
+
+ # Check if we already have a valid country prefix. If not, we try to figure out if we can
+ # add one, since in some countries (e.g. Italy) it's very custom to enter it without the prefix
+ if vat_id[:2] in VAT_ID_PATTERNS and re.match(VAT_ID_PATTERNS[vat_id[0:2]]['regex'], vat_id[2:]):
+ # Prefix set and prefix matches pattern, nothing to do
+ pass
+ elif re.match(VAT_ID_PATTERNS[cc_to_vat_prefix(country_code)]['regex'], vat_id):
+ # Prefix not set but adding it fixes pattern
+ vat_id = cc_to_vat_prefix(country_code) + vat_id
+ else:
+ # We have no idea what this is
+ pass
+
+ return vat_id
+
+
def _validate_vat_id_NO(vat_id, country_code):
# Inspired by vat_moss library
- if not vat_id.startswith("NO"):
- # prefix is not usually used in Norway, but expected by vat_moss library
- vat_id = "NO" + vat_id
try:
- vat_id = vat_moss.id.normalize(vat_id)
+ vat_id = normalize_vat_id(vat_id, country_code)
except ValueError:
raise VATIDFinalError(error_messages['invalid'])
@@ -104,7 +275,7 @@ def _validate_vat_id_NO(vat_id, country_code):
def _validate_vat_id_EU(vat_id, country_code):
# Inspired by vat_moss library
try:
- vat_id = vat_moss.id.normalize(vat_id)
+ vat_id = normalize_vat_id(vat_id, country_code)
except ValueError:
raise VATIDFinalError(error_messages['invalid'])
@@ -112,11 +283,10 @@ def _validate_vat_id_EU(vat_id, country_code):
raise VATIDFinalError(error_messages['invalid'])
number = vat_id[2:]
-
if vat_id[:2] != cc_to_vat_prefix(country_code):
raise VATIDFinalError(error_messages['country_mismatch'])
- if not re.match(vat_moss.id.ID_PATTERNS[cc_to_vat_prefix(country_code)]['regex'], number):
+ if not re.match(VAT_ID_PATTERNS[cc_to_vat_prefix(country_code)]['regex'], number):
raise VATIDFinalError(error_messages['invalid'])
# We are relying on the country code of the normalized VAT-ID and not the user/InvoiceAddress-provided
@@ -175,9 +345,12 @@ def _validate_vat_id_EU(vat_id, country_code):
def _validate_vat_id_CH(vat_id, country_code):
if vat_id[:3] != 'CHE':
- raise VATIDFinalError(_('Your VAT ID does not match the selected country.'))
+ raise VATIDFinalError(error_messages['country_mismatch'])
- vat_id = re.sub('[^A-Z0-9]', '', vat_id.replace('HR', '').replace('MWST', ''))
+ try:
+ vat_id = normalize_vat_id(vat_id, country_code)
+ except ValueError:
+ raise VATIDFinalError(error_messages['invalid'])
try:
transport = Transport(
cache=SqliteCache(os.path.join(settings.CACHE_DIR, "validate_vat_id_ch_zeep_cache.db")),
diff --git a/src/pretix/base/services/waitinglist.py b/src/pretix/base/services/waitinglist.py
index 238212ea04..527021997d 100644
--- a/src/pretix/base/services/waitinglist.py
+++ b/src/pretix/base/services/waitinglist.py
@@ -113,6 +113,11 @@ def assign_automatically(event: Event, user_id: int=None, subevent_id: int=None)
lock_objects(quotas, shared_lock_objects=[event])
for wle in qs:
+ # add this event to wle.item as it is not yet cached and is needed in check_quotas
+ wle.item.event = event
+ if wle.variation:
+ wle.variation.item = wle.item
+
if (wle.item_id, wle.variation_id, wle.subevent_id) in gone:
continue
ev = (wle.subevent or event)
diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py
index 7c57318173..540ab5c3a6 100644
--- a/src/pretix/base/settings.py
+++ b/src/pretix/base/settings.py
@@ -180,6 +180,19 @@ DEFAULTS = {
widget=forms.CheckboxInput(attrs={'data-display-dependency': '#id_settings-customer_accounts'}),
)
},
+ 'customer_accounts_require_login_for_order_access': {
+ 'default': 'False',
+ 'type': bool,
+ 'form_class': forms.BooleanField,
+ 'serializer_class': serializers.BooleanField,
+ 'form_kwargs': dict(
+ label=_("Require login to access order confirmation pages"),
+ help_text=_("If enabled, users who were logged in at the time of purchase must also log in to access their order information. "
+ "If a customer account is created while placing an order, the restriction only becomes active after the customer "
+ "account is activated."),
+ widget=forms.CheckboxInput(attrs={'data-display-dependency': '#id_settings-customer_accounts'}),
+ )
+ },
'customer_accounts_link_by_email': {
'default': 'False',
'type': bool,
@@ -629,13 +642,40 @@ DEFAULTS = {
'form_kwargs': dict(
label=_("Ask for VAT ID"),
help_text=format_lazy(
- _("Only works if an invoice address is asked for. VAT ID is never required and only requested from "
- "business customers in the following countries: {countries}"),
+ _("Only works if an invoice address is asked for. VAT ID is only requested from business customers "
+ "in the following countries: {countries}."),
countries=lazy(lambda *args: ', '.join(sorted(gettext(Country(cc).name) for cc in VAT_ID_COUNTRIES)), str)()
),
widget=forms.CheckboxInput(attrs={'data-checkbox-dependency': '#id_invoice_address_asked'}),
)
},
+ 'invoice_address_vatid_required_countries': {
+ 'default': ['IT', 'GR'],
+ 'type': list,
+ 'form_class': forms.MultipleChoiceField,
+ 'serializer_class': serializers.MultipleChoiceField,
+ 'serializer_kwargs': dict(
+ choices=lazy(
+ lambda *args: sorted([(cc, gettext(Country(cc).name)) for cc in VAT_ID_COUNTRIES], key=lambda c: c[1]),
+ list
+ )(),
+ ),
+ 'form_kwargs': dict(
+ label=_("Require VAT ID in"),
+ choices=lazy(
+ lambda *args: sorted([(cc, gettext(Country(cc).name)) for cc in VAT_ID_COUNTRIES], key=lambda c: c[1]),
+ list
+ )(),
+ help_text=format_lazy(
+ _("VAT ID is optional by default, because not all businesses are assigned a VAT ID in all countries. "
+ "VAT ID will be required for all business addresses in the selected countries."),
+ ),
+ widget=forms.CheckboxSelectMultiple(attrs={
+ "class": "scrolling-multiple-choice",
+ 'data-display-dependency': '#id_invoice_address_vatid'
+ }),
+ )
+ },
'invoice_address_explanation_text': {
'default': '',
'type': LazyI18nString,
@@ -690,6 +730,7 @@ DEFAULTS = {
label=_("Minimum length of invoice number after prefix"),
help_text=_("The part of your invoice number after your prefix will be filled up with leading zeros up to this length, e.g. INV-001 or INV-00001."),
max_value=12,
+ min_value=1,
required=True,
)
},
@@ -725,8 +766,9 @@ DEFAULTS = {
message=lazy(lambda *args: _('Please only use the characters {allowed} in this field.').format(
allowed='A-Z, a-z, 0-9, -./:#'
), str)()
- )
+ ),
],
+ max_length=155,
)
},
'invoice_numbers_prefix_cancellations': {
@@ -747,8 +789,9 @@ DEFAULTS = {
message=lazy(lambda *args: _('Please only use the characters {allowed} in this field.').format(
allowed='A-Z, a-z, 0-9, -./:#'
), str)()
- )
+ ),
],
+ max_length=155,
)
},
'invoice_renderer_highlight_order_code': {
@@ -1203,6 +1246,7 @@ DEFAULTS = {
'form_class': forms.CharField,
'serializer_class': serializers.CharField,
'form_kwargs': dict(
+ max_length=190,
label=_("Company name"),
)
},
@@ -1216,6 +1260,7 @@ DEFAULTS = {
'placeholder': '12345'
}),
label=_("ZIP code"),
+ max_length=190,
)
},
'invoice_address_from_city': {
@@ -1228,6 +1273,7 @@ DEFAULTS = {
'placeholder': _('Random City')
}),
label=_("City"),
+ max_length=190,
)
},
'invoice_address_from_state': {
@@ -1264,7 +1310,8 @@ DEFAULTS = {
'serializer_class': serializers.CharField,
'form_kwargs': dict(
label=_("Domestic tax ID"),
- help_text=_("e.g. tax number in Germany, ABN in Australia, …")
+ help_text=_("e.g. tax number in Germany, ABN in Australia, …"),
+ max_length=190,
)
},
'invoice_address_from_vat_id': {
@@ -1274,6 +1321,7 @@ DEFAULTS = {
'serializer_class': serializers.CharField,
'form_kwargs': dict(
label=_("EU VAT ID"),
+ max_length=190,
)
},
'invoice_introductory_text': {
diff --git a/src/pretix/base/templatetags/html_time.py b/src/pretix/base/templatetags/html_time.py
new file mode 100644
index 0000000000..55b4fc224d
--- /dev/null
+++ b/src/pretix/base/templatetags/html_time.py
@@ -0,0 +1,65 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-today pretix 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 .
+#
+# 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
+# 
- {{ settings.PRETIX_INSTANCE_NAME }}
+
+ {{ settings.PRETIX_INSTANCE_NAME }}
+
+ {%- block content %}
+ {%- if theme_style_external_links|tobool %}
+
+ {% include "versions.html" -%}
+
+
+
+ {#- Do not conflict with RTD insertion of analytics script #}
+ {%- if not READTHEDOCS %}
+ {%- if theme_analytics_id %}
+
+
+
-{%- block footer %}
-
-
+ {%- else %}
+
+
+
+ {%- endif %}
+ {% include "breadcrumbs.html" %}
+
+ {%- endblock %}
+
+ {%- block document %}
+
+ {%- endblock %}
+ {% include "footer.html" %}
+
+ {% block body %}{% endblock %}
+
+ {%- if self.comments()|trim %}
+
+ {%- block comments %}{% endblock %}
+
+ {%- endif%}
+ asdf asdf asdf asdf 22
-{%- endblock %} - - + {%- endif %} + {%- block footer %} {% endblock %} + + + \ No newline at end of file diff --git a/doc/api/deviceauth.rst b/doc/api/deviceauth.rst index 99d9006b99..acf3d22a82 100644 --- a/doc/api/deviceauth.rst +++ b/doc/api/deviceauth.rst @@ -39,7 +39,7 @@ as well as the type of underlying hardware. Example: "rsa_pubkey": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqh…nswIDAQAB\n-----END PUBLIC KEY-----\n" } -The ``rsa_pubkey`` is optional any only required for certain fatures such as working with reusable +The ``rsa_pubkey`` is optional any only required for certain features such as working with reusable media and NFC cryptography. Every initialization token can only be used once. On success, you will receive a response containing diff --git a/doc/api/fundamentals.rst b/doc/api/fundamentals.rst index 00b2d261c0..d72e3f6d66 100644 --- a/doc/api/fundamentals.rst +++ b/doc/api/fundamentals.rst @@ -117,7 +117,7 @@ List-level conditional fetching If modification checks are not possible with this granularity, you can instead check for the full list. In this case, the list of objects may contain a regular HTTP header ``Last-Modified`` with the date of the last modification to any item of that resource. You can then pass this date back in your next request in the -``If-Modified-Since`` header. If the any object has changed in the meantime, you will receive back a full list +``If-Modified-Since`` header. If any object has changed in the meantime, you will receive back a full list (if something it missing, this means the object has been deleted). If nothing happened, we'll send back a ``304 Not Modified`` return code. diff --git a/doc/api/resources/item_program_times.rst b/doc/api/resources/item_program_times.rst index 0bfaf617a3..db8a6d3368 100644 --- a/doc/api/resources/item_program_times.rst +++ b/doc/api/resources/item_program_times.rst @@ -5,6 +5,7 @@ Resource description -------------------- Program times for products (items) that can be set in addition to event times, e.g. to display seperate schedules within an event. +Note that ``program_times`` are not available for items inside event series. The program times resource contains the following public fields: .. rst-class:: rest-resource-table @@ -45,28 +46,28 @@ Endpoints Vary: Accept Content-Type: application/json - { - "count": 3, - "next": null, - "previous": null, - "results": [ - { - "id": 2, - "start": "2025-08-14T22:00:00Z", - "end": "2025-08-15T00:00:00Z" - }, - { - "id": 3, - "start": "2025-08-12T22:00:00Z", - "end": "2025-08-13T22:00:00Z" - }, - { - "id": 14, - "start": "2025-08-15T22:00:00Z", - "end": "2025-08-17T22:00:00Z" - } - ] - } + { + "count": 3, + "next": null, + "previous": null, + "results": [ + { + "id": 2, + "start": "2025-08-14T22:00:00Z", + "end": "2025-08-15T00:00:00Z" + }, + { + "id": 3, + "start": "2025-08-12T22:00:00Z", + "end": "2025-08-13T22:00:00Z" + }, + { + "id": 14, + "start": "2025-08-15T22:00:00Z", + "end": "2025-08-17T22:00:00Z" + } + ] + } :param organizer: The ``slug`` field of the organizer to fetch :param event: The ``slug`` field of the event to fetch diff --git a/doc/api/resources/items.rst b/doc/api/resources/items.rst index 4c80412840..a8a5a14822 100644 --- a/doc/api/resources/items.rst +++ b/doc/api/resources/items.rst @@ -142,6 +142,7 @@ variations list of objects A list with o program_times list of objects A list with one object for each program time of this item. Can be empty. Only writable during creation, use separate endpoint to modify this later. + Not available for items in event series. ├ id integer Internal ID of the variation ├ value multi-lingual string The "name" of the variation ├ default_price money (string) The price set directly for this variation or ``null`` @@ -243,6 +244,8 @@ Also note that ``variations``, ``bundles``, ``addons`` and ``program_times`` ar bundles, add-ons and program times please use the dedicated nested endpoints. By design this endpoint does not support ``PATCH`` and ``PUT`` with nested ``variations``, ``bundles``, ``addons`` and/or ``program_times``. +``program_times`` is not available to items in event series. + Endpoints --------- diff --git a/doc/development/algorithms/pricing.rst b/doc/development/algorithms/pricing.rst index aa1c7769fc..f64790e121 100644 --- a/doc/development/algorithms/pricing.rst +++ b/doc/development/algorithms/pricing.rst @@ -211,7 +211,7 @@ The line-based computation has a few significant advantages: The main disadvantage is that the tax looks "wrong" when computed from the sum. Taking the sum of net prices (420.15) and multiplying it with the tax rate (19%) yields a tax amount of 79.83 (instead of 79.85) and a gross sum of 499.98 -(instead of 499.98). This becomes a problem when juristictions, data formats, or external systems expect this calculation +(instead of 500.00). This becomes a problem when juristictions, data formats, or external systems expect this calculation to work on the level of the entire order. A prominent example is the EN 16931 standard for e-invoicing that does not allow the computation as created by pretix. diff --git a/doc/requirements.rtd.txt b/doc/requirements.rtd.txt index ca98fe9ab0..19638c5b73 100644 --- a/doc/requirements.rtd.txt +++ b/doc/requirements.rtd.txt @@ -1,9 +1,8 @@ -sphinx==7.4.* -jinja2==3.1.* -sphinx-rtd-theme -sphinxcontrib-httpdomain -sphinxcontrib-images -sphinxcontrib-jquery -sphinxcontrib-spelling==8.* -sphinxemoji +sphinx==9.1.* +sphinx-rtd-theme~=3.1.0 +sphinxcontrib-httpdomain~=1.8.1 +sphinxcontrib-images~=1.0.1 +sphinxcontrib-jquery~=4.1 +sphinxcontrib-spelling~=8.0.2 +sphinxemoji~=0.3.2 pyenchant==3.3.* diff --git a/doc/requirements.txt b/doc/requirements.txt index 5de0c0984f..74538aae46 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,10 +1,9 @@ -e ../ -sphinx==7.4.* -jinja2==3.1.* -sphinx-rtd-theme -sphinxcontrib-httpdomain -sphinxcontrib-images -sphinxcontrib-jquery -sphinxcontrib-spelling==8.* -sphinxemoji +sphinx==9.1.* +sphinx-rtd-theme~=3.1.0 +sphinxcontrib-httpdomain~=1.8.1 +sphinxcontrib-images~=1.0.1 +sphinxcontrib-jquery~=4.1 +sphinxcontrib-spelling~=8.0.2 +sphinxemoji~=0.3.2 pyenchant==3.3.* diff --git a/pyproject.toml b/pyproject.toml index 5bdb79bf68..a05b8de67c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ name = "pretix" dynamic = ["version"] description = "Reinventing presales, one ticket at a time" readme = "README.rst" -requires-python = ">=3.9" +requires-python = ">=3.10" license = {file = "LICENSE"} keywords = ["tickets", "web", "shop", "ecommerce"] authors = [ @@ -29,16 +29,17 @@ dependencies = [ "arabic-reshaper==3.0.0", # Support for Arabic in reportlab "babel", "BeautifulSoup4==4.14.*", - "bleach==6.2.*", - "celery==5.5.*", + "bleach==6.3.*", + "celery==5.6.*", "chardet==5.2.*", "cryptography>=44.0.0", - "css-inline==0.18.*", + "css-inline==0.19.*", "defusedcsv>=1.1.0", + "dnspython==2.*", "Django[argon2]==4.2.*,>=4.2.26", - "django-bootstrap3==25.2", - "django-compressor==4.5.1", - "django-countries==7.6.*", + "django-bootstrap3==26.1", + "django-compressor==4.6.0", + "django-countries==8.2.*", "django-filter==25.1", "django-formset-js-improved==0.5.0.4", "django-formtools==2.5.1", @@ -49,22 +50,22 @@ dependencies = [ "django-localflavor==5.0", "django-markup", "django-oauth-toolkit==2.3.*", - "django-otp==1.6.*", - "django-phonenumber-field==7.3.*", + "django-otp==1.7.*", + "django-phonenumber-field==8.4.*", "django-redis==6.0.*", "django-scopes==2.0.*", "django-statici18n==2.6.*", "djangorestframework==3.16.*", - "dnspython==2.7.*", + "dnspython==2.8.*", "drf_ujson2==1.7.*", "geoip2==5.*", "importlib_metadata==8.*", # Polyfill, we can probably drop this once we require Python 3.10+ "isoweek", "jsonschema", - "kombu==5.5.*", + "kombu==5.6.*", "libsass==0.23.*", "lxml", - "markdown==3.9", # 3.3.5 requires importlib-metadata>=4.4, but django-bootstrap3 requires importlib-metadata<3. + "markdown==3.10", # 3.3.5 requires importlib-metadata>=4.4, but django-bootstrap3 requires importlib-metadata<3. # We can upgrade markdown again once django-bootstrap3 upgrades or once we drop Python 3.6 and 3.7 "mt-940==4.30.*", "oauthlib==3.3.*", @@ -74,31 +75,30 @@ dependencies = [ "paypal-checkout-serversdk==1.0.*", "PyJWT==2.10.*", "phonenumberslite==9.0.*", - "Pillow==11.3.*", + "Pillow==12.1.*", "pretix-plugin-build", "protobuf==6.33.*", "psycopg2-binary", "pycountry", "pycparser==2.23", "pycryptodome==3.23.*", - "pypdf==6.2.*", + "pypdf==6.5.*", "python-bidi==0.6.*", # Support for Arabic in reportlab "python-dateutil==2.9.*", "pytz", "pytz-deprecation-shim==0.1.*", "pyuca", "qrcode==8.2", - "redis==6.4.*", + "redis==7.1.*", "reportlab==4.4.*", "requests==2.32.*", - "sentry-sdk==2.44.*", + "sentry-sdk==2.49.*", "sepaxml==2.7.*", "stripe==7.9.*", "text-unidecode==1.*", "tlds>=2020041600", "tqdm==4.*", "ua-parser==1.0.*", - "vat_moss_forked==2020.3.20.0.11.0", "vobject==0.9.*", "webauthn==2.7.*", "zeep==4.3.*" @@ -110,10 +110,10 @@ dev = [ "aiohttp==3.13.*", "coverage", "coveralls", - "fakeredis==2.32.*", + "fakeredis==2.33.*", "flake8==7.3.*", "freezegun", - "isort==6.1.*", + "isort==7.0.*", "pep8-naming==0.15.*", "potypo", "pytest-asyncio>=0.24", @@ -123,7 +123,7 @@ dev = [ "pytest-mock==3.15.*", "pytest-sugar", "pytest-xdist==3.8.*", - "pytest==8.4.*", + "pytest==9.0.*", "responses", ] diff --git a/src/pretix/__init__.py b/src/pretix/__init__.py index 7c5f8da56f..402b2279bf 100644 --- a/src/pretix/__init__.py +++ b/src/pretix/__init__.py @@ -19,4 +19,4 @@ # You should have received a copy of the GNU Affero General Public License along with this program. If not, see #'.join([ str(_('Optional, but depending on the country you reside in we might need to charge you ' 'additional taxes if you do not enter it.')), - str(_('If you are registered in Switzerland, you can enter your UID instead.')), ]) else: self.fields['vat_id'].help_text = '
'.join([ str(_('Optional, but it might be required for you to claim tax benefits on your invoice ' 'depending on your and the seller’s country of residence.')), - str(_('If you are registered in Switzerland, you can enter your UID instead.')), ]) transmission_type_choices = [ @@ -1358,13 +1362,24 @@ class BaseInvoiceAddressForm(forms.ModelForm): "transmission method.")} ) + vat_id_applicable = ( + 'vat_id' in self.fields and + data.get('is_business') and + ask_for_vat_id(data.get('country')) + ) + vat_id_required = vat_id_applicable and str(data.get('country')) in self.event.settings.invoice_address_vatid_required_countries + if vat_id_required and not data.get('vat_id'): + raise ValidationError({ + "vat_id": _("This field is required.") + }) + if self.validate_vat_id and self.instance.vat_id_validated and 'vat_id' not in self.changed_data: - pass - elif self.validate_vat_id and data.get('is_business') and ask_for_vat_id(data.get('country')) and data.get('vat_id'): + pass # Skip re-validation if it is validated + elif self.validate_vat_id and vat_id_applicable: try: normalized_id = validate_vat_id(data.get('vat_id'), str(data.get('country'))) self.instance.vat_id_validated = True - self.instance.vat_id = normalized_id + self.instance.vat_id = data['vat_id'] = normalized_id except VATIDFinalError as e: if self.all_optional: self.instance.vat_id_validated = False @@ -1372,6 +1387,9 @@ class BaseInvoiceAddressForm(forms.ModelForm): else: raise ValidationError({"vat_id": e.message}) except VATIDTemporaryError as e: + # We couldn't check it online, but we can still normalize it + normalized_id = normalize_vat_id(data.get('vat_id'), str(data.get('country'))) + self.instance.vat_id = data['vat_id'] = normalized_id self.instance.vat_id_validated = False if self.request and self.vat_warning: messages.warning(self.request, e.message) diff --git a/src/pretix/base/forms/user.py b/src/pretix/base/forms/user.py index e3083322de..773f952203 100644 --- a/src/pretix/base/forms/user.py +++ b/src/pretix/base/forms/user.py @@ -89,8 +89,6 @@ class User2FADeviceAddForm(forms.Form): class UserPasswordChangeForm(forms.Form): error_messages = { - 'pw_current': _("Please enter your current password if you want to change your email address " - "or password."), 'pw_current_wrong': _("The current password you entered was not correct."), 'pw_mismatch': _("Please enter the same password twice"), 'rate_limit': _("For security reasons, please wait 5 minutes before you try again."), @@ -103,19 +101,19 @@ class UserPasswordChangeForm(forms.Form): attrs={'autocomplete': 'username'}, )) old_pw = forms.CharField(max_length=255, - required=False, + required=True, label=_("Your current password"), widget=forms.PasswordInput( attrs={'autocomplete': 'current-password'}, )) new_pw = forms.CharField(max_length=255, - required=False, + required=True, label=_("New password"), widget=forms.PasswordInput( attrs={'autocomplete': 'new-password'}, )) new_pw_repeat = forms.CharField(max_length=255, - required=False, + required=True, label=_("Repeat new password"), widget=forms.PasswordInput( attrs={'autocomplete': 'new-password'}, @@ -130,7 +128,7 @@ class UserPasswordChangeForm(forms.Form): def clean_old_pw(self): old_pw = self.cleaned_data.get('old_pw') - if old_pw and settings.HAS_REDIS: + if settings.HAS_REDIS: from django_redis import get_redis_connection rc = get_redis_connection("redis") cnt = rc.incr('pretix_pwchange_%s' % self.user.pk) @@ -141,7 +139,7 @@ class UserPasswordChangeForm(forms.Form): code='rate_limit', ) - if old_pw and not check_password(old_pw, self.user.password): + if not check_password(old_pw, self.user.password): raise forms.ValidationError( self.error_messages['pw_current_wrong'], code='pw_current_wrong', @@ -151,17 +149,22 @@ class UserPasswordChangeForm(forms.Form): def clean_new_pw(self): password1 = self.cleaned_data.get('new_pw', '') - if password1 and validate_password(password1, user=self.user) is not None: + if validate_password(password1, user=self.user) is not None: raise forms.ValidationError( _(password_validators_help_texts()), code='pw_invalid' ) + if self.user.check_password(password1): + raise forms.ValidationError( + self.error_messages['pw_equal'], + code='pw_equal', + ) return password1 def clean_new_pw_repeat(self): password1 = self.cleaned_data.get('new_pw') password2 = self.cleaned_data.get('new_pw_repeat') - if password1 and password1 != password2: + if password1 != password2: raise forms.ValidationError( self.error_messages['pw_mismatch'], code='pw_mismatch' diff --git a/src/pretix/base/invoicing/pdf.py b/src/pretix/base/invoicing/pdf.py index a97d713744..2eed2f8e33 100644 --- a/src/pretix/base/invoicing/pdf.py +++ b/src/pretix/base/invoicing/pdf.py @@ -32,7 +32,6 @@ from itertools import groupby from typing import Tuple import bleach -import vat_moss.exchange_rates from bidi import get_display from django.contrib.staticfiles import finders from django.db.models import Sum @@ -47,7 +46,6 @@ from reportlab.lib.styles import ParagraphStyle, StyleSheet1 from reportlab.lib.units import mm from reportlab.pdfbase import pdfmetrics from reportlab.pdfbase.pdfmetrics import stringWidth -from reportlab.pdfbase.ttfonts import TTFont from reportlab.pdfgen.canvas import Canvas from reportlab.platypus import ( BaseDocTemplate, Flowable, Frame, KeepTogether, NextPageTemplate, @@ -60,7 +58,8 @@ from pretix.base.services.currencies import SOURCE_NAMES from pretix.base.signals import register_invoice_renderers from pretix.base.templatetags.money import money_filter from pretix.helpers.reportlab import ( - FontFallbackParagraph, ThumbnailingImageReader, reshaper, + FontFallbackParagraph, ThumbnailingImageReader, register_ttf_font_if_new, + reshaper, ) from pretix.presale.style import get_fonts @@ -235,25 +234,25 @@ class BaseReportlabInvoiceRenderer(BaseInvoiceRenderer): """ Register fonts with reportlab. By default, this registers the OpenSans font family """ - pdfmetrics.registerFont(TTFont('OpenSans', finders.find('fonts/OpenSans-Regular.ttf'))) - pdfmetrics.registerFont(TTFont('OpenSansIt', finders.find('fonts/OpenSans-Italic.ttf'))) - pdfmetrics.registerFont(TTFont('OpenSansBd', finders.find('fonts/OpenSans-Bold.ttf'))) - pdfmetrics.registerFont(TTFont('OpenSansBI', finders.find('fonts/OpenSans-BoldItalic.ttf'))) + register_ttf_font_if_new('OpenSans', finders.find('fonts/OpenSans-Regular.ttf')) + register_ttf_font_if_new('OpenSansIt', finders.find('fonts/OpenSans-Italic.ttf')) + register_ttf_font_if_new('OpenSansBd', finders.find('fonts/OpenSans-Bold.ttf')) + register_ttf_font_if_new('OpenSansBI', finders.find('fonts/OpenSans-BoldItalic.ttf')) pdfmetrics.registerFontFamily('OpenSans', normal='OpenSans', bold='OpenSansBd', italic='OpenSansIt', boldItalic='OpenSansBI') for family, styles in get_fonts(event=self.event, pdf_support_required=True).items(): - pdfmetrics.registerFont(TTFont(family, finders.find(styles['regular']['truetype']))) + register_ttf_font_if_new(family, finders.find(styles['regular']['truetype'])) if family == self.event.settings.invoice_renderer_font: self.font_regular = family if 'bold' in styles: self.font_bold = family + ' B' if 'italic' in styles: - pdfmetrics.registerFont(TTFont(family + ' I', finders.find(styles['italic']['truetype']))) + register_ttf_font_if_new(family + ' I', finders.find(styles['italic']['truetype'])) if 'bold' in styles: - pdfmetrics.registerFont(TTFont(family + ' B', finders.find(styles['bold']['truetype']))) + register_ttf_font_if_new(family + ' B', finders.find(styles['bold']['truetype'])) if 'bolditalic' in styles: - pdfmetrics.registerFont(TTFont(family + ' B I', finders.find(styles['bolditalic']['truetype']))) + register_ttf_font_if_new(family + ' B I', finders.find(styles['bolditalic']['truetype'])) def _normalize(self, text): # reportlab does not support unicode combination characters @@ -1059,7 +1058,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer): def fmt(val): try: - return vat_moss.exchange_rates.format(val, self.invoice.foreign_currency_display) + return money_filter(val, self.invoice.foreign_currency_display) except ValueError: return localize(val) + ' ' + self.invoice.foreign_currency_display diff --git a/src/pretix/base/invoicing/peppol.py b/src/pretix/base/invoicing/peppol.py index c8a28752a9..a4d43c50d3 100644 --- a/src/pretix/base/invoicing/peppol.py +++ b/src/pretix/base/invoicing/peppol.py @@ -19,8 +19,11 @@ # You should have received a copy of the GNU Affero General Public License along with this program. If not, see #
'voucher_list', ['voucher_list'], lambda voucher_list: ' \n'.join(voucher_list), - ' 68CYU2H6ZTP3WLK5\n 7MB94KKPVEPSMVF2' + '68CYU2H6ZTP3WLK5 \n7MB94KKPVEPSMVF2', + inline=False, ), - SimpleFunctionalTextPlaceholder( + MarkdownTextPlaceholder( # join vouchers with two spaces at end of line so markdown-parser inserts a
'voucher_url_list', ['event', 'voucher_list'], lambda event, voucher_list: ' \n'.join([ @@ -638,6 +671,7 @@ def base_placeholders(sender, **kwargs): ) + '?voucher=' + c for c in ['68CYU2H6ZTP3WLK5', '7MB94KKPVEPSMVF2'] ]), + inline=False, ), SimpleFunctionalTextPlaceholder( 'url', ['event', 'voucher_list'], lambda event, voucher_list: build_absolute_uri(event, 'presale:event.index', kwargs={ @@ -656,13 +690,13 @@ def base_placeholders(sender, **kwargs): 'comment', ['comment'], lambda comment: comment, _('An individual text with a reason can be inserted here.'), ), - SimpleFunctionalTextPlaceholder( + MarkdownTextPlaceholder( 'payment_info', ['order', 'payments'], _placeholder_payments, - _('The amount has been charged to your card.'), + _('The amount has been charged to your card.'), inline=False, ), - SimpleFunctionalTextPlaceholder( + MarkdownTextPlaceholder( 'payment_info', ['payment_info'], lambda payment_info: payment_info, - _('Please transfer money to this bank account: 9999-9999-9999-9999'), + _('Please transfer money to this bank account: 9999-9999-9999-9999'), inline=False, ), SimpleFunctionalTextPlaceholder( 'attendee_name', ['position'], lambda position: position.attendee_name, @@ -719,13 +753,13 @@ def base_placeholders(sender, **kwargs): )) for k, v in sender.meta_data.items(): - ph.append(SimpleFunctionalTextPlaceholder( + ph.append(MarkdownTextPlaceholder( 'meta_%s' % k, ['event'], lambda event, k=k: event.meta_data[k], - v + v, inline=True, )) - ph.append(SimpleFunctionalTextPlaceholder( + ph.append(MarkdownTextPlaceholder( 'meta_%s' % k, ['event_or_subevent'], lambda event_or_subevent, k=k: event_or_subevent.meta_data[k], - v + v, inline=True, )) return ph @@ -753,7 +787,7 @@ def get_available_placeholders(event, base_parameters, rich=False): if not isinstance(val, (list, tuple)): val = [val] for v in val: - if isinstance(v, BaseRichTextPlaceholder) and not rich: + if isinstance(v, BaseRichTextPlaceholder) and not rich and not v.allowed_in_plain_content: continue if all(rp in base_parameters for rp in v.required_context): params[v.identifier] = v @@ -767,7 +801,11 @@ def get_sample_context(event, context_parameters, rich=True): sample = v.render_sample(event) if isinstance(sample, PlainHtmlAlternativeString): context_dict[k] = PlainHtmlAlternativeString( - sample.plain, + '<{el} class="placeholder" title="{title}">{plain}'.format( + el='span', + title=lbl, + plain=escape(sample.plain), + ), '<{el} class="placeholder placeholder-html" title="{title}">{html}'.format( el='div' if sample.is_block else 'span', title=lbl, @@ -775,13 +813,13 @@ def get_sample_context(event, context_parameters, rich=True): ) ) elif str(sample).strip().startswith('* ') or str(sample).startswith(' '): - context_dict[k] = '
{}
'.format(
+ context_dict[k] = mark_safe('{}
'.format(
lbl,
markdown_compile_email(str(sample))
- )
+ ))
else:
- context_dict[k] = '{}'.format(
+ context_dict[k] = mark_safe('{}'.format(
lbl,
escape(sample)
- )
+ ))
return context_dict
diff --git a/src/pretix/base/services/pricing.py b/src/pretix/base/services/pricing.py
index 6f03a91394..3921a1b132 100644
--- a/src/pretix/base/services/pricing.py
+++ b/src/pretix/base/services/pricing.py
@@ -231,7 +231,7 @@ def apply_rounding(rounding_mode: Literal["line", "sum_by_net", "sum_by_net_keep
"""
def _key(line):
- return (line.tax_rate, line.tax_code)
+ return (line.tax_rate, line.tax_code or "")
places = settings.CURRENCY_PLACES.get(currency, 2)
minimum_unit = Decimal('1') / 10 ** places
diff --git a/src/pretix/base/services/tax.py b/src/pretix/base/services/tax.py
index 781374c568..2a05d36ecc 100644
--- a/src/pretix/base/services/tax.py
+++ b/src/pretix/base/services/tax.py
@@ -27,7 +27,6 @@ from decimal import Decimal
from xml.etree import ElementTree
import requests
-import vat_moss.id
from django.conf import settings
from django.utils.translation import gettext_lazy as _
from zeep import Client, Transport
@@ -42,14 +41,142 @@ logger = logging.getLogger(__name__)
error_messages = {
'unavailable': _(
'Your VAT ID could not be checked, as the VAT checking service of '
- 'your country is currently not available. We will therefore '
- 'need to charge VAT on your invoice. You can get the tax amount '
- 'back via the VAT reimbursement process.'
+ 'your country is currently not available. We will therefore need to '
+ 'charge you the same tax rate as if you did not enter a VAT ID.'
),
'invalid': _('This VAT ID is not valid. Please re-check your input.'),
'country_mismatch': _('Your VAT ID does not match the selected country.'),
}
+VAT_ID_PATTERNS = {
+ # Patterns generated by consulting the following URLs:
+ #
+ # - http://en.wikipedia.org/wiki/VAT_identification_number
+ # - http://ec.europa.eu/taxation_customs/vies/faq.html
+ # - https://euipo.europa.eu/tunnel-web/secure/webdav/guest/document_library/Documents/COSME/VAT%20numbers%20EU.pdf
+ # - http://www.skatteetaten.no/en/International-pages/Felles-innhold-benyttes-i-flere-malgrupper/Brochure/Guide-to-value-added-tax-in-Norway/?chapter=7159
+ 'AT': { # Austria
+ 'regex': '^U\\d{8}$',
+ 'country_code': 'AT'
+ },
+ 'BE': { # Belgium
+ 'regex': '^(1|0?)\\d{9}$',
+ 'country_code': 'BE'
+ },
+ 'BG': { # Bulgaria
+ 'regex': '^\\d{9,10}$',
+ 'country_code': 'BG'
+ },
+ 'CH': { # Switzerland
+ 'regex': '^\\dE{9}$',
+ 'country_code': 'CH'
+ },
+ 'CY': { # Cyprus
+ 'regex': '^\\d{8}[A-Z]$',
+ 'country_code': 'CY'
+ },
+ 'CZ': { # Czech Republic
+ 'regex': '^\\d{8,10}$',
+ 'country_code': 'CZ'
+ },
+ 'DE': { # Germany
+ 'regex': '^\\d{9}$',
+ 'country_code': 'DE'
+ },
+ 'DK': { # Denmark
+ 'regex': '^\\d{8}$',
+ 'country_code': 'DK'
+ },
+ 'EE': { # Estonia
+ 'regex': '^\\d{9}$',
+ 'country_code': 'EE'
+ },
+ 'EL': { # Greece
+ 'regex': '^\\d{9}$',
+ 'country_code': 'GR'
+ },
+ 'ES': { # Spain
+ 'regex': '^[A-Z0-9]\\d{7}[A-Z0-9]$',
+ 'country_code': 'ES'
+ },
+ 'FI': { # Finland
+ 'regex': '^\\d{8}$',
+ 'country_code': 'FI'
+ },
+ 'FR': { # France
+ 'regex': '^[A-Z0-9]{2}\\d{9}$',
+ 'country_code': 'FR'
+ },
+ 'GB': { # United Kingdom
+ 'regex': '^(GD\\d{3}|HA\\d{3}|\\d{9}|\\d{12})$',
+ 'country_code': 'GB'
+ },
+ 'HR': { # Croatia
+ 'regex': '^\\d{11}$',
+ 'country_code': 'HR'
+ },
+ 'HU': { # Hungary
+ 'regex': '^\\d{8}$',
+ 'country_code': 'HU'
+ },
+ 'IE': { # Ireland
+ 'regex': '^(\\d{7}[A-Z]{1,2}|\\d[A-Z+*]\\d{5}[A-Z])$',
+ 'country_code': 'IE'
+ },
+ 'IT': { # Italy
+ 'regex': '^\\d{11}$',
+ 'country_code': 'IT'
+ },
+ 'LT': { # Lithuania
+ 'regex': '^(\\d{9}|\\d{12})$',
+ 'country_code': 'LT'
+ },
+ 'LU': { # Luxembourg
+ 'regex': '^\\d{8}$',
+ 'country_code': 'LU'
+ },
+ 'LV': { # Latvia
+ 'regex': '^\\d{11}$',
+ 'country_code': 'LV'
+ },
+ 'MT': { # Malta
+ 'regex': '^\\d{8}$',
+ 'country_code': 'MT'
+ },
+ 'NL': { # Netherlands
+ 'regex': '^\\d{9}B\\d{2}$',
+ 'country_code': 'NL'
+ },
+ 'NO': { # Norway
+ 'regex': '^\\d{9}MVA$',
+ 'country_code': 'NO'
+ },
+ 'PL': { # Poland
+ 'regex': '^\\d{10}$',
+ 'country_code': 'PL'
+ },
+ 'PT': { # Portugal
+ 'regex': '^\\d{9}$',
+ 'country_code': 'PT'
+ },
+ 'RO': { # Romania
+ 'regex': '^\\d{2,10}$',
+ 'country_code': 'RO'
+ },
+ 'SE': { # Sweden
+ 'regex': '^\\d{12}$',
+ 'country_code': 'SE'
+ },
+ 'SI': { # Slovenia
+ 'regex': '^\\d{8}$',
+ 'country_code': 'SI'
+ },
+ 'SK': { # Slovakia
+ 'regex': '^\\d{10}$',
+ 'country_code': 'SK'
+ },
+}
+
class VATIDError(Exception):
def __init__(self, message):
@@ -64,13 +191,57 @@ class VATIDTemporaryError(VATIDError):
pass
+def normalize_vat_id(vat_id, country_code):
+ """
+ Accepts a VAT ID and normaizes it, getting rid of spaces, periods, dashes
+ etc and converting it to upper case.
+
+ Original function from https://github.com/wbond/vat_moss-python
+ Copyright (c) 2015 Will Bond