From ea3b6d0259d0eb570718e6d3354f6e8dd7a9a03a Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 5 Dec 2022 09:28:08 +1100
Subject: [PATCH] add status to client export

---
 app/Export/CSV/ClientExport.php | 14 ++++++++++++++
 app/Filters/InvoiceFilters.php  |  2 --
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/Export/CSV/ClientExport.php b/app/Export/CSV/ClientExport.php
index 5ba69ed72622..3b740de32c24 100644
--- a/app/Export/CSV/ClientExport.php
+++ b/app/Export/CSV/ClientExport.php
@@ -76,6 +76,7 @@ class ClientExport extends BaseExport
         'contact_custom_value3' => 'contact.custom_value3',
         'contact_custom_value4' => 'contact.custom_value4',
         'email' => 'contact.email',
+        'status' => 'status'
     ];
 
     private array $decorate_keys = [
@@ -173,6 +174,19 @@ class ClientExport extends BaseExport
             $entity['industry_id'] = $client->industry ? ctrans("texts.industry_{$client->industry->name}") : '';
         }
 
+        $entity['status'] = $this->calculateStatus($client);
+
         return $entity;
     }
+
+    private function calculateStatus($client)
+    {
+        if($client->is_deleted)
+            return ctrans('texts.deleted');
+
+        if($client->deleted_at)
+            return ctrans('texts.arcvived');
+
+        return ctrans('texts.active');
+    }
 }
diff --git a/app/Filters/InvoiceFilters.php b/app/Filters/InvoiceFilters.php
index 46a63b0be388..d2c5c82aefcf 100644
--- a/app/Filters/InvoiceFilters.php
+++ b/app/Filters/InvoiceFilters.php
@@ -56,8 +56,6 @@ class InvoiceFilters extends QueryFilters
         if (in_array('unpaid', $status_parameters)) {
             $this->builder->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL]);
         }
-        //->where('due_date', '>', Carbon::now())
-        //->orWhere('partial_due_date', '>', Carbon::now());
 
         if (in_array('overdue', $status_parameters)) {
             $this->builder->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])