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

fixed #713

Browse Source
This commit is contained in:
denisdulici 2019-01-07 16:03:58 +03:00
parent bc9fbfb3fb
commit a118d9eab8
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Settings/Settings.php
View File

@ -35,7 +35,6 @@ class Settings extends Controller
$setting->put('company_logo', Media::find($setting->pull('company_logo'))); $setting->put('company_logo', Media::find($setting->pull('company_logo')));
$setting->put('invoice_logo', Media::find($setting->pull('invoice_logo'))); $setting->put('invoice_logo', Media::find($setting->pull('invoice_logo')));
$setting->put('financial_start', $this->getFinancialStart()->format('d F'));
$timezones = $this->getTimezones(); $timezones = $this->getTimezones();
@ -161,11 +160,6 @@ class Settings extends Controller
$this->oneCompany($key, $value); $this->oneCompany($key, $value);
} }
// Format financial year
if ($key == 'financial_start') {
$value = Date::parse($value)->format('d-m');
}
setting()->set('general.' . $key, $value); setting()->set('general.' . $key, $value);
} }

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

@ -33,7 +33,6 @@ class Companies extends Controller
/** /**
* Update the specified resource in storage. * Update the specified resource in storage.
* *
* @param Company $company
* @param Request $request * @param Request $request
* *
* @return Response * @return Response
@ -71,11 +70,6 @@ class Companies extends Controller
} }
} }
// Format financial year
if ($key == 'financial_start') {
$value = Date::parse($value)->format('d-m');
}
setting()->set('general.' . $key, $value); setting()->set('general.' . $key, $value);
} }

4
resources/views/settings/settings/edit.blade.php
View File

@ -44,7 +44,7 @@
</div> </div>
<div class="tab-pane tab-margin" id="localisation"> <div class="tab-pane tab-margin" id="localisation">
{{ Form::textGroup('financial_start', trans('settings.localisation.financial_start'), 'calendar-check-o', ['id' => 'financial_start', 'class' => 'form-control', 'data-inputmask' => '\'alias\': \'dd MM\'', 'data-mask' => '', 'autocomplete' => 'off'], $setting['financial_start']) }} {{ Form::textGroup('financial_start', trans('settings.localisation.financial_start'), 'calendar-check-o', ['id' => 'financial_start', 'class' => 'form-control', 'data-inputmask' => '\'alias\': \'dd-mm\'', 'data-mask' => '', 'autocomplete' => 'off'], $setting['financial_start']) }}
{{ Form::selectGroup('timezone', trans('settings.localisation.timezone'), 'globe', $timezones, null, []) }} {{ Form::selectGroup('timezone', trans('settings.localisation.timezone'), 'globe', $timezones, null, []) }}
@ -228,7 +228,7 @@
}); });
$('#financial_start').datepicker({ $('#financial_start').datepicker({
format: 'dd MM', format: 'dd-mm',
todayBtn: 'linked', todayBtn: 'linked',
weekStart: 1, weekStart: 1,
autoclose: true, autoclose: true,

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

@ -56,7 +56,7 @@
</div> </div>
{{ Form::textGroup('company_tax_number', trans('general.tax_number'), 'percent', []) }} {{ Form::textGroup('company_tax_number', trans('general.tax_number'), 'percent', []) }}
{{ Form::textGroup('financial_start', trans('settings.localisation.financial_start'), 'calendar-check-o', ['id' => 'financial_start', 'class' => 'form-control', 'data-inputmask' => '\'alias\': \'dd MM\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::now()->startOfYear()->format('d F')) }} {{ Form::textGroup('financial_start', trans('settings.localisation.financial_start'), 'calendar-check-o', ['id' => 'financial_start', 'class' => 'form-control', 'data-inputmask' => '\'alias\': \'dd-mm\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::now()->startOfYear()->format('d F')) }}
{{ Form::textareaGroup('company_address', trans('settings.company.address')) }} {{ Form::textareaGroup('company_address', trans('settings.company.address')) }}
@ -98,7 +98,7 @@
$(document).ready(function() { $(document).ready(function() {
$('#financial_start').datepicker({ $('#financial_start').datepicker({
format: 'dd MM', format: 'dd-mm',
todayBtn: 'linked', todayBtn: 'linked',
weekStart: 1, weekStart: 1,
autoclose: true, autoclose: true,