From 4e0538a5d76d7eb6a3bfab0bb87732cb54eec612 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 7 Jun 2021 14:42:36 +0300 Subject: [PATCH 1/3] Financial year start bugfix solved --- .../assets/js/components/AkauntingDate.vue | 19 +++++++++++++++++++ .../views/partials/form/date_group.blade.php | 5 ++++- .../settings/localisation/edit.blade.php | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/components/AkauntingDate.vue b/resources/assets/js/components/AkauntingDate.vue index 95e0e3168..641f28d7e 100644 --- a/resources/assets/js/components/AkauntingDate.vue +++ b/resources/assets/js/components/AkauntingDate.vue @@ -4,12 +4,14 @@ :class="[ {'readonly': readonly}, {'disabled': disabled}, + {'hidden-year': hiddenYear}, formClasses ]" :footer-error="formError" :prependIcon="icon" :readonly="readonly" :disabled="disabled" + @focus="focus" > + + \ No newline at end of file diff --git a/resources/views/partials/form/date_group.blade.php b/resources/views/partials/form/date_group.blade.php index 0b93b26ea..18d62ed25 100644 --- a/resources/views/partials/form/date_group.blade.php +++ b/resources/views/partials/form/date_group.blade.php @@ -8,7 +8,6 @@ @else :form-classes="[{'has-error': form.errors.get('{{ $name }}') }]" @endif - :group_class="'{{ $group_class }}'" icon="fa fa-{{ $icon }}" @@ -52,6 +51,10 @@ @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event" @endif + @if (!empty($attributes['hidden_year'])) + hidden-year + @endif + @if (!empty($attributes['change'])) @change="{{ $attributes['change'] }}" @endif diff --git a/resources/views/settings/localisation/edit.blade.php b/resources/views/settings/localisation/edit.blade.php index 2018e8346..d2ae80aaa 100644 --- a/resources/views/settings/localisation/edit.blade.php +++ b/resources/views/settings/localisation/edit.blade.php @@ -18,7 +18,7 @@
- {{ Form::dateGroup('financial_start', trans('settings.localisation.financial_start'), 'calendar', ['id' => 'financial_start', 'class' => 'form-control datepicker', 'show-date-format' => 'j F', 'date-format' => 'd-m', 'autocomplete' => 'off'], setting('localisation.financial_start')) }} + {{ Form::dateGroup('financial_start', trans('settings.localisation.financial_start'), 'calendar', ['id' => 'financial_start', 'class' => 'form-control datepicker', 'show-date-format' => 'j F', 'date-format' => 'd-m', 'autocomplete' => 'off', 'hidden_year' => true], setting('localisation.financial_start')) }} {{ Form::selectGroup('financial_denote', trans('settings.localisation.financial_denote.title'), 'calendar', $financial_denote_options, setting('localisation.financial_denote'), []) }} From af8265c381e9beb3f1d59a5f26e7a4398ad41956 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 7 Jun 2021 14:48:34 +0300 Subject: [PATCH 2/3] Js function refactoring --- resources/assets/js/components/AkauntingDate.vue | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/resources/assets/js/components/AkauntingDate.vue b/resources/assets/js/components/AkauntingDate.vue index 641f28d7e..b32cf3a34 100644 --- a/resources/assets/js/components/AkauntingDate.vue +++ b/resources/assets/js/components/AkauntingDate.vue @@ -133,11 +133,14 @@ export default { }, focus() { - if (this.hiddenYear) { - document.querySelector('.numInputWrapper').classList.add('hidden-year-flatpickr'); - } else { - document.querySelector('.numInputWrapper').classList.remove('hidden-year-flatpickr'); - } + let date_wrapper_html = document.querySelectorAll('.numInputWrapper'); + date_wrapper_html.forEach((wrapper) => { + if(this.hiddenYear) { + wrapper.classList.add('hidden-year-flatpickr'); + } else { + wrapper.classList.remove('hidden-year-flatpickr'); + } + }); } }, From 1baa17c136c20a6ba5d6494798383a5b2b4d28da Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 7 Jun 2021 14:57:39 +0300 Subject: [PATCH 3/3] Code refactoring --- resources/assets/js/components/AkauntingDate.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/resources/assets/js/components/AkauntingDate.vue b/resources/assets/js/components/AkauntingDate.vue index b32cf3a34..9b125e1b9 100644 --- a/resources/assets/js/components/AkauntingDate.vue +++ b/resources/assets/js/components/AkauntingDate.vue @@ -134,13 +134,15 @@ export default { focus() { let date_wrapper_html = document.querySelectorAll('.numInputWrapper'); + if(this.hiddenYear) { date_wrapper_html.forEach((wrapper) => { - if(this.hiddenYear) { - wrapper.classList.add('hidden-year-flatpickr'); - } else { - wrapper.classList.remove('hidden-year-flatpickr'); - } + wrapper.classList.add('hidden-year-flatpickr'); }); + } else { + date_wrapper_html.forEach((wrapper) => { + wrapper.classList.remove('hidden-year-flatpickr'); + }); + } } },