Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CHK-7187] Fix Apple Pay Race Condition #171

Open
wants to merge 1 commit into
base: CHK-4297
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
15 changes: 11 additions & 4 deletions view/frontend/web/js/model/spi.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ define([
localStorage.setItem(AGREEMENT_DATE_KEY, currentTime.toString());
return true;
};
let onClickPromise = null;

/**
* Fastlane init model.
Expand Down Expand Up @@ -114,6 +115,9 @@ define([
}

try {
if (window.checkoutConfig.bold.payment_type_clicked === "apple" || window.checkoutConfig.bold.payment_type_clicked === "google") {
await onClickPromise;
}
return await onUpdatePaymentOrderCallback(paymentType, paymentPayload);
} catch (e) {
console.error(e);
Expand All @@ -139,7 +143,7 @@ define([
throw e;
}
},
'onRequireOrderData': async function (requirements) {
'onRequireOrderData': function (requirements) {
try {
return onRequireOrderDataCallback(requirements);
} catch (e) {
Expand All @@ -155,9 +159,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 (window.checkoutConfig.bold.payment_type_clicked === "apple" || window.checkoutConfig.bold.payment_type_clicked === "google") {
onClickPromise = onClickPaymentOrderCallback(pageSource);
} else {
await onClickPaymentOrderCallback(pageSource);
}
} catch (e) {
console.error(e);
fullScreenLoader.stopLoader();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@ define(
'Bold_CheckoutPaymentBooster/js/action/express-pay/update-quote-address-action',
'Bold_CheckoutPaymentBooster/js/action/express-pay/update-quote-shipping-method-action',
'Bold_CheckoutPaymentBooster/js/action/express-pay/save-shipping-information-action',
'Bold_CheckoutPaymentBooster/js/action/express-pay/create-wallet-pay-order-action'
'Bold_CheckoutPaymentBooster/js/action/express-pay/create-wallet-pay-order-action',
'Bold_CheckoutPaymentBooster/js/action/express-pay/get-active-quote-action',
'Magento_Checkout/js/model/quote'
],
function (
updateQuoteAddressAction,
updateQuoteShippingMethodAction,
saveShippingInformationAction,
createWalletPayOrderAction
createWalletPayOrderAction,
getActiveQuote,
quote
) {
'use strict';

Expand All @@ -29,6 +33,12 @@ define(
return;
}

if (!quote.getQuoteId()) {
let response = await getActiveQuote();
response = JSON.parse(response);
window.checkoutConfig.quoteData.entity_id = response.quoteId;
}

if (addressProvided) {
if (isWalletPayment && paymentData['shipping_address']) {
updateQuoteAddressAction('shipping', paymentData['shipping_address']);
Expand Down