Dashboard and setting->email page issue solved.

This commit is contained in:
Cüneyt Şentürk 2020-02-19 11:10:27 +03:00
parent 8b9c7bfb9d
commit 9c84d267fc
8 changed files with 7 additions and 32 deletions

View File

@ -46,14 +46,10 @@ import AkauntingRadioGroup from './forms/AkauntingRadioGroup';
import AkauntingSelect from './AkauntingSelect'; import AkauntingSelect from './AkauntingSelect';
import AkauntingDate from './AkauntingDate'; import AkauntingDate from './AkauntingDate';
import AkauntingRecurring from './AkauntingRecurring'; import AkauntingRecurring from './AkauntingRecurring';
import {VMoney} from 'v-money';
export default { export default {
name: 'akaunting-modal', name: 'akaunting-modal',
componentName: 'akaunting-modal',
components: { components: {
SlideYUpTransition, SlideYUpTransition,
AkauntingRadioGroup, AkauntingRadioGroup,
@ -62,10 +58,6 @@ export default {
AkauntingRecurring AkauntingRecurring
}, },
directives: {
money: VMoney
},
props: { props: {
show: Boolean, show: Boolean,
title: { title: {

View File

@ -118,6 +118,7 @@ const dashboard = new Vue({
this.widget.sort = 0; this.widget.sort = 0;
}, },
// Global filter change date column
onChangeFilterDate() { onChangeFilterDate() {
if (this.filter_date) { if (this.filter_date) {
window.location.href = url + '?start_date=' + this.filter_date[0] + '&end_date=' + this.filter_date[1]; window.location.href = url + '?start_date=' + this.filter_date[0] + '&end_date=' + this.filter_date[1];

View File

@ -161,7 +161,5 @@
@endsection @endsection
@push('scripts_start') @push('scripts_start')
<script src="https://unpkg.com/vue"></script>
<script src="{{ asset('public/js/common/dashboards.js?v=' . version('short')) }}"></script> <script src="{{ asset('public/js/common/dashboards.js?v=' . version('short')) }}"></script>
@endpush @endpush

View File

@ -5,14 +5,12 @@
@stack('scripts_start') @stack('scripts_start')
<script src="{{ asset('public/0.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/vendor/chart.js/dist/Chart.min.js') }}"></script>
<script src="{{ asset('public/js/common/search.js?v=' . version('short')) }}"></script> <script src="{{ asset('public/js/common/search.js?v=' . version('short')) }}"></script>
@stack('charts') @stack('charts')
<script src="{{ asset('public/vendor/chart.js/dist/Chart.min.js') }}"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/echarts/4.0.2/echarts-en.min.js" charset=utf-8></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/echarts/4.0.2/echarts-en.min.js" charset=utf-8></script>
<!-- Argon --> <!-- Argon -->

View File

@ -14,7 +14,7 @@
placeholder="{{ trans('general.form.select.field', ['field' => $text]) }}" placeholder="{{ trans('general.form.select.field', ['field' => $text]) }}"
name="{{ $name }}" name="{{ $name }}"
@if(old($name, $value)) @if (old($name, $value))
value="{{ old($name, $value) }}" value="{{ old($name, $value) }}"
@endif @endif
@ -55,7 +55,7 @@
:disabled="'{{ $attributes['disabled'] }}'" :disabled="'{{ $attributes['disabled'] }}'"
@endif @endif
@if(isset($attributes['v-error-message'])) @if (isset($attributes['v-error-message']))
:form-error="{{ $attributes['v-error-message'] }}" :form-error="{{ $attributes['v-error-message'] }}"
@else @else
:form-error="form.errors.get('{{ $name }}')" :form-error="form.errors.get('{{ $name }}')"

View File

@ -103,5 +103,7 @@
@endsection @endsection
@push('scripts_start') @push('scripts_start')
<script src="{{ asset('public/38.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/settings/settings.js?v=' . version('short')) }}"></script> <script src="{{ asset('public/js/settings/settings.js?v=' . version('short')) }}"></script>
@endpush @endpush

View File

@ -10,14 +10,6 @@
</div> </div>
</div> </div>
@push('charts')
<script>
var widget_donut_{{ $class->model->id }} = new Vue({
el: '#widget-donut-{{ $class->model->id }}',
});
</script>
@endpush
@push('body_scripts') @push('body_scripts')
{!! $chart->script() !!} {!! $chart->script() !!}
@endpush @endpush

View File

@ -10,14 +10,6 @@
</div> </div>
</div> </div>
@push('charts')
<script>
var widget_line_{{ $class->model->id }} = new Vue({
el: '#widget-line-{{ $class->model->id }}',
});
</script>
@endpush
@push('body_scripts') @push('body_scripts')
{!! $chart->script() !!} {!! $chart->script() !!}
@endpush @endpush