Merge pull request #20807 from davidjosephhayes/wordpress-profile-signon-2

[civicrm-core.git] / CRM / Financial / Page / AJAX.php

diff --git a/CRM/Financial/Page/AJAX.php b/CRM/Financial/Page/AJAX.php
index 484d7a41d1cfc3fb5446b77e20b996dfdb770de8..33e891cb2a5768f3dd2c0f148c1be1b46641f2a3 100644 (file)
--- a/CRM/Financial/Page/AJAX.php
+++ b/CRM/Financial/Page/AJAX.php
@@ -371,7 +371,7 @@ class CRM_Financial_Page_AJAX {
           $js = "enableActions('x')";
           $row[$financialItem->id]['check'] = "<input type='checkbox' id='mark_x_" . $financialItem->id . "' name='mark_x_" . $financialItem->id . "' value='1' onclick={$js}></input>";
           $row[$financialItem->id]['action'] = CRM_Core_Action::formLink(
-            CRM_Financial_Form_BatchTransaction::links(),
+            (new CRM_Financial_Form_BatchTransaction())->links(),
             NULL,
             [
               'id' => $financialItem->id,
@@ -389,7 +389,7 @@ class CRM_Financial_Page_AJAX {
           $js = "enableActions('y')";
           $row[$financialItem->id]['check'] = "<input type='checkbox' id='mark_y_" . $financialItem->id . "' name='mark_y_" . $financialItem->id . "' value='1' onclick={$js}></input>";
           $row[$financialItem->id]['action'] = CRM_Core_Action::formLink(
-            CRM_Financial_Page_BatchTransaction::links(),
+            (new CRM_Financial_Page_BatchTransaction())->links(),
             NULL,
             [
               'id' => $financialItem->id,
@@ -427,6 +427,7 @@ class CRM_Financial_Page_AJAX {
       if ($financialItem->contact_id) {
         $row[$financialItem->id]['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage(!empty($row[$financialItem->id]['contact_sub_type']) ? $row[$financialItem->id]['contact_sub_type'] : CRM_Utils_Array::value('contact_type', $row[$financialItem->id]), FALSE, $financialItem->contact_id);
       }
+      // @todo: Is this right? Shouldn't it be adding to the array as we loop?
       $financialitems = $row;
     }
 
@@ -478,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();
         }
       }
     }