crocodic-studio / crudbooster

src/helpers/CB.php

Spacing +22 added lines, -22 removed lines

@@ -18,7 +18,7 @@ 
 {
 
     public function getRoleByName($roleName) {
-        return $this->find("cb_roles",['name'=>$roleName]);
+        return $this->find("cb_roles", ['name'=>$roleName]);
     }
 
     public function fcm() {
@@ -34,7 +34,7 @@ 
     }
 
     public function getDeveloperUrl($path = null) {
-        $path = ($path)?"/".trim($path,"/"):null;
+        $path = ($path) ? "/".trim($path, "/") : null;
         return url(cbConfig("DEV_PATH")).$path;
     }
 
@@ -51,22 +51,22 @@ 
     }
 
     public function getAdminUrl($path = null) {
-        $path = ($path)?"/".trim($path,"/"):null;
+        $path = ($path) ? "/".trim($path, "/") : null;
         return url(cbConfig("ADMIN_PATH")).$path;
     }
 
     public function getAppName() {
-        return env("APP_NAME","CRUDBOOSTER");
+        return env("APP_NAME", "CRUDBOOSTER");
     }
 
     public function uploadBase64($value)
     {
         $fileData = base64_decode($value);
         $mime_type = finfo_buffer(finfo_open(), $fileData, FILEINFO_MIME_TYPE);
-        if($mime_type) {
-            if($mime_type = explode('/', $mime_type)) {
+        if ($mime_type) {
+            if ($mime_type = explode('/', $mime_type)) {
                 $ext = $mime_type[1];
-                if($ext) {
+                if ($ext) {
                     $filePath = 'uploads/'.date('Y-m');
                     Storage::makeDirectory($filePath);
                     $filename = sha1(strRandom(5)).'.'.$ext;
@@ -86,7 +86,7 @@ 
 
             $file = request()->file($name);
             $ext = $file->getClientOriginalExtension();
-            if(in_array($ext,cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) {
+            if (in_array($ext, cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) {
                 $filename = slug(pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME));
                 $file_path = 'uploads/'.date('Y-m');
 
@@ -100,14 +100,14 @@ 
                 }
 
                 if (Storage::putFileAs($file_path, $file, $filename)) {
-                    if($resize_width || $resize_height) {
+                    if ($resize_width || $resize_height) {
                         $this->resizeImage($file_path.'/'.$filename, $resize_width, $resize_height);
                     }
                     return $file_path.'/'.$filename;
                 } else {
                     throw new \Exception("Something went wrong, file can't upload!");
                 }
-            }else{
+            } else {
                 throw new \Exception("The file format is not allowed!");
             }
 
@@ -130,22 +130,22 @@ 
                 $img = Image::make(storage_path('app/'.$file_path.'/'.$filename));
                 $img->fit($resize_width, $resize_height);
                 $img->save(storage_path('app/'.$file_path.'/'.$filename), $qty);
-            } elseif ($resize_width && ! $resize_height) {
+            } elseif ($resize_width && !$resize_height) {
                 $img = Image::make(storage_path('app/'.$file_path.'/'.$filename));
-                $img->resize($resize_width, null, function ($constraint) {
+                $img->resize($resize_width, null, function($constraint) {
                     $constraint->aspectRatio();
                 });
                 $img->save(storage_path('app/'.$file_path.'/'.$filename), $qty);
-            } elseif (! $resize_width && $resize_height) {
+            } elseif (!$resize_width && $resize_height) {
                 $img = Image::make(storage_path('app/'.$file_path.'/'.$filename));
-                $img->resize(null, $resize_height, function ($constraint) {
+                $img->resize(null, $resize_height, function($constraint) {
                     $constraint->aspectRatio();
                 });
                 $img->save(storage_path('app/'.$file_path.'/'.$filename), $qty);
             } else {
                 $img = Image::make(storage_path('app/'.$file_path.'/'.$filename));
                 if ($img->width() > 1300) {
-                    $img->resize(1300, null, function ($constraint) {
+                    $img->resize(1300, null, function($constraint) {
                         $constraint->aspectRatio();
                     });
                 }
@@ -252,7 +252,7 @@ 
         $validator = Validator::make($input_arr, $rules, $messages);
         if ($validator->fails()) {
             $message = $validator->errors()->all();
-            throw new CBValidationException(implode("; ",$message));
+            throw new CBValidationException(implode("; ", $message));
         }
     }
 
@@ -264,7 +264,7 @@ 
     public function findPrimaryKey($table)
     {
         $pk = DB::getDoctrineSchemaManager()->listTableDetails($table)->getPrimaryKey();
-        if(!$pk) {
+        if (!$pk) {
             return null;
         }
         return $pk->getColumns()[0];
@@ -313,7 +313,7 @@ 
             $string_parameters_array = explode('&', $string_parameters);
             foreach ($string_parameters_array as $s) {
                 $part = explode('=', $s);
-                if(isset($part[0]) && isset($part[1])) {
+                if (isset($part[0]) && isset($part[1])) {
                     $name = htmlspecialchars(urldecode($part[0]));
                     $name = strip_tags($name);
                     $value = htmlspecialchars(urldecode($part[1]));
@@ -330,16 +330,16 @@ 
 
 
     public function routeGet($prefix, $controller) {
-        $alias = str_replace("@"," ", $controller);
+        $alias = str_replace("@", " ", $controller);
         $alias = ucwords($alias);
-        $alias = str_replace(" ","",$alias);
+        $alias = str_replace(" ", "", $alias);
         Route::get($prefix, ['uses' => $controller, 'as' => $alias]);
     }
 
     public function routePost($prefix, $controller) {
-        $alias = str_replace("@"," ", $controller);
+        $alias = str_replace("@", " ", $controller);
         $alias = ucwords($alias);
-        $alias = str_replace(" ","",$alias);
+        $alias = str_replace(" ", "", $alias);
         Route::post($prefix, ['uses' => $controller, 'as' => $alias]);
     }
 

src/routes.php

Spacing +21 added lines, -21 removed lines

@@ -1,32 +1,32 @@ 
 <?php
 
 // Developer Backend Middleware
-Route::group(['middleware' => ['web',\crocodicstudio\crudbooster\middlewares\CBDeveloper::class],
+Route::group(['middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBDeveloper::class],
     'prefix'=>cbConfig('DEV_PATH'),
-    'namespace' => 'crocodicstudio\crudbooster\controllers'], function () {
-    cb()->routeController("modules", "DeveloperModulesController",'crocodicstudio\crudbooster\controllers');
-    cb()->routeController("menus", "DeveloperMenusController",'crocodicstudio\crudbooster\controllers');
-    cb()->routeController("roles","DeveloperRolesController",'crocodicstudio\crudbooster\controllers');
-    cb()->routeController("users","DeveloperUsersController",'crocodicstudio\crudbooster\controllers');
-    cb()->routeGet("/","DeveloperDashboardController@getIndex");
+    'namespace' => 'crocodicstudio\crudbooster\controllers'], function() {
+    cb()->routeController("modules", "DeveloperModulesController", 'crocodicstudio\crudbooster\controllers');
+    cb()->routeController("menus", "DeveloperMenusController", 'crocodicstudio\crudbooster\controllers');
+    cb()->routeController("roles", "DeveloperRolesController", 'crocodicstudio\crudbooster\controllers');
+    cb()->routeController("users", "DeveloperUsersController", 'crocodicstudio\crudbooster\controllers');
+    cb()->routeGet("/", "DeveloperDashboardController@getIndex");
 });
 
 // Developer Auth Middleware
 Route::group(['middleware' => ['web'],
     'prefix'=>cbConfig('DEV_PATH'),
-    'namespace' => 'crocodicstudio\crudbooster\controllers'], function () {
-    cb()->routePost("login","AdminAuthController@postLoginDeveloper");
-    cb()->routeGet("login","AdminAuthController@getLoginDeveloper");
-    cb()->routeGet("logout","AdminAuthController@getLogoutDeveloper");
+    'namespace' => 'crocodicstudio\crudbooster\controllers'], function() {
+    cb()->routePost("login", "AdminAuthController@postLoginDeveloper");
+    cb()->routeGet("login", "AdminAuthController@getLoginDeveloper");
+    cb()->routeGet("logout", "AdminAuthController@getLogoutDeveloper");
 });
 
 // Routing without any middleware
-Route::group(['middleware' => ['web'], 'namespace' => '\crocodicstudio\crudbooster\controllers'], function () {
+Route::group(['middleware' => ['web'], 'namespace' => '\crocodicstudio\crudbooster\controllers'], function() {
     cb()->routeGet('uploads/{one?}/{two?}/{three?}/{four?}/{five?}', "FileController@getPreview");
 });
 
 // Routing without any middleware with admin prefix
-Route::group(['middleware' => ['web'], 'prefix' => cbConfig('ADMIN_PATH'), 'namespace' => 'crocodicstudio\crudbooster\controllers'], function () {
+Route::group(['middleware' => ['web'], 'prefix' => cbConfig('ADMIN_PATH'), 'namespace' => 'crocodicstudio\crudbooster\controllers'], function() {
     cb()->routeGet('logout', "AdminAuthController@getLogout");
     cb()->routePost('login', "AdminAuthController@postLogin");
     cb()->routeGet('login', "AdminAuthController@getLogin");
@@ -37,8 +37,8 @@ 
     'middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBBackend::class],
     'prefix' => cbConfig('ADMIN_PATH'),
     'namespace' => 'crocodicstudio\crudbooster\controllers',
-], function () {
-    cb()->routeController('profile', 'AdminProfileController','crocodicstudio\crudbooster\controllers');
+], function() {
+    cb()->routeController('profile', 'AdminProfileController', 'crocodicstudio\crudbooster\controllers');
 });
 
 // Auto Routing for App\Http\Controllers
@@ -46,24 +46,24 @@ 
     'middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBBackend::class],
     'prefix' => cbConfig('ADMIN_PATH'),
     'namespace' => 'App\Http\Controllers',
-], function () {
+], function() {
 
     if (Request::is(cbConfig('ADMIN_PATH'))) {
-        if($dashboard = cbConfig("ADMIN_DASHBOARD_CONTROLLER")) {
+        if ($dashboard = cbConfig("ADMIN_DASHBOARD_CONTROLLER")) {
             cb()->routeGet("/", $dashboard);
-        }else{
+        } else {
             cb()->routeGet("/", "\crocodicstudio\crudbooster\controllers\AdminDashboardController@getIndex");
         }
     }
 
     $controllers = glob(app_path('Http/Controllers/Admin*Controller.php'));
 
-    foreach($controllers as $controller) {
+    foreach ($controllers as $controller) {
         $controllerName = basename($controller);
-        $controllerName = rtrim($controllerName,".php");
+        $controllerName = rtrim($controllerName, ".php");
         $className = '\App\Http\Controllers\\'.$controllerName;
         $controllerClass = new $className();
-        if(method_exists($controllerClass, 'cbInit')) {
+        if (method_exists($controllerClass, 'cbInit')) {
             cb()->routeController($controllerClass->getData('permalink'), $controllerName);
         }
     }

src/types/checkbox/Checkbox.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
      */
     public function optionsFromTable($table, $key_field, $display_field, $SQLCondition = null) {
         $data = DB::table($table);
-        if($SQLCondition && is_callable($SQLCondition)) {
+        if ($SQLCondition && is_callable($SQLCondition)) {
             $data = call_user_func($SQLCondition, $data);
         }elseif ($SQLCondition && is_string($SQLCondition)) {
             $data->whereRaw($SQLCondition);
@@ -42,7 +42,7 @@ 
         $data = $data->get();
         $options = [];
         foreach ($data as $d) {
-            $options[ $d->$key_field ] = $d->$display_field;
+            $options[$d->$key_field] = $d->$display_field;
         }
         $this->options($options);
     }

src/types/date/Hook.php

Spacing +2 added lines, -2 removed lines

@@ -20,9 +20,9 @@
      */
     public function indexRender($row, $column)
     {
-        if($column->getFormat()) {
+        if ($column->getFormat()) {
             return date($column->getFormat(), strtotime($row->{$column->getField()}));
-        }else{
+        } else {
             return $row->{$column->getField()};
         }
     }

src/helpers/UserSession.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php 
 namespace crocodicstudio\crudbooster\helpers;
 
-class UserSession  {
+class UserSession {
 
     public function user()
     {
@@ -21,14 +21,14 @@ 
     public function photo()
     {
         $user = $this->user();
-        return ($user->photo)?asset($user->photo):asset(dummyPhoto());
+        return ($user->photo) ?asset($user->photo) : asset(dummyPhoto());
     }
 
     public function roleName()
     {
         $user = $this->user();
         $role = cb()->find("cb_roles", $user->cb_roles_id);
-        if($role) return $role->name;
+        if ($role) return $role->name;
         else return null;
     }
 

src/controllers/AdminProfileController.php

Spacing +7 added lines, -7 removed lines

@@ -11,11 +11,11 @@ 
     public function getIndex() {
         $data = [];
         $data['page_title'] = 'Profile';
-        return view('crudbooster::profile',$data);
+        return view('crudbooster::profile', $data);
     }
 
     public function postUpdate() {
-        validator(request()->all(),[
+        validator(request()->all(), [
             'name'=>'required|max:255|min:3',
             'email'=>'required|email',
             'photo'=>'image',
@@ -26,19 +26,19 @@ 
             $data = [];
             $data['name'] = request('name');
             $data['email'] = request('email');
-            if(request('password')) {
+            if (request('password')) {
                 $data['password'] = Hash::make(request('password'));
             }
-            if(request()->hasFile('photo')) {
+            if (request()->hasFile('photo')) {
                 $data['photo'] = cb()->uploadFile('photo', true, 200, 200);
             }
             DB::table("users")->where("id", auth()->id())->update($data);
-        }catch (\Exception $e) {
+        } catch (\Exception $e) {
             Log::error($e);
-            return cb()->redirectBack("Something went wrong!","warning");
+            return cb()->redirectBack("Something went wrong!", "warning");
         }
 
-        return cb()->redirectBack("The profile data has been updated!","success");
+        return cb()->redirectBack("The profile data has been updated!", "success");
     }
 
 }

src/helpers/SidebarMenus.php

Spacing +21 added lines, -21 removed lines

@@ -22,7 +22,7 @@ 
     private function assignToModel($menu) {
         $model = new SidebarModel();
         $model->setId($menu->id);
-        if($menu->type == "url") {
+        if ($menu->type == "url") {
             $model->setUrl($menu->path);
             $model->setIcon($menu->icon);
             $model->setName($menu->name);
@@ -43,9 +43,9 @@ 
             $model->setBasepath(config('crudbooster.ADMIN_PATH').'/'.basename($model->getUrl()));
         }
 
-        if(request()->is($model->getBasepath()."*")) {
+        if (request()->is($model->getBasepath()."*")) {
             $model->setIsActive(true);
-        }else{
+        } else {
             $model->setIsActive(false);
         }
 
@@ -54,22 +54,22 @@ 
 
     private function loadData($parent_id = null) {
         $menus = DB::table("cb_menus");
-        if($parent_id) {
-            $menus->where("parent_cb_menus_id",$parent_id);
-        }else{
+        if ($parent_id) {
+            $menus->where("parent_cb_menus_id", $parent_id);
+        } else {
             $menus->whereNull("parent_cb_menus_id");
         }
-        return $menus->orderBy("sort_number","asc")->get();
+        return $menus->orderBy("sort_number", "asc")->get();
     }
 
     private function rolePrivilege($cb_roles_id, $cb_menus_id) {
-        return cb()->find("cb_role_privileges",['cb_roles_id'=>$cb_roles_id,'cb_menus_id'=>$cb_menus_id]);
+        return cb()->find("cb_role_privileges", ['cb_roles_id'=>$cb_roles_id, 'cb_menus_id'=>$cb_menus_id]);
     }
 
-    private function checkPrivilege($roles_id,$menu) {
-        if($roles_id) {
+    private function checkPrivilege($roles_id, $menu) {
+        if ($roles_id) {
             $privilege = $this->rolePrivilege($roles_id, $menu->id);
-            if($privilege && !$privilege->can_browse) {
+            if ($privilege && !$privilege->can_browse) {
                 return false;
             }
         }
@@ -78,36 +78,36 @@ 
     }
 
     public function all($withPrivilege = true) {
-        $roles_id = ($withPrivilege)?cb()->session()->roleId():null;
+        $roles_id = ($withPrivilege) ?cb()->session()->roleId() : null;
         $menus = $this->loadData();
         $result = [];
         $menus_active = false;
-        foreach($menus as $menu) {
+        foreach ($menus as $menu) {
 
-            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue;
+            if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue;
 
             $sidebarModel = $this->assignToModel($menu);
-            if($sidebarModel->getisActive()) $menus_active = true;
-            if($menus2 = $this->loadData($menu->id)) {
+            if ($sidebarModel->getisActive()) $menus_active = true;
+            if ($menus2 = $this->loadData($menu->id)) {
                 $sub1 = [];
                 $menus2_active = false;
                 foreach ($menus2 as $menu2) {
 
-                    if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue;
+                    if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue;
 
                     $sidebarModel2 = $this->assignToModel($menu2);
-                    if($sidebarModel2->getisActive()) $menus2_active = true;
+                    if ($sidebarModel2->getisActive()) $menus2_active = true;
 
-                    if($menus3 = $this->loadData($menu2->id)) {
+                    if ($menus3 = $this->loadData($menu2->id)) {
                         $sub2 = [];
                         $menus3_active = false;
                         foreach ($menus3 as $menu3) {
 
-                            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue;
+                            if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue;
 
                             $sidebarModel3 = $this->assignToModel($menu3);
 
-                            if($sidebarModel3->getisActive()) {
+                            if ($sidebarModel3->getisActive()) {
                                 $menus3_active = true;
                             }
 

src/controllers/traits/ControllerSetting.php

Spacing +8 added lines, -8 removed lines

@@ -29,9 +29,9 @@ 
         $this->setButtonDetail(true);
         $this->setButtonSave(true);
         $this->setButtonLimitPage(true);
-        $this->hideButtonDeleteWhen(function ($row) { return false; });
-        $this->hideButtonDetailWhen(function ($row) { return false; });
-        $this->hideButtonEditWhen(function ($row) { return false; });
+        $this->hideButtonDeleteWhen(function($row) { return false; });
+        $this->hideButtonDetailWhen(function($row) { return false; });
+        $this->hideButtonEditWhen(function($row) { return false; });
     }
 
 
@@ -128,9 +128,9 @@ 
      * @param ButtonColor $color
      * @param string $attributes
      */
-    public function addIndexActionButton($label, $actionURL, $fontAwesome_icon=null, $color=null, $attributes = null)
+    public function addIndexActionButton($label, $actionURL, $fontAwesome_icon = null, $color = null, $attributes = null)
     {
-        $color = ($color)?:ButtonColor::DARK_BLUE;
+        $color = ($color) ?: ButtonColor::DARK_BLUE;
 
         $model = new IndexActionButtonModel();
         $model->setLabel($label);
@@ -185,12 +185,12 @@ 
      * @param $fontAwesome_icon
      * @param ButtonColor|string $color
      */
-    public function addActionButton($label, $url_target, $condition_callback=null, $fontAwesome_icon=null, $color=null, $confirmation = false)
+    public function addActionButton($label, $url_target, $condition_callback = null, $fontAwesome_icon = null, $color = null, $confirmation = false)
     {
         $new = new AddActionButtonModel();
         $new->setLabel($label);
-        $new->setIcon($fontAwesome_icon?:"fa fa-bars");
-        $new->setColor($color?:"primary");
+        $new->setIcon($fontAwesome_icon ?: "fa fa-bars");
+        $new->setColor($color ?: "primary");
         $new->setUrl($url_target);
         $new->setCondition($condition_callback);
         $new->setConfirmation($confirmation);

src/controllers/CBController.php

Spacing +54 added lines, -54 removed lines

@@ -26,14 +26,14 @@ 
 
     public function __call($method, $parameters)
     {
-        if($method == "getData") {
+        if ($method == "getData") {
             $key = $parameters[0];
-            if(isset($this->data[$key])) {
+            if (isset($this->data[$key])) {
                 return $this->data[$key];
-            }else{
+            } else {
                 return null;
             }
-        }else{
+        } else {
             return null;
         }
     }
@@ -48,19 +48,19 @@ 
 
         $query->addSelect($this->data['table'].'.'.cb()->pk($this->data['table']).' as primary_key');
 
-        if(isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index']))
+        if (isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index']))
         {
             $query = call_user_func($this->data['hook_query_index'], $query);
         }
 
-        $softDelete = isset($this->data['disable_soft_delete'])?$this->data['disable_soft_delete']:true;
-        if($softDelete === true && Schema::hasColumn($this->data['table'],'deleted_at')) {
+        $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true;
+        if ($softDelete === true && Schema::hasColumn($this->data['table'], 'deleted_at')) {
             $query->whereNull($this->data['table'].'.deleted_at');
         }
 
 
-        if(isset($joins)) {
-            foreach($joins as $join)
+        if (isset($joins)) {
+            foreach ($joins as $join)
             {
                 $query->join($join['target_table'],
                         $join['target_table_primary'],
@@ -70,31 +70,31 @@ 
             }
         }
 
-        foreach($columns as $column) {
+        foreach ($columns as $column) {
             /** @var ColumnModel $column */
-            if(strpos($column->getField(),".") === false) {
+            if (strpos($column->getField(), ".") === false) {
                 $query->addSelect($this->data['table'].'.'.$column->getField());
-            }else{
+            } else {
                 $query->addSelect($column->getField());
             }
 
             $query = getTypeHook($column->getType())->query($query, $column);
         }
 
-        if(request()->has('q'))
+        if (request()->has('q'))
         {
-            if(isset($this->data['hook_search_query'])) {
+            if (isset($this->data['hook_search_query'])) {
                 $query = call_user_func($this->data['hook_search_query'], $query);
-            }else{
-                $query->where(function ($where) use ($columns) {
+            } else {
+                $query->where(function($where) use ($columns) {
                     /**
                      * @var $where Builder
                      */
-                    foreach($columns as $column)
+                    foreach ($columns as $column)
                     {
-                        if(strpos($column->getField(),".") === false) {
+                        if (strpos($column->getField(), ".") === false) {
                             $field = $this->data['table'].'.'.$column->getField();
-                        }else{
+                        } else {
                             $field = $column->getField();
                         }
                         $where->orWhere($field, 'like', '%'.request('q').'%');
@@ -103,17 +103,17 @@ 
             }
         }
 
-        if(isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index'])) {
+        if (isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index'])) {
             $query = call_user_func($this->data['hook_query_index'], $query);
         }
 
 
-        if(request()->has(['order_by','order_sort']))
+        if (request()->has(['order_by', 'order_sort']))
         {
-            if(in_array(request('order_by'),columnSingleton()->getColumnNameOnly())) {
+            if (in_array(request('order_by'), columnSingleton()->getColumnNameOnly())) {
                 $query->orderBy(request('order_by'), request('order_sort'));
             }
-        }else{
+        } else {
             $query->orderBy($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), "desc");
         }
 
@@ -122,7 +122,7 @@ 
 
     public function getIndex()
     {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if (!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area");
 
         $query = $this->repository();
         $result = $query->paginate(20);
@@ -137,51 +137,51 @@ 
      */
     private function validation()
     {
-        if(isset($this->data['validation'])) {
+        if (isset($this->data['validation'])) {
             $validator = Validator::make(request()->all(), @$this->data['validation'], @$this->data['validation_messages']);
             if ($validator->fails()) {
                 $message = $validator->messages();
                 $message_all = $message->all();
-                throw new CBValidationException(implode(', ',$message_all));
+                throw new CBValidationException(implode(', ', $message_all));
             }
         }
     }
 
     public function getAdd()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area");
 
         $data = [];
         $data['page_title'] = $this->data['page_title'].' : Add';
         $data['action_url'] = module()->addSaveURL();
-        return view('crudbooster::module.form.form',array_merge($data, $this->data));
+        return view('crudbooster::module.form.form', array_merge($data, $this->data));
     }
 
     public function postAddSave()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area");
 
         try {
             $this->validation();
             columnSingleton()->valueAssignment();
             $data = columnSingleton()->getAssignmentData();
 
-            if(Schema::hasColumn($this->data['table'], 'created_at')) {
+            if (Schema::hasColumn($this->data['table'], 'created_at')) {
                 $data['created_at'] = date('Y-m-d H:i:s');
             }
 
             $id = DB::table($this->data['table'])->insertGetId($data);
 
-            if(isset($this->data['hook_after_insert']) && is_callable($this->data['hook_after_insert'])) {
+            if (isset($this->data['hook_after_insert']) && is_callable($this->data['hook_after_insert'])) {
                 call_user_func($this->data['hook_after_insert'], $id);
             }
 
         } catch (CBValidationException $e) {
             Log::debug($e);
-            return cb()->redirectBack($e->getMessage(),'info');
+            return cb()->redirectBack($e->getMessage(), 'info');
         } catch (\Exception $e) {
             Log::error($e);
-            return cb()->redirectBack($e->getMessage(),'warning');
+            return cb()->redirectBack($e->getMessage(), 'warning');
         }
 
         if (request('submit') == trans('crudbooster.button_save_more')) {
@@ -193,7 +193,7 @@ 
 
     public function getEdit($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area");
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();
@@ -204,17 +204,17 @@ 
 
     public function postEditSave($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area");
 
         try {
             $this->validation();
             columnSingleton()->valueAssignment();
             $data = columnSingleton()->getAssignmentData();
-            if(Schema::hasColumn($this->data['table'], 'updated_at')) {
+            if (Schema::hasColumn($this->data['table'], 'updated_at')) {
                 $data['updated_at'] = date('Y-m-d H:i:s');
             }
 
-            if(isset($this->data['hook_before_update']) && is_callable($this->data['hook_before_update'])) {
+            if (isset($this->data['hook_before_update']) && is_callable($this->data['hook_before_update'])) {
                 call_user_func($this->data['hook_before_update'], $id);
             }
 
@@ -222,16 +222,16 @@ 
                 ->where(cb()->pk($this->data['table']), $id)
                 ->update($data);
 
-            if(isset($this->data['hook_after_update']) && is_callable($this->data['hook_after_update'])) {
+            if (isset($this->data['hook_after_update']) && is_callable($this->data['hook_after_update'])) {
                 call_user_func($this->data['hook_after_update'], $id);
             }
 
         } catch (CBValidationException $e) {
             Log::debug($e);
-            return cb()->redirectBack($e->getMessage(),'info');
+            return cb()->redirectBack($e->getMessage(), 'info');
         } catch (\Exception $e) {
             Log::error($e);
-            return cb()->redirectBack($e->getMessage(),'warning');
+            return cb()->redirectBack($e->getMessage(), 'warning');
         }
 
 
@@ -244,15 +244,15 @@ 
 
     public function getDelete($id)
     {
-        if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if (!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area");
 
-        if(isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) {
+        if (isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) {
             call_user_func($this->data['hook_before_delete'], $id);
         }
 
-        $softDelete = isset($this->data['disable_soft_delete'])?$this->data['disable_soft_delete']:true;
+        $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true;
 
-        if ($softDelete === true && Schema::hasColumn($this->data['table'],'deleted_at')) {
+        if ($softDelete === true && Schema::hasColumn($this->data['table'], 'deleted_at')) {
             DB::table($this->data['table'])
                 ->where(getPrimaryKey($this->data['table']), $id)
                 ->update(['deleted_at' => date('Y-m-d H:i:s')]);
@@ -262,7 +262,7 @@ 
                 ->delete();
         }
 
-        if(isset($this->data['hook_after_delete']) && is_callable($this->data['hook_after_delete'])) {
+        if (isset($this->data['hook_after_delete']) && is_callable($this->data['hook_after_delete'])) {
             call_user_func($this->data['hook_after_delete'], $id);
         }
 
@@ -271,7 +271,7 @@ 
 
     public function getDetail($id)
     {
-        if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if (!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area");
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();
@@ -281,21 +281,21 @@ 
 
     public function postUploadImage()
     {
-        if(auth()->guest()) return redirect(cb()->getLoginUrl());
+        if (auth()->guest()) return redirect(cb()->getLoginUrl());
 
         $file = null;
         try {
 
             cb()->validation([
-                'userfile' => 'required|mimes:' . implode(",",config('crudbooster.UPLOAD_IMAGE_EXTENSION_ALLOWED'))
+                'userfile' => 'required|mimes:'.implode(",", config('crudbooster.UPLOAD_IMAGE_EXTENSION_ALLOWED'))
             ]);
 
             $file = cb()->uploadFile('userfile', true);
 
         } catch (CBValidationException $e) {
-            return response()->json(['status'=>false,'message'=>$e->getMessage()]);
+            return response()->json(['status'=>false, 'message'=>$e->getMessage()]);
         } catch (\Exception $e) {
-            return response()->json(['status'=>false,'message'=>$e->getMessage()]);
+            return response()->json(['status'=>false, 'message'=>$e->getMessage()]);
         }
 
         return response()->json([
@@ -308,21 +308,21 @@ 
 
     public function postUploadFile()
     {
-        if(auth()->guest()) return redirect(cb()->getLoginUrl());
+        if (auth()->guest()) return redirect(cb()->getLoginUrl());
 
         $file = null;
         try {
 
             cb()->validation([
-                'userfile' => 'required|mimes:' . implode(",",config('crudbooster.UPLOAD_FILE_EXTENSION_ALLOWED'))
+                'userfile' => 'required|mimes:'.implode(",", config('crudbooster.UPLOAD_FILE_EXTENSION_ALLOWED'))
             ]);
 
             $file = cb()->uploadFile('userfile', true);
 
         } catch (CBValidationException $e) {
-            return response()->json(['status'=>false,'message'=>$e->getMessage()]);
+            return response()->json(['status'=>false, 'message'=>$e->getMessage()]);
         } catch (\Exception $e) {
-            return response()->json(['status'=>false,'message'=>$e->getMessage()]);
+            return response()->json(['status'=>false, 'message'=>$e->getMessage()]);
         }
 
         return response()->json([