From 8ac9d07bb74b2bd7a09e90a632a03f51fb916900 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Tue, 21 Nov 2023 10:02:21 +1300 Subject: [PATCH] Remove assignments for template that are not needed for updated template --- CRM/Contribute/Form/Contribution/Confirm.php | 21 +------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php index c35b1d809b..0266c9a7e2 100644 --- a/CRM/Contribute/Form/Contribution/Confirm.php +++ b/CRM/Contribute/Form/Contribution/Confirm.php @@ -1557,21 +1557,8 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr $this->_values['membership_id'] = $membership->id; } } - if ($this->_priceSetId && !empty($this->_useForMember) && !empty($this->_lineItem)) { - foreach ($this->_lineItem[$this->_priceSetId] as & $priceFieldOp) { - if (!empty($priceFieldOp['membership_type_id']) && $membership->membership_type_id == $priceFieldOp['membership_type_id']) { - $membershipOb = $membership; - $priceFieldOp['start_date'] = $membershipOb->start_date ? CRM_Utils_Date::formatDateOnlyLong($membershipOb->start_date) : '-'; - $priceFieldOp['end_date'] = $membershipOb->end_date ? CRM_Utils_Date::formatDateOnlyLong($membershipOb->end_date) : '-'; - } - else { - $priceFieldOp['start_date'] = $priceFieldOp['end_date'] = 'N/A'; - } - } - $this->_values['lineItem'] = $this->_lineItem; - $this->assign('lineItem', $this->_lineItem); - } } + $this->assign('lineItem', $this->isQuickConfig() ? NULL : $this->getLineItems()); if (!empty($errors)) { $message = $this->compileErrorMessage($errors); @@ -2663,12 +2650,6 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr $form->_params['source'] = $paymentParams['contribution_source']; } - // get the price set values for receipt. - if ($form->_priceSetId && $form->_lineItem) { - $form->_values['lineItem'] = $form->_lineItem; - $form->_values['priceSetID'] = $form->_priceSetId; - } - $form->_values['contribution_id'] = $contribution->id; $form->_values['contribution_page_id'] = $contribution->contribution_page_id; -- 2.25.1