From bcddd423c77533fe4ba23ea3381b878ef4fcdb09 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 22 Aug 2023 09:41:24 +1000
Subject: [PATCH] Adjustments for without_deleted_clients query

---
 app/Filters/QueryFilters.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Filters/QueryFilters.php b/app/Filters/QueryFilters.php
index e58f88c8c3884..718ba25a4f26e 100644
--- a/app/Filters/QueryFilters.php
+++ b/app/Filters/QueryFilters.php
@@ -298,7 +298,7 @@ abstract class QueryFilters
     {
         return $this->builder->where(function ($query) {
             $query->whereHas('client', function ($sub_query) {
-                $sub_query->where('is_deleted', 0);
+                $sub_query->where('is_deleted', 0)->where('deleted_at', null);
             })->orWhere('client_id', null);
         });
     }
@@ -310,7 +310,7 @@ abstract class QueryFilters
     {
         return $this->builder->where(function ($query) {
             $query->whereHas('vendor', function ($sub_query) {
-                $sub_query->where('is_deleted', 0);
+                $sub_query->where('is_deleted', 0)->where('deleted_at', null);
             })->orWhere('vendor_id', null);
         });
     }