v2 first commit

app/Models/Auth/Permission.php

@@ -2,19 +2,14 @@
 
 namespace App\Models\Auth;
 
-use EloquentFilter\Filterable;
-use Laratrust\LaratrustPermission;
+use Laratrust\Models\LaratrustPermission;
 use Laratrust\Traits\LaratrustPermissionTrait;
 use Kyslik\ColumnSortable\Sortable;
-use Request;
-use Route;
+use Lorisleiva\LaravelSearchString\Concerns\SearchString;
 
 class Permission extends LaratrustPermission
 {
-    use LaratrustPermissionTrait;
-    use Filterable;
-    use Sortable;
-
+    use LaratrustPermissionTrait, SearchString, Sortable;
 
     protected $table = 'permissions';
 
@@ -25,31 +20,6 @@ class Permission extends LaratrustPermission
      */
     protected $fillable = ['name', 'display_name', 'description'];
 
-    /**
-     * Define the filter provider globally.
-     *
-     * @return ModelFilter
-     */
-    public function modelFilter()
-    {
-        // Check if is api or web
-        if (Request::is('api/*')) {
-            $arr = array_reverse(explode('\\', explode('@', app()['api.router']->currentRouteAction())[0]));
-            $folder = $arr[1];
-            $file = $arr[0];
-        } else {
-            list($folder, $file) = explode('/', Route::current()->uri());
-        }
-
-        if (empty($folder) || empty($file)) {
-            return $this->provideFilter();
-        }
-
-        $class = '\App\Filters\\' . ucfirst($folder) .'\\' . ucfirst($file);
-
-        return $this->provideFilter($class);
-    }
-
     /**
      * Scope to get all rows filtered, sorted and paginated.
      *
@@ -62,9 +32,9 @@ class Permission extends LaratrustPermission
     {
         $request = request();
 
-        $input = $request->input();
-        $limit = $request->get('limit', setting('general.list_limit', '25'));
+        $search = $request->get('search');
+        $limit = $request->get('limit', setting('default.list_limit', '25'));
 
-        return $query->filter($input)->sortable($sort)->paginate($limit);
+        return $query->usingSearchString($search)->sortable($sort)->paginate($limit);
     }
 }

app/Models/Auth/Role.php

@@ -2,19 +2,15 @@
 
 namespace App\Models\Auth;
 
-use EloquentFilter\Filterable;
-use Laratrust\LaratrustRole;
+use Laratrust\Models\LaratrustRole;
 use Laratrust\Traits\LaratrustRoleTrait;
 use Kyslik\ColumnSortable\Sortable;
-use Request;
-use Route;
+use Lorisleiva\LaravelSearchString\Concerns\SearchString;
 
 class Role extends LaratrustRole
 {
-    use LaratrustRoleTrait;
-    use Filterable;
-    use Sortable;
-    
+    use LaratrustRoleTrait, SearchString, Sortable;
+
     protected $table = 'roles';
 
     /**
@@ -24,31 +20,6 @@ class Role extends LaratrustRole
      */
     protected $fillable = ['name', 'display_name', 'description'];
 
-    /**
-     * Define the filter provider globally.
-     *
-     * @return ModelFilter
-     */
-    public function modelFilter()
-    {
-        // Check if is api or web
-        if (Request::is('api/*')) {
-            $arr = array_reverse(explode('\\', explode('@', app()['api.router']->currentRouteAction())[0]));
-            $folder = $arr[1];
-            $file = $arr[0];
-        } else {
-            list($folder, $file) = explode('/', Route::current()->uri());
-        }
-
-        if (empty($folder) || empty($file)) {
-            return $this->provideFilter();
-        }
-
-        $class = '\App\Filters\\' . ucfirst($folder) .'\\' . ucfirst($file);
-
-        return $this->provideFilter($class);
-    }
-
     /**
      * Scope to get all rows filtered, sorted and paginated.
      *
@@ -61,9 +32,9 @@ class Role extends LaratrustRole
     {
         $request = request();
 
-        $input = $request->input();
-        $limit = $request->get('limit', setting('general.list_limit', '25'));
+        $search = $request->get('search');
+        $limit = $request->get('limit', setting('default.list_limit', '25'));
 
-        return $query->filter($input)->sortable($sort)->paginate($limit);
+        return $query->usingSearchString($search)->sortable($sort)->paginate($limit);
     }
 }

app/Models/Auth/User.php

@@ -3,21 +3,19 @@
 namespace App\Models\Auth;
 
 use App\Notifications\Auth\Reset;
+use App\Traits\Media;
 use Date;
-use EloquentFilter\Filterable;
 use GuzzleHttp\Exception\RequestException;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Laratrust\Traits\LaratrustUserTrait;
 use Kyslik\ColumnSortable\Sortable;
-use App\Traits\Media;
-use Request;
-use Route;
+use Lorisleiva\LaravelSearchString\Concerns\SearchString;
 
 class User extends Authenticatable
 {
-    use Filterable, LaratrustUserTrait, Notifiable, SoftDeletes, Sortable, Media;
+    use LaratrustUserTrait, Notifiable, SearchString, SoftDeletes, Sortable, Media;
 
     protected $table = 'users';
 
@@ -54,9 +52,14 @@ class User extends Authenticatable
         return $this->morphToMany('App\Models\Common\Company', 'user', 'user_companies', 'user_id', 'company_id');
     }
 
-    public function customer()
+    public function contact()
     {
-        return $this->hasOne('App\Models\Income\Customer', 'user_id', 'id');
+        return $this->hasOne('App\Models\Common\Contact', 'user_id', 'id');
+    }
+
+    public function dashboards()
+    {
+        return $this->hasMany('App\Models\Common\Dashboard');
     }
 
     /**
@@ -73,7 +76,7 @@ class User extends Authenticatable
     public function getPictureAttribute($value)
     {
         // Check if we should use gravatar
-        if (setting('general.use_gravatar', '0') == '1') {
+        if (setting('default.use_gravatar', '0') == '1') {
             try {
                 // Check for gravatar
                 $url = 'https://www.gravatar.com/avatar/' . md5(strtolower($this->getAttribute('email'))).'?size=90&d=404';
@@ -135,33 +138,6 @@ class User extends Authenticatable
         $this->attributes['password'] = bcrypt($value);
     }
 
-    /**
-     * Define the filter provider globally.
-     *
-     * @return ModelFilter
-     */
-    public function modelFilter()
-    {
-        // Check if is api or web
-        if (Request::is('api/*')) {
-            $arr = array_reverse(explode('\\', explode('@', app()['api.router']->currentRouteAction())[0]));
-            $folder = $arr[1];
-            $file = $arr[0];
-        } else {
-            list($folder, $file) = explode('/', Route::current()->uri());
-        }
-
-        if (empty($folder) || empty($file)) {
-            return $this->provideFilter();
-        }
-
-        //$class = '\App\Filters\Auth\Users';
-
-        $class = '\App\Filters\\' . ucfirst($folder) . '\\' . ucfirst($file);
-
-        return $this->provideFilter($class);
-    }
-
     /**
      * Scope to get all rows filtered, sorted and paginated.
      *
@@ -174,10 +150,10 @@ class User extends Authenticatable
     {
         $request = request();
 
-        $input = $request->input();
-        $limit = $request->get('limit', setting('general.list_limit', '25'));
+        $search = $request->get('search');
+        $limit = $request->get('limit', setting('default.list_limit', '25'));
 
-        return $query->filter($input)->sortable($sort)->paginate($limit);
+        return $query->usingSearchString($search)->sortable($sort)->paginate($limit);
     }
 
     /**