Merge pull request #21213 from colemanw/entityBatchRef

EntityBatch - Deprecate del() function (#2757)

CRM/Batch/BAO/EntityBatch.php

@@ -29,19 +29,14 @@ class CRM_Batch_BAO_EntityBatch extends CRM_Batch_DAO_EntityBatch {
   /**
    * Remove entries from entity batch.
    * @param array|int $params
+   * @deprecated
    * @return CRM_Batch_DAO_EntityBatch
    */
   public static function del($params) {
     if (!is_array($params)) {
       $params = ['id' => $params];
     }
-    $entityBatch = new CRM_Batch_DAO_EntityBatch();
-    $entityId = $params['id'] ?? NULL;
-    CRM_Utils_Hook::pre('delete', 'EntityBatch', $entityId, $params);
-    $entityBatch->copyValues($params);
-    $entityBatch->delete();
-    CRM_Utils_Hook::post('delete', 'EntityBatch', $entityBatch->id, $entityBatch);
-    return $entityBatch;
+    return self::deleteRecord($params);
   }
 
 }

CRM/Financial/Page/AJAX.php

@@ -479,7 +479,11 @@ class CRM_Financial_Page_AJAX {
           $updated = CRM_Batch_BAO_EntityBatch::create($params);
         }
         else {
-          $updated = CRM_Batch_BAO_EntityBatch::del($params);
+          $delete = \Civi\Api4\EntityBatch::delete(FALSE);
+          foreach ($params as $field => $val) {
+            $delete->addWhere($field, '=', $val);
+          }
+          $updated = $delete->execute()->count();
         }
       }
     }