From 4fc05015099da72cf2d354d995e605a30f22968e Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 24 Dec 2018 15:09:03 +0300 Subject: [PATCH] added to wizard #681 --- resources/views/settings/settings/edit.blade.php | 3 +-- resources/views/wizard/companies/edit.blade.php | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/resources/views/settings/settings/edit.blade.php b/resources/views/settings/settings/edit.blade.php index 4da10ef70..c88059a10 100644 --- a/resources/views/settings/settings/edit.blade.php +++ b/resources/views/settings/settings/edit.blade.php @@ -44,8 +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']) }} + {{ 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()->format('d F')) }} {{ Form::selectGroup('timezone', trans('settings.localisation.timezone'), 'globe', $timezones, null, []) }} diff --git a/resources/views/wizard/companies/edit.blade.php b/resources/views/wizard/companies/edit.blade.php index b86f8a645..ff192575f 100644 --- a/resources/views/wizard/companies/edit.blade.php +++ b/resources/views/wizard/companies/edit.blade.php @@ -54,10 +54,9 @@


- {{ Form::textGroup('company_tax_number', trans('general.tax_number'), 'percent', []) }} - {{ Form::textGroup('company_phone', trans('settings.company.phone'), 'phone', []) }} + {{ 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']) }} {{ Form::textareaGroup('company_address', trans('settings.company.address')) }} @@ -80,10 +79,15 @@ @endsection @push('js') + +@if (language()->getShortCode() != 'en') + +@endif @endpush @push('css') + @endpush @@ -93,6 +97,14 @@ var text_no = '{{ trans('general.no') }}'; $(document).ready(function() { + $('#financial_start').datepicker({ + format: 'dd MM', + todayBtn: 'linked', + weekStart: 1, + autoclose: true, + language: '{{ language()->getShortCode() }}' + }); + $('#company_logo').fancyfile({ text : '{{ trans('general.form.select.file') }}', style : 'btn-default',