diff --git a/app/Export/CSV/BaseExport.php b/app/Export/CSV/BaseExport.php index 2398e64a6fc1..ca5e9c1a0953 100644 --- a/app/Export/CSV/BaseExport.php +++ b/app/Export/CSV/BaseExport.php @@ -355,7 +355,7 @@ class BaseExport private function resolveClientContactKey($column, $entity, $transformer) { - + if(!$entity->client) { return ""; } @@ -380,11 +380,11 @@ class BaseExport private function resolveExpenseKey($column, $entity, $transformer) { - // $transformed_entity = $transformer->includeExpense($entity); + $transformed_entity = $transformer->includeExpense($entity); - // $manager = new Manager(); - // $manager->setSerializer(new ArraySerializer()); - // $transformed_entity = $manager->createData($transformed_entity)->toArray(); + $manager = new Manager(); + $manager->setSerializer(new ArraySerializer()); + $transformed_entity = $manager->createData($transformed_entity)->toArray(); if($column == 'user' && $entity?->expense?->user) return $entity->expense->user->present()->name() ?? ' '; @@ -396,6 +396,9 @@ class BaseExport return $entity->expense->category?->name ?? ' '; } + if(array_key_exists($column, $transformed_entity)) + return $transformed_entity[$column]; + if(property_exists($entity, $column)) return $entity?->{$column} ?? '';