From e81f180bc3db6fb48cbb1ed2d2f04f92774aa615 Mon Sep 17 00:00:00 2001 From: yashodha Date: Wed, 4 Jan 2017 12:03:00 +0530 Subject: [PATCH 1/2] CRM-19795: Contribution page confirmation screen undefined index pay_later_receipt --- CRM/Contribute/Form/Contribution/Confirm.php | 2 +- CRM/Contribute/Form/Contribution/Main.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php index 9192e9122615..2a91d349cd59 100644 --- a/CRM/Contribute/Form/Contribution/Confirm.php +++ b/CRM/Contribute/Form/Contribution/Confirm.php @@ -332,7 +332,7 @@ public function preProcess() { $this->_params['is_pay_later'] = $this->get('is_pay_later'); $this->assign('is_pay_later', $this->_params['is_pay_later']); if ($this->_params['is_pay_later']) { - $this->assign('pay_later_receipt', $this->_values['pay_later_receipt']); + $this->assign('pay_later_receipt', CRM_Utils_Array::value('pay_later_receipt',$this->_values)); } // if onbehalf-of-organization if (!empty($this->_values['onbehalf_profile_id']) && !empty($this->_params['onbehalf']['organization_name'])) { diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php index 74e8216889c9..7a1454ce4a80 100644 --- a/CRM/Contribute/Form/Contribution/Main.php +++ b/CRM/Contribute/Form/Contribution/Main.php @@ -1222,7 +1222,7 @@ public function submit($params) { $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', $this->_values['pay_later_receipt']); + $this->assign('pay_later_receipt', CRM_Utils_Array::value('pay_later_receipt',$this->_values)); } if ($this->_membershipBlock['is_separate_payment'] && !empty($params['separate_amount'])) { From 1488ce4de3b1ea8b42d4d43b80dcd3962c3a0eb7 Mon Sep 17 00:00:00 2001 From: yashodha Date: Wed, 4 Jan 2017 16:50:50 +0530 Subject: [PATCH 2/2] CRM-19795: minor fix --- CRM/Contribute/Form/Contribution/Confirm.php | 2 +- CRM/Contribute/Form/Contribution/Main.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php index 2a91d349cd59..2cead6123aba 100644 --- a/CRM/Contribute/Form/Contribution/Confirm.php +++ b/CRM/Contribute/Form/Contribution/Confirm.php @@ -332,7 +332,7 @@ public function preProcess() { $this->_params['is_pay_later'] = $this->get('is_pay_later'); $this->assign('is_pay_later', $this->_params['is_pay_later']); if ($this->_params['is_pay_later']) { - $this->assign('pay_later_receipt', CRM_Utils_Array::value('pay_later_receipt',$this->_values)); + $this->assign('pay_later_receipt', CRM_Utils_Array::value('pay_later_receipt', $this->_values)); } // if onbehalf-of-organization if (!empty($this->_values['onbehalf_profile_id']) && !empty($this->_params['onbehalf']['organization_name'])) { diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php index 7a1454ce4a80..77b256c24938 100644 --- a/CRM/Contribute/Form/Contribution/Main.php +++ b/CRM/Contribute/Form/Contribution/Main.php @@ -1222,7 +1222,7 @@ public function submit($params) { $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_receipt', CRM_Utils_Array::value('pay_later_receipt', $this->_values)); } if ($this->_membershipBlock['is_separate_payment'] && !empty($params['separate_amount'])) {