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

2026-09-13 16:14:40 +00:00 · 2026-02-19 17:45:52 +01:00
1 changed files with 21 additions and 15 deletions
@@ -786,6 +786,10 @@ class PaypalMethod(BasePaymentProvider):
                else:
                    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 capture in purchaseunit.payments.captures:
                    try:
@@ -794,6 +798,10 @@ class PaypalMethod(BasePaymentProvider):
                        pass

                    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 '
                                            'soon as the payment completed.'))
                payment.info = json.dumps(pp_captured_order.dict())
@@ -801,8 +809,6 @@ class PaypalMethod(BasePaymentProvider):
                payment.save()
                return

-            payment.refresh_from_db()
-
            if pp_captured_order.status != 'COMPLETED':
                payment.fail(info=pp_captured_order.dict())
                logger.error('Invalid state: %s' % repr(pp_captured_order.dict()))