Merge pull request #10364 from JMAConsulting/CRM-20588

CRM-20588, Add Pre and Post hook for Batch
civicrm · May 22, 2017 · a39f4b3 · a39f4b3
2 parents 8de130f + 8f30d0b
commit a39f4b3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 26 deletions.
diff --git a/CRM/Batch/BAO/Batch.php b/CRM/Batch/BAO/Batch.php
@@ -51,26 +51,24 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch {
    * Create a new batch.
    *
    * @param array $params
-   * @param array $ids
-   *   Associated array of ids.
-   * @param string $context
-   *   String.
    *
    * @return object
    *   $batch batch object
    */
-  public static function create(&$params, $ids = NULL, $context = NULL) {
-    if (empty($params['id'])) {
+  public static function create(&$params) {
+    $op = 'edit';
+    $batchId = CRM_Utils_Array::value('id', $params);
+    if (!$batchId) {
+      $op = 'create';
       $params['name'] = CRM_Utils_String::titleToVar($params['title']);
     }
-
+    CRM_Utils_Hook::pre($op, 'Batch', $batchId, $params);
     $batch = new CRM_Batch_DAO_Batch();
     $batch->copyValues($params);
-    if ($context == 'financialBatch' && !empty($ids['batchID'])) {
-      $batch->id = $ids['batchID'];
-    }
     $batch->save();
 
+    CRM_Utils_Hook::post($op, 'Batch', $batch->id, $batch);
+
     return $batch;
   }
 
@@ -170,9 +168,11 @@ public static function removeBatchEntity($params) {
    */
   public static function deleteBatch($batchId) {
     // delete entry from batch table
+    CRM_Utils_Hook::pre('delete', 'Batch', $batchId, CRM_Core_DAO::$_nullArray);
     $batch = new CRM_Batch_DAO_Batch();
     $batch->id = $batchId;
     $batch->delete();
+    CRM_Utils_Hook::post('delete', 'Batch', $batch->id, $batch);
     return TRUE;
   }
 

diff --git a/CRM/Financial/Form/Export.php b/CRM/Financial/Form/Export.php
@@ -167,12 +167,11 @@ public function postProcess() {
     $batchParams['modified_id'] = $session->get('userID');
     $batchParams['status_id'] = $this->_exportStatusId;
 
-    $ids = array();
     foreach ($batchIds as $batchId) {
-      $batchParams['id'] = $ids['batchID'] = $batchId;
+      $batchParams['id'] = $batchId;
       // Update totals
       $batchParams = array_merge($batchParams, $totals[$batchId]);
-      CRM_Batch_BAO_Batch::create($batchParams, $ids, 'financialBatch');
+      CRM_Batch_BAO_Batch::create($batchParams);
     }
 
     CRM_Batch_BAO_Batch::exportFinancialBatch($batchIds, $this->_exportFormat);

diff --git a/CRM/Financial/Form/FinancialBatch.php b/CRM/Financial/Form/FinancialBatch.php
@@ -196,11 +196,9 @@ public static function formRule($values, $files, $self) {
    */
   public function postProcess() {
     $session = CRM_Core_Session::singleton();
-    $ids = array();
     $params = $this->exportValues();
     $batchStatus = CRM_Core_PseudoConstant::get('CRM_Batch_DAO_Batch', 'status_id');
     if ($this->_id) {
-      $ids['batchID'] = $this->_id;
       $params['id'] = $this->_id;
     }
 
@@ -230,7 +228,7 @@ public function postProcess() {
       $activityTypeName = 'Edit Batch';
     }
 
-    $batch = CRM_Batch_BAO_Batch::create($params, $ids, 'financialBatch');
+    $batch = CRM_Batch_BAO_Batch::create($params);
 
     //set batch id
     $this->_id = $batch->id;

diff --git a/CRM/Financial/Page/AJAX.php b/CRM/Financial/Page/AJAX.php
@@ -183,7 +183,6 @@ public static function assignRemove() {
     if ($recordClass[0] == 'CRM' && count($recordClass) >= 3) {
       foreach ($records as $recordID) {
         $params = array();
-        $ids = NULL;
         switch ($op) {
           case 'assign':
           case 'remove':
@@ -207,14 +206,12 @@ public static function assignRemove() {
             $params = $totals[$recordID];
           case 'reopen':
             $status = $op == 'close' ? 'Closed' : 'Reopened';
-            $ids['batchID'] = $recordID;
             $batchStatus = CRM_Core_PseudoConstant::get('CRM_Batch_DAO_Batch', 'status_id', array('labelColumn' => 'name'));
             $params['status_id'] = CRM_Utils_Array::key($status, $batchStatus);
             $session = CRM_Core_Session::singleton();
             $params['modified_date'] = date('YmdHis');
             $params['modified_id'] = $session->get('userID');
             $params['id'] = $recordID;
-            $context = "financialBatch";
             break;
 
           case 'export':
@@ -223,17 +220,11 @@ public static function assignRemove() {
 
           case 'delete':
             $params = $recordID;
-            $context = "financialBatch";
             break;
         }
 
         if (method_exists($recordBAO, $methods[$op]) & !empty($params)) {
-          if (isset($context)) {
-            $updated = call_user_func_array(array($recordBAO, $methods[$op]), array(&$params, $ids, $context));
-          }
-          else {
-            $updated = call_user_func_array(array($recordBAO, $methods[$op]), array(&$params, $ids));
-          }
+          $updated = call_user_func_array(array($recordBAO, $methods[$op]), array(&$params));
           if ($updated) {
             $redirectStatus = $updated->status_id;
             if ($batchStatus[$updated->status_id] == "Reopened") {