Skip to content

Improves Apple pay errors #69

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.

Sign up for GitHub

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

Merged
khushboo-singhvi merged 8 commits into from
Sep 16, 2025
Merged

Improves Apple pay errors #69

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
95f4db1
Apple Pay return ApplePayError object when no delivery method is avai…
Dec 13, 2023
813b58f
Create Apple Pay onPlaceOrderError callback
Dec 13, 2023
a168774
CS Apple Pay error message
Dec 13, 2023
5bb8a0e
Display Apple Pay explicit place order error
Dec 14, 2023
8c27577
Update button.js
khushboo-singhvi Sep 15, 2025
d030243
Merge branch 'develop-3' into apple-pay-display-errors
khushboo-singhvi Sep 15, 2025
61f09ba
Update button.js
khushboo-singhvi Sep 15, 2025
a6dcbc8
Merge branch 'develop-3' into apple-pay-display-errors
khushboo-singhvi Sep 16, 2025
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
72 changes: 61 additions & 11 deletions view/frontend/web/js/applepay/button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,16 @@ define([
.then((result) => {
// Stop if no shipping methods.
if (result.length === 0) {
reject($t('There are no shipping methods available for you right now. Please try again or use an alternative payment method.'));
}
console.info('There are no shipping methods available for you right now. Please try again or use an alternative payment method.');
reject({
newTotal: {
label: this.getMerchantName(),
amount: this.isProductView
? formatAmount(totalsModel().getTotal() * 100)
: formatAmount(getCartSubtotal() * 100),
},
errors: [new ApplePayError('addressUnserviceable')],
}); }
let shippingMethods = [];

self.shippingMethods = {};
Expand Down Expand Up @@ -383,10 +391,7 @@ define([
.done((response) => {
self.afterSetTotalsInfo(response, shippingMethods, self.isProductView, resolve);
})
.fail((e) => {
console.error('Adyen ApplePay: Unable to get totals', e);
reject($t('We\'re unable to fetch the cart totals for you. Please try an alternative payment method.'));
});
.fail((e) => this._onGetTotalsError(e, reject));
});
});
},
Expand Down Expand Up @@ -433,10 +438,7 @@ define([
.done((response) => {
// this ensures newTotal/newLineItems are valid and well-formed
self.afterSetTotalsInfo(response, shippingMethod, self.isProductView, resolve);
}).fail((e) => {
console.error('Adyen ApplePay: Unable to get totals', e);
reject($t('We\'re unable to fetch the cart totals for you. Please try an alternative payment method.'));
});
}).fail((e) => this._onGetTotalsError(e, reject));
});
},

Expand Down Expand Up @@ -608,11 +610,59 @@ define([
actions.resolve(window.ApplePaySession.STATUS_SUCCESS);
})
.fail((err) => {
console.error('Adyen ApplePay Unable to take payment', err);
this._onPlaceOrderError('payment', error);
actions.reject(window.ApplePaySession.STATUS_FAILURE);
});
},

/**
* @param {*} error
* @param {function} reject
* @private
*/
_onGetTotalsError: function (error, reject) {
reject({
status: window.ApplePaySession.STATUS_FAILURE,
});

console.error('Adyen ApplePay: Unable to get totals', error);
this._displayError($t('We\'re unable to fetch the cart totals for you. Please try an alternative payment method.'));
},

/**
* @param {string} step
* @param {*} error
* @param {function} reject
* @private
*/
_onPlaceOrderError: function(step, error) {
console.error(
`Adyen ApplePay: Unable to take payment, something went wrong during ${step} step.`,
error,
);

const errorMessage = error?.responseJSON.message ?? $t('Your payment failed, Please try again later');
this._displayError(errorMessage);
},

/**
* @see https://magento.stackexchange.com/questions/237959/how-to-use-javascript-to-display-page-messages
* @param {string} error
* @private
*/
_displayError: function (error) {
setTimeout(() => {
customerData.set('messages', {
messages: [{
text: error,
type: 'error',
}],
});

window.scrollTo({ top: 0, behavior: 'smooth' });
}, 1000);
},

getMerchantName: function() {
const config = configModel().getConfig();
return config?.merchantAccount ?? $t('Grand Total');
Expand Down