Adjustments for expense filters

This commit is contained in:
David Bomba 2023-01-16 10:48:57 +11:00
parent 45fac70557
commit 59faed5e59

View File

@ -69,14 +69,15 @@ class ExpenseFilters extends QueryFilters
return $this->builder; 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)) { if (in_array('logged', $status_parameters)) {
$query->orWhere(function ($query){ $query->orWhere(function ($query){
$query->where('amount', '>', 0) $query->where('amount', '>', 0)
->whereNull('invoice_id') ->whereNull('invoice_id')
->whereNull('payment_date'); ->whereNull('payment_date')
->where('should_be_invoiced',false);
}); });
} }