From d0837b369f9e72948137f4d4b15ad2b1591b621c Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Fri, 18 Mar 2022 18:46:07 +1300 Subject: [PATCH] Ensure pay later variables assigned --- CRM/Contribute/Form/Contribution/Main.php | 8 +++----- CRM/Event/Form/Registration/Register.php | 6 ++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php index 9d6a15c9b9..2f54fc9305 100644 --- a/CRM/Contribute/Form/Contribution/Main.php +++ b/CRM/Contribute/Form/Contribution/Main.php @@ -1400,12 +1400,10 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu // Would be nice to someday understand the point of this set. $this->set('is_pay_later', $params['is_pay_later']); // assign pay later stuff - $this->_params['is_pay_later'] = CRM_Utils_Array::value('is_pay_later', $params, FALSE); + $this->_params['is_pay_later'] = $params['is_pay_later']; $this->assign('is_pay_later', $params['is_pay_later']); - if ($params['is_pay_later']) { - $this->assign('pay_later_text', $this->_values['pay_later_text']); - $this->assign('pay_later_receipt', CRM_Utils_Array::value('pay_later_receipt', $this->_values)); - } + $this->assign('pay_later_text', $params['is_pay_later'] ? $this->_values['pay_later_text'] : NULL); + $this->assign('pay_later_receipt', ($params['is_pay_later'] && isset($this->_values['pay_later_receipt'])) ? $this->_values['pay_later_receipt'] : NULL); if ($this->_membershipBlock && $this->_membershipBlock['is_separate_payment'] && !empty($params['separate_amount'])) { $this->set('amount', $params['separate_amount']); diff --git a/CRM/Event/Form/Registration/Register.php b/CRM/Event/Form/Registration/Register.php index 5352797a92..640e5b3395 100644 --- a/CRM/Event/Form/Registration/Register.php +++ b/CRM/Event/Form/Registration/Register.php @@ -985,10 +985,8 @@ class CRM_Event_Form_Registration_Register extends CRM_Event_Form_Registration { // assign pay later stuff $this->_params['is_pay_later'] = CRM_Utils_Array::value('is_pay_later', $params, FALSE); $this->assign('is_pay_later', $params['is_pay_later']); - if ($params['is_pay_later']) { - $this->assign('pay_later_text', $this->_values['event']['pay_later_text']); - $this->assign('pay_later_receipt', $this->_values['event']['pay_later_receipt']); - } + $this->assign('pay_later_text', $params['is_pay_later'] ? $this->_values['event']['pay_later_text'] : NULL); + $this->assign('pay_later_receipt', $params['is_pay_later'] ? $this->_values['event']['pay_later_receipt'] : NULL); if (!$this->_allowConfirmation) { // check if the participant is already registered -- 2.25.1