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

Merge pull request #1306 from denisdulici/master

Browse Source 
Added language selection in company
This commit is contained in:
Denis Duliçi 2020-02-27 11:33:21 +03:00 committed by GitHub
commit ce9276715c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Jobs/Common/CreateCompany.php
View File

@ -44,6 +44,11 @@ class CreateCompany extends Job
protected function callSeeds()
{
// Set custom locale
if ($this->request->has('locale')) {
app()->setLocale($this->request->get('locale'));
}
// Company seeds
Artisan::call('company:seed', [
'company' => $this->company->id

6
app/Jobs/Common/UpdateCompany.php
View File

@ -33,17 +33,13 @@ class UpdateCompany extends Job
*/
public function handle()
{
// Check if user can access company
$this->authorize();
// Update company
$this->company->update($this->request->all());
// Clear current settings
// Clear current and load given company settings
setting()->setExtraColumns(['company_id' => $this->company->id]);
setting()->forgetAll();
// Load settings based on the given company
setting()->load(true);
if ($this->request->has('name')) {

2
resources/views/common/companies/create.blade.php
View File

@ -23,7 +23,7 @@
{{ Form::selectGroup('currency', trans_choice('general.currencies', 1), 'exchange-alt', $currencies) }}
{{ Form::textGroup('domain', trans('companies.domain'), 'globe', []) }}
{{ Form::selectGroup('locale', trans_choice('general.languages', 1), 'flag', language()->allowed(), setting('default.locale', config('app.locale', 'en-GB')), []) }}
{{ Form::textareaGroup('address', trans('general.address')) }}

4
resources/views/common/companies/edit.blade.php
View File

@ -22,9 +22,9 @@
{{ Form::emailGroup('email', trans('general.email'), 'envelope') }}
{{ Form::selectGroup('currency', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, $company->currency) }}
{{ Form::selectGroup('currency', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, $company->currency ?? 'USD') }}
{{ Form::textGroup('domain', trans('companies.domain'), 'globe', []) }}
{{ Form::selectGroup('locale', trans_choice('general.languages', 1), 'flag', language()->allowed(), $company->locale ?? config('app.locale', 'en-GB'), []) }}
{{ Form::textareaGroup('address', trans('general.address')) }}