Merge branch 'develop' into feature/fix-stripe-options-merge

craftcms · Dec 19, 2023 · 9dda183 · 9dda183
2 parents 6ab28b6 + b634dc4
commit 9dda183
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Release Notes for Stripe for Craft Commerce
 
+## Unreleased
+- Payment method data is now stored in expanded form within transaction response data. ([#276](https://github.com/craftcms/commerce-stripe/pull/276))
+
 ## 4.0.1.1 - 2023-10-25
 
 - Restored support for backend payments using the old payment form.
@@ -27,7 +30,7 @@
 - Removed `craft\commerce\stripe\base\Gateway::normalizePaymentToken()`.
 - Removed `craft\commerce\stripe\events\BuildGatewayRequestEvent::$metadata`. `BuildGatewayRequestEvent::$request` should be used instead.
 - Deprecated the `commerce-stripe/default/fetch-plans` action.
-- Deprecated creating new payment sources via the `commerce/subscriptions/subscribe` action. 
+- Deprecated creating new payment sources via the `commerce/subscriptions/subscribe` action.
 - Fixed a bug where `craft\commerce\stripe\base\SubscriptionGateway::getSubscriptionPlans()` was returning incorrectly-formatted data.
 
 ## 3.1.1 - 2023-05-10

diff --git a/src/gateways/PaymentIntents.php b/src/gateways/PaymentIntents.php
@@ -252,13 +252,17 @@ public function completePurchase(Transaction $transaction): RequestResponseInter
     {
         $data = Json::decodeIfJson($transaction->response);
 
+        $paymentIntentOptions = [
+            'expand' => ['payment_method'],
+        ];
+
         if ($data['object'] == 'payment_intent') {
-            $paymentIntent = $this->getStripeClient()->paymentIntents->retrieve($data['id']);
+            $paymentIntent = $this->getStripeClient()->paymentIntents->retrieve($data['id'], $paymentIntentOptions);
         } else {
             // Likely a checkout object
             $checkoutSession = $this->getStripeClient()->checkout->sessions->retrieve($data['id']);
             $paymentIntent = $checkoutSession['payment_intent'];
-            $paymentIntent = $this->getStripeClient()->paymentIntents->retrieve($paymentIntent);
+            $paymentIntent = $this->getStripeClient()->paymentIntents->retrieve($paymentIntent, $paymentIntentOptions);
         }
 
         return $this->createPaymentResponseFromApiResource($paymentIntent);