Fix: ensure Stripe subscriptions respect multi-Stripe accounts (#8200)

Author: jonwaldstein

src/PaymentGateways/Gateways/Stripe/StripePaymentElementGateway/Webhooks/Listeners/InvoicePaymentSucceeded.php

@@ -43,6 +43,7 @@ public function __invoke(Event $event)
     }
 
     /**
+     * @unreleased Added $formId parameter and stripe_account option for Stripe Connect support
      * @since 4.8.0 Add support for Stripe API version 2025-03-31.basil and later versions
      * @since 4.3.0 Update Stripe Invoice metadata
      * @since 3.0.4 Return a bool value.
@@ -71,7 +72,7 @@ public function processEvent(Event $event): bool
          * the payment_intent which is required for processing this webhook.
          */
         if (is_null($invoice->payment_intent)) {
-            $invoice = $this->getCompleteInvoiceFromStripe($event->data->object->id);
+            $invoice = $this->getCompleteInvoiceFromStripe($event->data->object->id, $subscription->donationFormId);
         }
 
         $gatewayTransactionId = $invoice->payment_intent;

src/PaymentGateways/Gateways/Stripe/StripePaymentElementGateway/Webhooks/Listeners/StripeWebhookListenerRepository.php

@@ -84,16 +84,28 @@ protected function getGatewaySubscriptionId(Invoice $invoice): ?string
     /**
      * Retrieve a complete invoice from the Stripe API.
      *
-     * @since 4.8.0
+     * For Stripe Connect accounts, we need to pass the connected account ID to retrieve the invoice from the correct account, not the platform account.
+     *
+     * @unreleased Added $formId parameter and stripe_account option for Stripe Connect support
      *
      * @param string $invoiceId The Stripe invoice ID
+     * @param int|null $formId Form ID to determine the connected account
      * @return Invoice The complete Stripe invoice object with all properties
      * @throws Exception If the API call fails
      */
-    protected function getCompleteInvoiceFromStripe(string $invoiceId): Invoice
+    protected function getCompleteInvoiceFromStripe(string $invoiceId, ?int $formId = null): Invoice
     {
         try {
-            return \Stripe\Invoice::retrieve($invoiceId);
+            $options = [];
+
+            if ($formId) {
+                $connectedAccountId = give_stripe_get_connected_account_id($formId);
+                if (!empty($connectedAccountId)) {
+                    $options = ['stripe_account' => $connectedAccountId];
+                }
+            }
+
+            return \Stripe\Invoice::retrieve($invoiceId, $options);
         } catch (ApiErrorException $exception) {
             throw new Exception(
                 sprintf(

src/PaymentGateways/Gateways/Stripe/Webhooks/StripeEventListener.php

@@ -17,6 +17,7 @@ abstract class StripeEventListener implements EventListener
     use CanSetupStripeApp;
 
     /**
+     * @unreleased Pass connected account ID to Event::retrieve for Stripe Connect support
      * @since 2.21.0
      * @throws Exception
      */
@@ -26,27 +27,58 @@ public function __invoke(Event $event)
             $this->setupStripeApp($formId);
             $this->logEventReceiveTime();
 
-            $this->processEvent($this->getEventFromStripe($event->id));
+            $this->processEvent($this->getEventFromStripe($event->id, $formId));
         }
     }
 
     /**
+     * Retrieves the full event from Stripe.
+     *
+     * For Stripe Connect accounts, we need to pass the connected account ID to retrieve the event from the correct account, not the platform account.
+     *
+     * @unreleased Added $formId parameter and stripe_account option for Stripe Connect support
      * @since 2.21.0
      *
      * @param string $eventId
+     * @param int|null $formId Form ID to determine the connected account
      *
      * @return Event
      * @throws Exception
      */
-    protected function getEventFromStripe($eventId)
+    protected function getEventFromStripe($eventId, $formId = null)
     {
         try {
-            return Event::retrieve($eventId);
+            $options = $this->getStripeConnectOptions($formId);
+
+            return Event::retrieve($eventId, $options);
         } catch (\Exception $e) {
             throw new Exception($e->getMessage());
         }
     }
 
+    /**
+     * Get Stripe Connect options for API calls.
+     *
+     * Returns an array with the stripe_account option if a connected account is configured for the given form. This is required for Stripe Connect to make API calls to the correct connected account instead of the platform account.
+     *
+     * @unreleased
+     *
+     * @param int|null $formId Form ID to determine the connected account
+     *
+     * @return array Options array for Stripe API calls
+     */
+    protected function getStripeConnectOptions($formId = null): array
+    {
+        if ($formId) {
+            $connectedAccountId = give_stripe_get_connected_account_id($formId);
+            if (!empty($connectedAccountId)) {
+                return ['stripe_account' => $connectedAccountId];
+            }
+        }
+
+        return [];
+    }
+
     /**
      * @since 2.21.0
      * @return void