mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-05-24 02:14:21 -04:00
Adjustments for without_deleted_clients query
This commit is contained in:
parent
39471152fb
commit
bcddd423c7
@ -298,7 +298,7 @@ abstract class QueryFilters
|
||||
{
|
||||
return $this->builder->where(function ($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);
|
||||
});
|
||||
}
|
||||
@ -310,7 +310,7 @@ abstract class QueryFilters
|
||||
{
|
||||
return $this->builder->where(function ($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);
|
||||
});
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user