format fixes
authormonishdeb <monish.deb@webaccessglobal.com>
Fri, 27 Nov 2015 11:37:12 +0000 (17:07 +0530)
committermonishdeb <monish.deb@webaccessglobal.com>
Fri, 27 Nov 2015 11:37:12 +0000 (17:07 +0530)
CRM/Contribute/BAO/Query.php
CRM/Report/Form/Contribute/RecurSummary.php
templates/CRM/Contribute/Form/Search/Common.tpl

index 737da6e43d1709c676b04c481ab137964d8d34ef..99eab181fb7afecf49002c9ff12b6b4a860403eb 100644 (file)
@@ -643,7 +643,7 @@ class CRM_Contribute_BAO_Query {
       case 'civicrm_contribution_recur':
         if ($mode == 1) {
           // 'Made payment for the recurring contributions?' is ticked yes
-            $from = " $side JOIN civicrm_contribution_recur ON contact_a.id = civicrm_contribution_recur.contact_id ";
+          $from = " $side JOIN civicrm_contribution_recur ON contact_a.id = civicrm_contribution_recur.contact_id ";
           if (self::$_contribRecurPayment == TRUE) {
             $from .= " AND civicrm_contribution.contribution_recur_id = civicrm_contribution_recur.id ";
           }
index d8298866bac09abe1c1365cfd5513ea0cce282eb..6c28c1ceec5b4774a2e9666b2accb903c54d1423 100644 (file)
@@ -84,7 +84,7 @@ class CRM_Report_Form_Contribute_RecurSummary extends CRM_Report_Form {
     parent::__construct();
   }
 
-       /**
+  /**
    * @param bool $freeze
    *
    * @return array
@@ -343,11 +343,12 @@ class CRM_Report_Form_Contribute_RecurSummary extends CRM_Report_Form {
     }
     // Add total line only if results are available
     if (count($rows) > 0) {
-      $lastRow = array('civicrm_contribution_recur_payment_instrument_id' => '',
-                      'civicrm_contribution_recur_start_date' => $started,
-                      'civicrm_contribution_recur_cancel_date' => $cancelled,
-                      'civicrm_contribution_recur_contribution_status_id' => $active,
-                      'civicrm_contribution_recur_amount' => CRM_Utils_Money::format($total),
+      $lastRow = array(
+        'civicrm_contribution_recur_payment_instrument_id' => '',
+        'civicrm_contribution_recur_start_date' => $started,
+        'civicrm_contribution_recur_cancel_date' => $cancelled,
+        'civicrm_contribution_recur_contribution_status_id' => $active,
+        'civicrm_contribution_recur_amount' => CRM_Utils_Money::format($total),
       );
       $rows[] = $lastRow;
     }
index 618e3bba46839319fe3d95df3c2ffa1dd3afa01f..6f4c0c17883c28ce1a566f1eb514cd9e904bbc1a 100644 (file)
 {include file="CRM/Campaign/Form/addCampaignToComponent.tpl" campaignContext="componentSearch"
 campaignTrClass='' campaignTdClass=''}
 
+{* contribution recurring search *}
 <tr>
   <td colspan="2">
     {include file="CRM/Contribute/Form/Search/ContributionRecur.tpl"}