From 1041d4939ab275eef69b6f3f98d58430f29a3427 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 18 Oct 2023 09:32:12 +1300 Subject: [PATCH] Remove reference to front end membership block from back office form --- CRM/Contribute/Form/Contribution.php | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php index 0599b3b932..72812cfbc4 100644 --- a/CRM/Contribute/Form/Contribution.php +++ b/CRM/Contribute/Form/Contribution.php @@ -1519,7 +1519,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP /** * Create the recurring contribution record. * - * @param CRM_Core_Form $form + * @param self $form * @param array $params * @param array $recurParams * @@ -1535,19 +1535,6 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP $recurParams['currency'] = $params['currency'] ?? NULL; $recurParams['payment_instrument_id'] = $params['payment_instrument_id']; - // CRM-14354: For an auto-renewing membership with an additional contribution, - // if separate payments is not enabled, make sure only the membership fee recurs - if (!empty($this->_membershipBlock) - && $this->_membershipBlock['is_separate_payment'] === '0' - && isset($params['selectMembership']) - && $form->_values['is_allow_other_amount'] == '1' - // CRM-16331 - && !empty($form->_membershipTypeValues) - && !empty($form->_membershipTypeValues[$params['selectMembership']]['minimum_fee']) - ) { - $recurParams['amount'] = $form->_membershipTypeValues[$params['selectMembership']]['minimum_fee']; - } - $recurParams['is_test'] = 0; if (($form->_action & CRM_Core_Action::PREVIEW) || (isset($form->_mode) && ($form->_mode == 'test')) -- 2.25.1