Merge pull request #8406 from turbo124/v5-develop

Fixes for upcoming filters
This commit is contained in:
David Bomba 2023-03-30 08:22:05 +11:00 committed by GitHub
commit d0a1e0bb35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -131,7 +131,7 @@ class InvoiceFilters extends QueryFilters
*/
public function upcoming(): Builder
{
return $this->builder
return $this->builder->whereIn('status_id', [Invoice::STATUS_PARTIAL, Invoice::STATUS_SENT])
->where(function ($query) {
$query->whereNull('due_date')
->orWhere('due_date', '>', now());