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

Merge pull request #1470 from denisdulici/master

Browse Source 
Hide lines w/o money in reports
This commit is contained in:
Denis Duliçi 2020-06-06 11:50:29 +03:00 committed by GitHub
commit 6f97f2e18c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 55 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@
@else @else
<tr> <tr>
<td colspan="{{ count($class->dates) + 2 }}"> <td colspan="{{ count($class->dates) + 2 }}">
<h5 class="text-center pl-0">{{ trans('general.no_records') }}</h5> <div class="text-muted pl-0">{{ trans('general.no_records') }}</div>
</td> </td>
</tr> </tr>
@endif @endif

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

@ -1,11 +1,17 @@
<tfoot> <tfoot>
<tr class="row rp-border-top-1 font-size-unset px-3"> @if ($grand_total = array_sum($class->footer_totals[$table]))
<th class="{{ $class->column_name_width }} text-uppercase">{{ trans_choice('general.totals', 1) }}</th> <tr class="row rp-border-top-1 font-size-unset px-3">
@php $grand_total = 0; @endphp <th class="{{ $class->column_name_width }} text-uppercase">{{ trans_choice('general.totals', 1) }}</th>
@foreach($class->footer_totals[$table] as $total) @foreach($class->footer_totals[$table] as $total)
@php $grand_total += $total; @endphp <th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
<th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th> @endforeach
@endforeach <th class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($grand_total, setting('default.currency'), true)</th>
<th class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($grand_total, setting('default.currency'), true)</th> </tr>
</tr> @else
<tr>
<td colspan="{{ count($class->dates) + 2 }}">
<div class="text-muted pl-0">{{ trans('general.no_records') }}</div>
</td>
</tr>
@endif
</tfoot> </tfoot>

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

@ -1,9 +1,9 @@
@php $row_total = 0; @endphp @if ($row_total = array_sum($rows))
<tr class="row rp-border-top-1 font-size-unset"> <tr class="row rp-border-top-1 font-size-unset">
<td class="{{ $class->column_name_width }} long-texts pr-0">{{ $class->row_names[$table][$id] }}</td> <td class="{{ $class->column_name_width }} long-texts pr-0">{{ $class->row_names[$table][$id] }}</td>
@foreach($rows as $row) @foreach($rows as $row)
@php $row_total += $row; @endphp <td class="{{ $class->column_value_width }} text-right px-0">@money($row, setting('default.currency'), true)</td>
<td class="{{ $class->column_value_width }} text-right px-0">@money($row, setting('default.currency'), true)</td> @endforeach
@endforeach <td class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($row_total, setting('default.currency'), true)</td>
<td class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($row_total, setting('default.currency'), true)</td> </tr>
</tr> @endif

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

@ -1,11 +1,17 @@
<tfoot> <tfoot>
<tr class="row rp-border-top-1 font-size-unset px-3 mb-3"> @if ($grand_total = array_sum($class->footer_totals[$table]))
<th class="{{ $class->column_name_width }} text-uppercase">{{ trans_choice('general.totals', 1) }}</th> <tr class="row rp-border-top-1 font-size-unset px-3 mb-3">
@php $grand_total = 0; @endphp <th class="{{ $class->column_name_width }} text-uppercase">{{ trans_choice('general.totals', 1) }}</th>
@foreach($class->footer_totals[$table] as $date => $total) @foreach($class->footer_totals[$table] as $date => $total)
@php $grand_total += $total; @endphp <th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
<th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th> @endforeach
@endforeach <th class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($grand_total, setting('default.currency'), true)</th>
<th class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($grand_total, setting('default.currency'), true)</th> </tr>
</tr> @else
<tr>
<td colspan="{{ count($class->dates) + 2 }}">
<div class="text-muted pl-0">{{ trans('general.no_records') }}</div>
</td>
</tr>
@endif
</tfoot> </tfoot>

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

@ -1,11 +1,17 @@
<tfoot> <tfoot>
<tr class="row rp-border-bottom-1 font-size-unset px-3"> @if ($grand_total = array_sum($class->footer_totals[$table]))
<th class="{{ $class->column_name_width }} text-left">{{ trans('reports.net') }}</th> <tr class="row rp-border-bottom-1 font-size-unset px-3">
@php $grand_total = 0; @endphp <th class="{{ $class->column_name_width }} text-left">{{ trans('reports.net') }}</th>
@foreach($class->footer_totals[$table] as $total) @foreach($class->footer_totals[$table] as $total)
@php $grand_total += $total; @endphp <th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
<th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th> @endforeach
@endforeach <th class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($grand_total, setting('default.currency'), true)</th>
<th class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($grand_total, setting('default.currency'), true)</th> </tr>
</tr> @else
<tr>
<td colspan="{{ count($class->dates) + 2 }}">
<div class="text-muted pl-0">{{ trans('general.no_records') }}</div>
</td>
</tr>
@endif
</tfoot> </tfoot>