From 08ff370dd8498fda768c1e6e113055079354bb25 Mon Sep 17 00:00:00 2001 From: eileen Date: Mon, 2 Nov 2020 15:24:27 +1300 Subject: [PATCH] [REF] Simplify use of shared code. This function has been sharing 'transitionComponentWithStatusMessage' but in fact it throws away the status message and the preliminary checks are silly. This simplifies it so it calls the part of the function it actually does share --- CRM/Contribute/Form/Task/Batch.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CRM/Contribute/Form/Task/Batch.php b/CRM/Contribute/Form/Task/Batch.php index a22383623e..5cf089e51a 100644 --- a/CRM/Contribute/Form/Task/Batch.php +++ b/CRM/Contribute/Form/Task/Batch.php @@ -211,11 +211,12 @@ class CRM_Contribute_Form_Task_Batch extends CRM_Contribute_Form_Task { // @todo add check as to whether the status is updated. if (!empty($value['contribution_status_id'])) { // @todo - use completeorder api or make api call do this. - CRM_Contribute_BAO_Contribution::transitionComponentWithReturnMessage($contribution['id'], - $value['contribution_status_id'], - CRM_Utils_Array::value("field[{$contributionID}][contribution_status_id]", $this->_defaultValues), - $contribution['receive_date'] - ); + CRM_Contribute_BAO_Contribution::transitionComponents([ + 'contribution_id' => $contribution['id'], + 'contribution_status_id' => $value['contribution_status_id'], + 'previous_contribution_status_id' => CRM_Utils_Array::value("field[{$contributionID}][contribution_status_id]", $this->_defaultValues), + 'receive_date' => $contribution['receive_date'], + ]); } } CRM_Core_Session::setStatus(ts("Your updates have been saved."), ts('Saved'), 'success'); -- 2.25.1