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

Export maps

Browse Source
This commit is contained in:
David Bomba 2023-07-13 21:52:39 +10:00
parent df4620ac62
commit 82fa7cbae0
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

@ -355,7 +355,7 @@ class BaseExport
private function resolveClientContactKey($column, $entity, $transformer) private function resolveClientContactKey($column, $entity, $transformer)
{ {
if(!$entity->client) { if(!$entity->client) {
return ""; return "";
} }
@ -380,11 +380,11 @@ class BaseExport
private function resolveExpenseKey($column, $entity, $transformer) private function resolveExpenseKey($column, $entity, $transformer)
{ {
// $transformed_entity = $transformer->includeExpense($entity); $transformed_entity = $transformer->includeExpense($entity);
// $manager = new Manager(); $manager = new Manager();
// $manager->setSerializer(new ArraySerializer()); $manager->setSerializer(new ArraySerializer());
// $transformed_entity = $manager->createData($transformed_entity)->toArray(); $transformed_entity = $manager->createData($transformed_entity)->toArray();
if($column == 'user' && $entity?->expense?->user) if($column == 'user' && $entity?->expense?->user)
return $entity->expense->user->present()->name() ?? ' '; return $entity->expense->user->present()->name() ?? ' ';
@ -396,6 +396,9 @@ class BaseExport
return $entity->expense->category?->name ?? ' '; return $entity->expense->category?->name ?? ' ';
} }
if(array_key_exists($column, $transformed_entity))
return $transformed_entity[$column];
if(property_exists($entity, $column)) if(property_exists($entity, $column))
return $entity?->{$column} ?? ''; return $entity?->{$column} ?? '';