Skip to content

Commit

Permalink
ASW-0 Fix: Merge adyen/develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	Resources/frontend/js/jquery.adyen-disable-payment.js
#	Resources/views/frontend/register/payment_fieldset.tpl
  • Loading branch information
bortefi committed May 5, 2022
2 parents 4359f67 + e7e6be1 commit 1f86b9a
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Resources/frontend/js/jquery.adyen-disable-payment.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
if (0 === me.opts.adyenStoredMethodId.length) {
return;
}

if('' === me.modalContent){
return;
}
Expand All @@ -84,6 +85,7 @@
var me = this;
$.loadingIndicator.open();
$.loadingIndicator.loader.$loader.addClass('over-modal');

$.post({
url: me.opts.adyenDisableTokenUrl,
dataType: 'json',
Expand Down

0 comments on commit 1f86b9a

Please sign in to comment.