Skip to content

[EPC-9645] Fix empty modal issue on 3DS2 fingerprint only actions #2933

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 3 commits into from
Apr 16, 2025
Merged

[EPC-9645] Fix empty modal issue on 3DS2 fingerprint only actions #2933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58f5961
[EPC-9645] Update logic to show modal
candemiralp Apr 3, 2025
4c41a16
Merge branch 'main' into ECP-9645
candemiralp Apr 4, 2025
35c31db
Merge branch 'main' into ECP-9645
khushboo-singhvi Apr 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
15 changes: 13 additions & 2 deletions view/frontend/web/js/model/adyen-payment-modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,15 @@ define(
'use strict';

return {
showModal: function(adyenPaymentService, fullScreenLoader, messageContainer, orderId, modalLabel, callback=(ko.observable(true))) {
showModal: function(
adyenPaymentService,
fullScreenLoader,
messageContainer,
orderId,
modalLabel,
callback=(ko.observable(true)),
openDefault = true
) {
let popupModal = $('#' + modalLabel).modal({
// disable user to hide popup
clickableOverlay: false,
Expand All @@ -32,7 +40,10 @@ define(
modalClass: modalLabel
});

popupModal.modal('openModal');
if (openDefault) {
popupModal.modal('openModal');
}

return popupModal;
},
/**
Expand Down
24 changes: 17 additions & 7 deletions view/frontend/web/js/view/payment/method-renderer/adyen-cc-method.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,22 +257,34 @@ define(
let self = this;
let popupModal;

fullScreenLoader.stopLoader();

if (action.type === 'threeDS2' || action.type === 'await') {
popupModal = self.showModal();
}

try {
self.checkoutComponent.createFromAction(
action).mount('#' + this.modalLabel);
self.checkoutComponent.createFromAction(action, {
onActionHandled: function (event) {
if (event.componentType === "3DS2Challenge") {
fullScreenLoader.stopLoader();
popupModal.modal('openModal');
}
}
}).mount('#' + this.modalLabel);
} catch (e) {
console.log(e);
self.closeModal(popupModal);
}
},
showModal: function() {
let actionModal = AdyenPaymentModal.showModal(adyenPaymentService, fullScreenLoader, this.messageContainer, this.orderId, this.modalLabel, this.isPlaceOrderActionAllowed);
let actionModal = AdyenPaymentModal.showModal(
adyenPaymentService,
fullScreenLoader,
this.messageContainer,
this.orderId,
this.modalLabel,
this.isPlaceOrderActionAllowed,
false
);
$("." + this.modalLabel + " .action-close").hide();

return actionModal;
Expand Down Expand Up @@ -384,11 +396,9 @@ define(
let request = result.data;
AdyenPaymentModal.hideModalLabel(this.modalLabel);
fullScreenLoader.startLoader();
let popupModal = self.showModal();

adyenPaymentService.paymentDetails(request, self.orderId).
done(function(responseJSON) {
fullScreenLoader.stopLoader();
self.handleAdyenResult(responseJSON, self.orderId);
}).
fail(function(response) {
Expand Down
34 changes: 22 additions & 12 deletions view/frontend/web/js/view/payment/method-renderer/adyen-cc-vault-method.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,11 @@ define([
handleOnAdditionalDetails: function (result) {
let self = this;
let request = result.data;

fullScreenLoader.stopLoader();

let popupModal = self.showModal();
adyenPaymentModal.hideModalLabel(this.modalLabel);
fullScreenLoader.startLoader();

adyenPaymentService.paymentDetails(request, self.orderId).done(function (responseJSON) {
self.handleAdyenResult(responseJSON,
self.orderId);
self.handleAdyenResult(responseJSON, self.orderId);
}).fail(function (response) {
self.closeModal(popupModal);
errorProcessor.process(response, self.messageContainer);
Expand Down Expand Up @@ -286,23 +283,36 @@ define([
}
try {
// Determine threeDS2 modal size, based on screen width
const threeDSConfiguration = {
challengeWindowSize: screen.width < 460 ? '01' : '02'
const actionComponentConfiguration = {
challengeWindowSize: screen.width < 460 ? '01' : '02',
onActionHandled: function (event) {
if (event.componentType === "3DS2Challenge") {
fullScreenLoader.stopLoader();
popupModal.modal('openModal');
}
}
}

this.checkoutComponent.createFromAction(action, threeDSConfiguration).mount(
this.checkoutComponent.createFromAction(action, actionComponentConfiguration).mount(
'#' + this.modalLabel + 'Content'
);

fullScreenLoader.stopLoader();
} catch (e) {
console.log(e);
self.closeModal(popupModal);
}
},

showModal: function() {
let actionModal = adyenPaymentModal.showModal(adyenPaymentService, fullScreenLoader, this.messageContainer, this.orderId, this.modalLabel, this.isPlaceOrderActionAllowed)
let actionModal = adyenPaymentModal.showModal(
adyenPaymentService,
fullScreenLoader,
this.messageContainer,
this.orderId,
this.modalLabel,
this.isPlaceOrderActionAllowed,
false
);

$("." + this.modalLabel + " .action-close").hide();

return actionModal;
Expand Down
36 changes: 29 additions & 7 deletions view/frontend/web/js/view/payment/method-renderer/adyen-pm-method.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,8 @@ define(

handleOnAdditionalDetails: function(state, component) {
const self = this;
adyenPaymentModal.hideModalLabel(this.modalLabel);
fullScreenLoader.startLoader();
// call endpoint with state.data if available
let request = {};
if (!!state.data) {
Expand Down Expand Up @@ -374,9 +376,7 @@ define(

if (!!response.isFinal) {
// Status is final redirect to the success page
$.mage.redirect(
window.checkoutConfig.payment.adyen.successPage
);
$.mage.redirect(window.checkoutConfig.payment.adyen.successPage);
} else {
// render component
self.orderId = orderId;
Expand All @@ -387,17 +387,39 @@ define(
renderActionComponent: function(resultCode, action, component) {
let self = this;
let actionNode = document.getElementById(this.modalLabel + 'Content');
fullScreenLoader.stopLoader();

if (resultCode !== 'RedirectShopper') {
self.popupModal = adyenPaymentModal.showModal(adyenPaymentService, fullScreenLoader, this.messageContainer, this.orderId, this.modalLabel, this.isPlaceOrderActionAllowed)
let isModalVisible = true;

if (action.type === 'threeDS2') {
isModalVisible = false;
} else {
fullScreenLoader.stopLoader();
}

self.popupModal = adyenPaymentModal.showModal(
adyenPaymentService,
fullScreenLoader,
this.messageContainer,
this.orderId,
this.modalLabel,
this.isPlaceOrderActionAllowed,
isModalVisible
);

$("." + this.modalLabel + " .action-close").hide();
}

self.actionComponent = self.checkoutComponent.createFromAction(action).mount(actionNode);
self.actionComponent = self.checkoutComponent.createFromAction(action, {
onActionHandled: function (event) {
if (event.componentType === "3DS2Challenge") {
fullScreenLoader.stopLoader();
self.popupModal.modal('openModal');
}
}
}).mount(actionNode);
},


isButtonActive: function() {
return paymentComponentStates().getIsPlaceOrderAllowed(this.getMethodCode());
},
Expand Down
Loading