From f16bf0faa4ac0845bd4e21c63d60d3b76f0cecb6 Mon Sep 17 00:00:00 2001 From: eileen Date: Tue, 30 Apr 2013 13:07:33 +1200 Subject: [PATCH] CRM-12468 preliminary tidy up - whitespace, missing ts --- CRM/Report/Form/Pledge/Pbnp.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/CRM/Report/Form/Pledge/Pbnp.php b/CRM/Report/Form/Pledge/Pbnp.php index 8484de5a67..c47811afe1 100644 --- a/CRM/Report/Form/Pledge/Pbnp.php +++ b/CRM/Report/Form/Pledge/Pbnp.php @@ -41,10 +41,10 @@ class CRM_Report_Form_Pledge_Pbnp extends CRM_Report_Form { 'pieChart' => 'Pie Chart', ); public $_drilldownReport = array('pledge/summary' => 'Link to Detail Report'); - + protected $_customGroupExtends = array( 'Pledge'); - + function __construct() { $this->_columns = array( 'civicrm_contact' => @@ -96,7 +96,7 @@ class CRM_Report_Form_Pledge_Pbnp extends CRM_Report_Form { array( 'pledge_create_date' => array( - 'title' => 'Pledge Made', + 'title' => ts('Pledge Made'), 'operatorType' => CRM_Report_Form::OP_DATE, ), 'currency' => @@ -223,9 +223,9 @@ class CRM_Report_Form_Pledge_Pbnp extends CRM_Report_Form { $this->_from = " FROM civicrm_contact {$this->_aliases['civicrm_contact']} {$this->_aclFrom} - INNER JOIN civicrm_pledge {$this->_aliases['civicrm_pledge']} + INNER JOIN civicrm_pledge {$this->_aliases['civicrm_pledge']} ON ({$this->_aliases['civicrm_pledge']}.contact_id = - {$this->_aliases['civicrm_contact']}.id) AND + {$this->_aliases['civicrm_contact']}.id) AND {$this->_aliases['civicrm_pledge']}.status_id IN ( {$statusIds} ) LEFT JOIN civicrm_pledge_payment {$this->_aliases['civicrm_pledge_payment']} ON ({$this->_aliases['civicrm_pledge']}.id = @@ -234,8 +234,8 @@ class CRM_Report_Form_Pledge_Pbnp extends CRM_Report_Form { // include address field if address column is to be included if ($this->_addressField) { $this->_from .= " - LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']} - ON ({$this->_aliases['civicrm_contact']}.id = + LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']} + ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id) AND {$this->_aliases['civicrm_address']}.is_primary = 1\n"; } @@ -243,16 +243,16 @@ class CRM_Report_Form_Pledge_Pbnp extends CRM_Report_Form { // include email field if email column is to be included if ($this->_emailField) { $this->_from .= " - LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']} - ON ({$this->_aliases['civicrm_contact']}.id = - {$this->_aliases['civicrm_email']}.contact_id) AND + LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']} + ON ({$this->_aliases['civicrm_contact']}.id = + {$this->_aliases['civicrm_email']}.contact_id) AND {$this->_aliases['civicrm_email']}.is_primary = 1\n"; } } function groupBy() { $this->_groupBy = " - GROUP BY {$this->_aliases['civicrm_pledge']}.contact_id, + GROUP BY {$this->_aliases['civicrm_pledge']}.contact_id, {$this->_aliases['civicrm_pledge']}.id, {$this->_aliases['civicrm_pledge']}.currency"; } @@ -307,7 +307,7 @@ class CRM_Report_Form_Pledge_Pbnp extends CRM_Report_Form { //handle the Financial Type Ids if (array_key_exists('civicrm_pledge_financial_type_id', $row)) { if ($value = $row['civicrm_pledge_financial_type_id']) { - $rows[$rowNum]['civicrm_pledge_financial_type_id'] = + $rows[$rowNum]['civicrm_pledge_financial_type_id'] = CRM_Contribute_PseudoConstant::financialType($value, false); } $entryFound = TRUE; -- 2.25.1