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

Merge pull request #2256 from CihanSenturk/master

Browse Source 
country field value changed to `company.country` (#1hwqn9e)
This commit is contained in:
Cüneyt Şentürk 2021-09-29 17:34:18 +03:00 committed by GitHub
commit 5ab96026fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Wizard/Companies.php
View File

@ -97,10 +97,6 @@ class Companies extends Controller
}
setting()->set($real_key, $value);
if ($key == 'country') {
setting()->set('default.' . $key, $value);
}
}
// Save all settings

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

@ -89,7 +89,6 @@ class CreateCompany extends Job implements HasOwner, HasSource, ShouldCreate
'company.country' => $this->request->get('country'),
'default.currency' => $this->request->get('currency'),
'default.locale' => $this->request->get('locale', 'en-GB'),
'default.country' => $this->request->get('country'),
]);
if (!empty($this->request->settings)) {

2
resources/views/modals/customers/create.blade.php
View File

@ -18,7 +18,7 @@
{{ Form::textareaGroup('address', trans('general.address')) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }}
{{ Form::hidden('type', 'customer') }}
{!! Form::hidden('enabled', '1', []) !!}

2
resources/views/modals/vendors/create.blade.php vendored
View File

@ -18,7 +18,7 @@
{{ Form::textareaGroup('address', trans('general.address')) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }}
{{ Form::hidden('type', 'vendor') }}
{!! Form::hidden('enabled', '1', []) !!}

2
resources/views/purchases/vendors/create.blade.php vendored
View File

@ -37,7 +37,7 @@
{{ Form::textGroup('state', trans('general.state'), 'city', []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }}
{{ Form::fileGroup('logo', trans_choice('general.pictures', 1), '', ['dropzone-class' => 'form-file']) }}

2
resources/views/sales/customers/create.blade.php
View File

@ -38,7 +38,7 @@
{{ Form::textGroup('state', trans('general.state'), 'city', []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }}
{{ Form::textGroup('reference', trans('general.reference'), 'file', []) }}

2
resources/views/settings/default/edit.blade.php
View File

@ -32,8 +32,6 @@
{{ Form::selectGroup('locale', trans_choice('general.languages', 1), 'flag', language()->allowed(), setting('default.locale'), []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
{{ Form::selectGroup('list_limit', trans('settings.default.list_limit'), 'columns', ['10' => '10', '25' => '25', '50' => '50', '100' => '100'], setting('default.list_limit'), []) }}
{{ Form::radioGroup('use_gravatar', trans('settings.default.use_gravatar'), setting('default.use_gravatar')) }}