projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #4925 from KarinG/patch-1
[civicrm-core.git]
/
CRM
/
Report
/
Form
/
Contribute
/
Detail.php
diff --git
a/CRM/Report/Form/Contribute/Detail.php
b/CRM/Report/Form/Contribute/Detail.php
index 76e3309e161e6aa32cacb6aeb89903122fd89903..42b37694d75fc9c08f99622dd34f070fe18f71e3 100644
(file)
--- a/
CRM/Report/Form/Contribute/Detail.php
+++ b/
CRM/Report/Form/Contribute/Detail.php
@@
-45,10
+45,8
@@
class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
protected $_customGroupExtends = array('Contribution');
/**
protected $_customGroupExtends = array('Contribution');
/**
- *
*/
/**
*/
/**
- *
*/
public function __construct() {
*/
public function __construct() {
@@
-101,7
+99,7
@@
class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
'title' => ts('Last Name, First Name'),
'default' => '1',
'default_weight' => '0',
'title' => ts('Last Name, First Name'),
'default' => '1',
'default_weight' => '0',
- 'default_order' => 'ASC'
+ 'default_order' => 'ASC'
,
),
),
'grouping' => 'contact-fields',
),
),
'grouping' => 'contact-fields',
@@
-174,15
+172,15
@@
class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
'net_amount' => NULL,
'contribution_or_soft' => array(
'title' => ts('Contribution OR Soft Credit?'),
'net_amount' => NULL,
'contribution_or_soft' => array(
'title' => ts('Contribution OR Soft Credit?'),
- 'dbAlias' => "'Contribution'"
+ 'dbAlias' => "'Contribution'"
,
),
'soft_credits' => array(
'title' => ts('Soft Credits'),
),
'soft_credits' => array(
'title' => ts('Soft Credits'),
- 'dbAlias' => "NULL"
+ 'dbAlias' => "NULL"
,
),
'soft_credit_for' => array(
'title' => ts('Soft Credit For'),
),
'soft_credit_for' => array(
'title' => ts('Soft Credit For'),
- 'dbAlias' => "NULL"
+ 'dbAlias' => "NULL"
,
),
),
'filters' => array(
),
),
'filters' => array(
@@
-593,7
+591,7
@@
GROUP BY {$this->_aliases['civicrm_contribution']}.currency";
) {
$tempQuery = "(SELECT * FROM civireport_contribution_detail_temp1)";
}
) {
$tempQuery = "(SELECT * FROM civireport_contribution_detail_temp1)";
}
- else
if (CRM_Utils_Array::value('contribution_or_soft_value', $this->_params) ==
+ elseif (CRM_Utils_Array::value('contribution_or_soft_value', $this->_params) ==
'soft_credits_only'
) {
$tempQuery = "(SELECT * FROM civireport_contribution_detail_temp2)";
'soft_credits_only'
) {
$tempQuery = "(SELECT * FROM civireport_contribution_detail_temp2)";
@@
-618,8
+616,7
@@
UNION ALL
list($alias, $rest) = explode('.', $clause);
$orderClause[] = $aliases[$alias] . "_" . $rest;
}
list($alias, $rest) = explode('.', $clause);
$orderClause[] = $aliases[$alias] . "_" . $rest;
}
- $orderBy = (!empty($orderClause)) ?
- "ORDER BY " . implode(', ', $orderClause) : '';
+ $orderBy = (!empty($orderClause)) ? "ORDER BY " . implode(', ', $orderClause) : '';
}
// 6. show result set from temp table 3
}
// 6. show result set from temp table 3
@@
-874,11
+871,9
@@
WHERE civicrm_contribution_contribution_id={$row['civicrm_contribution_contribu
}
else {
// other aliases are higher level; roll count into their total
}
else {
// other aliases are higher level; roll count into their total
- $totals[$key] = (array_key_exists($key, $totals)) ?
- $totals[$key] + $dao->ct : $dao->ct;
+ $totals[$key] = (array_key_exists($key, $totals)) ? $totals[$key] + $dao->ct : $dao->ct;
if ($showsumcontribs) {
if ($showsumcontribs) {
- $sumcontribs[$key] = array_key_exists($key, $sumcontribs) ?
- $sumcontribs[$key] + $dao->sumcontribs : $dao->sumcontribs;
+ $sumcontribs[$key] = array_key_exists($key, $sumcontribs) ? $sumcontribs[$key] + $dao->sumcontribs : $dao->sumcontribs;
}
}
}
}
}
}
@@
-893,7
+888,7
@@
WHERE civicrm_contribution_contribution_id={$row['civicrm_contribution_contribu
) {
$title = '%1 contributions: %2';
}
) {
$title = '%1 contributions: %2';
}
- else
if (CRM_Utils_Array::value('contribution_or_soft_value', $this->_params) ==
+ elseif (CRM_Utils_Array::value('contribution_or_soft_value', $this->_params) ==
'soft_credits_only'
) {
$title = '%1 soft-credits: %2';
'soft_credits_only'
) {
$title = '%1 soft-credits: %2';
@@
-901,7
+896,7
@@
WHERE civicrm_contribution_contribution_id={$row['civicrm_contribution_contribu
foreach ($totals as $key => $total) {
$totalandsum[$key] = ts($title, array(
1 => $total,
foreach ($totals as $key => $total) {
$totalandsum[$key] = ts($title, array(
1 => $total,
- 2 => CRM_Utils_Money::format($sumcontribs[$key])
+ 2 => CRM_Utils_Money::format($sumcontribs[$key])
,
));
}
$this->assign('sectionTotals', $totalandsum);
));
}
$this->assign('sectionTotals', $totalandsum);
@@
-912,4
+907,3
@@
WHERE civicrm_contribution_contribution_id={$row['civicrm_contribution_contribu
}
}
}
}
}
}
-