From fcb3e039cea746fbafcb8ad89621d44190c2b54f Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 23 Aug 2023 20:36:56 +1000 Subject: [PATCH] Fixes for reports --- app/Export/CSV/CreditExport.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/Export/CSV/CreditExport.php b/app/Export/CSV/CreditExport.php index 69c396ff8f72..2cf25cb56899 100644 --- a/app/Export/CSV/CreditExport.php +++ b/app/Export/CSV/CreditExport.php @@ -99,10 +99,7 @@ class CreditExport extends BaseExport return $this->processMetaData($row, $credit); })->toArray(); - nlog(array_merge(['column' => $header], $report)); - - - return array_merge(['column' => $header], $report); + return array_merge(['columns' => $header], $report); } private function processMetaData(array $row, Credit $credit): array @@ -121,7 +118,7 @@ class CreditExport extends BaseExport $clean_row[$key]['hashed_id'] = $report_keys[0] == 'credit' ? null : $credit->{$report_keys[0]}->hashed_id ?? null; $clean_row[$key]['value'] = $row[$column_key]; $clean_row[$key]['identifier'] = $value; - + if(in_array($clean_row[$key]['id'], ['amount', 'balance', 'partial', 'refunded', 'applied','unit_cost','cost','price'])) $clean_row[$key]['display_value'] = Number::formatMoney($row[$column_key], $credit->client); else