v2 first commit

This commit is contained in:
denisdulici
2019-11-16 10:21:14 +03:00
parent 5b23e9c2c4
commit 6d50fa8442
3075 changed files with 3451681 additions and 65594 deletions

View File

@@ -4,30 +4,31 @@
@include('charts::_partials.helpers.hex2rgb')
@push('body_scripts')
<script type="text/javascript">
var ctx = document.getElementById("{{ $model->id }}")
var ctx = document.getElementById("{{ $model->id }}");
var data = {
labels: [
@foreach($model->labels as $label)
"{!! $label !!}",
@foreach ($model->labels as $label)
"{!! $label !!}",
@endforeach
],
datasets: [{
fill: true,
@if($model->colors)
backgroundColor: hex2rgba_convert("{{ $model->colors[0] }}", 50),
@if ($model->colors)
backgroundColor: hex2rgba_convert("{{ $model->colors[0] }}", 50),
@endif
label: "{!! $model->element_label !!}",
lineTension: 0.3,
@if($model->colors)
borderColor: "{{ $model->colors[0] }}",
@if ($model->colors)
borderColor: "{{ $model->colors[0] }}",
@endif
data: [
@foreach($model->values as $dta)
{{ $dta }},
@foreach ($model->values as $dta)
{{ $dta }},
@endforeach
],
]
}]
};
@@ -37,13 +38,14 @@
options: {
responsive: {{ $model->responsive || !$model->width ? 'true' : 'false' }},
maintainAspectRatio: false,
@if($model->title)
title: {
display: true,
text: "{!! $model->title !!}",
fontSize: 20,
}
@if ($model->title)
title: {
display: true,
text: "{!! $model->title !!}",
fontSize: 20
}
@endif
}
});
</script>
@endpush

View File

@@ -2,56 +2,57 @@
@include('charts::_partials.container.canvas2')
@endif
@push('body_scripts')
<script type="text/javascript">
var ctx = document.getElementById("{{ $model->id }}")
var ctx = document.getElementById("{{ $model->id }}");
var myChart = new Chart(ctx, {
type: 'bar',
data: {
labels: [
@foreach($model->labels as $label)
"{!! $label !!}",
@foreach ($model->labels as $label)
"{!! $label !!}",
@endforeach
],
datasets: [
{
label: "{!! $model->element_label !!}",
backgroundColor: [
@if($model->colors)
@foreach($model->colors as $color)
"{{ $color }}",
@endforeach
@else
@foreach($model->values as $dta)
"{{ sprintf('#%06X', mt_rand(0, 0xFFFFFF)) }}",
@endforeach
@endif
],
data: [
@foreach($model->values as $dta)
{{ $dta }},
@endforeach
],
}
]
datasets: [{
label: "{!! $model->element_label !!}",
backgroundColor: [
@if ($model->colors)
@foreach ($model->colors as $color)
"{{ $color }}",
@endforeach
@else
@foreach ($model->values as $dta)
"{{ sprintf('#%06X', mt_rand(0, 0xFFFFFF)) }}",
@endforeach
@endif
],
data: [
@foreach ($model->values as $dta)
{{ $dta }},
@endforeach
]
}]
},
options: {
responsive: {{ $model->responsive || !$model->width ? 'true' : 'false' }},
maintainAspectRatio: false,
@if($model->title)
@if ($model->title)
title: {
display: true,
text: "{!! $model->title !!}",
fontSize: 20,
fontSize: 20
},
@endif
scales: {
yAxes: [{
display: true,
ticks: {
beginAtZero: true,
beginAtZero: true
}
}]
}
}
});
</script>
@endpush

View File

@@ -2,34 +2,35 @@
@include('charts::_partials.container.canvas2')
@endif
@push('body_scripts')
<script type="text/javascript">
var ctx = document.getElementById("{{ $model->id }}")
var ctx = document.getElementById("{{ $model->id }}");
var myChart = new Chart(ctx, {
type: 'doughnut',
data: {
labels: [
@foreach($model->labels as $label)
"{!! $label !!}",
@foreach ($model->labels as $label)
"{!! $label !!}",
@endforeach
],
datasets: [{
data: [
@foreach($model->values as $dta)
{{ $dta }},
@foreach ($model->values as $dta)
{{ $dta }},
@endforeach
],
backgroundColor: [
@if($model->colors)
@foreach($model->colors as $color)
"{{ $color }}",
@endforeach
@else
@foreach($model->values as $dta)
"{{ sprintf('#%06X', mt_rand(0, 0xFFFFFF)) }}",
@endforeach
@endif
],
@if ($model->colors)
@foreach ($model->colors as $color)
"{{ $color }}",
@endforeach
@else
@foreach ($model->values as $dta)
"{{ sprintf('#%06X', mt_rand(0, 0xFFFFFF)) }}",
@endforeach
@endif
]
}]
},
options: {
@@ -38,7 +39,7 @@
legend: {
display: true,
fullWidth: true,
position: 'right',
position: 'right'
},
tooltips: {
callbacks: {
@@ -60,13 +61,14 @@
}
}
},
@if($model->title)
@if ($model->title)
title: {
display: true,
text: "{!! $model->title !!}",
fontSize: 20,
fontSize: 20
}
@endif
}
});
</script>
@endpush

View File

@@ -2,30 +2,30 @@
@include('charts::_partials.container.canvas2')
@endif
@push('body_scripts')
<script type="text/javascript">
var ctx = document.getElementById("{{ $model->id }}")
var ctx = document.getElementById("{{ $model->id }}");
var data = {
labels: [
@foreach($model->labels as $label)
"{!! $label !!}",
@foreach ($model->labels as $label)
"{!! $label !!}",
@endforeach
],
datasets: [
{
fill: false,
label: "{!! $model->element_label !!}",
lineTension: 0.3,
@if($model->colors)
borderColor: "{{ $model->colors[0] }}",
backgroundColor: "{{ $model->colors[0] }}",
@endif
data: [
@foreach($model->values as $dta)
{{ $dta }},
@endforeach
],
}
]
datasets: [{
fill: false,
label: "{!! $model->element_label !!}",
lineTension: 0.3,
@if ($model->colors)
borderColor: "{{ $model->colors[0] }}",
backgroundColor: "{{ $model->colors[0] }}",
@endif
data: [
@foreach ($model->values as $dta)
{{ $dta }},
@endforeach
]
}]
};
var myLineChart = new Chart(ctx, {
@@ -34,13 +34,14 @@
options: {
responsive: {{ $model->responsive || !$model->width ? 'true' : 'false' }},
maintainAspectRatio: false,
@if($model->title)
title: {
display: true,
text: "{!! $model->title !!}",
fontSize: 20,
}
@if ($model->title)
title: {
display: true,
text: "{!! $model->title !!}",
fontSize: 20
}
@endif
}
});
</script>
@endpush

View File

@@ -4,34 +4,35 @@
@include('charts::_partials.helpers.hex2rgb')
@push('body_scripts')
<script type="text/javascript">
var ctx = document.getElementById("{{ $model->id }}");
var ctx = document.getElementById("{{ $model->id }}")
var data = {
labels: [
@foreach($model->labels as $label)
"{!! $label !!}",
@foreach ($model->labels as $label)
"{!! $label !!}",
@endforeach
],
datasets: [
@for ($i = 0; $i < count($model->datasets); $i++)
{
fill: true,
label: "{!! $model->datasets[$i]['label'] !!}",
lineTension: 0.3,
@if($model->colors and count($model->colors) > $i)
@php($c = $model->colors[$i])
@else
@php($c = sprintf('#%06X', mt_rand(0, 0xFFFFFF)))
@endif
borderColor: "{{ $c }}",
backgroundColor: hex2rgba_convert("{{ $c }}", 50),
data: [
@foreach($model->datasets[$i]['values'] as $dta)
{{ $dta }},
@endforeach
],
},
{
fill: true,
label: "{!! $model->datasets[$i]['label'] !!}",
lineTension: 0.3,
@if ($model->colors and count($model->colors) > $i)
@php $c = $model->colors[$i]; @endphp
@else
@php $c = sprintf('#%06X', mt_rand(0, 0xFFFFFF)); @endphp
@endif
borderColor: "{{ $c }}",
backgroundColor: hex2rgba_convert("{{ $c }}", 50),
data: [
@foreach ($model->datasets[$i]['values'] as $dta)
{{ $dta }},
@endforeach
]
},
@endfor
]
};
@@ -42,15 +43,14 @@
options: {
responsive: {{ $model->responsive || !$model->width ? 'true' : 'false' }},
maintainAspectRatio: false,
@if($model->title)
title: {
display: true,
text: "{!! $model->title !!}",
fontSize: 20,
}
@if ($model->title)
title: {
display: true,
text: "{!! $model->title !!}",
fontSize: 20
}
@endif
}
});
</script>
@endpush

View File

@@ -2,50 +2,52 @@
@include('charts::_partials.container.canvas2')
@endif
@push('body_scripts')
<script type="text/javascript">
var ctx = document.getElementById("{{ $model->id }}")
var ctx = document.getElementById("{{ $model->id }}");
var myChart = new Chart(ctx, {
type: 'bar',
data: {
labels: [
@foreach($model->labels as $label)
"{!! $label !!}",
@foreach ($model->labels as $label)
"{!! $label !!}",
@endforeach
],
datasets: [
@for ($i = 0; $i < count($model->datasets); $i++)
{
fill: true,
label: "{!! $model->datasets[$i]['label'] !!}",
lineTension: 0.3,
@if($model->colors and count($model->colors) > $i)
borderColor: "{{ $model->colors[$i] }}",
backgroundColor: "{{ $model->colors[$i] }}",
@else
$c = sprintf('#%06X', mt_rand(0, 0xFFFFFF))
borderColor: "{{ $c }}",
backgroundColor: "{{ $c }}",
@endif
data: [
@foreach($model->datasets[$i]['values'] as $dta)
{{ $dta }},
@endforeach
],
},
{
fill: true,
label: "{!! $model->datasets[$i]['label'] !!}",
lineTension: 0.3,
@if ($model->colors and count($model->colors) > $i)
borderColor: "{{ $model->colors[$i] }}",
backgroundColor: "{{ $model->colors[$i] }}",
@else
@php $c = sprintf('#%06X', mt_rand(0, 0xFFFFFF)); @endphp
borderColor: "{{ $c }}",
backgroundColor: "{{ $c }}",
@endif
data: [
@foreach ($model->datasets[$i]['values'] as $dta)
{{ $dta }},
@endforeach
],
},
@endfor
]
},
options: {
responsive: {{ $model->responsive || !$model->width ? 'true' : 'false' }},
maintainAspectRatio: false,
@if($model->title)
title: {
@if ($model->title)
title: {
display: true,
text: "{!! $model->title !!}",
fontSize: 20,
text: "{!! $model->title !!}",
fontSize: 20,
},
@endif
scales: {
scales: {
yAxes: [{
display: true,
ticks: {
@@ -56,3 +58,4 @@
}
});
</script>
@endpush

View File

@@ -2,33 +2,35 @@
@include('charts::_partials.container.canvas2')
@endif
@push('body_scripts')
<script type="text/javascript">
var ctx = document.getElementById("{{ $model->id }}")
var ctx = document.getElementById("{{ $model->id }}");
var data = {
labels: [
@foreach($model->labels as $label)
"{!! $label !!}",
@foreach ($model->labels as $label)
"{!! $label !!}",
@endforeach
],
datasets: [
@for ($i = 0; $i < count($model->datasets); $i++)
{
fill: false,
label: "{!! $model->datasets[$i]['label'] !!}",
lineTension: 0.3,
@if($model->colors and count($model->colors) > $i)
@php($c = $model->colors[$i])
@else
@php($c = sprintf('#%06X', mt_rand(0, 0xFFFFFF)))
@endif
borderColor: "{{ $c }}",
backgroundColor: "{{ $c }}",
data: [
@foreach($model->datasets[$i]['values'] as $dta)
{{ $dta }},
@endforeach
],
},
{
fill: false,
label: "{!! $model->datasets[$i]['label'] !!}",
lineTension: 0.3,
@if ($model->colors and count($model->colors) > $i)
@php $c = $model->colors[$i]; @endphp
@else
@php $c = sprintf('#%06X', mt_rand(0, 0xFFFFFF)); @endphp
@endif
borderColor: "{{ $c }}",
backgroundColor: "{{ $c }}",
data: [
@foreach ($model->datasets[$i]['values'] as $dta)
{{ $dta }},
@endforeach
]
},
@endfor
]
};
@@ -43,13 +45,14 @@
display: true,
position: 'top'
},
@if($model->title)
title: {
display: true,
text: "{!! $model->title !!}",
fontSize: 20,
}
@if ($model->title)
title: {
display: true,
text: "{!! $model->title !!}",
fontSize: 20
}
@endif
}
});
</script>
@endpush

View File

@@ -2,33 +2,35 @@
@include('charts::_partials.container.canvas2')
@endif
@push('body_scripts')
<script type="text/javascript">
var ctx = document.getElementById("{{ $model->id }}")
var ctx = document.getElementById("{{ $model->id }}");
var data = {
labels: [
@foreach($model->labels as $label)
"{!! $label !!}",
@foreach ($model->labels as $label)
"{!! $label !!}",
@endforeach
],
datasets: [
@for ($i = 0; $i < count($model->datasets); $i++)
{
fill: false,
label: "{!! $model->datasets[$i]['label'] !!}",
lineTension: 0.3,
@if($model->colors and count($model->colors) > $i)
@php($c = $model->colors[$i])
@else
@php($c = sprintf('#%06X', mt_rand(0, 0xFFFFFF)))
@endif
borderColor: "{{ $c }}",
backgroundColor: "{{ $c }}",
data: [
@foreach($model->datasets[$i]['values'] as $dta)
{{ $dta }},
@endforeach
],
},
{
fill: false,
label: "{!! $model->datasets[$i]['label'] !!}",
lineTension: 0.3,
@if ($model->colors and count($model->colors) > $i)
@php $c = $model->colors[$i]; @endphp
@else
@php $c = sprintf('#%06X', mt_rand(0, 0xFFFFFF)); @endphp
@endif
borderColor: "{{ $c }}",
backgroundColor: "{{ $c }}",
data: [
@foreach ($model->datasets[$i]['values'] as $dta)
{{ $dta }},
@endforeach
]
},
@endfor
]
};
@@ -46,13 +48,14 @@
animation: {
duration: 0
},
@if($model->title)
title: {
display: true,
text: "{!! $model->title !!}",
fontSize: 20,
}
@if ($model->title)
title: {
display: true,
text: "{!! $model->title !!}",
fontSize: 20
}
@endif
}
});
</script>
@endpush

View File

@@ -2,46 +2,48 @@
@include('charts::_partials.container.canvas2')
@endif
@push('body_scripts')
<script type="text/javascript">
var ctx = document.getElementById("{{ $model->id }}")
var ctx = document.getElementById("{{ $model->id }}");
var myChart = new Chart(ctx, {
type: 'pie',
data: {
labels: [
@foreach($model->labels as $label)
"{!! $label !!}",
@foreach ($model->labels as $label)
"{!! $label !!}",
@endforeach
],
datasets: [{
data: [
@foreach($model->values as $dta)
{{ $dta }},
@foreach ($model->values as $dta)
{{ $dta }},
@endforeach
],
backgroundColor: [
@if($model->colors)
@foreach($model->colors as $color)
"{{ $color }}",
@endforeach
@else
@foreach($model->values as $dta)
"{{ sprintf('#%06X', mt_rand(0, 0xFFFFFF)) }}",
@endforeach
@endif
],
@if ($model->colors)
@foreach ($model->colors as $color)
"{{ $color }}",
@endforeach
@else
@foreach ($model->values as $dta)
"{{ sprintf('#%06X', mt_rand(0, 0xFFFFFF)) }}",
@endforeach
@endif
]
}]
},
options: {
responsive: {{ $model->responsive || !$model->width ? 'true' : 'false' }},
maintainAspectRatio: false,
@if($model->title)
title: {
display: true,
text: "{!! $model->title !!}",
fontSize: 20,
}
@if ($model->title)
title: {
display: true,
text: "{!! $model->title !!}",
fontSize: 20
}
@endif
}
});
</script>
@endpush

View File

@@ -1,28 +0,0 @@
@foreach ((array) session('flash_notification') as $messages)
@foreach ((array)$messages as $message)
@if ($message['overlay'])
@include('flash::modal', [
'modalClass' => 'flash-modal',
'title' => $message['title'],
'body' => $message['message']
])
@else
<div class="alert
alert-{{ $message['level'] }}
{{ $message['important'] ? 'alert-important' : '' }}"
>
@if ($message['important'])
<button type="button"
class="close"
data-dismiss="alert"
aria-hidden="true"
>&times;</button>
@endif
{!! $message['message'] !!}
</div>
@endif
@endforeach
@endforeach
{{ session()->forget('flash_notification') }}

View File

@@ -1,19 +0,0 @@
<div id="flash-overlay-modal" class="modal fade {{ $modalClass or '' }}">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">{{ $title }}</h4>
</div>
<div class="modal-body">
<p>{!! $body !!}</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>

View File

@@ -1,9 +1,19 @@
<ul class="{{ config('language.flags.ul_class') }}">
@foreach (language()->allowed() as $code => $name)
<li class="{{ config('language.flags.li_class') }}">
<a href="{{ language()->back($code) }}">
<img src="{{ asset('vendor/akaunting/language/src/Resources/assets/img/flags/'. language()->country($code) .'.png') }}" alt="{{ $name }}" width="{{ config('language.flags.width') }}" /> &nbsp; {{ $name }}
</a>
</li>
<a href="#!" class="list-group-item list-group-item-action">
<div class="row align-items-center">
<div class="col-auto">
<img src="{{ asset('vendor/akaunting/language/src/Resources/assets/img/flags/'. language()->country($code) .'.png') }}" alt="{{ $name }}" width="{{ config('language.flags.width') }}" />
</div>
<div class="col ml--2">
<div class="d-flex justify-content-between align-items-center">
<div>
<h4 class="mb-0 text-sm">
{{ $name }}
</h4>
</div>
</div>
</div>
</div>
</a>
@endforeach
</ul>

View File

@@ -2,7 +2,7 @@
{{-- Header --}}
@slot('header')
@component('mail::header', ['url' => config('app.url')])
{{ setting('general.company_name', config('mail.from.name', config('app.name'))) }}
{{ setting('company.name', config('mail.from.name', config('app.name'))) }}
@endcomponent
@endslot
@@ -21,7 +21,7 @@
{{-- Footer --}}
@slot('footer')
@component('mail::footer')
&copy; {{ date('Y') }} {{ setting('general.company_name', config('mail.from.name', config('app.name'))) }}. All rights reserved.
&copy; {{ date('Y') }} {{ setting('company.name', config('mail.from.name', config('app.name'))) }}. All rights reserved.
@endcomponent
@endslot
@endcomponent

View File

@@ -2,7 +2,7 @@
{{-- Header --}}
@slot('header')
@component('mail::header', ['url' => config('app.url')])
{{ setting('general.company_name', config('mail.from.name', config('app.name'))) }}
{{ setting('company.name', config('mail.from.name', config('app.name'))) }}
@endcomponent
@endslot
@@ -21,7 +21,7 @@
{{-- Footer --}}
@slot('footer')
@component('mail::footer')
© {{ date('Y') }} {{ setting('general.company_name', config('mail.from.name', config('app.name'))) }}. All rights reserved.
© {{ date('Y') }} {{ setting('company.name', config('mail.from.name', config('app.name'))) }}. All rights reserved.
@endcomponent
@endslot
@endcomponent

View File

@@ -45,7 +45,7 @@
@if (! empty($salutation))
{{ $salutation }}
@else
{!! trans('notifications.salutation', ['company_name' => setting('general.company_name', config('mail.from.name', config('app.name')))]) !!}
{!! trans('notifications.salutation', ['company_name' => setting('company.name', config('mail.from.name', config('app.name')))]) !!}
@endif
<!-- Subcopy -->

View File

@@ -1,5 +1,5 @@
@if ($paginator->hasPages())
<ul class="pagination">
<ul class="pagination mb-0">
{{-- Previous Page Link --}}
@if ($paginator->onFirstPage())
<li class="page-item disabled"><span class="page-link">&laquo;</span></li>
@@ -17,11 +17,20 @@
{{-- Array Of Links --}}
@if (is_array($element))
@foreach ($element as $page => $url)
@if ($page < $paginator->currentPage())
@continue
@endif
@if ($page == $paginator->currentPage())
<li class="page-item active"><span class="page-link">{{ $page }}</span></li>
@else
<li class="page-item"><a class="page-link" href="{{ $url }}">{{ $page }}</a></li>
@if ($page > ($paginator->currentPage() + 3))
@break
@endif
@endif
@endforeach
@endif
@endforeach

View File

@@ -1,25 +1,29 @@
<ul class="pagination pagination-sm no-margin">
<ul class="pagination justify-content-end mb-0">
{{-- Previous Page Link --}}
@if ($paginator->onFirstPage())
<li class="disabled"><span>&laquo;</span></li>
<li class="page-item disabled">
<a class="page-link" href="#" tabindex="-1">
<i class="fas fa-angle-left"></i>
</a>
</li>
@else
<li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li>
<li class="page-item"><a class="page-link" tabindex="-1" href="{{ $paginator->previousPageUrl() }}" rel="prev"><i class="fas fa-angle-left"></i></a></li>
@endif
{{-- Pagination Elements --}}
@foreach ($elements as $element)
{{-- "Three Dots" Separator --}}
@if (is_string($element))
<li class="disabled"><span>{{ $element }}</span></li>
<li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">{{ $element }}</a></li>
@endif
{{-- Array Of Links --}}
@if (is_array($element))
@foreach ($element as $page => $url)
@if ($page == $paginator->currentPage())
<li class="active"><span>{{ $page }}</span></li>
<li class="page-item active"><a class="page-link" href="#" tabindex="-1">{{ $page }}</a></li>
@else
<li><a href="{{ $url }}">{{ $page }}</a></li>
<li class="page-item"><a class="page-link" tabindex="-1" href="{{ $url }}">{{ $page }}</a></li>
@endif
@endforeach
@endif
@@ -27,8 +31,12 @@
{{-- Next Page Link --}}
@if ($paginator->hasMorePages())
<li><a href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li>
<li class="page-item"><a class="page-link" tabindex="-1" href="{{ $paginator->nextPageUrl() }}" rel="next"><i class="fas fa-angle-right"></i></a></li>
@else
<li class="disabled"><span>&raquo;</span></li>
<li class="page-item disabled">
<a class="page-link" href="#" tabindex="-1">
<i class="fas fa-angle-right"></i>
</a>
</li>
@endif
</ul>