diff --git a/app/Http/Controllers/Settings/Settings.php b/app/Http/Controllers/Settings/Settings.php index 4556864ad..27fb9923c 100644 --- a/app/Http/Controllers/Settings/Settings.php +++ b/app/Http/Controllers/Settings/Settings.php @@ -35,7 +35,6 @@ class Settings extends Controller $setting->put('company_logo', Media::find($setting->pull('company_logo'))); $setting->put('invoice_logo', Media::find($setting->pull('invoice_logo'))); - $setting->put('financial_start', $this->getFinancialStart()->format('d F')); $timezones = $this->getTimezones(); @@ -161,11 +160,6 @@ class Settings extends Controller $this->oneCompany($key, $value); } - // Format financial year - if ($key == 'financial_start') { - $value = Date::parse($value)->format('d-m'); - } - setting()->set('general.' . $key, $value); } diff --git a/app/Http/Controllers/Wizard/Companies.php b/app/Http/Controllers/Wizard/Companies.php index bb4b2bd2c..26061253e 100644 --- a/app/Http/Controllers/Wizard/Companies.php +++ b/app/Http/Controllers/Wizard/Companies.php @@ -33,7 +33,6 @@ class Companies extends Controller /** * Update the specified resource in storage. * - * @param Company $company * @param Request $request * * @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); } diff --git a/resources/views/settings/settings/edit.blade.php b/resources/views/settings/settings/edit.blade.php index 52383db6d..1b9757f3a 100644 --- a/resources/views/settings/settings/edit.blade.php +++ b/resources/views/settings/settings/edit.blade.php @@ -44,7 +44,7 @@
- {{ 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, []) }} @@ -228,7 +228,7 @@ }); $('#financial_start').datepicker({ - format: 'dd MM', + format: 'dd-mm', todayBtn: 'linked', weekStart: 1, autoclose: true, diff --git a/resources/views/wizard/companies/edit.blade.php b/resources/views/wizard/companies/edit.blade.php index e113b1ab1..c8229016e 100644 --- a/resources/views/wizard/companies/edit.blade.php +++ b/resources/views/wizard/companies/edit.blade.php @@ -56,7 +56,7 @@
{{ 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')) }} @@ -98,7 +98,7 @@ $(document).ready(function() { $('#financial_start').datepicker({ - format: 'dd MM', + format: 'dd-mm', todayBtn: 'linked', weekStart: 1, autoclose: true,