CRM-15509 remove hidePaypalExpress assignment as I've switched to an opt-in in the tpl

diff --git a/CRM/Contribute/Form/AbstractEditPayment.php b/CRM/Contribute/Form/AbstractEditPayment.php
index f9b9b054df8ef1e2fe878d4f1d58b47817aa674d..e81dc5047941e9e222f11cead4032f4b2499bf83 100644 (file)
--- a/CRM/Contribute/Form/AbstractEditPayment.php
+++ b/CRM/Contribute/Form/AbstractEditPayment.php
@@ -407,7 +407,6 @@ LEFT JOIN  civicrm_contribution on (civicrm_contribution.contact_id = civicrm_co
 
     // this required to show billing block
     $this->assign_by_ref('paymentProcessor', $paymentProcessor);
-    $this->assign('hidePayPalExpress', TRUE);
   }
 
   /**

diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php
index 9b1d98dcca843c7185734966c28a516190e19462..390a386f9700ad853e59c6a950d76230fb5269da 100644 (file)
--- a/CRM/Event/Form/Participant.php
+++ b/CRM/Event/Form/Participant.php
@@ -317,7 +317,6 @@ class CRM_Event_Form_Participant extends CRM_Contact_Form_Task {
 
       // this required to show billing block
       $this->assign_by_ref('paymentProcessor', $paymentProcessor);
-      $this->assign('hidePayPalExpress', TRUE);
     }
 
     if ($this->_showFeeBlock) {
@@ -1291,7 +1290,7 @@ class CRM_Event_Form_Participant extends CRM_Contact_Form_Task {
           $this->_params['role_id']
         );
       }
-      
+
       //CRM-15372 patch to fix fee amount replacing amount
       $this->_params['fee_amount'] =  $this->_params['amount'];
 
@@ -1368,13 +1367,13 @@ class CRM_Event_Form_Participant extends CRM_Contact_Form_Task {
 
         //build contribution params
         if (!$this->_onlinePendingContributionId) {
-          if (empty($params['source'])) { 
+          if (empty($params['source'])) {
             $contributionParams['source'] = ts('%1 : Offline registration (by %2)', array(1 => $eventTitle, 2 => $userName));
-          }                                                           
-          else {                                                     
-            $contributionParams['source'] = $params['source'];                                                             
-          }                                                          
-        } 
+          }
+          else {
+            $contributionParams['source'] = $params['source'];
+          }
+        }
 
         $contributionParams['currency'] = $config->defaultCurrency;
         $contributionParams['non_deductible_amount'] = 'null';
@@ -1672,7 +1671,7 @@ class CRM_Event_Form_Participant extends CRM_Contact_Form_Task {
           $invoiceSettings = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME,'contribution_invoice_settings');
           $invoicing = CRM_Utils_Array::value('invoicing', $invoiceSettings);
           $totalTaxAmount = 0;
-          
+
           //add dataArray in the receipts in ADD and UPDATE condition
           $dataArray = array();
           if ($this->_action & CRM_Core_Action::ADD) {
@@ -1738,8 +1737,8 @@ class CRM_Event_Form_Participant extends CRM_Contact_Form_Task {
         $prefixValue = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME, 'contribution_invoice_settings');
         $invoicing = CRM_Utils_Array::value('invoicing', $prefixValue);
         if (count($taxAmt) > 0 && (isset($invoicing) && isset($prefixValue['is_email_pdf']))) {
-          $sendTemplateParams['isEmailPdf'] = True; 
-          $sendTemplateParams['contributionId'] = $contributionId; 
+          $sendTemplateParams['isEmailPdf'] = True;
+          $sendTemplateParams['contributionId'] = $contributionId;
         }
         list($mailSent, $subject, $message, $html) = CRM_Core_BAO_MessageTemplate::sendTemplate($sendTemplateParams);
         if ($mailSent) {

diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
index f532df28269398f1e9679866ec8dd8f4c7979f06..1262b1e96862b33f8422222de8c3061a627a84fc 100644 (file)
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@ -193,7 +193,6 @@ class CRM_Member_Form_Membership extends CRM_Member_Form {
 
       // this required to show billing block
       $this->assign_by_ref('paymentProcessor', $paymentProcessor);
-      $this->assign('hidePayPalExpress', TRUE);
     }
 
     if ($this->_action & CRM_Core_Action::ADD) {
@@ -1281,9 +1280,9 @@ WHERE   id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
           $params['contribution_source'] = ts('%1 Membership: Offline signup (by %2)', array(1 => $membershipType, 2 => $userName));
         }
         else {
-          $params['contribution_source'] = $formValues['source'];      
+          $params['contribution_source'] = $formValues['source'];
         }
-      }        
+      }
 
       if (empty($params['is_override']) &&
         CRM_Utils_Array::value('contribution_status_id', $params) == array_search('Pending', CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name'))
@@ -1678,7 +1677,7 @@ WHERE   id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
             } else {
               $dataArray[$value['tax_rate']] = CRM_Utils_Array::value('tax_amount', $value);
             }
-          } 
+          }
         }
         if ($taxAmount) {
           $this->assign('totalTaxAmount', $totalTaxAmount);

diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php
index e0de74e80c3a56c54506d530a6e6754d56ba4064..a0af3de959f4a462f912c076a1a5d29705c72d9b 100644 (file)
--- a/CRM/Member/Form/MembershipRenewal.php
+++ b/CRM/Member/Form/MembershipRenewal.php
@@ -183,7 +183,6 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form {
 
       // this required to show billing block
       $this->assign_by_ref('paymentProcessor', $paymentProcessor);
-      $this->assign('hidePayPalExpress', TRUE);
     }
     else {
       $this->assign('membershipMode', FALSE);