From b4a0cf9a6ca7ccafdd66ac1a4ffbc6a1d0b0d804 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Mon, 24 Jul 2023 11:29:24 +1200 Subject: [PATCH] Follow on cleanup - remove unused assign --- CRM/Contribute/Form/Contribution/Confirm.php | 6 +----- CRM/Contribute/Form/Contribution/ThankYou.php | 10 ++++------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php index 4005992021..ade4987cbf 100644 --- a/CRM/Contribute/Form/Contribution/Confirm.php +++ b/CRM/Contribute/Form/Contribution/Confirm.php @@ -762,11 +762,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr ->execute() ->first(); - if ($membership) { - if ($membership["membership_type_id.duration_unit:name"] === 'lifetime') { - $this->assign('islifetime', TRUE); - continue; - } + if ($membership && $membership['membership_type_id.duration_unit:name'] !== 'lifetime') { $this->assign('renewal_mode', TRUE); $this->_currentMemberships[$membership['membership_type_id']] = $membership['membership_type_id']; $memType['current_membership'] = $membership['end_date']; diff --git a/CRM/Contribute/Form/Contribution/ThankYou.php b/CRM/Contribute/Form/Contribution/ThankYou.php index 5eb6769dd1..4b8414d528 100644 --- a/CRM/Contribute/Form/Contribution/ThankYou.php +++ b/CRM/Contribute/Form/Contribution/ThankYou.php @@ -15,6 +15,8 @@ * @copyright CiviCRM LLC https://civicrm.org/licensing */ +use Civi\Api4\Membership; + /** * Form for thank-you / success page - 3rd step of online contribution process. */ @@ -383,7 +385,7 @@ class CRM_Contribute_Form_Contribution_ThankYou extends CRM_Contribute_Form_Cont if ($cid) { //show current membership, skip pending and cancelled membership records, //because we take first membership record id for renewal - $membership = \Civi\Api4\Membership::get(FALSE) + $membership = Membership::get(FALSE) ->addSelect('end_date', 'membership_type_id', 'membership_type_id.duration_unit:name') ->addWhere('contact_id', '=', $cid) ->addWhere('membership_type_id', '=', $memType['id']) @@ -393,11 +395,7 @@ class CRM_Contribute_Form_Contribution_ThankYou extends CRM_Contribute_Form_Cont ->execute() ->first(); - if ($membership) { - if ($membership["membership_type_id.duration_unit:name"] === 'lifetime') { - $this->assign('islifetime', TRUE); - continue; - } + if ($membership && $membership['membership_type_id.duration_unit:name'] !== 'lifetime') { $this->assign('renewal_mode', TRUE); $this->_currentMemberships[$membership['membership_type_id']] = $membership['membership_type_id']; $memType['current_membership'] = $membership['end_date']; -- 2.25.1