diff --git a/app/Http/Controllers/Modules/Item.php b/app/Http/Controllers/Modules/Item.php index a7b404a5f..31821c2c5 100644 --- a/app/Http/Controllers/Modules/Item.php +++ b/app/Http/Controllers/Modules/Item.php @@ -40,8 +40,8 @@ class Item extends Controller { $this->checkApiToken(); - $installed = false; $enable = false; + $installed = false; $module = $this->getModule($alias); @@ -69,29 +69,29 @@ class Item extends Controller { $this->checkApiToken(); - $json = array(); - $json['step'] = array(); + $json = []; + $json['step'] = []; $name = $request['name']; $version = $request['version']; // Download - $json['step'][] = array( + $json['step'][] = [ 'text' => trans('modules.installation.download', ['module' => $name]), 'url' => url('apps/download') - ); + ]; // Unzip - $json['step'][] = array( + $json['step'][] = [ 'text' => trans('modules.installation.unzip', ['module' => $name]), 'url' => url('apps/unzip') - ); + ]; // Download - $json['step'][] = array( + $json['step'][] = [ 'text' => trans('modules.installation.install', ['module' => $name]), 'url' => url('apps/install') - ); + ]; return response()->json($json); } @@ -170,13 +170,13 @@ class Item extends Controller $module = Module::alias($alias)->first(); - $data = array( + $data = [ 'company_id' => session('company_id'), 'module_id' => $module->id, 'category' => $json['data']['category'], 'version' => $json['data']['version'], 'description' => trans('modules.uninstalled', ['module' => $json['data']['name']]), - ); + ]; ModuleHistory::create($data); @@ -197,13 +197,13 @@ class Item extends Controller $module = Module::alias($alias)->first(); - $data = array( + $data = [ 'company_id' => session('company_id'), 'module_id' => $module->id, 'category' => $json['data']['category'], 'version' => $json['data']['version'], 'description' => trans_choice('modules.updated', $json['data']['name']), - ); + ]; ModuleHistory::create($data); @@ -222,13 +222,13 @@ class Item extends Controller $module = Module::alias($alias)->first(); - $data = array( + $data = [ 'company_id' => session('company_id'), 'module_id' => $module->id, 'category' => $json['data']['category'], 'version' => $json['data']['version'], 'description' => trans('modules.enabled', ['module' => $json['data']['name']]), - ); + ]; $module->status = 1; @@ -251,13 +251,13 @@ class Item extends Controller $module = Module::alias($alias)->first(); - $data = array( + $data = [ 'company_id' => session('company_id'), 'module_id' => $module->id, 'category' => $json['data']['category'], 'version' => $json['data']['version'], 'description' => trans('modules.disabled', ['module' => $json['data']['name']]), - ); + ]; $module->status = 0; diff --git a/app/Http/Controllers/Modules/Tiles.php b/app/Http/Controllers/Modules/Tiles.php index 525f37e55..849ae2ee3 100644 --- a/app/Http/Controllers/Modules/Tiles.php +++ b/app/Http/Controllers/Modules/Tiles.php @@ -17,7 +17,7 @@ class Tiles extends Controller * * @return Response */ - public function category($alias) + public function categoryModules($alias) { $this->checkApiToken(); @@ -34,7 +34,7 @@ class Tiles extends Controller * * @return Response */ - public function paid() + public function paidModules() { $this->checkApiToken(); @@ -49,7 +49,7 @@ class Tiles extends Controller * * @return Response */ - public function new() + public function newModules() { $this->checkApiToken(); @@ -64,7 +64,7 @@ class Tiles extends Controller * * @return Response */ - public function free() + public function freeModules() { $this->checkApiToken(); diff --git a/routes/web.php b/routes/web.php index 247d73237..13d2b4002 100644 --- a/routes/web.php +++ b/routes/web.php @@ -118,10 +118,10 @@ Route::group(['middleware' => 'language'], function () { Route::group(['prefix' => 'apps'], function () { Route::resource('token', 'Modules\Token'); Route::resource('home', 'Modules\Home'); - Route::get('categories/{alias}', 'Modules\Tiles@category'); - Route::get('paid', 'Modules\Tiles@paid'); - Route::get('new', 'Modules\Tiles@new'); - Route::get('free', 'Modules\Tiles@free'); + Route::get('categories/{alias}', 'Modules\Tiles@categoryModules'); + Route::get('paid', 'Modules\Tiles@paidModules'); + Route::get('new', 'Modules\Tiles@newModules'); + Route::get('free', 'Modules\Tiles@freeModules'); Route::post('steps', 'Modules\Item@steps'); Route::post('download', 'Modules\Item@download'); Route::post('unzip', 'Modules\Item@unzip');