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

report alignment and big test values fixed

Browse Source
This commit is contained in:
batuhanbas
2020-01-13 15:55:28 +03:00
parent 22ee37622e
commit e1bdcd0964
12 changed files with 57 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +1,15 @@
<div class="table-responsive mt-4 overflow-auto">
<div class="table-responsive overflow-auto mt-5">
<table class="table align-items-center">
<thead class="border-top-style">
<tfoot class="border-top-style">
<tr>
<th style="width: 179px;">{{ trans('reports.net_profit') }}</th>
<th class="long-texts report-column">{{ trans('reports.net_profit') }}</th>
@foreach($class->net_profit as $profit)
<th class="text-right">@money($profit, setting('default.currency'), true)</th>
<th class="long-texts report-column">@money($profit, setting('default.currency'), true)</th>
@endforeach
<th class="text-right">@money(array_sum($class->net_profit), setting('default.currency'), true)</th>
<th class="long-texts report-column">
@money(array_sum($class->net_profit), setting('default.currency'), true)
</th>
</tr>
</thead>
</tfoot>
</table>
</div>

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

@ -2,11 +2,13 @@
<table class="table align-items-center">
<thead class="border-top-style">
<tr>
<th style="width: 152px;"></th>
<th class="long-texts report-column"></th>
@foreach($class->dates as $date)
<th class="text-right">{{ $date }}</th>
<th class="long-texts report-column">{{ $date }}</th>
@endforeach
<th class="text-right">{{ trans_choice('general.totals', 1) }}</th>
<th class="long-texts report-column">
<h5>{{ trans_choice('general.totals', 1) }}</h5>
</th>
</tr>
</thead>
</table>

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

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

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

@ -1,5 +1,7 @@
<thead class="border-top-style">
<tr>
<th colspan="{{ count($class->dates) + 2 }}">{{ $table }}</th>
<th colspan="{{ count($class->dates) + 2 }}">
<h5>{{ $table }}</h5>
</th>
</tr>
</thead>

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

@ -2,11 +2,13 @@
<table class="table align-items-center">
<thead class="border-top-style">
<tr>
<th style="width: 152px;"></th>
<th class="long-texts report-column"></th>
@foreach($class->dates as $date)
<th class="text-right">{{ $date }}</th>
<th class="long-texts report-column">{{ $date }}</th>
@endforeach
<th class="text-right">{{ trans_choice('general.totals', 1) }}</th>
<th class="long-texts report-column">
<h5>{{ trans_choice('general.totals', 1) }}</h5>
</th>
</tr>
</thead>
</table>

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

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