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

Jump to bottom

MAE-492: Fix membership end date after CiviCRM 5.35 update #368

Merged
merged 1 commit into from
Mar 18, 2021
Merged

MAE-492: Fix membership end date after CiviCRM 5.35 update #368

Show file tree
Hide file tree
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
14 changes: 12 additions & 2 deletions CRM/MembershipExtras/Hook/Pre/MembershipEdit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,15 @@ class CRM_MembershipExtras_Hook_Pre_MembershipEdit {
*/
private $paymentContributionID;

/**
* The payment type e.g. refund or owed
*
* see CRM_Contribute_Form_AdditionalPayment::getPaymentType
*
* @var string
*/
private $paymentType;

/**
* We don't want to extend the same membership
* more than one time if for whatever reason
Expand All @@ -41,10 +50,11 @@ class CRM_MembershipExtras_Hook_Pre_MembershipEdit {
*/
private static $extendedMemberships = [];

public function __construct($id, &$params, $contributionID) {
public function __construct($id, &$params, $contributionID, $paymentType) {
$this->id = $id;
$this->params = &$params;
$this->paymentContributionID = $contributionID;
$this->paymentType = $paymentType;
}

/**
Expand Down Expand Up @@ -86,7 +96,7 @@ private function isRecordingPayment() {
$contributionId = $paymentRecordingDetails['id'];
}

$isRecordPayment = CRM_Utils_Request::retrieve('_qf_AdditionalPayment_upload', 'String') === 'Record Payment';
$isRecordPayment = $this->paymentType === 'owed';

if ($isAddAction && $contributionId && $isRecordPayment) {
$this->paymentContributionID = $contributionId;
Expand Down
7 changes: 6 additions & 1 deletion membershipextras.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@ function membershipextras_civicrm_pre($op, $objectName, $id, &$params) {
}

if ($objectName === 'Membership' && $op == 'edit') {
$membershipPreHook = new CRM_MembershipExtras_Hook_Pre_MembershipEdit($id, $params, $contributionID);
$paymentType = Civi::$statics[E::LONG_NAME]['paymentType'] ?? '';
$membershipPreHook = new CRM_MembershipExtras_Hook_Pre_MembershipEdit($id, $params, $contributionID, $paymentType);
$membershipPreHook->preProcess();
}
ahed-compucorp marked this conversation as resolved.
Show resolved Hide resolved

Expand Down Expand Up @@ -334,6 +335,10 @@ function membershipextras_civicrm_buildForm($formName, &$form) {
$membershipTypeHook = new CRM_MembershipExtras_Hook_BuildForm_ContributionEdit();
$membershipTypeHook->buildForm();
}

if ($formName == 'CRM_Contribute_Form_AdditionalPayment') {
Civi::$statics[E::LONG_NAME]['paymentType'] = $form->getVar('_paymentType');
}
}

/**
Expand Down
22 changes: 14 additions & 8 deletions tests/phpunit/CRM/MembershipExtras/Hook/Pre/MembershipEditTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,9 @@ public function testPreventExtendingPaymentPlanMembershipAfterContributionEdit()
$memberships = $this->getPaymentPlanRenewableMemberships($paymentPlan['id']);
$membershipParams = array_shift($memberships);
$membershipParams['end_date'] = date('Y-m-d');
$paymentType = 'owed';

$hook = new MembershipEditHook($membershipParams['id'], $membershipParams, $contributions[0]['id']);
$hook = new MembershipEditHook($membershipParams['id'], $membershipParams, $contributions[0]['id'], $paymentType);
$hook->preProcess();

$this->assertTrue(!isset($membership['end_date']));
Expand All @@ -134,13 +135,13 @@ public function testPreventExtendingPaymentPlanMembershipOnRecordingPayment() {
$memberships = $this->getPaymentPlanRenewableMemberships($paymentPlan['id']);
$membershipParams = array_shift($memberships);
$membershipParams['end_date'] = date('Y-m-d');
$paymentType = 'owed';

$tmpGlobals = [];
$tmpGlobals['_REQUEST']['entryURL'] = 'action=add&id=' . $contributions[0]['id'];
$tmpGlobals['_REQUEST']['_qf_AdditionalPayment_upload'] = 'Record Payment';
CRM_Utils_GlobalStack::singleton()->push($tmpGlobals);

$hook = new MembershipEditHook($membershipParams['id'], $membershipParams, NULL);
$hook = new MembershipEditHook($membershipParams['id'], $membershipParams, NULL, $paymentType);
$hook->preProcess();

$this->assertTrue(!isset($membership['end_date']));
Expand All @@ -160,14 +161,15 @@ public function testPreventExtendingPaymentPlanMembershipOnBulkStatusUpdate() {
$memberships = $this->getPaymentPlanRenewableMemberships($paymentPlan['id']);
$membershipParams = array_shift($memberships);
$membershipParams['end_date'] = date('Y-m-d');
$paymentType = 'owed';

$tmpGlobals = [];
$tmpGlobals['_REQUEST']['q'] = 'civicrm/contribute/search';
$tmpGlobals['_REQUEST']['_qf_Status_next'] = 'Update Pending Status';
$tmpGlobals['_REQUEST']['contribution_status_id'] = '1';
CRM_Utils_GlobalStack::singleton()->push($tmpGlobals);

$hook = new MembershipEditHook($membershipParams['id'], $membershipParams, NULL);
$hook = new MembershipEditHook($membershipParams['id'], $membershipParams, NULL, $paymentType);
$hook->preProcess();

$this->assertTrue(!isset($membership['end_date']));
Expand Down Expand Up @@ -220,7 +222,8 @@ public function testMembershipNotInPaymentPlanIsNotPreventedFromExtending() {

$newEndDate = date('Y-m-d', strtotime($membership['end_date'] . '+2 years'));
$membership['end_date'] = $newEndDate;
$hook = new MembershipEditHook($membership['id'], $membership, $payment['id']);
$paymentType = 'owed';
$hook = new MembershipEditHook($membership['id'], $membership, $payment['id'], $paymentType);
$hook->preProcess();

$this->assertEquals($newEndDate, $membership['end_date']);
Expand All @@ -240,6 +243,7 @@ public function testExtendPendingPaymentPlanMembershipOnRenewal() {
$memberships = $this->getPaymentPlanRenewableMemberships($paymentPlan['id']);
$membershipParams = array_shift($memberships);
$membershipEndDate = $membershipParams['end_date'];
$paymentType = 'owed';

$tmpGlobals = [];
$tmpGlobals['_REQUEST']['action'] = CRM_Core_Action::RENEW;
Expand All @@ -253,7 +257,7 @@ public function testExtendPendingPaymentPlanMembershipOnRenewal() {
$tmpGlobals['_REQUEST']['contribution_type_toggle'] = 'payment_plan';
CRM_Utils_GlobalStack::singleton()->push($tmpGlobals);

$hook = new MembershipEditHook($membershipParams['id'], $membershipParams, $contributions[0]['id']);
$hook = new MembershipEditHook($membershipParams['id'], $membershipParams, $contributions[0]['id'], $paymentType);
$hook->preProcess();

$this->assertEquals(
Expand All @@ -279,6 +283,7 @@ public function testExtendPendingPlanWithFixedMembershipAndOneInstalment() {
$memberships = $this->getPaymentPlanRenewableMemberships($paymentPlan['id']);
$membershipParams = array_shift($memberships);
$membershipEndDate = $membershipParams['end_date'];
$paymentType = 'owed';

$tmpGlobals['_REQUEST']['action'] = CRM_Core_Action::RENEW;
$tmpGlobals['_REQUEST']['contribution_status_id'] = civicrm_api3('OptionValue', 'getvalue', [
Expand All @@ -291,7 +296,7 @@ public function testExtendPendingPlanWithFixedMembershipAndOneInstalment() {
$tmpGlobals['_REQUEST']['contribution_type_toggle'] = 'payment_plan';
CRM_Utils_GlobalStack::singleton()->push($tmpGlobals);

$hook = new MembershipEditHook($membershipParams['id'], $membershipParams, $contributions[0]['id']);
$hook = new MembershipEditHook($membershipParams['id'], $membershipParams, $contributions[0]['id'], $paymentType);
$hook->preProcess();

$this->assertEquals(
Expand All @@ -316,8 +321,9 @@ public function testVerifyMembershipStartDate() {
$membershipParams = array_shift($memberships);
$originalStartDate = $membershipParams['start_date'];
$membershipParams['start_date'] = date('Y-m-d', strtotime('+1000 years'));
$paymentType = 'owed';

$hook = new MembershipEditHook($membershipParams['id'], $membershipParams, $contributions[0]['id']);
$hook = new MembershipEditHook($membershipParams['id'], $membershipParams, $contributions[0]['id'], $paymentType);
$hook->preProcess();

$this->assertEquals($originalStartDate, $membershipParams['start_date']);
Expand Down