X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FReport%2FForm%2FContribute%2FSoftCredit.php;h=e68006ace1e03decc14139f1ec6c2c9a258e841e;hb=fa84149cbbbbba2df1bd65c29522a28507dd83a2;hp=c61438921881f3ef3696c600069c1f267c8a1fac;hpb=39de6fd54b9843705d13cb9f70fbcc6296103670;p=civicrm-core.git diff --git a/CRM/Report/Form/Contribute/SoftCredit.php b/CRM/Report/Form/Contribute/SoftCredit.php index c614389218..e68006ace1 100644 --- a/CRM/Report/Form/Contribute/SoftCredit.php +++ b/CRM/Report/Form/Contribute/SoftCredit.php @@ -46,12 +46,10 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form { public $_drilldownReport = array('contribute/detail' => 'Link to Detail Report'); /** - * */ /** - * */ - function __construct() { + public function __construct() { // Check if CiviCampaign is a) enabled and b) has active campaigns $config = CRM_Core_Config::singleton(); @@ -103,7 +101,7 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form { 'filters' => array( 'sort_name' => array( 'name' => 'sort_name', - 'title' => ts('Soft Credit Name') + 'title' => ts('Soft Credit Name'), ), ), 'grouping' => 'contact-fields', @@ -146,13 +144,13 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form { ), 'civicrm_financial_type' => array( 'dao' => 'CRM_Financial_DAO_FinancialType', - 'fields' => array('financial_type' => NULL,), + 'fields' => array('financial_type' => NULL), 'filters' => array( 'id' => array( 'name' => 'id', 'title' => ts('Financial Type'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'options' => CRM_Contribute_PseudoConstant::financialType() + 'options' => CRM_Contribute_PseudoConstant::financialType(), ), ), 'grouping' => 'softcredit-fields', @@ -243,11 +241,11 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form { parent::__construct(); } - function preProcess() { + public function preProcess() { parent::preProcess(); } - function select() { + public function select() { $select = array(); $this->_columnHeaders = array(); foreach ($this->_columns as $tableName => $table) { @@ -322,12 +320,12 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form { * * @return array */ - static function formRule($fields, $files, $self) { + public static function formRule($fields, $files, $self) { $errors = $grouping = array(); return $errors; } - function from() { + public function from() { $alias_constituent = 'constituentname'; $alias_creditor = 'contact_civireport'; $this->_from = " @@ -387,13 +385,13 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form { } } - function groupBy() { + public function groupBy() { $this->_rollup = 'WITH ROLLUP'; $this->_groupBy = " GROUP BY {$this->_aliases['civicrm_contribution_soft']}.contact_id, constituentname.id {$this->_rollup}"; } - function where() { + public function where() { parent::where(); $this->_where .= " AND {$this->_aliases['civicrm_contribution']}.is_test = 0 "; } @@ -403,7 +401,7 @@ GROUP BY {$this->_aliases['civicrm_contribution_soft']}.contact_id, constituentn * * @return array */ - function statistics(&$rows) { + public function statistics(&$rows) { $statistics = parent::statistics($rows); $select = " @@ -445,7 +443,7 @@ GROUP BY {$this->_aliases['civicrm_contribution']}.currency return $statistics; } - function postProcess() { + public function postProcess() { $this->beginPostProcess(); $this->buildACLClause(array('constituentname', 'contact_civireport')); @@ -475,7 +473,7 @@ GROUP BY {$this->_aliases['civicrm_contribution']}.currency /** * @param $rows */ - function alterDisplay(&$rows) { + public function alterDisplay(&$rows) { // custom code to alter rows $entryFound = FALSE; @@ -543,4 +541,3 @@ GROUP BY {$this->_aliases['civicrm_contribution']}.currency $this->removeDuplicates($rows); } } -