From 59faed5e59fcca8bd51fcb9f004384fbf3cead2b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 16 Jan 2023 10:48:57 +1100
Subject: [PATCH] Adjustments for expense filters

---
 app/Filters/ExpenseFilters.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Filters/ExpenseFilters.php b/app/Filters/ExpenseFilters.php
index fefd6c038e3c..2a1892e9f2a3 100644
--- a/app/Filters/ExpenseFilters.php
+++ b/app/Filters/ExpenseFilters.php
@@ -69,14 +69,15 @@ class ExpenseFilters extends QueryFilters
             return $this->builder;
         }
 
-        $this->builder->whereNested(function ($query) use($status_parameters){
+        $this->builder->where(function ($query) use($status_parameters){
 
             if (in_array('logged', $status_parameters)) {
 
                 $query->orWhere(function ($query){
                     $query->where('amount', '>', 0)
                           ->whereNull('invoice_id')
-                          ->whereNull('payment_date');
+                          ->whereNull('payment_date')
+                          ->where('should_be_invoiced',false);
                 });
                 
             }