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 #19348 from sunilpawar/dev_age_at_deceased_date
[civicrm-core.git]
/
CRM
/
Contact
/
BAO
/
Contact.php
diff --git
a/CRM/Contact/BAO/Contact.php
b/CRM/Contact/BAO/Contact.php
index 0edeb2f09a4101f923a0fc136f278a95597c85c6..d6f5527756a9bd3725feaf5b97d86a81e9e02814 100644
(file)
--- a/
CRM/Contact/BAO/Contact.php
+++ b/
CRM/Contact/BAO/Contact.php
@@
-2599,7
+2599,11
@@
LEFT JOIN civicrm_email ON ( civicrm_contact.id = civicrm_email.contact_id )
if ($contact->birth_date) {
$birthDate = CRM_Utils_Date::customFormat($contact->birth_date, '%Y%m%d');
if ($birthDate < date('Ymd')) {
if ($contact->birth_date) {
$birthDate = CRM_Utils_Date::customFormat($contact->birth_date, '%Y%m%d');
if ($birthDate < date('Ymd')) {
- $age = CRM_Utils_Date::calculateAge($birthDate);
+ $deceasedDate = NULL;
+ if (!empty($contact->is_deceased) && !empty($contact->deceased_date)) {
+ $deceasedDate = $contact->deceased_date;
+ }
+ $age = CRM_Utils_Date::calculateAge($birthDate, $deceasedDate);
$values['age']['y'] = $age['years'] ?? NULL;
$values['age']['m'] = $age['months'] ?? NULL;
}
$values['age']['y'] = $age['years'] ?? NULL;
$values['age']['m'] = $age['months'] ?? NULL;
}
@@
-2657,7
+2661,7
@@
LEFT JOIN civicrm_email ON ( civicrm_contact.id = civicrm_email.contact_id )
return CRM_Contribute_BAO_Contribution::contributionCount($contactId);
case 'membership':
return CRM_Contribute_BAO_Contribution::contributionCount($contactId);
case 'membership':
- return CRM_Member_BAO_Membership::getContactMembershipCount($contactId, TRUE);
+ return CRM_Member_BAO_Membership::getContactMembershipCount(
(int)
$contactId, TRUE);
case 'participant':
return CRM_Event_BAO_Participant::getContactParticipantCount($contactId);
case 'participant':
return CRM_Event_BAO_Participant::getContactParticipantCount($contactId);