CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

PPv2: Handle payment execution/capture calls properly even if no captures are present yet. (#5909)

Browse Source
This commit is contained in:
Martin Gross
2026-02-20 11:40:22 +01:00
committed by GitHub
parent 769e1312d4
commit b534c125db
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pretix/plugins/paypal2/payment.py
View File

@@ -786,6 +786,10 @@ class PaypalMethod(BasePaymentProvider):
else: else:
pp_captured_order = response.result pp_captured_order = response.result
payment.refresh_from_db()
any_captures = False
all_captures_completed = True
for purchaseunit in pp_captured_order.purchase_units: for purchaseunit in pp_captured_order.purchase_units:
for capture in purchaseunit.payments.captures: for capture in purchaseunit.payments.captures:
try: try:
@@ -794,6 +798,10 @@ class PaypalMethod(BasePaymentProvider):
pass pass
if capture.status != 'COMPLETED': if capture.status != 'COMPLETED':
all_captures_completed = False
else:
any_captures = True
if not (any_captures and all_captures_completed):
messages.warning(request, _('PayPal has not yet approved the payment. We will inform you as ' messages.warning(request, _('PayPal has not yet approved the payment. We will inform you as '
'soon as the payment completed.')) 'soon as the payment completed.'))
payment.info = json.dumps(pp_captured_order.dict()) payment.info = json.dumps(pp_captured_order.dict())
@@ -801,8 +809,6 @@ class PaypalMethod(BasePaymentProvider):
payment.save() payment.save()
return return
payment.refresh_from_db()
if pp_captured_order.status != 'COMPLETED': if pp_captured_order.status != 'COMPLETED':
payment.fail(info=pp_captured_order.dict()) payment.fail(info=pp_captured_order.dict())
logger.error('Invalid state: %s' % repr(pp_captured_order.dict())) logger.error('Invalid state: %s' % repr(pp_captured_order.dict()))