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

Adjustments for base export

Browse Source
This commit is contained in:
David Bomba 2023-07-15 09:34:27 +10:00
parent b8bc92deb0
commit 79d637075b
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@ namespace App\Export\CSV;
use App\Utils\Number; use App\Utils\Number;
use App\Models\Client; use App\Models\Client;
use App\Models\Expense;
use App\Models\Invoice; use App\Models\Invoice;
use App\Models\GatewayType; use App\Models\GatewayType;
use App\Models\Payment; use App\Models\Payment;
@ -381,12 +382,7 @@ class BaseExport
private function resolveExpenseKey($column, $entity, $transformer) private function resolveExpenseKey($column, $entity, $transformer)
{ {
$transformed_entity = $transformer->includeExpense($entity);
$manager = new Manager();
$manager->setSerializer(new ArraySerializer());
$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() ?? ' ';
@ -397,6 +393,15 @@ class BaseExport
return $entity->expense->category?->name ?? ' '; return $entity->expense->category?->name ?? ' ';
} }
if($entity instanceof Expense)
return '';
$transformed_entity = $transformer->includeExpense($entity);
$manager = new Manager();
$manager->setSerializer(new ArraySerializer());
$transformed_entity = $manager->createData($transformed_entity)->toArray();
if(array_key_exists($column, $transformed_entity)) if(array_key_exists($column, $transformed_entity))
return $transformed_entity[$column]; return $transformed_entity[$column];