From 0130208ab9b4d554bc776d658470bbdabf8b3256 Mon Sep 17 00:00:00 2001 From: Deepak Srivastava Date: Thu, 3 Oct 2013 13:24:24 +0530 Subject: [PATCH] CRM-13333 - made on-behalf-org defaults populate correctly --- CRM/Contribute/Form/Contribution/OnBehalfOf.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CRM/Contribute/Form/Contribution/OnBehalfOf.php b/CRM/Contribute/Form/Contribution/OnBehalfOf.php index 4079e7fd0b..9218596500 100644 --- a/CRM/Contribute/Form/Contribution/OnBehalfOf.php +++ b/CRM/Contribute/Form/Contribution/OnBehalfOf.php @@ -69,9 +69,19 @@ class CRM_Contribute_Form_Contribution_OnBehalfOf { if ($contactID) { $form->_employers = CRM_Contact_BAO_Relationship::getPermissionedEmployer($contactID); - if (!empty($form->_employers)) { + + if (!empty($form->_membershipContactID) && $contactID != $form->_membershipContactID) { + // renewal case - membership being renewed may or may not be for organization + if (!empty($form->_employers) && array_key_exists($form->_membershipContactID, $form->_employers)) { + // if _membershipContactID belongs to employers list, we can say: + $form->_relatedOrganizationFound = TRUE; + } + } else if (!empty($form->_employers)) { + // not a renewal case and _employers list is not empty $form->_relatedOrganizationFound = TRUE; + } + if ($form->_relatedOrganizationFound) { $locDataURL = CRM_Utils_System::url('civicrm/ajax/permlocation', 'cid=', FALSE, NULL, FALSE); $form->assign('locDataURL', $locDataURL); -- 2.25.1