Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 05:24:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adjustments for without_deleted_clients query

Browse Source
This commit is contained in:
David Bomba 2023-08-22 09:41:24 +10:00
parent 39471152fb
commit bcddd423c7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Filters/QueryFilters.php
View File

@ -298,7 +298,7 @@ abstract class QueryFilters
{ {
return $this->builder->where(function ($query) { return $this->builder->where(function ($query) {
$query->whereHas('client', function ($sub_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); })->orWhere('client_id', null);
}); });
} }
@ -310,7 +310,7 @@ abstract class QueryFilters
{ {
return $this->builder->where(function ($query) { return $this->builder->where(function ($query) {
$query->whereHas('vendor', function ($sub_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); })->orWhere('vendor_id', null);
}); });
} }