Merge remote-tracking branch 'magento-tsg/MAGETWO-99590' into 2.3.2-develop-pr52

Author: StasKozar

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

@@ -6,12 +6,15 @@
 
 /** @var Magento\AuthorizenetAcceptjs\Block\Payment $block */
 ?>
-<script type="text/x-magento-init">
-    {
-        "#payment_form_<?= $block->escapeJs($block->escapeHtml($block->getMethodCode())) ?>": {
-            "Magento_AuthorizenetAcceptjs/js/payment-form": {
-                "config": <?= /* @noEscape */ $block->getPaymentConfig() ?>
-            }
-        }
-    }
-</script>
+<script>
+    //<![CDATA[
+    require(
+        ['Magento_AuthorizenetAcceptjs/js/payment-form'],
+        function(Authorizenet) {
+            var config = <?= /* @noEscape */ $block->getPaymentConfig() ?>,
+                form = "#payment_form_<?= $block->escapeJs($block->escapeHtml($block->getMethodCode())) ?>";
+
+            new Authorizenet(config, form);
+        });
+    //]]>
+</script>

app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/web/js/payment-form.js

@@ -8,9 +8,8 @@ define([
 ], function (AuthorizenetAcceptjs, $) {
     'use strict';
 
-    return function (data, element) {
-        var $form = $(element),
-            config = data.config;
+    return function (config, element) {
+        var $form = $(element);
 
         config.active = $form.length > 0 && !$form.is(':hidden');
         new AuthorizenetAcceptjs(config);