diff --git a/app/design/adminhtml/default/default/template/transit/form.phtml b/app/design/adminhtml/default/default/template/transit/form.phtml
index 260af71..e960b99 100644
--- 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
index 9f2d2e7..98a4f3c 100644
--- 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({