From 45fac7055719e01df670683d5998be4756ad703b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 16 Jan 2023 10:38:52 +1100
Subject: [PATCH] Fixes for quote queries

---
 app/Filters/QuoteFilters.php | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/app/Filters/QuoteFilters.php b/app/Filters/QuoteFilters.php
index 4a83a46553c5..c83ed856293d 100644
--- a/app/Filters/QuoteFilters.php
+++ b/app/Filters/QuoteFilters.php
@@ -66,17 +66,8 @@ class QuoteFilters extends QueryFilters
             return $this->builder;
         }
 
-        $quote_filters = [];
-
         $this->builder->where(function ($query) use ($status_parameters){
 
-            if (in_array('draft', $status_parameters)) {
-                $query->orWhere(function ($q){
-                    $q->where('status_id', Quote::STATUS_DRAFT);
-                });
-
-            }
-
             if (in_array('sent', $status_parameters)) {
                 $query->orWhere(function ($q){
                               $q->where('status_id', Quote::STATUS_SENT)
@@ -84,13 +75,21 @@ class QuoteFilters extends QueryFilters
                               ->orWhere('due_date', '>=', now()->toDateString());
                           });
             }
+    
+            $quote_filters = [];
 
-            if (in_array('approved', $status_parameters)) {
-                $query->orWhere(function ($q){
-                    $q->where('status_id', Quote::STATUS_APPROVED)->company();
-                });
+            if (in_array('draft', $status_parameters)) {
+                $quote_filters[] = Quote::STATUS_DRAFT;
             }
 
+            
+            if (in_array('approved', $status_parameters)) {
+                $quote_filters[] = Quote::STATUS_APPROVED;
+            }
+
+            if(count($quote_filters) >0){
+                $query->orWhereIn('status_id', $quote_filters);
+            }
 
             if (in_array('expired', $status_parameters)) {
                 $query->orWhere(function ($q){