shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed install/update locale

Browse Source
This commit is contained in:
denisdulici
2020-02-03 18:57:31 +03:00
parent f7b0ef8973
commit a92689d3e3
12 changed files with 63 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/CompanySeed.php
View File

@ -19,7 +19,7 @@ class CompanySeed extends Command
* @var string
*/
protected $description = 'Seed for specific company';
/**
* Create a new command instance.
*

10
app/Console/Commands/FinishUpdate.php
View File

@ -3,6 +3,7 @@
namespace App\Console\Commands;
use App\Events\Install\UpdateFinished;
use App\Models\Common\Company;
use Illuminate\Console\Command;
class FinishUpdate extends Command
@ -12,7 +13,7 @@ class FinishUpdate extends Command
*
* @var string
*/
protected $signature = 'update:finish {alias} {company_id} {new} {old}';
protected $signature = 'update:finish {alias} {company} {new} {old}';
/**
* The console command description.
@ -43,7 +44,7 @@ class FinishUpdate extends Command
$this->call('cache:clear');
$alias = $this->argument('alias');
$company_id = $this->argument('company_id');
$company_id = $this->argument('company');
$new = $this->argument('new');
$old = $this->argument('old');
@ -53,6 +54,11 @@ class FinishUpdate extends Command
throw new \Exception(trans('modules.errors.finish', ['module' => $alias]));
}
// Set locale for modules
if ($alias != 'core') {
app()->setLocale(Company::find($company_id)->locale);
}
session(['company_id' => $company_id]);
setting()->setExtraColumns(['company_id' => $company_id]);

3
app/Console/Commands/Install.php
View File

@ -27,7 +27,7 @@ class Install extends Command
*
* @var string
*/
protected $signature = 'install
protected $signature = 'install
{--db-host=localhost : Database host}
{--db-port=3306 : Port of the database host}
{--db-name= : Name of the database}
@ -64,6 +64,7 @@ class Install extends Command
$this->line('Setting locale ' . $this->locale);
Session::put(self::OPT_LOCALE, $this->locale);
app()->setLocale($this->locale);
$this->prompt();

8
app/Console/Commands/Update.php
View File

@ -23,7 +23,7 @@ class Update extends Command
*
* @var string
*/
protected $signature = 'update {alias} {company_id} {new=latest}';
protected $signature = 'update {alias} {company} {new=latest}';
/**
* The console command description.
@ -31,7 +31,7 @@ class Update extends Command
* @var string
*/
protected $description = 'Allows to update Akaunting and modules directly through CLI';
/**
* Create a new command instance.
*/
@ -55,8 +55,8 @@ class Update extends Command
$this->old = $this->getOldVersion();
session(['company_id' => $this->argument('company_id')]);
setting()->setExtraColumns(['company_id' => $this->argument('company_id')]);
session(['company_id' => $this->argument('company')]);
setting()->setExtraColumns(['company_id' => $this->argument('company')]);
if (!$path = $this->download()) {
return self::CMD_ERROR;

2
app/Console/Commands/UserSeed.php
View File

@ -19,7 +19,7 @@ class UserSeed extends Command
* @var string
*/
protected $description = 'Seed for specific user';
/**
* Create a new command instance.
*