Fixed #259 and #289

craftcms · Mar 8, 2024 · 534c25d · 534c25d
1 parent bb99696
commit 534c25d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes for Stripe for Craft Commerce
 
+## Unreleased
+
+- Fixed a bug where redirects could break when adding a new payment source. ([#259](https://github.com/craftcms/commerce-stripe/issues/259), [#289](https://github.com/craftcms/commerce-stripe/issues/289))
+
 ## 4.1.1 - 2024-01-12
 
 - Fixed a bug where legacy default payment methods were not being set as default. ([#280](https://github.com/craftcms/commerce-stripe/pull/280))

diff --git a/src/web/assets/elementsform/js/paymentForm.js b/src/web/assets/elementsform/js/paymentForm.js
@@ -132,11 +132,15 @@ class PaymentIntentsElements {
             )
             .join('&');
 
+          const baseUrl = this.container.dataset.confirmSetupIntentUrl;
+          const hasQueryString = baseUrl.includes('?');
+          const returnUrl = `${baseUrl}${hasQueryString ? '&' : '?'}${params}`;
+
           this.stripeInstance
             .confirmSetup({
               elements,
               confirmParams: {
-                return_url: `${this.container.dataset.confirmSetupIntentUrl}&${params}`,
+                return_url: `${returnUrl}`,
               },
             })
             .then((result) => {