diff --git a/resources/assets/js/components/AkauntingModal.vue b/resources/assets/js/components/AkauntingModal.vue index 4795ec06a..7fffc8da0 100644 --- a/resources/assets/js/components/AkauntingModal.vue +++ b/resources/assets/js/components/AkauntingModal.vue @@ -46,14 +46,10 @@ import AkauntingRadioGroup from './forms/AkauntingRadioGroup'; import AkauntingSelect from './AkauntingSelect'; import AkauntingDate from './AkauntingDate'; import AkauntingRecurring from './AkauntingRecurring'; -import {VMoney} from 'v-money'; - export default { name: 'akaunting-modal', - componentName: 'akaunting-modal', - components: { SlideYUpTransition, AkauntingRadioGroup, @@ -62,10 +58,6 @@ export default { AkauntingRecurring }, - directives: { - money: VMoney - }, - props: { show: Boolean, title: { diff --git a/resources/assets/js/views/common/dashboards.js b/resources/assets/js/views/common/dashboards.js index 204f474fe..0eb4b6950 100644 --- a/resources/assets/js/views/common/dashboards.js +++ b/resources/assets/js/views/common/dashboards.js @@ -118,6 +118,7 @@ const dashboard = new Vue({ this.widget.sort = 0; }, + // Global filter change date column onChangeFilterDate() { if (this.filter_date) { window.location.href = url + '?start_date=' + this.filter_date[0] + '&end_date=' + this.filter_date[1]; diff --git a/resources/views/common/dashboards/show.blade.php b/resources/views/common/dashboards/show.blade.php index 055ec52eb..0ac7e4a4f 100644 --- a/resources/views/common/dashboards/show.blade.php +++ b/resources/views/common/dashboards/show.blade.php @@ -161,7 +161,5 @@ @endsection @push('scripts_start') - - @endpush diff --git a/resources/views/partials/admin/scripts.blade.php b/resources/views/partials/admin/scripts.blade.php index 948979caa..d5d7c6fce 100644 --- a/resources/views/partials/admin/scripts.blade.php +++ b/resources/views/partials/admin/scripts.blade.php @@ -5,14 +5,12 @@ @stack('scripts_start') - - - - @stack('charts') + + diff --git a/resources/views/partials/form/date_group.blade.php b/resources/views/partials/form/date_group.blade.php index 179fc134e..63d487104 100644 --- a/resources/views/partials/form/date_group.blade.php +++ b/resources/views/partials/form/date_group.blade.php @@ -14,7 +14,7 @@ placeholder="{{ trans('general.form.select.field', ['field' => $text]) }}" name="{{ $name }}" - @if(old($name, $value)) + @if (old($name, $value)) value="{{ old($name, $value) }}" @endif @@ -55,7 +55,7 @@ :disabled="'{{ $attributes['disabled'] }}'" @endif - @if(isset($attributes['v-error-message'])) + @if (isset($attributes['v-error-message'])) :form-error="{{ $attributes['v-error-message'] }}" @else :form-error="form.errors.get('{{ $name }}')" diff --git a/resources/views/settings/email/edit.blade.php b/resources/views/settings/email/edit.blade.php index f796899bb..6409f701c 100644 --- a/resources/views/settings/email/edit.blade.php +++ b/resources/views/settings/email/edit.blade.php @@ -103,5 +103,7 @@ @endsection @push('scripts_start') + + @endpush diff --git a/resources/views/widgets/donut_chart.blade.php b/resources/views/widgets/donut_chart.blade.php index 9e3823b2b..00a65a61a 100644 --- a/resources/views/widgets/donut_chart.blade.php +++ b/resources/views/widgets/donut_chart.blade.php @@ -10,14 +10,6 @@ -@push('charts') - -@endpush - @push('body_scripts') {!! $chart->script() !!} @endpush diff --git a/resources/views/widgets/line_chart.blade.php b/resources/views/widgets/line_chart.blade.php index 3a9f80ace..bae9c8c73 100644 --- a/resources/views/widgets/line_chart.blade.php +++ b/resources/views/widgets/line_chart.blade.php @@ -10,14 +10,6 @@ -@push('charts') - -@endpush - @push('body_scripts') {!! $chart->script() !!} @endpush