Skip to content

Commit

Permalink
Merge pull request #458 from eileenmcnaughton/grant
Browse files Browse the repository at this point in the history
Use primary phone join where is_primary desired, use primary_phone fr…
  • Loading branch information
eileenmcnaughton authored Nov 24, 2020
2 parents 8b572c4 + bcdf6ff commit 8e8ce4a
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public function fromClauses() :array {
'product_from_contribution',
'note_from_contact',
'email_from_contact',
'phone_from_contact',
'primary_phone_from_contact',
'address_from_contact',
'website_from_contact',
];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ function fromClauses() {
return [
'contact_from_contribution_recur',
'email_from_contact',
'phone_from_contact',
'primary_phone_from_contact',
'address_from_contact',
'website_from_contact',
];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ public function fromClauses() {
'event_from_participant',
'contact_from_participant',
'note_from_participant',
'phone_from_contact',
'primary_phone_from_contact',
'address_from_contact',
'email_from_contact',
'related_contact_from_participant',
Expand Down
1 change: 0 additions & 1 deletion CRM/Extendedreport/Form/Report/ExtendedReport.php
Original file line number Diff line number Diff line change
Expand Up @@ -5645,7 +5645,6 @@ protected function joinPhoneFromContact($prefix = '', $extra = []) {
if ($this->isTableSelected($prefix . 'civicrm_phone')) {
$this->_from .= " LEFT JOIN civicrm_phone {$this->_aliases[$prefix . 'civicrm_phone']}
ON {$this->_aliases[$prefix . 'civicrm_phone']}.contact_id = {$this->_aliases[$prefix . 'civicrm_contact']}.id
AND {$this->_aliases[$prefix . 'civicrm_phone']}.is_primary = 1
";
}
}
Expand Down
2 changes: 1 addition & 1 deletion CRM/Extendedreport/Form/Report/Grant/Detail.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function fromClauses() {
return [
'contact_from_grant',
'email_from_contact',
'phone_from_contact',
'primary_phone_from_contact',
];
}

Expand Down
2 changes: 1 addition & 1 deletion CRM/Extendedreport/Form/Report/Price/Lineitem.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public function fromClauses() {
'address_from_contact',
'address_from_contribution',
'email_from_contact',
'phone_from_contact',
'primary_phone_from_contact',
];

}
Expand Down

0 comments on commit 8e8ce4a

Please sign in to comment.