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

Minor cleanup for filters

Browse Source
This commit is contained in:
David Bomba 2023-01-31 08:24:42 +11:00
parent 2dcdd4d72c
commit 0995475352
5 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Filters/BankTransactionRuleFilters.php
View File

@ -11,11 +11,7 @@
namespace App\Filters; namespace App\Filters;
use App\Models\BankTransactionRule;
use App\Models\User;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Gate;
/** /**
* BankTransactionRuleilters. * BankTransactionRuleilters.
@ -73,19 +69,6 @@ class BankTransactionRuleFilters extends QueryFilters
return $this->builder->orderBy($sort_col[0], $sort_col[1]); return $this->builder->orderBy($sort_col[0], $sort_col[1]);
} }
/**
* Returns the base query.
*
* @param int company_id
* @param User $user
* @return Builder
* @deprecated
*/
public function baseQuery(int $company_id, User $user): Builder
{
}
/** /**
* Filters the query by the users company ID. * Filters the query by the users company ID.
* *

4
app/Filters/ClientFilters.php
View File

@ -11,11 +11,7 @@
namespace App\Filters; namespace App\Filters;
use App\Models\Client;
use App\Models\User;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Gate;
/** /**
* ClientFilters. * ClientFilters.

1
app/Filters/CompanyGatewayFilters.php
View File

@ -11,7 +11,6 @@
namespace App\Filters; namespace App\Filters;
use App\Models\User;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
/** /**

1
app/Filters/DesignFilters.php
View File

@ -62,7 +62,6 @@ class DesignFilters extends QueryFilters
*/ */
public function entityFilter(): Builder public function entityFilter(): Builder
{ {
//return $this->builder->whereCompanyId(auth()->user()->company()->id);
return $this->builder->where('company_id', auth()->user()->company()->id)->orWhere('company_id', null)->orderBy('id','asc'); return $this->builder->where('company_id', auth()->user()->company()->id)->orWhere('company_id', null)->orderBy('id','asc');
} }
} }

1
app/Filters/DocumentFilters.php
View File

@ -39,6 +39,7 @@ class DocumentFilters extends QueryFilters
* Overriding method as client_id does * Overriding method as client_id does
* not exist on this model, just pass * not exist on this model, just pass
* back the builder * back the builder
*
* @param string $client_id The client hashed id. * @param string $client_id The client hashed id.
* *
* @return Builder * @return Builder