From c79523bbfa6e2a8d18e028225f489b4f9e4263a7 Mon Sep 17 00:00:00 2001 From: eileen Date: Mon, 17 Feb 2020 14:37:16 +1300 Subject: [PATCH] Move determination of year & month to formatCreditCardDetails Per https://github.com/civicrm/civicrm-core/pull/16514 it makes sense as a better place for these --- CRM/Contribute/Form/AbstractEditPayment.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CRM/Contribute/Form/AbstractEditPayment.php b/CRM/Contribute/Form/AbstractEditPayment.php index 7469609f7f..2f15a66157 100644 --- a/CRM/Contribute/Form/AbstractEditPayment.php +++ b/CRM/Contribute/Form/AbstractEditPayment.php @@ -552,10 +552,6 @@ WHERE contribution_id = {$id} $this->_params['payment_processor_id'], ($this->_mode == 'test') ); - if (in_array('credit_card_exp_date', array_keys($this->_params))) { - $this->_params['year'] = CRM_Core_Payment_Form::getCreditCardExpirationYear($this->_params); - $this->_params['month'] = CRM_Core_Payment_Form::getCreditCardExpirationMonth($this->_params); - } $this->assign('credit_card_exp_date', CRM_Utils_Date::mysqlToIso(CRM_Utils_Date::format($this->_params['credit_card_exp_date']))); $this->assign('credit_card_number', CRM_Utils_System::mungeCreditCard($this->_params['credit_card_number'])); $this->assign('credit_card_type', CRM_Utils_Array::value('credit_card_type', $this->_params)); @@ -591,6 +587,10 @@ WHERE contribution_id = {$id} if (!empty($params['credit_card_number']) && empty($params['pan_truncation'])) { $params['pan_truncation'] = substr($params['credit_card_number'], -4); } + if (!empty($params['credit_card_exp_date'])) { + $params['year'] = CRM_Core_Payment_Form::getCreditCardExpirationYear($params); + $params['month'] = CRM_Core_Payment_Form::getCreditCardExpirationMonth($params); + } } /** -- 2.25.1