Merge remote-tracking branch 'origin/master' into cross-selling

# Conflicts:
#	src/pretix/presale/templates/pretixpresale/event/fragment_product_list.html
This commit is contained in:
Mira Weller
2024-08-29 13:49:28 +02:00
220 changed files with 119314 additions and 98078 deletions

View File

@@ -1300,6 +1300,7 @@ class PaymentStep(CartMixin, TemplateFlowStep):
def post(self, request):
self.request = request
self.request.pci_dss_payment_page = True
if "remove_payment" in request.POST:
self._remove_payment(request.POST["remove_payment"])
@@ -1464,6 +1465,10 @@ class PaymentStep(CartMixin, TemplateFlowStep):
return True
def get(self, request):
self.request.pci_dss_payment_page = True
return super().get(request)
class ConfirmStep(CartMixin, AsyncAction, TemplateFlowStep):
priority = 1001