make setupFields more resilient on ajax

hps · Jan 28, 2021 · 92f7b2b · 92f7b2b
1 parent e62226c
commit 92f7b2b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/design/adminhtml/default/default/template/transit/form.phtml b/app/design/adminhtml/default/default/template/transit/form.phtml
@@ -96,7 +96,7 @@ $allow_card_saving = Mage::getModel('hps_transit/payment')->getConfigData('allow
     };
 
     if (window.TransITMagentoAdmin.setupFields) {
-        window.TransITMagentoAdmin.setupFields();
+        window.TransITMagentoAdmin.loadLibrary(window.TransITMagentoAdmin.setupFields);
     }
 })();
 //]]>

diff --git a/js/transit/admin-checkout.js b/js/transit/admin-checkout.js
@@ -15,6 +15,10 @@
       return;
     }
 
+    if (document.querySelector(window.TransITMagentoAdmin.options.iframeTargets.cardNumber + ' iframe') !== null) {
+      return;
+    }
+
     GlobalPayments.configure(window.TransITMagentoAdmin.options.credentials);
 
     window.TransITMagentoAdmin.cardForm = GlobalPayments.ui.form({
-Original file line number
+Diff line change
@@ Expand Up @@
         };
         if (window.TransITMagentoAdmin.setupFields) {
-            window.TransITMagentoAdmin.setupFields();
+            window.TransITMagentoAdmin.loadLibrary(window.TransITMagentoAdmin.setupFields);
         }
     })();
     //]]>
@@ Expand Down @@