protected $_summary = NULL;
protected $_customGroupExtends = array(
- 'Contribution');
+ 'Contribution');
function __construct() {
$config = CRM_Core_Config::singleton();
),
),
'order_bys' =>
- array(
- 'sort_name' => array(
- 'title' => ts('Last Name, First Name'),
+ array(
+ 'sort_name' => array(
+ 'title' => ts('Last Name, First Name'),
'default' => '1',
'default_weight' => '0',
'default_order' => 'ASC'
'type' => CRM_Utils_Type::T_STRING,
),
'financial_type_id' =>
- array( 'title' => ts( 'Financial Type' ),
+ array( 'title' => ts( 'Financial Type' ),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::financialType(),
'type' => CRM_Utils_Type::T_INT,
'total_amount' =>
array('title' => ts('Contribution Amount')),
),
- 'order_bys' => array(
- 'financial_type_id' => array('title' => ts('Financial Type')),
- 'contribution_status_id' => array('title' => ts('Contribution Status')),
- 'payment_instrument_id' => array('title' => ts('Payment Instrument')),
+ 'order_bys' => array(
+ 'financial_type_id' => array('title' => ts('Financial Type')),
+ 'contribution_status_id' => array('title' => ts('Contribution Status')),
+ 'payment_instrument_id' => array('title' => ts('Payment Instrument')),
),
'grouping' => 'contri-fields',
),
),
),
),
- 'civicrm_note' =>
+ 'civicrm_note' =>
array(
'dao' => 'CRM_Core_DAO_Note',
'fields' =>
) + $this->addAddressFields(FALSE);
$this->_tagFilter = TRUE;
-
+
// Don't show Batch display column and filter unless batches are being used
$this->_closedBatches = CRM_Batch_BAO_Batch::getBatches();
if (!empty($this->_closedBatches)) {
$this->_columns['civicrm_batch']['dao'] = 'CRM_Batch_DAO_Batch';
$this->_columns['civicrm_batch']['fields']['batch_id'] = array(
'name' => 'id',
- 'title' => ts('Batch Name'),
+ 'title' => ts('Batch Name'),
);
$this->_columns['civicrm_batch']['filters']['bid'] = array(
'name' => 'id',
);
$this->_columns['civicrm_entity_batch']['dao'] = 'CRM_Batch_DAO_EntityBatch';
$this->_columns['civicrm_entity_batch']['fields']['entity_batch_id'] = array(
- 'name' => 'batch_id',
+ 'name' => 'batch_id',
'default' => TRUE,
'no_display' => TRUE,
);
$this->_from = NULL;
$this->_from = "
FROM civicrm_contact {$this->_aliases['civicrm_contact']} {$this->_aclFrom}
- INNER JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']}
+ 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";
if (!empty($this->_params['ordinality_value'])) {
$this->_from .= "
- INNER JOIN (SELECT c.id, IF(COUNT(oc.id) = 0, 0, 1) AS ordinality FROM civicrm_contribution c LEFT JOIN civicrm_contribution oc ON c.contact_id = oc.contact_id AND oc.receive_date < c.receive_date GROUP BY c.id) {$this->_aliases['civicrm_contribution_ordinality']}
+ INNER JOIN (SELECT c.id, IF(COUNT(oc.id) = 0, 0, 1) AS ordinality FROM civicrm_contribution c LEFT JOIN civicrm_contribution oc ON c.contact_id = oc.contact_id AND oc.receive_date < c.receive_date GROUP BY c.id) {$this->_aliases['civicrm_contribution_ordinality']}
ON {$this->_aliases['civicrm_contribution_ordinality']}.id = {$this->_aliases['civicrm_contribution']}.id";
}
$this->_from .= "
- LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
- ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND
+ 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)";
if ($this->_addressField OR (!empty($this->_params['state_province_id_value']) OR !empty($this->_params['country_id_value']))) {
$this->_from .= "
- LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']}
- ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id AND
+ 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";
}
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
+ $this->_from .= "
+ 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";
}
// include Honor name field
if ($this->_nameFieldHonor) {
$this->_from .= "
- LEFT JOIN civicrm_contact contacthonor
+ LEFT JOIN civicrm_contact contacthonor
ON contacthonor.id = {$this->_aliases['civicrm_contribution']}.honor_contact_id";
}
// include Honor email field
if ($this->_emailFieldHonor) {
$this->_from .= "
- LEFT JOIN civicrm_email emailhonor
+ LEFT JOIN civicrm_email emailhonor
ON emailhonor.contact_id = {$this->_aliases['civicrm_contribution']}.honor_contact_id
AND emailhonor.is_primary = 1\n";
}
//for contribution batches
if ($this->_closedBatches && CRM_Utils_Array::value('batch_id', $this->_params['fields'])) {
$this->_from .= "
- LEFT JOIN civicrm_entity_batch {$this->_aliases['civicrm_entity_batch']}
+ LEFT JOIN civicrm_entity_batch {$this->_aliases['civicrm_entity_batch']}
ON ({$this->_aliases['civicrm_entity_batch']}.entity_id = {$this->_aliases['civicrm_contribution']}.id AND
{$this->_aliases['civicrm_entity_batch']}.entity_table = 'civicrm_contribution')
- LEFT JOIN civicrm_batch {$this->_aliases['civicrm_batch']}
+ LEFT JOIN civicrm_batch {$this->_aliases['civicrm_batch']}
ON {$this->_aliases['civicrm_batch']}.id = {$this->_aliases['civicrm_entity_batch']}.batch_id";
}
}
$group = "\nGROUP BY {$this->_aliases['civicrm_contribution']}.currency";
$sql = "{$select} {$this->_from} {$this->_where} {$group}";
- crm_core_error::Debug( $sql);
$dao = CRM_Core_DAO::executeQuery($sql);
while ($dao->fetch()) {
$totalAmount[] = CRM_Utils_Money::format($dao->amount, $dao->currency)."(".$dao->count.")";
$average[] = CRM_Utils_Money::format($dao->avg, $dao->currency);
- $count += $dao->count;
+ $count += $dao->count;
}
$statistics['counts']['amount'] = array(
'title' => ts('Total Amount (Donations)'),
$lastKey = $rowNum;
}
}
-
+
function sectionTotals( ) {
// Reports using order_bys with sections must populate $this->_selectAliases in select() method.
// the last alias is the lowest-level section header; use count as-is
$totals[$key] = $dao->ct;
if ($showsumcontribs) { $sumcontribs[$key] = $dao->sumcontribs; }
- }
+ }
else {
// other aliases are higher level; roll count into their total
- $totals[$key] = (array_key_exists($key, $totals)) ? $totals[$key] + $dao->ct : $dao->ct;
- if ($showsumcontribs) {
- $sumcontribs[$key] = array_key_exists($key, $sumcontribs) ? $sumcontribs[$key] + $dao->sumcontribs : $dao->sumcontribs;
+ $totals[$key] = (array_key_exists($key, $totals)) ? $totals[$key] + $dao->ct : $dao->ct;
+ if ($showsumcontribs) {
+ $sumcontribs[$key] = array_key_exists($key, $sumcontribs) ? $sumcontribs[$key] + $dao->sumcontribs : $dao->sumcontribs;
}
}
}
if ($showsumcontribs) {
$totalandsum = array();
foreach ($totals as $key => $total) {
- $totalandsumvals = array(
- 1 => $total,
+ $totalandsumvals = array(
+ 1 => $total,
2 => CRM_Utils_Money::format($sumcontribs[$key]),
);
$totalandsum[$key] = ts("%1 contributions: %2", $totalandsumvals);