From c809e94763897acf5cb7000943325f1ff518bf35 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Thu, 20 Dec 2018 17:35:28 +0300 Subject: [PATCH] set company id --- app/Console/Commands/ModuleInstall.php | 19 +++++++++++++------ app/Http/Controllers/Modules/Item.php | 2 -- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/Console/Commands/ModuleInstall.php b/app/Console/Commands/ModuleInstall.php index 6ae58108b..8774e2814 100644 --- a/app/Console/Commands/ModuleInstall.php +++ b/app/Console/Commands/ModuleInstall.php @@ -31,17 +31,21 @@ class ModuleInstall extends Command */ public function handle() { + $alias = $this->argument('alias'); + $company_id = $this->argument('company_id'); + + // Set company id + session(['company_id' => $company_id]); + $request = [ - 'company_id' => $this->argument('company_id'), - 'alias' => strtolower($this->argument('alias')), + 'company_id' => $company_id, + 'alias' => strtolower($alias), 'status' => '1', ]; $model = Module::create($request); - $module = $this->laravel['modules']->findByAlias($model->alias); - - $company_id = $this->argument('company_id'); + $module = $this->laravel['modules']->findByAlias($alias); // Add history $data = [ @@ -61,7 +65,10 @@ class ModuleInstall extends Command $this->call('migrate', ['--force' => true]); // Trigger event - event(new ModuleInstalled($model->alias, $company_id)); + event(new ModuleInstalled($alias, $company_id)); + + // Unset company id + session()->forget('company_id'); $this->info('Module installed!'); } diff --git a/app/Http/Controllers/Modules/Item.php b/app/Http/Controllers/Modules/Item.php index b5d64e6d6..488fa87a1 100644 --- a/app/Http/Controllers/Modules/Item.php +++ b/app/Http/Controllers/Modules/Item.php @@ -286,8 +286,6 @@ class Item extends Controller * Final actions post update. * * @param $alias - * @param $old - * @param $new * @return Response */ public function post($alias)