From e073ff9698f1d36f715d598d8314fc89cc1a0692 Mon Sep 17 00:00:00 2001 From: PJaneta Date: Wed, 15 Jan 2025 12:42:59 +0100 Subject: [PATCH 1/3] AD-395 Intermittent Google Pay Error Message Followed by Successful Order Placement --- .../webroot/_ui/responsive/common/js/adyen_express_checkout.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen_express_checkout.js b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen_express_checkout.js index df94ecc9..d187e2c2 100644 --- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen_express_checkout.js +++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen_express_checkout.js @@ -198,6 +198,9 @@ var AdyenExpressCheckoutHybris = (function () { // Step 7: Configure the callback to get the shopper's information. + onSubmit: (state, element, actions) => { + actions.resolve(); + }, onAuthorized: (paymentData, actions) => { this.makePayment(this.prepareDataGoogle(paymentData), this.getGoogleUrl(), actions.resolve, actions.reject) }, From de592de851d60b10cd205b8b0eeb92ac1d3020c3 Mon Sep 17 00:00:00 2001 From: PJaneta Date: Thu, 16 Jan 2025 10:10:22 +0100 Subject: [PATCH 2/3] AD-395 Intermittent Google Pay Error Message Followed by Successful Order Placement --- .../_ui/responsive/common/js/adyen_express_checkout.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen_express_checkout.js b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen_express_checkout.js index d187e2c2..b0910cbe 100644 --- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen_express_checkout.js +++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen_express_checkout.js @@ -230,7 +230,9 @@ var AdyenExpressCheckoutHybris = (function () { success: function (response) { try { if (response.resultCode && (response.resultCode === 'Authorised' || response.resultCode === 'RedirectShopper')) { - resolve(); + resolve({ + resultCode: response.resultCode + }); AdyenExpressCheckoutHybris.handleResult(response, false); } else { reject(); From 67d0210fa4ab6fbd35d94661730226421af17365 Mon Sep 17 00:00:00 2001 From: PJaneta Date: Thu, 16 Jan 2025 12:20:04 +0100 Subject: [PATCH 3/3] AD-395 Intermittent Google Pay Error Message Followed by Successful Order Placement --- .../_ui/responsive/common/js/adyen_express_checkout.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen_express_checkout.js b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen_express_checkout.js index b0910cbe..de8c6a1f 100644 --- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen_express_checkout.js +++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen_express_checkout.js @@ -115,6 +115,8 @@ var AdyenExpressCheckoutHybris = (function () { const googlePayNodes = document.getElementsByClassName('adyen-google-pay-button'); + let paymentData; + const googlePayConfig = { // Step 2: Set the callback intents. @@ -199,11 +201,12 @@ var AdyenExpressCheckoutHybris = (function () { // Step 7: Configure the callback to get the shopper's information. onSubmit: (state, element, actions) => { - actions.resolve(); - }, - onAuthorized: (paymentData, actions) => { this.makePayment(this.prepareDataGoogle(paymentData), this.getGoogleUrl(), actions.resolve, actions.reject) }, + onAuthorized: (data, actions) => { + paymentData = data; + actions.resolve(); + }, onError: function (error) { console.log(error) }