FireCheckout compatibility fix to save shipping address on single page (

#152) checkout for PayPal
rvvup · Jul 30, 2024 · aa4a595 · aa4a595
1 parent 8c5ea6d
commit aa4a595
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 10 deletions.
diff --git a/view/frontend/web/js/view/payment/method-renderer/rvvup-method.js b/view/frontend/web/js/view/payment/method-renderer/rvvup-method.js
@@ -23,6 +23,7 @@ define([
         'Magento_Ui/js/model/messageList',
         'Magento_Customer/js/model/customer',
         'Rvvup_Payments/js/view/payment/methods/rvvup-paypal',
+        'Magento_Checkout/js/action/set-shipping-information',
         'domReady!'
     ], function (
         Component,
@@ -49,6 +50,7 @@ define([
         messageList,
         customer,
         rvvupPaypal,
+        setShippingInformation,
     ) {
         'use strict';
 
@@ -368,17 +370,22 @@ define([
                             if(!rvvupPaypal.validate(self, additionalValidators)) {
                                 return reject(createError);
                             }
-                            setPaymentInformation(self.messageContainer, self.getData(), false).done(function () {
+                            let saveShippingPromise = rvvupPaypal.shouldSaveShippingInformation() ? setShippingInformation() : $.Deferred().resolve();
+
+                            saveShippingPromise
+                                .then(function () {
+                                    return setPaymentInformation(self.messageContainer, self.getData(), false);
+                                })
+                                .then(function () {
                                 return $.when(getOrderPaymentActions(self.messageContainer))
-                                    .done(function () {
-                                        return resolve();
-                                    }).fail(function () {
-                                        return reject(createError);
-                                    });
-                            }).fail(function () {
-                                loader.stopLoader();
-                                return reject(createError);
-                            })
+                                })
+                                .then(function () {
+                                    resolve();
+                                })
+                                .fail(function () {
+                                    loader.stopLoader();
+                                    return reject(createError);
+                                });
                         }).then(() => {
                             loader.stopLoader();
                             return orderPaymentAction.getPaymentToken();

diff --git a/view/frontend/web/js/view/payment/methods/rvvup-paypal-firecheckout-compatibility-hook.js b/view/frontend/web/js/view/payment/methods/rvvup-paypal-firecheckout-compatibility-hook.js
@@ -23,6 +23,15 @@ define(['mage/utils/wrapper'], function (wrapper) {
                     return true;
                 }
             );
+            target.shouldSaveShippingInformation = wrapper.wrapSuper(
+                target.shouldSaveShippingInformation,
+                function () {
+                    if (fcModule === null) {
+                        return false;
+                    }
+                    return !fcModule.layout.isMultistep();
+                }
+            )
         } catch (e) {
         }
         return target;

diff --git a/view/frontend/web/js/view/payment/methods/rvvup-paypal.js b/view/frontend/web/js/view/payment/methods/rvvup-paypal.js
@@ -12,6 +12,10 @@ define([], function () {
                 }
 
                 return main.isPlaceOrderActionAllowed() !== false;
+            },
+
+            shouldSaveShippingInformation: function () {
+                return false;
             }
         }
     }();
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,10 @@ define([], function () { @@
                     }
                     return main.isPlaceOrderActionAllowed() !== false;
+                },
+                shouldSaveShippingInformation: function () {
+                    return false;
                 }
             }
         }();
@@ Expand Down @@