diff --git a/app/Filters/ClientFilters.php b/app/Filters/ClientFilters.php index b1594a62761f..96d8cf26535d 100644 --- a/app/Filters/ClientFilters.php +++ b/app/Filters/ClientFilters.php @@ -45,6 +45,8 @@ class ClientFilters extends QueryFilters * * @param string query filter * @return Illuminate\Database\Query\Builder + * @deprecated + * */ public function filter(string $filter = '') : Builder { @@ -119,6 +121,7 @@ class ClientFilters extends QueryFilters * * @param int company_id * @return Illuminate\Database\Query\Builder + * @deprecated */ public function baseQuery(int $company_id, User $user) : Builder { @@ -167,6 +170,12 @@ class ClientFilters extends QueryFilters return $query; } + /** + * Filters the query by the users company ID + * + * @param $company_id The company Id + * @return Illuminate\Database\Query\Builder + */ public function entityFilter() { diff --git a/app/Filters/QueryFilters.php b/app/Filters/QueryFilters.php index e07ca15793d8..7f44bb74965c 100644 --- a/app/Filters/QueryFilters.php +++ b/app/Filters/QueryFilters.php @@ -15,15 +15,17 @@ use Illuminate\Http\Request; abstract class QueryFilters { /** - * + * active status */ const STATUS_ACTIVE = 'active'; + /** - * + * archived status */ const STATUS_ARCHIVED = 'archived'; + /** - * + * deleted status */ const STATUS_DELETED = 'deleted'; @@ -62,7 +64,7 @@ abstract class QueryFilters $this->builder = $builder; $this->entityFilter(); - + foreach ($this->filters() as $name => $value) { if (! method_exists($this, $name)) { continue;