Skip to content
Snippets Groups Projects
Unverified Commit 97dbd88c authored by eileen's avatar eileen :8ball: Committed by GitHub
Browse files

Merge pull request #12266 from jitendrapurohit/core-154

#154 - Can't edit related records when current employer has a…
parents 1c5bc02c 00538ec6
No related branches found
No related tags found
No related merge requests found
......@@ -1736,6 +1736,10 @@ SELECT relationship_type_id, relationship_direction
//contact before creating new membership record.
CRM_Member_BAO_Membership::deleteRelatedMemberships($membershipId, $relatedContactId);
}
//skip status calculation for pay later memberships.
if (!empty($membershipValues['status_id']) && $membershipValues['status_id'] == $pendingStatusId) {
$membershipValues['skipStatusCal'] = TRUE;
}
// check whether we have some related memberships still available
$query = "
......
......@@ -631,6 +631,28 @@ class api_v3_MembershipTest extends CiviUnitTestCase {
$result = $this->callAPISuccess('membership', 'get', $params);
$this->assertEquals(0, $result['count']);
//Create pay_later membership for organization.
$employerId[2] = $this->organizationCreate(array(), 1);
$params = array(
'contact_id' => $employerId[2],
'membership_type_id' => $membershipTypeId,
'source' => 'Test pay later suite',
'is_pay_later' => 1,
'status_id' => 5,
);
$organizationMembership = CRM_Member_BAO_Membership::add($params);
$organizationMembershipID = $organizationMembership->id;
$memberContactId[3] = $this->individualCreate(array('employer_id' => $employerId[2]), 0);
// Check that the employee inherited the membership
$params = array(
'contact_id' => $memberContactId[3],
'membership_type_id' => $membershipTypeId,
);
$result = $this->callAPISuccess('membership', 'get', $params);
$this->assertEquals(1, $result['count']);
$result = $result['values'][$result['id']];
$this->assertEquals($organizationMembershipID, $result['owner_membership_id']);
// Set up params for enable/disable checks
$relationship1 = $this->callAPISuccess('relationship', 'get', array('contact_id_a' => $memberContactId[1]));
$params = array(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment