Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add "pledge id" as column and filter in Contribution Detail report. #16868

Merged
merged 1 commit into from
Mar 31, 2020
Merged

Add "pledge id" as column and filter in Contribution Detail report. #16868

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 41 additions & 1 deletion CRM/Report/Form/Contribute/Detail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,12 +343,25 @@ public function __construct() {
],
],
],
'civicrm_pledge_payment' => [
'dao' => 'CRM_Pledge_DAO_PledgePayment',
'fields' => [
'pledge_id' => [
'title' => ts('Pledge ID'),
],
],
'filters' => [
'pledge_id' => [
'title' => ts('Pledge ID'),
'type' => CRM_Utils_Type::T_INT,
],
],
],
],
$this->getColumns('Address')
);
// The tests test for this variation of the sort_name field. Don't argue with the tests :-).
$this->_columns['civicrm_contact']['fields']['sort_name']['title'] = ts('Donor Name');

$this->_groupFilter = TRUE;
$this->_tagFilter = TRUE;
// If we have campaigns enabled, add those elements to both the fields, filters and sorting
Expand Down Expand Up @@ -793,6 +806,27 @@ public function alterDisplay(&$rows) {
);
}

// Contribution amount links to viewing contribution
if ($value = CRM_Utils_Array::value('civicrm_pledge_payment_pledge_id', $row)) {
if (CRM_Core_Permission::check('access CiviContribute')) {
$url = CRM_Utils_System::url(
"civicrm/contact/view/pledge",
[
'reset' => 1,
'id' => $row['civicrm_pledge_payment_pledge_id'],
'cid' => $row['civicrm_contact_id'],
'action' => 'view',
'context' => 'pledge',
'selectedChild' => 'pledge',
],
$this->_absoluteUrl
);
$rows[$rowNum]['civicrm_pledge_payment_pledge_id_link'] = $url;
$rows[$rowNum]['civicrm_pledge_payment_pledge_id_hover'] = ts("View Details of this Pledge.");
}
$entryFound = TRUE;
}

$entryFound = $this->alterDisplayAddressFields($row, $rows, $rowNum, 'contribute/detail', 'List all contribution(s) for this ') ? TRUE : $entryFound;

// skip looking further in rows, if first row itself doesn't
Expand Down Expand Up @@ -965,6 +999,12 @@ public function appendAdditionalFromJoins() {
}
// for credit card type
$this->addFinancialTrxnFromClause();

if ($this->isTableSelected('civicrm_pledge_payment')) {
$this->_from .= "
LEFT JOIN civicrm_pledge_payment {$this->_aliases['civicrm_pledge_payment']} ON {$this->_aliases['civicrm_pledge_payment']}.contribution_id = {$this->_aliases['civicrm_contribution']}.id
";
}
}

/**
Expand Down