From 1c44e08e11fe8269780148e856d8d076d4e6c725 Mon Sep 17 00:00:00 2001 From: eileen Date: Tue, 30 Apr 2013 15:34:30 +1200 Subject: [PATCH] CRM-12468 whitespace --- CRM/Report/Form/Contribute/Lybunt.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CRM/Report/Form/Contribute/Lybunt.php b/CRM/Report/Form/Contribute/Lybunt.php index c819ed9bfe..8065b49906 100644 --- a/CRM/Report/Form/Contribute/Lybunt.php +++ b/CRM/Report/Form/Contribute/Lybunt.php @@ -139,7 +139,7 @@ class CRM_Report_Form_Contribute_Lybunt extends CRM_Report_Form { 'options' => $optionYear, 'default' => date('Y'), ), - 'financial_type_id' => array( + 'financial_type_id' => array( 'title' => ts('Financial Type'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Contribute_PseudoConstant::financialType(), @@ -226,13 +226,13 @@ class CRM_Report_Form_Contribute_Lybunt extends CRM_Report_Form { $this->_from = " FROM civicrm_contribution {$this->_aliases['civicrm_contribution']} - INNER JOIN civicrm_contact {$this->_aliases['civicrm_contact']} + INNER JOIN civicrm_contact {$this->_aliases['civicrm_contact']} ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_contribution']}.contact_id {$this->_aclFrom} - LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']} + 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 - LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']} + {$this->_aliases['civicrm_email']}.is_primary = 1 + LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']} ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND {$this->_aliases['civicrm_phone']}.is_primary = 1 "; } @@ -249,8 +249,8 @@ class CRM_Report_Form_Contribute_Lybunt extends CRM_Report_Form { $clause = NULL; if ($fieldName == 'yid') { $clause = "contribution_civireport.contact_id NOT IN -(SELECT distinct contri.contact_id FROM civicrm_contribution contri - WHERE contri.is_test = 0 AND " . self::fiscalYearOffset('contri.receive_date') . " = $current_year) AND contribution_civireport.contact_id IN (SELECT distinct contri.contact_id FROM civicrm_contribution contri +(SELECT distinct contri.contact_id FROM civicrm_contribution contri + WHERE contri.is_test = 0 AND " . self::fiscalYearOffset('contri.receive_date') . " = $current_year) AND contribution_civireport.contact_id IN (SELECT distinct contri.contact_id FROM civicrm_contribution contri WHERE " . self::fiscalYearOffset('contri.receive_date') . " = $previous_year AND contri.is_test = 0)"; } elseif (CRM_Utils_Array::value('type', $field) & CRM_Utils_Type::T_DATE) { @@ -300,7 +300,7 @@ class CRM_Report_Form_Contribute_Lybunt extends CRM_Report_Form { $statistics = parent::statistics($rows); if (!empty($rows)) { $select = " - SELECT + SELECT SUM({$this->_aliases['civicrm_contribution']}.total_amount ) as amount "; $sql = "{$select} {$this->_from} {$this->_where}"; -- 2.25.1