wip

laravel · Aug 18, 2022 · 5b25e0c · 5b25e0c
1 parent 404c1ac
commit 5b25e0c
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/Concerns/HandlesPaymentFailures.php b/src/Concerns/HandlesPaymentFailures.php
@@ -30,28 +30,25 @@ public function handlePaymentFailure(Subscription $subscription, $paymentMethod
                 if ($e->payment->requiresConfirmation()) {
                     try {
                         if ($paymentMethod) {
-                            $e->payment->confirm([
+                            $paymentIntent = $e->payment->confirm([
+                                'expand' => ['invoice.subscription'],
                                 'payment_method' => $paymentMethod instanceof StripePaymentMethod
                                     ? $paymentMethod->id
                                     : $paymentMethod,
                             ]);
                         } else {
-                            $e->payment->confirm();
+                            $paymentIntent = $e->payment->confirm(['expand' => ['invoice.subscription']]);
                         }
                     } catch (StripeCardException) {
-                        //
+                        $paymentIntent = $e->payment->asStripePaymentIntent(['invoice.subscription']);
                     }
 
-                    $stripeSubscription = $subscription->asStripeSubscription(['latest_invoice.payment_intent']);
-
                     $subscription->fill([
-                        'stripe_status' => $stripeSubscription->status,
+                        'stripe_status' => $paymentIntent->invoice->subscription->status,
                     ])->save();
 
                     if ($subscription->hasIncompletePayment()) {
-                        (new Payment(
-                            $stripeSubscription->latest_invoice->payment_intent
-                        ))->validate();
+                        (new Payment($paymentIntent))->validate();
                     }
                 } else {
                     throw $e;