add organizer h1

pyproject.toml

@@ -91,7 +91,7 @@ dependencies = [
   "qrcode==7.4.*",
   "redis==5.0.*",
   "reportlab==4.2.*",
-  "requests==2.31.*",
+  "requests==2.32.*",
   "sentry-sdk==1.45.*",
   "sepaxml==2.6.*",
   "slimit",

src/pretix/base/services/tax.py

@@ -62,10 +62,7 @@ class VATIDTemporaryError(VATIDError):
 
 def _validate_vat_id_NO(vat_id, country_code):
     # Inspired by vat_moss library
-    try:
-        vat_id = vat_moss.id.normalize(vat_id)
-    except ValueError:
-        raise VATIDFinalError(error_messages['invalid'])
+    vat_id = vat_moss.id.normalize(vat_id)
 
     if not vat_id or len(vat_id) < 3 or not re.match('^\\d{9}MVA$', vat_id[2:]):
         raise VATIDFinalError(error_messages['invalid'])

src/pretix/control/views/event.py

@@ -749,40 +749,21 @@ class MailSettingsPreview(EventPermissionRequiredMixin, View):
         if preview_item not in MailSettingsForm.base_context:
             return HttpResponseBadRequest(_('invalid item'))
 
-        re_escape_single_bracket = r"((\{)[^\}]+\{|\}[^\{]+(\})|(\{)[^\}]*$|^[^\{]*(\}))"
+        regex = r"^" + re.escape(preview_item) + r"_(?P<idx>[\d]+)$"
         msgs = {}
         for k, v in request.POST.items():
             # only accept allowed fields
-            if not k.startswith(preview_item + "_"):
-                continue
-            idx = k[len(preview_item)+1:]
-            if idx in self.supported_locale:
-                cleaned_v = ""
-                test_v = v.replace("{{", "__").replace("}}", "__")
-                while True:
-                    match = re.search(re_escape_single_bracket, test_v)
-                    if not match:
-                        cleaned_v += v
-                        break
-                    if "{" in match.groups():
-                        # replace first occurrence of { with {{, but keep trailing { in testing string
-                        match_end = match.end()-1
-                        cleaned_v += v[:match_end].replace("{", "{{", 1)
-                    else:
-                        # replace last occurrence of } with }}
-                        match_end = match.end()
-                        cleaned_v += "}}".join(v[:match_end].rsplit("}", 1))
-
-                    v = v[match_end:]
-                    test_v = test_v[match_end:]
-
-                with language(self.supported_locale[idx], self.request.event.settings.region):
-                    if k.startswith('mail_subject_'):
-                        msgs[self.supported_locale[idx]] = format_map(bleach.clean(cleaned_v), self.placeholders(preview_item))
-                    else:
-                        msgs[self.supported_locale[idx]] = markdown_compile_email(
-                            format_map(cleaned_v, self.placeholders(preview_item))
-                        )
+            matched = re.search(regex, k)
+            if matched is not None:
+                idx = matched.group('idx')
+                if idx in self.supported_locale:
+                    with language(self.supported_locale[idx], self.request.event.settings.region):
+                        if k.startswith('mail_subject_'):
+                            msgs[self.supported_locale[idx]] = format_map(bleach.clean(v), self.placeholders(preview_item))
+                        else:
+                            msgs[self.supported_locale[idx]] = markdown_compile_email(
+                                format_map(v, self.placeholders(preview_item))
+                            )
 
         return JsonResponse({
             'item': preview_item,

src/pretix/plugins/paypal2/payment.py

@@ -30,7 +30,6 @@ from django import forms
 from django.conf import settings
 from django.contrib import messages
 from django.core.cache import cache
-from django.db import transaction
 from django.http import HttpRequest
 from django.template.loader import get_template
 from django.templatetags.static import static
@@ -55,7 +54,6 @@ from pretix.base.models import Event, Order, OrderPayment, OrderRefund, Quota
 from pretix.base.payment import BasePaymentProvider, PaymentException
 from pretix.base.services.mail import SendMailException
 from pretix.base.settings import SettingsSandbox
-from pretix.helpers import OF_SELF
 from pretix.helpers.urls import build_absolute_uri as build_global_uri
 from pretix.multidomain.urlreverse import build_absolute_uri, eventreverse
 from pretix.plugins.paypal2.client.core.environment import (
@@ -587,9 +585,6 @@ class PaypalMethod(BasePaymentProvider):
                 },
             })
             response = self.client.execute(paymentreq)
-
-            if payment:
-                ReferencedPayPalObject.objects.get_or_create(order=payment.order, payment=payment, reference=response.result.id)
         except IOError as e:
             if "RESOURCE_NOT_FOUND" in str(e):
                 messages.error(request, _('Your payment has failed due to a known issue within PayPal. Please try '
@@ -622,13 +617,7 @@ class PaypalMethod(BasePaymentProvider):
         }
         return template.render(ctx)
 
-    @transaction.atomic
     def execute_payment(self, request: HttpRequest, payment: OrderPayment):
-        payment = OrderPayment.objects.select_for_update(of=OF_SELF).get(pk=payment.pk)
-        if payment.state == OrderPayment.PAYMENT_STATE_CONFIRMED:
-            logger.warning('payment is already confirmed; possible return-view/webhook race-condition')
-            return
-
         try:
             if request.session.get('payment_paypal_oid', '') == '':
                 raise PaymentException(_('We were unable to process your payment. See below for details on how to '

src/pretix/plugins/paypal2/views.py

@@ -477,35 +477,29 @@ def webhook(request, *args, **kwargs):
                     amount=payment.amount - known_sum
                 )
     elif payment.state in (OrderPayment.PAYMENT_STATE_PENDING, OrderPayment.PAYMENT_STATE_CREATED,
-                           OrderPayment.PAYMENT_STATE_CANCELED, OrderPayment.PAYMENT_STATE_FAILED):
-        if sale['status'] == 'COMPLETED':
-            any_captures = False
-            all_captures_completed = True
-            for purchaseunit in sale['purchase_units']:
-                for capture in purchaseunit['payments']['captures']:
-                    try:
-                        ReferencedPayPalObject.objects.get_or_create(order=payment.order, payment=payment,
-                                                                     reference=capture['id'])
-                    except ReferencedPayPalObject.MultipleObjectsReturned:
-                        pass
-
-                    if capture['status'] not in ('COMPLETED', 'REFUNDED', 'PARTIALLY_REFUNDED'):
-                        all_captures_completed = False
-                    else:
-                        any_captures = True
-            if any_captures and all_captures_completed:
+                           OrderPayment.PAYMENT_STATE_CANCELED, OrderPayment.PAYMENT_STATE_FAILED) \
+            and sale['status'] == 'COMPLETED':
+        any_captures = False
+        all_captures_completed = True
+        for purchaseunit in sale['purchase_units']:
+            for capture in purchaseunit['payments']['captures']:
                 try:
-                    payment.info = json.dumps(sale.dict())
-                    payment.save(update_fields=['info'])
-                    payment.confirm()
-                except Quota.QuotaExceededException:
+                    ReferencedPayPalObject.objects.get_or_create(order=payment.order, payment=payment,
+                                                                 reference=capture['id'])
+                except ReferencedPayPalObject.MultipleObjectsReturned:
                     pass
-        elif sale['status'] == 'APPROVED':
-            request.session['payment_paypal_oid'] = payment.info_data['id']
+
+                if capture['status'] not in ('COMPLETED', 'REFUNDED', 'PARTIALLY_REFUNDED'):
+                    all_captures_completed = False
+                else:
+                    any_captures = True
+        if any_captures and all_captures_completed:
             try:
-                payment.payment_provider.execute_payment(request, payment)
-            except PaymentException as e:
-                logger.exception('PayPal2 - Could not capture/execute_payment from Webhook: {}'.format(str(e)))
+                payment.info = json.dumps(sale.dict())
+                payment.save(update_fields=['info'])
+                payment.confirm()
+            except Quota.QuotaExceededException:
+                pass
 
     return HttpResponse(status=200)