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.

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

Jump to bottom

Improves Apple pay errors #69

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Improves Apple pay errors #69

Changes from all commits
Commits
Show all changes
4 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
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
101 changes: 75 additions & 26 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 @@ -263,7 +263,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 = [];

Expand Down Expand Up @@ -349,10 +358,7 @@ define([

resolve(applePayShippingContactUpdate);
// Pass shipping methods back
}).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));
}).catch(reject);
},

Expand Down Expand Up @@ -418,10 +424,7 @@ define([

self.shippingMethod = shippingMethod.identifier;
resolve(applePayShippingMethodUpdate);
}).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 @@ -476,40 +479,86 @@ define([

let componentData = self.applePayComponent.data;

setShippingInformation(payload, this.isProductView).done(function () {
setShippingInformation(payload, this.isProductView).done(function() {
// Submit payment information
const postData = {
email: shippingContact.emailAddress,
paymentMethod: {
method: 'adyen_hpp',
additional_data: {
brand_code: 'applepay',
stateData: JSON.stringify(componentData)
}
}
stateData: JSON.stringify(componentData),
},
},
};

if (window.checkout && window.checkout.agreementIds) {
postData.paymentMethod.extension_attributes = {
agreement_ids: window.checkout.agreementIds
};
}
postData.paymentMethod = agreementsAssigner(postData.paymentMethod);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @dimitriBouteille,

Thank you for your contribution. I see that you've implemented the usage of agreementsAssigner(). However, I couldn't find the relevant import in RequireJS import block.

Is Magento_CheckoutAgreements/js/model/agreements-assigner required to be imported to the class?

Best regards,
Can

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @candemiralp

I think this line can be remove :)


createPayment(JSON.stringify(postData), this.isProductView)
.done(function () {
.done(function() {
redirectToSuccess();
resolve(window.ApplePaySession.STATUS_SUCCESS);
}).fail(function (r) {
reject(window.ApplePaySession.STATUS_FAILURE);
console.error('Adyen ApplePay Unable to take payment', r);
});
})
.fail((error) => this._onPlaceOrderError('payment', error, reject));

}.bind(this)).fail((error) => this._onPlaceOrderError('shippingInformation', error, reject));
},

/**
* @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.'));
},

}.bind(this)).fail(function (e) {
console.error('Adyen ApplePay Unable to set shipping information', e);
reject(window.ApplePaySession.STATUS_INVALID_BILLING_POSTAL_ADDRESS);
/**
* @param {string} step
* @param {*} error
* @param {function} reject
* @private
*/
_onPlaceOrderError: function(step, error, reject) {
reject({
status: window.ApplePaySession.STATUS_FAILURE,
});

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);
},

/**
* @returns {string}
*/
getMerchantName: function() {
const config = configModel().getConfig();
return config?.merchantAccount ?? $t('Grand Total');
Expand Down
Loading