[CHK-7187] Adding promise logic solving for race condition

bold-commerce · Jan 10, 2025 · 4b4b915 · 4b4b915
1 parent 0996a4b
commit 4b4b915
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/Observer/Product/ExpressPayBeforeAddToCartObserver.php b/Observer/Product/ExpressPayBeforeAddToCartObserver.php
@@ -55,6 +55,5 @@ public function execute(Observer $observer): void
         $this->checkoutSession->clearQuote();
 
         $this->cartRepository->save($quote);
-        $this->checkoutSession->setQuoteId($quote->getId());
     }
 }
diff --git a/view/frontend/web/js/action/express-pay/get-required-order-data-action.js b/view/frontend/web/js/action/express-pay/get-required-order-data-action.js
@@ -20,7 +20,9 @@ define(
          */
         return function (requirements) {
             const payload = {};
-            if (window.checkoutConfig.bold.payment_type_clicked == 'apple') {
+            if (window.checkoutConfig.quoteData.entity_id === ''
+                && (window.checkoutConfig.bold.payment_type_clicked === 'apple'
+                    || window.checkoutConfig.bold.payment_type_clicked === "google")) {
                 payload.totals = {
                     order_total: 0,
                     order_balance: 1000,

diff --git a/view/frontend/web/js/model/spi.js b/view/frontend/web/js/model/spi.js
@@ -47,6 +47,7 @@ define([
         localStorage.setItem(AGREEMENT_DATE_KEY, currentTime.toString());
         return true;
     };
+    let onClickPromise = null;
 
     /**
      * Fastlane init model.
@@ -114,6 +115,10 @@ define([
                         }
 
                         try {
+                            if (onClickPromise !== null) {
+                                await onClickPromise;
+                                onClickPromise = null;
+                            }
                             return await onUpdatePaymentOrderCallback(paymentType, paymentPayload);
                         } catch (e) {
                             console.error(e);
@@ -139,7 +144,7 @@ define([
                             throw e;
                         }
                     },
-                    'onRequireOrderData': async function (requirements) {
+                    'onRequireOrderData': function (requirements) {
                         try {
                             return onRequireOrderDataCallback(requirements);
                         } catch (e) {
@@ -155,9 +160,12 @@ define([
                     'onClickPaymentOrder': async (paymentType, paymentPayload) => {
                         const pageSource = paymentPayload.containerId.replace('express-pay-buttons-', '');
                         window.checkoutConfig.bold.payment_type_clicked = paymentPayload?.payment_data?.payment_type;
-
-                        try {                                
-                            onClickPaymentOrderCallback(pageSource);
+                        try {
+                            if (paymentPayload?.payment_data?.payment_type !== "apple" || paymentPayload?.payment_data?.payment_type !== "google") {
+                                await onClickPaymentOrderCallback(pageSource);
+                            } else {
+                                onClickPromise = onClickPaymentOrderCallback(pageSource);
+                            }
                         } catch (e) {
                             console.error(e);
                             fullScreenLoader.stopLoader();