Leave loading of Stripe.Js to civicrm_stripe.js

mattwire · Jul 24, 2018 · e71bc71 · e71bc71
1 parent d4ba89f
commit e71bc71
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/CRM/Core/Payment/Stripe.php b/CRM/Core/Payment/Stripe.php
@@ -336,7 +336,7 @@ public function getBillingAddressFieldsMetadata($billingLocationID = NULL) {
 
   /**
    * Set default values when loading the (payment) form
-   * 
+   *
    * @param \CRM_Core_Form $form
    */
   public function buildForm(&$form) {

diff --git a/js/civicrm_stripe.js b/js/civicrm_stripe.js
@@ -109,7 +109,9 @@
   });
 
   function loadStripeBillingBlock() {
+    // Setup Stripe.Js
     var $stripePubKey = $('#stripe-pub-key');
+
     if ($stripePubKey.length) {
       if (!$().Stripe) {
         $.getScript('https://js.stripe.com/v2/', function () {

diff --git a/stripe.php b/stripe.php
@@ -224,7 +224,6 @@ function stripe_civicrm_alterContent( &$content, $context, $tplName, &$object )
       $stripeJSURL = CRM_Core_Resources::singleton()
         ->getUrl('com.drastikbydesign.stripe', 'js/civicrm_stripe.js');
       $content .= "<script src='{$stripeJSURL}'></script>";
-      $content .= "<script src='https://js.stripe.com/v2/'></script>";
       $_stripe_scripts_added = TRUE;
     }
   }
@@ -239,10 +238,12 @@ function stripe_civicrm_alterContent( &$content, $context, $tplName, &$object )
  */
 function stripe_civicrm_buildForm($formName, &$form) {
   global $_stripe_scripts_added;
-  if (!empty($form->_paymentProcessor['class_name'])) {
+  if (!isset($form->_paymentProcessor)) {
+    return;
+  }
+  $paymentProcessor = $form->_paymentProcessor;
+  if (!empty($paymentProcessor['class_name'])) {
     if (!$_stripe_scripts_added) {
-      CRM_Core_Resources::singleton()
-        ->addScriptUrl('https://js.stripe.com/v2/', 10, 'page-body');
       CRM_Core_Resources::singleton()
         ->addScriptFile('com.drastikbydesign.stripe', 'js/civicrm_stripe.js');
     }
-Original file line number
+Diff line change
@@ Expand Up @@
       /**
        * Set default values when loading the (payment) form
-       *
+       *
        * @param \CRM_Core_Form $form
        */
       public function buildForm(&$form) {
@@ Expand Down @@