Merge pull request #62 from shopware5/pt-13158/checkout-in-ios-webview

PT-13158 - Fix checkout in ios web view
shopware5 · Aug 28, 2024 · c3d5535 · c3d5535
2 parents a050436 + 342ead6
commit c3d5535
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 27 deletions.
diff --git a/Resources/views/frontend/_public/src/js/jquery.create_order_function.js b/Resources/views/frontend/_public/src/js/jquery.create_order_function.js
@@ -41,7 +41,7 @@
             delete this.latestResponse;
 
             if (jsonResponse.redirectTo) {
-                window.location.replace(jsonResponse.redirectTo);
+                $.redirectToUrl(jsonResponse.redirectTo);
                 return;
             }
         }
@@ -121,7 +121,7 @@
             return;
         }
 
-        window.location.replace(this.sourcePlugin.opts.paypalErrorPage);
+        $.redirectToUrl(this.sourcePlugin.opts.paypalErrorPage);
     };
 
     $.createSwagPaymentPaypalCreateOrderFunction = function(createOrderUrl, sourcePlugin) {

diff --git a/Resources/views/frontend/_public/src/js/jquery.redirect.js b/Resources/views/frontend/_public/src/js/jquery.redirect.js
@@ -0,0 +1,10 @@
+(function ($) {
+    /**
+     * @param { string } url
+     */
+    $.redirectToUrl = function (url) {
+        setTimeout(function () {
+            window.location.replace(url);
+        }, 250);
+    };
+})(jQuery);
diff --git a/Resources/views/frontend/_public/src/js/jquery.swag-paypal-unified-sepa.js b/Resources/views/frontend/_public/src/js/jquery.swag-paypal-unified-sepa.js
@@ -183,18 +183,19 @@
 
         onApprove: function(data, actions) {
             var params = {
-                token: data.orderID,
-                payerId: data.payerID,
-                basketId: this.opts.basketId
-            };
+                    token: data.orderID,
+                    payerId: data.payerID,
+                    basketId: this.opts.basketId
+                },
+                url = $.swagPayPalRenderUrl(this.opts.returnUrl, params);
 
             $.loadingIndicator.open({
                 openOverlay: true,
                 closeOnClick: false,
                 theme: 'light'
             });
 
-            actions.redirect($.swagPayPalRenderUrl(this.opts.returnUrl, params));
+            $.redirectToUrl(url);
         },
 
         /**
@@ -205,7 +206,8 @@
                 extraParams = {};
             }
 
-            window.location.replace($.swagPayPalRenderUrl(this.opts.paypalErrorPage, extraParams));
+            var url = $.swagPayPalRenderUrl(this.opts.paypalErrorPageUrl, extraParams);
+            $.redirectToUrl(url);
         }
     });
 

diff --git a/...frontend/_public/src/js/jquery.swag-paypal-unified.advanced-credit-debit-card-fallback.js b/...frontend/_public/src/js/jquery.swag-paypal-unified.advanced-credit-debit-card-fallback.js
@@ -104,7 +104,8 @@
                 theme: 'light'
             });
 
-            actions.redirect(this.renderConfirmUrl(data));
+            var url = this.renderConfirmUrl(data);
+            $.redirectToUrl(url);
         },
 
         /**
@@ -123,7 +124,7 @@
         },
 
         onPayPalAPIError: function() {
-            window.location.replace(this.opts.paypalErrorPage);
+            $.redirectToUrl(this.opts.paypalErrorPage);
         }
     });
 })(jQuery, window);
diff --git a/...es/views/frontend/_public/src/js/jquery.swag-paypal-unified.advanced-credit-debit-card.js b/...es/views/frontend/_public/src/js/jquery.swag-paypal-unified.advanced-credit-debit-card.js
@@ -387,7 +387,7 @@
                 jsonResponse = JSON.parse(response.responseText);
 
                 if (jsonResponse.redirectTo) {
-                    window.location.replace(jsonResponse.redirectTo);
+                    $.redirectToUrl(jsonResponse.redirectTo);
 
                     return;
                 }

diff --git a/Resources/views/frontend/_public/src/js/jquery.swag-paypal-unified.express-address-patch.js b/Resources/views/frontend/_public/src/js/jquery.swag-paypal-unified.express-address-patch.js
@@ -65,7 +65,7 @@
             var url = new URL(window.location);
             url.searchParams.set(this.opts.requireAddressPatchKey, requireAddressPatch.toString());
 
-            window.location.href = url.toString();
+            $.redirectToUrl(url.toString());
             window.history.pushState({ path: url.toString() }, '', url.toString());
         },
 

diff --git a/...urces/views/frontend/_public/src/js/jquery.swag-paypal-unified.express-checkout-button.js b/...urces/views/frontend/_public/src/js/jquery.swag-paypal-unified.express-checkout-button.js
@@ -371,11 +371,12 @@
                 data: data
             }).then(function (response) {
                 var params = {
-                    expressCheckout: response.expressCheckout,
-                    token: response.token
-                };
+                        expressCheckout: response.expressCheckout,
+                        token: response.token
+                    },
+                    url = $.swagPayPalRenderUrl(me.opts.confirmUrl, params);
 
-                actions.redirect($.swagPayPalRenderUrl(me.opts.confirmUrl, params));
+                $.redirectToUrl(url);
             }, function () {
                 me.onPayPalAPIError();
             }).promise();

diff --git a/Resources/views/frontend/_public/src/js/jquery.swag-paypal-unified.in-context-checkout.js b/Resources/views/frontend/_public/src/js/jquery.swag-paypal-unified.in-context-checkout.js
@@ -208,7 +208,8 @@
                 theme: 'light'
             });
 
-            return actions.redirect(this.renderConfirmUrl(data));
+            var url = this.renderConfirmUrl(data);
+            $.redirectToUrl(url);
         },
 
         /**

diff --git a/Resources/views/frontend/_public/src/js/jquery.swag-paypal-unified.pay-later.js b/Resources/views/frontend/_public/src/js/jquery.swag-paypal-unified.pay-later.js
@@ -167,7 +167,8 @@
                 theme: 'light'
             });
 
-            return actions.redirect(this.renderConfirmUrl(data));
+            var url = this.renderConfirmUrl(data);
+            $.redirectToUrl(url);
         },
 
         /**
@@ -186,7 +187,7 @@
         },
 
         onPayPalAPIError: function() {
-            window.location.replace(this.opts.paypalErrorPage);
+            $.redirectToUrl(this.opts.paypalErrorPage);
         }
     });
 

diff --git a/Resources/views/frontend/_public/src/js/jquery.swag-paypal-unified.polling.js b/Resources/views/frontend/_public/src/js/jquery.swag-paypal-unified.polling.js
@@ -43,11 +43,11 @@
         },
 
         redirectToSuccess() {
-            window.location = this.opts.successUrl;
+            $.redirectToUrl(this.opts.successUrl);
         },
 
         redirectToError() {
-            window.location = this.opts.errorUrl;
+            $.redirectToUrl(this.opts.errorUrl);
         },
 
         retryPolling() {

diff --git a/Resources/views/frontend/_public/src/js/jquery.swag-paypal-unified.smart-payment-buttons.js b/Resources/views/frontend/_public/src/js/jquery.swag-paypal-unified.smart-payment-buttons.js
@@ -181,18 +181,19 @@
 
         onApprove: function(data, actions) {
             var params = {
-                token: data.orderID,
-                payerId: data.payerID,
-                basketId: this.opts.basketId
-            };
+                    token: data.orderID,
+                    payerId: data.payerID,
+                    basketId: this.opts.basketId
+                },
+                url = $.swagPayPalRenderUrl(this.opts.returnUrl, params);
 
             $.loadingIndicator.open({
                 openOverlay: true,
                 closeOnClick: false,
                 theme: 'light'
             });
 
-            actions.redirect($.swagPayPalRenderUrl(this.opts.returnUrl, params));
+            $.redirectToUrl(url);
         },
 
         destroy: function() {

diff --git a/Subscriber/Frontend.php b/Subscriber/Frontend.php
@@ -98,6 +98,7 @@ public function onCollectJavascript()
             $this->pluginDir . '/Resources/views/frontend/_public/src/js/jquery.swag-paypal-unified.pui-phone-number-field.js',
             $this->pluginDir . '/Resources/views/frontend/_public/src/js/jquery.swag-paypal-unified.pui-birthday-field.js',
             $this->pluginDir . '/Resources/views/frontend/_public/src/js/jquery.swag-paypal-unified.polling.js',
+            $this->pluginDir . '/Resources/views/frontend/_public/src/js/jquery.redirect.js',
         ];
 
         return new ArrayCollection($jsPath);

diff --git a/plugin.xml b/plugin.xml
@@ -5,13 +5,22 @@
     <label lang="de">PayPal</label>
     <label lang="en">PayPal</label>
 
-    <version>6.1.9</version>
+    <version>6.1.10</version>
     <copyright>(c) by shopware AG</copyright>
     <license>MIT</license>
     <link>http://store.shopware.com</link>
     <author>shopware AG</author>
     <compatibility minVersion="5.2.27" maxVersion="5.99.99"/>
 
+    <changelog version="6.1.10">
+        <changes lang="de">
+            PT-13158 - Fehler während des Bestellabschlusses in iOS Web-Views behoben;
+        </changes>
+        <changes lang="en">
+            PT-13158 - Fix error during order checkout in iOS web views;
+        </changes>
+    </changelog>
+
     <changelog version="6.1.9">
         <changes lang="de">
             PT-13158 - Fehler beim Laden des PayPal-Buttons für den Bestellabschluss in Web-Views behoben;