[REF] Simplify use of shared code.
authoreileen <emcnaughton@wikimedia.org>
Mon, 2 Nov 2020 02:24:27 +0000 (15:24 +1300)
committereileen <emcnaughton@wikimedia.org>
Mon, 2 Nov 2020 02:24:27 +0000 (15:24 +1300)
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

index a22383623e0a5d6611ff30a34345f79086d1d8a3..5cf089e51a51bf89efa9f90cc98d89ea39789732 100644 (file)
@@ -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');