From 49ca5cd9aea998f81eaa56676dba0d8f59dce015 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 22 Nov 2023 11:31:10 +1300 Subject: [PATCH] Replace ref to undeclared property with tax-inclusive lookup --- CRM/Contribute/Form/Contribution/Confirm.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php index 88bed9766c..6ab0aff649 100644 --- a/CRM/Contribute/Form/Contribution/Confirm.php +++ b/CRM/Contribute/Form/Contribution/Confirm.php @@ -690,7 +690,6 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr } $membershipTypeValues = CRM_Member_BAO_Membership::buildMembershipTypeValues($this, $membershipTypeIds); - $this->_membershipTypeValues = $membershipTypeValues; $endDate = NULL; // Check if we support auto-renew on this contribution page @@ -1130,15 +1129,13 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr // 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' + if ($this->isSeparateMembershipPayment() && isset($params['selectMembership']) - && $this->_values['is_allow_other_amount'] == '1' + && $this->getContributionPageValue('is_allow_other_amount') // CRM-16331 - && !empty($this->_membershipTypeValues) - && !empty($this->_membershipTypeValues[$params['selectMembership']]['minimum_fee']) + && !empty($this->order->getMembershipTotalAmount()) ) { - $recurParams['amount'] = $this->_membershipTypeValues[$params['selectMembership']]['minimum_fee']; + $recurParams['amount'] = $this->order->getMembershipTotalAmount(); } $recurParams['is_test'] = 0; -- 2.25.1