From 79107b6516f719b1df3b2eef107930a62db5aa9a Mon Sep 17 00:00:00 2001 From: eileen Date: Wed, 27 May 2020 12:36:18 +1200 Subject: [PATCH] [REF] Remove unreachable block. This code was duplicated onto this form for cleanup. Since this is the renewal form there should always be a current membership. I haven't removed the IF yet for readability but that would follow on --- CRM/Member/Form/MembershipRenewal.php | 44 --------------------------- 1 file changed, 44 deletions(-) diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php index a4dd83f0ac..4e35a8c969 100644 --- a/CRM/Member/Form/MembershipRenewal.php +++ b/CRM/Member/Form/MembershipRenewal.php @@ -896,50 +896,6 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form { $updateStatusId = array_search('Pending', $allStatus); } } - else { - // NEW Membership - $memParams = [ - 'contact_id' => $contactID, - 'membership_type_id' => $membershipTypeID, - ]; - - if (!$pending) { - $dates = CRM_Member_BAO_MembershipType::getDatesForMembershipType($membershipTypeID, NULL, NULL, NULL, $numRenewTerms); - - foreach (['join_date', 'start_date', 'end_date'] as $dateType) { - $memParams[$dateType] = $formDates[$dateType] ?? NULL; - if (empty($memParams[$dateType])) { - $memParams[$dateType] = $dates[$dateType] ?? NULL; - } - } - - $status = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate(CRM_Utils_Date::customFormat($dates['start_date'], - $statusFormat - ), - CRM_Utils_Date::customFormat($dates['end_date'], - $statusFormat - ), - CRM_Utils_Date::customFormat($dates['join_date'], - $statusFormat - ), - 'today', - TRUE, - $membershipTypeID, - $memParams - ); - $updateStatusId = $status['id'] ?? NULL; - } - else { - // if IPN/Pay-Later set status to: PENDING - $updateStatusId = array_search('Pending', $allStatus); - } - - if (!empty($membershipSource)) { - $memParams['source'] = $membershipSource; - } - $memParams['is_test'] = $is_test; - $memParams['is_pay_later'] = $isPayLater; - } // Putting this in an IF is precautionary as it seems likely that it would be ignored if empty, but // perhaps shouldn't be? if ($contributionRecurID) { -- 2.25.1