shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source
This commit is contained in:
Cüneyt Şentürk
2020-01-04 15:08:18 +03:00
parent 5e4094ee13 dca5a64122
commit 366b855d53
29 changed files with 181 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
resources/views/common/reports/index.blade.php
View File

@ -12,107 +12,58 @@
@section('content')
<div class="row mb-4">
@foreach($categories as $name => $reports)
<div class="col-md-12">
<h3>{{ $name }}</h3>
</div>
<div class="col-md-12">
<h3 id="stats">{{ trans('reports.income_expense') }}</h3>
</div>
@foreach($reports['income-expense'] as $report)
<div class="col-md-4">
<div class="card card-stats">
<span>
<div class="dropdown card-action-button">
<a class="btn btn-sm items-align-center py-2 mr-0 shadow-none--hover" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-ellipsis-v text-primary"></i>
</a>
<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
@permission('create-common-reports')
<a class="dropdown-item" href="{{ route('reports.edit', $report->id) }}">{{ trans('general.edit') }}</a>
<div class="dropdown-divider"></div>
@endpermission
@permission('delete-common-reports')
{!! Form::deleteLink($report, 'common/reports') !!}
@endpermission
</div>
</div>
</span>
<div class="card-body">
<div class="row">
<div class="col">
<a href="{{ route('reports.show', $report->id) }}">
<h5 class="card-title text-uppercase text-muted mb-0">{{ $report->name }}</h5>
<span class="h2 font-weight-bold mb-0">{{ $classes[$report->id]->getTotal() }}</span>
@foreach($reports as $report)
<div class="col-md-4">
<div class="card card-stats">
<span>
<div class="dropdown card-action-button">
<a class="btn btn-sm items-align-center py-2 mr-0 shadow-none--hover" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-ellipsis-v text-primary"></i>
</a>
<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
@permission('create-common-reports')
<a class="dropdown-item" href="{{ route('reports.edit', $report->id) }}">{{ trans('general.edit') }}</a>
<div class="dropdown-divider"></div>
@endpermission
@permission('delete-common-reports')
{!! Form::deleteLink($report, 'common/reports') !!}
@endpermission
</div>
</div>
<div class="col-auto">
</span>
<div class="card-body">
<div class="row">
<div class="col">
<a href="{{ route('reports.show', $report->id) }}">
<h5 class="card-title text-uppercase text-muted mb-0">{{ $report->name }}</h5>
<span class="h2 font-weight-bold mb-0">{{ $classes[$report->id]->getTotal() }}</span>
</a>
</div>
<div class="col-auto">
<a href="{{ route('reports.show', $report->id) }}">
<div class="icon icon-shape bg-orange text-white rounded-circle shadow">
<i class="{{ $classes[$report->id]->getIcon() }}"></i>
</div>
</a>
</div>
</div>
<p class="mt-3 mb-0 text-sm">
<a href="{{ route('reports.show', $report->id) }}">
<div class="icon icon-shape bg-orange text-white rounded-circle shadow">
<i class="{{ $classes[$report->id]->getIcon() }}"></i>
</div>
<span class="text-nowrap">{{ $report->description }}</span>
</a>
</div>
</p>
</div>
<p class="mt-3 mb-0 text-sm">
<a href="{{ route('reports.show', $report->id) }}">
<span class="text-nowrap">{{ $report->description }}</span>
</a>
</p>
</div>
</div>
</div>
@endforeach
@endforeach
<div class="col-md-12">
<h3 id="stats">{{ trans('general.accounting') }}</h3>
</div>
@foreach($reports['accounting'] as $report)
<div class="col-md-4">
<div class="card card-stats">
<span>
<div class="dropdown card-action-button">
<a class="btn btn-sm items-align-center py-2 mr-0 shadow-none--hover" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-ellipsis-v text-primary"></i>
</a>
<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
@permission('create-common-reports')
<a class="dropdown-item" href="{{ route('reports.edit', $report->id) }}">{{ trans('general.edit') }}</a>
<div class="dropdown-divider"></div>
@endpermission
@permission('delete-common-reports')
{!! Form::deleteLink($report, 'common/reports') !!}
@endpermission
</div>
</div>
</span>
<div class="card-body">
<div class="row">
<div class="col">
<a href="{{ route('reports.show', $report->id) }}">
<h5 class="card-title text-uppercase text-muted mb-0">{{ $report->name }}</h5>
<span class="h2 font-weight-bold mb-0">{{ $classes[$report->id]->getTotal() }}</span>
</a>
</div>
<div class="col-auto">
<a href="{{ route('reports.show', $report->id) }}">
<div class="icon icon-shape bg-orange text-white rounded-circle shadow">
<i class="{{ $classes[$report->id]->getIcon() }}"></i>
</div>
</a>
</div>
</div>
<p class="mt-3 mb-0 text-sm">
<a href="{{ route('reports.show', $report->id) }}">
<span class="text-nowrap">{{ $report->description }}</span>
</a>
</p>
</div>
</div>
</div>
@endforeach
</div>
@endsection

2
resources/views/partials/reports/filter.blade.php
View File

@ -1,6 +1,6 @@
<div class="card-header">
{!! Form::open([
'url' => 'common/reports/' . $class->report->id . '/display',
'url' => 'common/reports/' . $class->report->id,
'role' => 'form',
'method' => 'GET',
]) !!}

2
resources/views/widgets/account_balance.blade.php
View File

@ -1,4 +1,4 @@
<div id="widgets-account-balance" class="{{ $model->settings->width }}">
<div id="widget-{{ $model->id }}" class="{{ $model->settings->width }}">
<div class="card">
@include('partials.widgets.standard_header', ['header_class' => 'border-bottom-0'])

10
resources/views/widgets/income_by_category.blade.php → resources/views/widgets/donut_chart.blade.php
View File

@ -1,9 +1,9 @@
<div id="widgets-income-by-category" class="{{ $model->settings->width }}">
<div id="widget-{{ $model->id }}" class="{{ $model->settings->width }}">
<div class="card">
@include('partials.widgets.standard_header')
<div class="card-body" id="income-category-doughnut">
<div class="dashboard-categories">
<div class="card-body" id="widget-donut-{{ $model->id }}">
<div class="chart-donut">
{!! $chart->container() !!}
</div>
</div>
@ -12,8 +12,8 @@
@push('charts')
<script>
var income_category_doughnut = new Vue({
el: '#income-category-doughnut',
var widget_donut_{{ $model->id }} = new Vue({
el: '#widget-donut-{{ $model->id }}',
});
</script>
@endpush

23
resources/views/widgets/expenses_by_category.blade.php
View File

@ -1,23 +0,0 @@
<div id="widgets-expenses-by-category" class="{{ $model->settings->width }}">
<div class="card">
@include('partials.widgets.standard_header')
<div class="card-body" id="expenses-category-doughnut">
<div class="dashboard-categories">
{!! $chart->container() !!}
</div>
</div>
</div>
</div>
@push('charts')
<script>
var expenses_category_doughnut = new Vue({
el: '#expenses-category-doughnut',
});
</script>
@endpush
@push('body_scripts')
{!! $chart->script() !!}
@endpush

2
resources/views/widgets/latest_expenses.blade.php
View File

@ -1,4 +1,4 @@
<div id="widgets-latest-expenses" class="{{ $model->settings->width }}">
<div id="widget-{{ $model->id }}" class="{{ $model->settings->width }}">
<div class="card">
@include('partials.widgets.standard_header', ['header_class' => 'border-bottom-0'])

2
resources/views/widgets/latest_income.blade.php
View File

@ -1,4 +1,4 @@
<div id="widgets-latest-income" class="{{ $model->settings->width }}">
<div id="widget-{{ $model->id }}" class="{{ $model->settings->width }}">
<div class="card">
@include('partials.widgets.standard_header', ['header_class' => 'border-bottom-0'])

8
resources/views/widgets/cash_flow.blade.php → resources/views/widgets/line_chart.blade.php
View File

@ -1,8 +1,8 @@
<div id="widgets-cash-flow" class="{{ $model->settings->width }}">
<div id="widget-{{ $model->id }}" class="{{ $model->settings->width }}">
<div class="card">
@include('partials.widgets.standard_header')
<div class="card-body" id="cashflow">
<div class="card-body" id="widget-line-{{ $model->id }}">
<div class="chart">
{!! $chart->container() !!}
</div>
@ -12,8 +12,8 @@
@push('charts')
<script>
var cash_flow = new Vue({
el: '#cashflow',
var widget_line_{{ $model->id }} = new Vue({
el: '#widget-line-{{ $model->id }}',
});
</script>
@endpush

4
resources/views/widgets/total_expenses.blade.php
View File

@ -1,4 +1,4 @@
<div id="widgets-total-expenses" class="{{ $model->settings->width }}">
<div id="widget-{{ $model->id }}" class="{{ $model->settings->width }}">
<div class="card bg-gradient-danger card-stats">
@include('partials.widgets.stats_header', ['header_class' => 'border-bottom-0'])
@ -10,7 +10,7 @@
</div>
<div class="col-auto">
<div class="icon icon-shape bg-white text-danger rounded-circle shadow">
<div class="icon icon-shape bg-white text-danger rounded-circle shadow">
<i class="fa fa-shopping-cart"></i>
</div>
</div>

24
resources/views/widgets/total_income.blade.php
View File

@ -1,4 +1,4 @@
<div id="widgets-total-income" class="{{ $model->settings->width }}">
<div id="widget-{{ $model->id }}" class="{{ $model->settings->width }}">
<div class="card bg-gradient-info card-stats">
@include('partials.widgets.stats_header', ['header_class' => 'border-bottom-0'])
@ -16,17 +16,17 @@
</div>
</div>
<p class="mt-3 mb-0 text-sm cursor-default">
<span class="text-white">{{ trans('widgets.receivables') }}</span>
<el-tooltip
content="{{ trans('widgets.open_invoices') }}: {{ $totals['open'] }} / {{ trans('widgets.overdue_invoices') }}: {{ $totals['overdue'] }}"
effect="light"
:open-delay="200"
placement="top"
popper-class="text-dark">
<span class="text-white font-weight-bold float-right">{{ $totals['open'] }} / {{ $totals['overdue'] }}</span>
</el-tooltip>
</p>
<p class="mt-3 mb-0 text-sm cursor-default">
<span class="text-white">{{ trans('widgets.receivables') }}</span>
<el-tooltip
content="{{ trans('widgets.open_invoices') }}: {{ $totals['open'] }} / {{ trans('widgets.overdue_invoices') }}: {{ $totals['overdue'] }}"
effect="light"
:open-delay="200"
placement="top"
popper-class="text-dark">
<span class="text-white font-weight-bold float-right">{{ $totals['open'] }} / {{ $totals['overdue'] }}</span>
</el-tooltip>
</p>
</div>
</div>
</div>

2
resources/views/widgets/total_profit.blade.php
View File

@ -1,4 +1,4 @@
<div id="widgets-total-profit" class="{{ $model->settings->width }}">
<div id="widget-{{ $model->id }}" class="{{ $model->settings->width }}">
<div class="card bg-gradient-success card-stats">
@include('partials.widgets.stats_header', ['header_class' => 'border-bottom-0'])