Skip to content

Commit e6ff25a

Browse files
MC-15776: Merge release branch into 2.3-develop
- fix merge conflict
1 parent 58ae7c0 commit e6ff25a

File tree

1 file changed

+8
-4
lines changed
  • app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment

1 file changed

+8
-4
lines changed

app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment/script.phtml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,16 @@
99
<script>
1010
//<![CDATA[
1111
require(
12-
['Magento_AuthorizenetAcceptjs/js/payment-form'],
13-
function(Authorizenet) {
12+
[
13+
'Magento_AuthorizenetAcceptjs/js/authorizenet',
14+
'jquery',
15+
'domReady!'
16+
], function(AuthorizenetAcceptjs, $) {
1417
var config = <?= /* @noEscape */ $block->getPaymentConfig() ?>,
15-
form = "#payment_form_<?= $block->escapeJs($block->escapeHtml($block->getMethodCode())) ?>";
18+
form = $('#payment_form_<?= /* @noEscape */ $block->escapeJs($block->escapeHtml($block->getMethodCode())) ?>');
1619

17-
new Authorizenet(config, form);
20+
config.active = form.length > 0 && !form.is(':hidden');
21+
new AuthorizenetAcceptjs(config);
1822
});
1923
//]]>
2024
</script>

0 commit comments

Comments
 (0)