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

improved reports layout

Browse Source
This commit is contained in:
denisdulici
2020-01-14 14:47:05 +03:00
parent 2f98696caf
commit 567a2ddbd5
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
<tfoot> <tfoot>
<tr> <tr>
<th class="long-texts report-column">{{ trans_choice('general.totals', 1) }}</th> <th class="report-column">{{ trans_choice('general.totals', 1) }}</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="long-texts report-column text-right">@money($total, setting('default.currency'), true)</th> <th class="report-column text-right px-0">@money($total, setting('default.currency'), true)</th>
@endforeach @endforeach
<th class="long-texts report-column text-right">@money($total_total, setting('default.currency'), true)</th> <th class="report-column text-right">@money($total_total, setting('default.currency'), true)</th>
</tr> </tr>
</tfoot> </tfoot>

4
resources/views/partials/reports/table/header.blade.php
View File

@@ -3,10 +3,10 @@
@if ($table == 'default') @if ($table == 'default')
<th>{{ $class->groups[$class->report->group] }}</th> <th>{{ $class->groups[$class->report->group] }}</th>
@else @else
<th class="text-right">{{ $table }}</th> <th>{{ $table }}</th>
@endif @endif
@foreach($class->dates as $date) @foreach($class->dates as $date)
<th class="text-right">{{ $date }}</th> <th class="text-right px-0">{{ $date }}</th>
@endforeach @endforeach
<th class="text-right">{{ trans_choice('general.totals', 1) }}</th> <th class="text-right">{{ trans_choice('general.totals', 1) }}</th>
</tr> </tr>

6
resources/views/partials/reports/table/rows.blade.php
View File

@@ -1,9 +1,9 @@
@php $row_total = 0; @endphp @php $row_total = 0; @endphp
<tr> <tr>
<td class="long-texts report-column">{{ $class->getTableRowList()[$id] }}</td> <td class="report-column">{{ $class->getTableRowList()[$id] }}</td>
@foreach($items as $item) @foreach($items as $item)
@php $row_total += $item; @endphp @php $row_total += $item; @endphp
<td class="long-texts report-column text-right">@money($item, setting('default.currency'), true)</td> <td class="report-column text-right px-0">@money($item, setting('default.currency'), true)</td>
@endforeach @endforeach
<td class="long-texts report-column text-right">@money($row_total, setting('default.currency'), true)</td> <td class="report-column text-right">@money($row_total, setting('default.currency'), true)</td>
</tr> </tr>

6
resources/views/reports/profit_loss/content/footer.blade.php
View File

@@ -2,11 +2,11 @@
<table class="table align-items-center"> <table class="table align-items-center">
<tfoot class="border-top-style"> <tfoot class="border-top-style">
<tr> <tr>
<th class="long-texts report-column">{{ trans('reports.net_profit') }}</th> <th class="report-column">{{ trans('reports.net_profit') }}</th>
@foreach($class->net_profit as $profit) @foreach($class->net_profit as $profit)
<th class="long-texts report-column text-right">@money($profit, setting('default.currency'), true)</th> <th class="report-column text-right px-0">@money($profit, setting('default.currency'), true)</th>
@endforeach @endforeach
<th class="long-texts report-column text-right"> <th class="report-column text-right">
@money(array_sum($class->net_profit), setting('default.currency'), true) @money(array_sum($class->net_profit), setting('default.currency'), true)
</th> </th>
</tr> </tr>

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

@@ -2,12 +2,12 @@
<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 class="long-texts report-column text-right"></th> <th class="report-column text-right"></th>
@foreach($class->dates as $date) @foreach($class->dates as $date)
<th class="long-texts report-column text-right">{{ $date }}</th> <th class="report-column text-right px-0">{{ $date }}</th>
@endforeach @endforeach
<th class="long-texts report-column text-right"> <th class="report-column text-right">
<h5>{{ trans_choice('general.totals', 1) }}</h5> {{ trans_choice('general.totals', 1) }}
</th> </th>
</tr> </tr>
</thead> </thead>

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

@@ -1,11 +1,11 @@
<tfoot> <tfoot>
<tr> <tr>
<th class="long-texts report-column">{{ trans_choice('general.totals', 1) }}</th> <th class="report-column">{{ 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="long-texts report-column text-right">@money($total, setting('default.currency'), true)</th> <th class="report-column text-right px-0">@money($total, setting('default.currency'), true)</th>
@endforeach @endforeach
<th class="long-texts report-column text-right">@money($total_total, setting('default.currency'), true)</th> <th class="report-column text-right">@money($total_total, setting('default.currency'), true)</th>
</tr> </tr>
</tfoot> </tfoot>

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

@@ -2,11 +2,11 @@
<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 class="long-texts report-column text-right"></th> <th class="report-column text-right"></th>
@foreach($class->dates as $date) @foreach($class->dates as $date)
<th class="long-texts report-column text-right">{{ $date }}</th> <th class="report-column text-right px-0">{{ $date }}</th>
@endforeach @endforeach
<th class="long-texts report-column text-right"> <th class="report-column text-right">
<h5>{{ trans_choice('general.totals', 1) }}</h5> <h5>{{ trans_choice('general.totals', 1) }}</h5>
</th> </th>
</tr> </tr>

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

@@ -1,11 +1,11 @@
<tfoot> <tfoot>
<tr> <tr>
<th class="long-texts report-column">{{ trans('reports.net') }}</th> <th class="report-column">{{ 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="long-texts report-column text-right">@money($total, setting('default.currency'), true)</th> <th class="report-column text-right px-0">@money($total, setting('default.currency'), true)</th>
@endforeach @endforeach
<th class="long-texts report-column text-right">@money($total_total, setting('default.currency'), true)</th> <th class="report-column text-right">@money($total_total, setting('default.currency'), true)</th>
</tr> </tr>
</tfoot> </tfoot>