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

Merge pull request #1339 from batuhawk/master

Browse Source 
Forgotten classes in reports
This commit is contained in:
Batuhan Baş 2020-03-10 12:32:02 +03:00 committed by GitHub
commit c17a9f1ad0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,8 +4,8 @@
@php $grand_total = 0; @endphp @php $grand_total = 0; @endphp
@foreach($class->footer_totals[$table] as $total) @foreach($class->footer_totals[$table] as $total)
@php $grand_total += $total; @endphp @php $grand_total += $total; @endphp
<th class="{{ $class->column_width }}">@money($total, setting('default.currency'), true)</th> <th class="{{ $class->column_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
@endforeach @endforeach
<th class="{{ $class->head_column_width }}">@money($grand_total, setting('default.currency'), true)</th> <th class="{{ $class->head_column_width }} text-right">@money($grand_total, setting('default.currency'), true)</th>
</tr> </tr>
</tfoot> </tfoot>

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

@ -6,8 +6,8 @@
<th class="{{ $class->head_column_width }}">{{ $table }}</th> <th class="{{ $class->head_column_width }}">{{ $table }}</th>
@endif @endif
@foreach($class->dates as $date) @foreach($class->dates as $date)
<th class="{{ $class->column_width }}">{{ $date }}</th> <th class="{{ $class->column_width }} text-right px-0">{{ $date }}</th>
@endforeach @endforeach
<th class="{{ $class->head_column_width }}">{{ trans_choice('general.totals', 1) }}</th> <th class="{{ $class->head_column_width }} text-right">{{ trans_choice('general.totals', 1) }}</th>
</tr> </tr>
</thead> </thead>

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

@ -3,7 +3,7 @@
<td class="{{ $class->head_column_width }}">{{ $class->row_names[$table][$id] }}</td> <td class="{{ $class->head_column_width }}">{{ $class->row_names[$table][$id] }}</td>
@foreach($rows as $row) @foreach($rows as $row)
@php $row_total += $row; @endphp @php $row_total += $row; @endphp
<td class="{{ $class->column_width }}">@money($row, setting('default.currency'), true)</td> <td class="{{ $class->column_width }} text-right px-0">@money($row, setting('default.currency'), true)</td>
@endforeach @endforeach
<td class="{{ $class->head_column_width }}">@money($row_total, setting('default.currency'), true)</td> <td class="{{ $class->head_column_width }} text-right">@money($row_total, setting('default.currency'), true)</td>
</tr> </tr>

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

@ -4,9 +4,9 @@
<tr class="row rp-border-top-1 font-size-unset px-3"> <tr class="row rp-border-top-1 font-size-unset px-3">
<th class="{{ $class->head_column_width }} text-uppercase text-nowrap">{{ trans('reports.net_profit') }}</th> <th class="{{ $class->head_column_width }} text-uppercase text-nowrap">{{ trans('reports.net_profit') }}</th>
@foreach($class->net_profit as $profit) @foreach($class->net_profit as $profit)
<th class="{{ $class->column_width }}">@money($profit, setting('default.currency'), true)</th> <th class="{{ $class->column_width }} text-right px-0">@money($profit, setting('default.currency'), true)</th>
@endforeach @endforeach
<th class="{{ $class->head_column_width }}"> <th class="{{ $class->head_column_width }} 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>

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

@ -2,11 +2,11 @@
<table class="table table-hover align-items-center rp-border-collapse"> <table class="table table-hover align-items-center rp-border-collapse">
<thead class="border-top-style"> <thead class="border-top-style">
<tr class="row rp-border-bottom-1 font-size-unset px-3"> <tr class="row rp-border-bottom-1 font-size-unset px-3">
<th class="{{ $class->head_column_width }}"></th> <th class="{{ $class->head_column_width }} text-right px-0"></th>
@foreach($class->dates as $date) @foreach($class->dates as $date)
<th class="{{ $class->column_width }}">{{ $date }}</th> <th class="{{ $class->column_width }} text-right px-0">{{ $date }}</th>
@endforeach @endforeach
<th class="{{ $class->head_column_width }} text-uppercase"> <th class="{{ $class->head_column_width }} text-uppercase text-right">
{{ trans_choice('general.totals', 1) }} {{ trans_choice('general.totals', 1) }}
</th> </th>
</tr> </tr>

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

@ -4,8 +4,8 @@
@php $grand_total = 0; @endphp @php $grand_total = 0; @endphp
@foreach($class->footer_totals[$table] as $date => $total) @foreach($class->footer_totals[$table] as $date => $total)
@php $grand_total += $total; @endphp @php $grand_total += $total; @endphp
<th class="{{ $class->column_width }}">@money($total, setting('default.currency'), true)</th> <th class="{{ $class->column_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
@endforeach @endforeach
<th class="{{ $class->head_column_width }}">@money($grand_total, setting('default.currency'), true)</th> <th class="{{ $class->head_column_width }} text-right">@money($grand_total, setting('default.currency'), true)</th>
</tr> </tr>
</tfoot> </tfoot>