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

Merge pull request #951 from batuhawk/master

Browse Source 
Diffrent reports status tables updated
This commit is contained in:
Batuhan Baş 2019-11-28 11:20:41 +03:00 committed by GitHub
commit d380267269
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
@php $chart = $class->getChart(); @endphp @php $chart = $class->getChart(); @endphp
<div class="card-body" id="report-chart"> <div id="report-chart" class="card-body pt-0">
{!! $chart->container() !!} {!! $chart->container() !!}
</div> </div>

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

@ -6,13 +6,13 @@
'class' => 'mb-0', 'class' => 'mb-0',
]) !!} ]) !!}
<div id="items" class="float-left box-filter"> <div id="items" class="float-left">
{!! Form::select('year', $class->filters['years'], request('year', $class->year), ['class' => 'form-control form-control-sm table-header-search ml--2']) !!} {!! Form::select('year', $class->filters['years'], request('year', $class->year), ['class' => 'form-control form-control-sm table-header-search']) !!}
@php unset($class->filters['years']) @endphp @php unset($class->filters['years']) @endphp
@foreach($class->filters as $name => $values) @foreach($class->filters as $name => $values)
{!! Form::select($name . '[]', $values, request($name), ['id' => 'filter-' . $name, 'class' => 'form-control form-control-sm table-header-search']) !!} {!! Form::select($name . '[]', $values, request($name), ['id' => 'filter-' . $name, 'class' => 'form-control form-control-sm table-header-search']) !!}
@endforeach @endforeach
{!! Form::button('<span class="fa fa-filter"></span> &nbsp;' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-secondary btn-sm card-buttons ml-1']) !!} {!! Form::button('<span class="fa fa-filter"></span> &nbsp;' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-secondary btn-sm card-buttons']) !!}
</div> </div>
{!! Form::close() !!} {!! Form::close() !!}

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

@ -1,7 +1,7 @@
@section('title', $class->report->name) @section('title', $class->report->name)
@section('new_button') @section('new_button')
<span class="new-button"> <span>
<a href="{{ url($class->getUrl('print')) }}" target="_blank" class="btn btn-white btn-sm"><span class="fa fa-print"></span> &nbsp;{{ trans('general.print') }}</a> <a href="{{ url($class->getUrl('print')) }}" target="_blank" class="btn btn-white btn-sm"><span class="fa fa-print"></span> &nbsp;{{ trans('general.print') }}</a>
</span> </span>
<span> <span>

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

@ -1,4 +1,4 @@
<div class="table-responsive mt-4 overflow-auto"> <div class="table-responsive overflow-auto">
<table class="table align-items-center table-hover" id="tbl-report"> <table class="table align-items-center table-hover" id="tbl-report">
@include($class->views['table.header']) @include($class->views['table.header'])
<tbody> <tbody>

2
resources/views/reports/profit_loss/content/header.blade.php
View File

@ -1,4 +1,4 @@
<div class="table-responsive mt-4 overflow-auto"> <div class="table-responsive overflow-auto">
<table class="table align-items-center"> <table class="table align-items-center">
<thead class="border-top-style"> <thead class="border-top-style">
<tr> <tr>

10
resources/views/reports/profit_loss/table/footer.blade.php
View File

@ -1,11 +1,11 @@
<tfoot> <tfoot>
<tr> <tr>
<th style="width: 179px;">{{ trans_choice('general.totals', 1) }}</th> <th style="width: 179px;">{{ trans_choice('general.totals', 1) }}</th>
@php $total_total = 0; @endphp @php $total_total = 0; @endphp
@foreach($class->totals[$table] as $date => $total) @foreach($class->totals[$table] as $date => $total)
@php $total_total += $total; @endphp @php $total_total += $total; @endphp
<th class="text-right">@money($total, setting('default.currency'), true)</th> <th class="text-right">@money($total, setting('default.currency'), true)</th>
@endforeach @endforeach
<th class="text-right">@money($total_total, setting('default.currency'), true)</th> <th class="text-right">@money($total_total, setting('default.currency'), true)</th>
</tr> </tr>
</tfoot> </tfoot>

8
resources/views/reports/tax_summary/content/header.blade.php
View File

@ -1,12 +1,12 @@
<div class="table-responsive mt-4"> <div class="table-responsive overflow-auto">
<table class="table align-items-center"> <table class="table align-items-center">
<thead class="border-top-style"> <thead class="border-top-style">
<tr> <tr>
<th>&nbsp;</th> <th style="width: 152px;"></th>
@foreach($class->dates as $date) @foreach($class->dates as $date)
<th class="text-right pl-0">{{ $date }}</th> <th class="text-right">{{ $date }}</th>
@endforeach @endforeach
<th class="text-right pl-0">{{ trans_choice('general.totals', 1) }}</th> <th class="text-right">{{ trans_choice('general.totals', 1) }}</th>
</tr> </tr>
</thead> </thead>
</table> </table>

6
resources/views/reports/tax_summary/table/footer.blade.php
View File

@ -1,11 +1,11 @@
<tfoot> <tfoot>
<tr> <tr>
<th>{{ trans('reports.net') }}</th> <th style="width: 179px;">{{ trans('reports.net') }}</th>
@php $total_total = 0; @endphp @php $total_total = 0; @endphp
@foreach($class->totals[$table] as $total) @foreach($class->totals[$table] as $total)
@php $total_total += $total; @endphp @php $total_total += $total; @endphp
<th class="text-right pl-0">@money($total, setting('default.currency'), true)</th> <th class="text-right">@money($total, setting('default.currency'), true)</th>
@endforeach @endforeach
<th class="text-right pl-0">@money($total_total, setting('default.currency'), true)</th> <th class="text-right">@money($total_total, setting('default.currency'), true)</th>
</tr> </tr>
</tfoot> </tfoot>

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

@ -29,7 +29,7 @@
</div> </div>
</div> </div>
<div class="card-body mt--4" id="cashflow"> <div class="card-body pt-0" id="cashflow">
<div class="chart"> <div class="chart">
{!! $cashflow->container() !!} {!! $cashflow->container() !!}
</div> </div>

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

@ -32,7 +32,7 @@
</div> </div>
<div class="card-body" id="expense-category-doughnut"> <div class="card-body" id="expense-category-doughnut">
<div class="chart dashboard-categories"> <div class="dashboard-categories">
{!! $donut_expenses->container() !!} {!! $donut_expenses->container() !!}
</div> </div>
</div> </div>

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

@ -32,7 +32,7 @@
</div> </div>
<div class="card-body" id="income-category-doughnut"> <div class="card-body" id="income-category-doughnut">
<div class="chart dashboard-categories"> <div class="dashboard-categories">
{!! $donut_incomes->container() !!} {!! $donut_incomes->container() !!}
</div> </div>
</div> </div>