Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for report previews

Browse Source
This commit is contained in:
David Bomba 2023-09-14 14:44:44 +10:00
parent d5b380d302
commit cee315cf6d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Export/CSV/BaseExport.php
View File

@ -915,13 +915,13 @@ class BaseExport
$helper = new Helpers(); $helper = new Helpers();
$header = []; $header = [];
nlog("header");
foreach ($this->input['report_keys'] as $value) { foreach ($this->input['report_keys'] as $value) {
$key = array_search($value, $this->entity_keys); $key = array_search($value, $this->entity_keys);
$original_key = $key; $original_key = $key;
// nlog("{$key} => {$value}"); nlog("{$key} => {$value}");
$prefix = ''; $prefix = '';
if(!$key) { if(!$key) {
@ -962,6 +962,9 @@ class BaseExport
if(!$key) { if(!$key) {
$prefix = ctrans('texts.expense')." "; $prefix = ctrans('texts.expense')." ";
$key = array_search($value, $this->expense_report_keys); $key = array_search($value, $this->expense_report_keys);
if(!$key && $value == 'expense.category')
$key = 'category';
} }
if(!$key) { if(!$key) {
@ -988,6 +991,8 @@ class BaseExport
$prefix = ''; $prefix = '';
} }
nlog("key => {$key}");
$key = str_replace('item.', '', $key); $key = str_replace('item.', '', $key);
$key = str_replace('recurring_invoice.', '', $key); $key = str_replace('recurring_invoice.', '', $key);
$key = str_replace('purchase_order.', '', $key); $key = str_replace('purchase_order.', '', $key);
@ -1040,7 +1045,7 @@ class BaseExport
} }
} }
// nlog($header); nlog($header);
return $header; return $header;
} }
@ -1094,8 +1099,6 @@ class BaseExport
} }
nlog($clean_row);
return $clean_row; return $clean_row;
} }