Merge pull request #167 from compucorp/PROD-223-fix-export

PROD-223: Limit credit note query alter to CSV
compucorp · May 16, 2024 · af18074 · af18074
2 parents 9043d3a + 13b90a6
commit af18074
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/Civi/Financeextras/APIWrapper/SearchDisplayRun.php b/Civi/Financeextras/APIWrapper/SearchDisplayRun.php
@@ -140,11 +140,26 @@ private static function alterCreditNoteSearchDisplayMoneyColumn(array $creditNot
    */
   private static function alterFinanceReportDisplay(&$result) {
     foreach ($result as &$display) {
+      if (!is_array($display)) {
+        continue;
+      }
       foreach ($display['columns'] as &$column) {
         if (in_array($column['label'], ['Net Amount', 'Tax Amount'])) {
           $column['val'] = \CRM_Utils_Money::format(abs(trim($column['val']) ?: 0));
         }
       }
+
+      $entityFinancialTrxn = \Civi\Api4\EntityFinancialTrxn::get(FALSE)
+        ->addWhere('entity_table', '=', 'civicrm_financial_item')
+        ->addWhere('entity_id', '=', $display['key'])
+        ->addWhere('financial_trxn_id', '=', $display['data']['FinancialItem_EntityFinancialTrxn_FinancialTrxn_01.id'])
+        ->execute()
+        ->first();
+
+      $key = $entityFinancialTrxn['id'] ?? NULL;
+      if (!empty($key)) {
+        $display['key'] = $key;
+      }
     }
   }
 

diff --git a/Civi/Financeextras/Hook/BatchExport/UpdateQuery.php b/Civi/Financeextras/Hook/BatchExport/UpdateQuery.php
@@ -10,6 +10,13 @@ class UpdateQuery {
   public function __construct(public string &$query) {}
 
   public function addCreditNoteToQuery() {
+
+    $export_format = \CRM_Utils_Request::retrieve('export_format', 'String');
+
+    if (!in_array($export_format, ['CSV'])) {
+      return;
+    }
+
     $this->query = "SELECT
       ft.id as financial_trxn_id,
       ft.trxn_date,

diff --git a/managed/SavedSearch_SOA_Finance_Report_Beta_v3.mgd.php b/managed/SavedSearch_SOA_Finance_Report_Beta_v3.mgd.php
@@ -31,6 +31,7 @@
             'LOWER(FinancialItem_EntityFinancialTrxn_FinancialTrxn_01.amount) AS LOWER_FinancialItem_EntityFinancialTrxn_FinancialTrxn_01_amount',
             'FinancialItem_Contact_contact_id_01.display_name',
             'FinancialItem_Contact_contact_id_01.id',
+            'FinancialItem_EntityFinancialTrxn_FinancialTrxn_01.id',
           ],
           'orderBy' => [],
           'where' => [],