+--------------------------------------------------------------------+
| CiviCRM version 4.6 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014 |
+ | Copyright CiviCRM LLC (c) 2004-2015 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
* $Id$
*
*/
'dao' => 'CRM_Contribute_DAO_Contribution',
//'bao' => 'CRM_Contribute_BAO_Contribution',
'fields' => array(
+ 'contribution_status_id' => array(
+ 'title' => ts('Contribution Status'),
+ ),
'contribution_source' => array('title' => ts('Source')),
'currency' => array(
'required' => TRUE,
'title' => ts('Contribution Amount Stats'),
'default' => TRUE,
'statistics' => array(
- 'sum' => ts('Contribution Aggregate'),
'count' => ts('Contributions'),
+ 'sum' => ts('Contribution Aggregate'),
'avg' => ts('Contribution Avg'),
),
),
'chart' => TRUE,
),
'contribution_source' => NULL,
+ 'contribution_status_id' => array(
+ 'title' => ts('Contribution Status'),
+ 'operatorType' => CRM_Report_Form::OP_MULTISELECT,
+ 'options' => CRM_Contribute_PseudoConstant::contributionStatus(),
+ 'default' => array(1),
+ 'type' => CRM_Utils_Type::T_INT,
+ ),
),
),
'civicrm_contribution_soft' => array(
'title' => ts('Soft Credit Amount Stats'),
'name' => 'amount',
'statistics' => array(
- 'sum' => ts('Soft Credit Aggregate'),
'count' => ts('Soft Credits'),
+ 'sum' => ts('Soft Credit Aggregate'),
'avg' => ts('Soft Credit Avg'),
),
),
if (!empty($field['required']) ||
!empty($this->_params['fields'][$fieldName])
) {
-
// only include statistics columns if set
if (!empty($field['statistics'])) {
foreach ($field['statistics'] as $stat => $label) {
+ $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['title'] = $label;
+ $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['type'] = $field['type'];
+ $this->_statFields[] = "{$tableName}_{$fieldName}_{$stat}";
switch (strtolower($stat)) {
case 'sum':
$select[] = "SUM({$field['dbAlias']}) as {$tableName}_{$fieldName}_{$stat}";
- $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['title'] = $label;
- $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['type'] = $field['type'];
- $this->_statFields[] = "{$tableName}_{$fieldName}_{$stat}";
break;
case 'count':
$select[] = "COUNT({$field['dbAlias']}) as {$tableName}_{$fieldName}_{$stat}";
$this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['type'] = CRM_Utils_Type::T_INT;
- $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['title'] = $label;
- $this->_statFields[] = "{$tableName}_{$fieldName}_{$stat}";
break;
case 'avg':
$select[] = "ROUND(AVG({$field['dbAlias']}),2) as {$tableName}_{$fieldName}_{$stat}";
- $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['type'] = $field['type'];
- $this->_columnHeaders["{$tableName}_{$fieldName}_{$stat}"]['title'] = $label;
- $this->_statFields[] = "{$tableName}_{$fieldName}_{$stat}";
break;
}
}
$ignoreFields = array('total_amount', 'sort_name');
$errors = $self->customDataFormRule($fields, $ignoreFields);
- if (empty($fields['group_bys']['receive_date'])) {
- if (!empty($fields['receive_date_relative']) ||
- CRM_Utils_Date::isDate($fields['receive_date_from']) ||
- CRM_Utils_Date::isDate($fields['receive_date_to'])
- ) {
- $errors['receive_date_relative'] = ts("Do not use filter on Date if group by Receive Date is not used ");
- }
- }
if (empty($fields['fields']['total_amount'])) {
foreach (array(
'total_count_value',
return $errors;
}
- public function from() {
- $softCreditJoin = "LEFT";
+ public function from($entity = NULL) {
+ $softCreditJoinType = "LEFT";
if (!empty($this->_params['fields']['soft_amount']) &&
empty($this->_params['fields']['total_amount'])
) {
// if its only soft credit stats, use inner join
- $softCreditJoin = "INNER";
+ $softCreditJoinType = "INNER";
+ }
+
+ $softCreditJoin = "{$softCreditJoinType} JOIN civicrm_contribution_soft {$this->_aliases['civicrm_contribution_soft']}
+ ON {$this->_aliases['civicrm_contribution_soft']}.contribution_id = {$this->_aliases['civicrm_contribution']}.id";
+ if ($entity == 'contribution' || empty($this->_params['fields']['soft_amount'])) {
+ $softCreditJoin .= " AND {$this->_aliases['civicrm_contribution_soft']}.id = (SELECT MIN(id) FROM civicrm_contribution_soft cs WHERE cs.contribution_id = {$this->_aliases['civicrm_contribution']}.id) ";
}
$this->_from = "
INNER JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']}
ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_contribution']}.contact_id AND
{$this->_aliases['civicrm_contribution']}.is_test = 0
- {$softCreditJoin} JOIN civicrm_contribution_soft {$this->_aliases['civicrm_contribution_soft']}
- ON {$this->_aliases['civicrm_contribution_soft']}.contribution_id = {$this->_aliases['civicrm_contribution']}.id
+ {$softCreditJoin}
LEFT JOIN civicrm_financial_type {$this->_aliases['civicrm_financial_type']}
ON {$this->_aliases['civicrm_contribution']}.financial_type_id ={$this->_aliases['civicrm_financial_type']}.id
LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
$onlySoftCredit = $softCredit &&
!CRM_Utils_Array::value('total_amount', $this->_params['fields']);
$totalAmount = $average = $softTotalAmount = $softAverage = array();
+ $group = "\nGROUP BY {$this->_aliases['civicrm_contribution']}.currency";
- $select = "SELECT
+ $this->from('contribution');
+ $contriSQL = "SELECT
COUNT({$this->_aliases['civicrm_contribution']}.total_amount ) as civicrm_contribution_total_amount_count,
SUM({$this->_aliases['civicrm_contribution']}.total_amount ) as civicrm_contribution_total_amount_sum,
ROUND(AVG({$this->_aliases['civicrm_contribution']}.total_amount), 2) as civicrm_contribution_total_amount_avg,
-{$this->_aliases['civicrm_contribution']}.currency as currency";
+{$this->_aliases['civicrm_contribution']}.currency as currency
+{$this->_from} {$this->_where} {$group} {$this->_having}";
if ($softCredit) {
- $select .= ",
+ $this->from();
+ $softSQL = "SELECT
COUNT({$this->_aliases['civicrm_contribution_soft']}.amount ) as civicrm_contribution_soft_soft_amount_count,
SUM({$this->_aliases['civicrm_contribution_soft']}.amount ) as civicrm_contribution_soft_soft_amount_sum,
-ROUND(AVG({$this->_aliases['civicrm_contribution_soft']}.amount), 2) as civicrm_contribution_soft_soft_amount_avg";
+ROUND(AVG({$this->_aliases['civicrm_contribution_soft']}.amount), 2) as civicrm_contribution_soft_soft_amount_avg,
+{$this->_aliases['civicrm_contribution']}.currency as currency
+{$this->_from} {$this->_where} {$group} {$this->_having}";
}
- $group = "\nGROUP BY {$this->_aliases['civicrm_contribution']}.currency";
- $sql = "{$select} {$this->_from} {$this->_where} {$group} {$this->_having}";
- $dao = CRM_Core_DAO::executeQuery($sql);
+ $contriDAO = CRM_Core_DAO::executeQuery($contriSQL);
+
$totalAmount = $average = $softTotalAmount = $softAverage = array();
$count = $softCount = 0;
- while ($dao->fetch()) {
+ while ($contriDAO->fetch()) {
$totalAmount[]
- = CRM_Utils_Money::format($dao->civicrm_contribution_total_amount_sum, $dao->currency) .
- " (" . $dao->civicrm_contribution_total_amount_count . ")";
- $average[] = CRM_Utils_Money::format($dao->civicrm_contribution_total_amount_avg, $dao->currency);
- $count += $dao->civicrm_contribution_total_amount_count;
+ = CRM_Utils_Money::format($contriDAO->civicrm_contribution_total_amount_sum, $contriDAO->currency) .
+ " (" . $contriDAO->civicrm_contribution_total_amount_count . ")";
+ $average[] = CRM_Utils_Money::format($contriDAO->civicrm_contribution_total_amount_avg, $contriDAO->currency);
+ $count += $contriDAO->civicrm_contribution_total_amount_count;
+ }
- if ($softCredit) {
+ if ($softCredit) {
+ $softDAO = CRM_Core_DAO::executeQuery($softSQL);
+ while ($softDAO->fetch()) {
$softTotalAmount[]
- = CRM_Utils_Money::format($dao->civicrm_contribution_soft_soft_amount_sum, $dao->currency) .
- " (" . $dao->civicrm_contribution_soft_soft_amount_count . ")";
- $softAverage[] = CRM_Utils_Money::format($dao->civicrm_contribution_soft_soft_amount_avg, $dao->currency);
- $softCount += $dao->civicrm_contribution_soft_soft_amount_count;
+ = CRM_Utils_Money::format($softDAO->civicrm_contribution_soft_soft_amount_sum, $softDAO->currency) .
+ " (" . $softDAO->civicrm_contribution_soft_soft_amount_count . ")";
+ $softAverage[] = CRM_Utils_Money::format($softDAO->civicrm_contribution_soft_soft_amount_avg, $softDAO->currency);
+ $softCount += $softDAO->civicrm_contribution_soft_soft_amount_count;
}
}
parent::postProcess();
}
+ public function buildRows($sql, &$rows) {
+ $dao = CRM_Core_DAO::executeQuery($sql);
+ if (!is_array($rows)) {
+ $rows = array();
+ }
+
+ // use this method to modify $this->_columnHeaders
+ $this->modifyColumnHeaders();
+
+ $unselectedSectionColumns = $this->unselectedSectionColumns();
+
+ //CRM-16338 if both soft-credit and contribution are enabled then process the contribution's
+ //total amount's average, count and sum separately and add it to the respective result list
+ $softCredit = (!empty($this->_params['fields']['soft_amount']) && !empty($this->_params['fields']['total_amount'])) ? TRUE : FALSE;
+ if ($softCredit) {
+ $this->from('contribution');
+ $contriSQL = "{$this->_select} {$this->_from} {$this->_where} {$this->_groupBy} {$this->_having} {$this->_orderBy} {$this->_limit}";
+ $contriDAO = CRM_Core_DAO::executeQuery($contriSQL);
+ $contriFields = array(
+ 'civicrm_contribution_total_amount_sum',
+ 'civicrm_contribution_total_amount_avg',
+ 'civicrm_contribution_total_amount_count');
+ $contriRows = array();
+ while ($contriDAO->fetch()) {
+ $contriRow = array();
+ foreach ($contriFields as $column) {
+ $contriRow[$column] = $contriDAO->$column;
+ }
+ $contriRows[] = $contriRow;
+ }
+ }
+
+ $count = 0;
+ while ($dao->fetch()) {
+ $row = array();
+ foreach ($this->_columnHeaders as $key => $value) {
+ if ($softCredit && array_key_exists($key, $contriRows[$count])) {
+ $row[$key] = $contriRows[$count][$key];
+ }
+ elseif (property_exists($dao, $key)) {
+ $row[$key] = $dao->$key;
+ }
+ }
+
+ // section headers not selected for display need to be added to row
+ foreach ($unselectedSectionColumns as $key => $values) {
+ if (property_exists($dao, $key)) {
+ $row[$key] = $dao->$key;
+ }
+ }
+
+ $count++;
+ $rows[] = $row;
+ }
+
+ }
+
/**
* @param $rows
*/
*/
public function alterDisplay(&$rows) {
$entryFound = FALSE;
+ $contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus();
foreach ($rows as $rowNum => $row) {
// make count columns point to detail report
$entryFound = TRUE;
}
+ // convert contribution status id to status name
+ if ($value = CRM_Utils_Array::value('civicrm_contribution_contribution_status_id', $row)) {
+ $rows[$rowNum]['civicrm_contribution_contribution_status_id'] = $contributionStatus[$value];
+ $entryFound = TRUE;
+ }
+
// If using campaigns, convert campaign_id to campaign title
if (array_key_exists('civicrm_contribution_campaign_id', $row)) {
if ($value = $row['civicrm_contribution_campaign_id']) {
projects / civicrm-core.git / blobdiff