From: monishdeb Date: Fri, 27 Nov 2015 11:37:12 +0000 (+0530) Subject: format fixes X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1415b394fdb0f78ba70f6bc4ef987fe52316edc7;p=civicrm-core.git format fixes --- diff --git a/CRM/Contribute/BAO/Query.php b/CRM/Contribute/BAO/Query.php index 737da6e43d..99eab181fb 100644 --- a/CRM/Contribute/BAO/Query.php +++ b/CRM/Contribute/BAO/Query.php @@ -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 "; } diff --git a/CRM/Report/Form/Contribute/RecurSummary.php b/CRM/Report/Form/Contribute/RecurSummary.php index d8298866ba..6c28c1ceec 100644 --- a/CRM/Report/Form/Contribute/RecurSummary.php +++ b/CRM/Report/Form/Contribute/RecurSummary.php @@ -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; } diff --git a/templates/CRM/Contribute/Form/Search/Common.tpl b/templates/CRM/Contribute/Form/Search/Common.tpl index 618e3bba46..6f4c0c1788 100644 --- a/templates/CRM/Contribute/Form/Search/Common.tpl +++ b/templates/CRM/Contribute/Form/Search/Common.tpl @@ -160,6 +160,7 @@ {include file="CRM/Campaign/Form/addCampaignToComponent.tpl" campaignContext="componentSearch" campaignTrClass='' campaignTdClass=''} +{* contribution recurring search *} {include file="CRM/Contribute/Form/Search/ContributionRecur.tpl"}