Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 08:21:34 +02:00
Code Issues Releases Activity

Fixes for invoice items

Browse Source
This commit is contained in:
David Bomba 2023-09-11 22:15:24 +10:00
parent 7128bd434b
commit 7566d277ce
1 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/Export/CSV/InvoiceItemExport.php
View File

@ -81,12 +81,16 @@ class InvoiceItemExport extends BaseExport
return ['identifier' => $value, 'display_value' => $headerdisplay[$value]];
})->toArray();
$query->cursor()
->each(function ($resource) {
$items = $query->cursor()
->map(function ($resource) {
$this->iterateItems($resource);
});
$row = $this->processMetaData($this->storage_array[0], $resource);
$this->storage_array = [];
return $row;
})->toArray();
return array_merge(['columns' => $header], $this->storage_array);
return array_merge(['columns' => $header], $items);
}
@ -190,4 +194,34 @@ class InvoiceItemExport extends BaseExport
return $entity;
}
public function processMetaData(array $row, $resource): array
{
$entity = 'invoice';
$clean_row = [];
foreach (array_values($this->input['report_keys']) as $key => $value) {
$report_keys = explode(".", $value);
$column_key = $value;
if($value == 'type_id' || $value == 'item.type_id')
$column_key = 'type';
if($value == 'tax_id' || $value == 'item.tax_id')
$column_key = 'tax_category';
$clean_row[$key]['entity'] = $report_keys[0];
$clean_row[$key]['id'] = $report_keys[1] ?? $report_keys[0];
$clean_row[$key]['hashed_id'] = $report_keys[0] == $entity ? null : $resource->{$report_keys[0]}->hashed_id ?? null;
$clean_row[$key]['value'] = isset($row[$column_key]) ? $row[$column_key] : $row[$report_keys[1]];
$clean_row[$key]['identifier'] = $value;
$clean_row[$key]['display_value'] = isset($row[$column_key]) ? $row[$column_key] : $row[$report_keys[1]];
}
return $clean_row;
}
}