From 79d637075bbe05da8d1a142f54b1119b123da112 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 15 Jul 2023 09:34:27 +1000
Subject: [PATCH] Adjustments for base export

---
 app/Export/CSV/BaseExport.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/Export/CSV/BaseExport.php b/app/Export/CSV/BaseExport.php
index d15e51b477e5..fbec56c6ef2d 100644
--- a/app/Export/CSV/BaseExport.php
+++ b/app/Export/CSV/BaseExport.php
@@ -13,6 +13,7 @@ namespace App\Export\CSV;
 
 use App\Utils\Number;
 use App\Models\Client;
+use App\Models\Expense;
 use App\Models\Invoice;
 use App\Models\GatewayType;
 use App\Models\Payment;
@@ -381,12 +382,7 @@ class BaseExport
 
     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)
             return $entity->expense->user->present()->name() ?? ' ';
 
@@ -397,6 +393,15 @@ class BaseExport
             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)) 
             return $transformed_entity[$column];