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

report function usage updated

Browse Source
This commit is contained in:
batuhanbas
2020-03-10 14:54:20 +03:00
parent c17a9f1ad0
commit 1d08c0ea80
8 changed files with 40 additions and 57 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>
<tr class="row rp-border-top-1 font-size-unset px-3">
<th class="{{ $class->head_column_width }} text-uppercase">{{ trans_choice('general.totals', 1) }}</th>
<th class="{{ $class->column_name_width }} text-uppercase">{{ trans_choice('general.totals', 1) }}</th>
@php $grand_total = 0; @endphp
@foreach($class->footer_totals[$table] as $total)
@php $grand_total += $total; @endphp
<th class="{{ $class->column_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
<th class="{{ $class->head_column_width }} text-right">@money($grand_total, setting('default.currency'), true)</th>
<th class="{{ $class->column_name_width }} text-right">@money($grand_total, setting('default.currency'), true)</th>
</tr>
</tfoot>

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

@ -1,13 +1,13 @@
<thead class="thead-light">
<tr class="row font-size-unset">
@if (($table == 'default') && !empty($class->groups))
<th class="{{ $class->head_column_width }}">{{ $class->groups[$class->model->settings->group] }}</th>
<th class="{{ $class->column_name_width }}">{{ $class->groups[$class->model->settings->group] }}</th>
@else
<th class="{{ $class->head_column_width }}">{{ $table }}</th>
<th class="{{ $class->column_name_width }}">{{ $table }}</th>
@endif
@foreach($class->dates as $date)
<th class="{{ $class->column_width }} text-right px-0">{{ $date }}</th>
<th class="{{ $class->column_value_width }} text-right px-0">{{ $date }}</th>
@endforeach
<th class="{{ $class->head_column_width }} text-right">{{ trans_choice('general.totals', 1) }}</th>
<th class="{{ $class->column_name_width }} text-right">{{ trans_choice('general.totals', 1) }}</th>
</tr>
</thead>

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

@ -1,9 +1,9 @@
@php $row_total = 0; @endphp
<tr class="row rp-border-top-1 font-size-unset">
<td class="{{ $class->head_column_width }}">{{ $class->row_names[$table][$id] }}</td>
<td class="{{ $class->column_name_width }}">{{ $class->row_names[$table][$id] }}</td>
@foreach($rows as $row)
@php $row_total += $row; @endphp
<td class="{{ $class->column_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
<td class="{{ $class->head_column_width }} text-right">@money($row_total, setting('default.currency'), true)</td>
<td class="{{ $class->column_name_width }} text-right">@money($row_total, setting('default.currency'), true)</td>
</tr>

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

@ -1,12 +1,12 @@
<div class="table-responsive overflow-auto my-4">
<div class="table-responsive overflow-auto my-2">
<table class="table table-hover align-items-center rp-border-collapse">
<tfoot class="border-top-style">
<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->column_name_width }} text-uppercase text-nowrap border-top-0">{{ trans('reports.net_profit') }}</th>
@foreach($class->net_profit as $profit)
<th class="{{ $class->column_width }} text-right px-0">@money($profit, setting('default.currency'), true)</th>
<th class="{{ $class->column_value_width }} text-right px-0 border-top-0">@money($profit, setting('default.currency'), true)</th>
@endforeach
<th class="{{ $class->head_column_width }} text-right">
<th class="{{ $class->column_name_width }} text-right border-top-0">
@money(array_sum($class->net_profit), setting('default.currency'), true)
</th>
</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">
<thead class="border-top-style">
<tr class="row rp-border-bottom-1 font-size-unset px-3">
<th class="{{ $class->head_column_width }} text-right px-0"></th>
<th class="{{ $class->column_name_width }} text-right px-0 border-top-0"></th>
@foreach($class->dates as $date)
<th class="{{ $class->column_width }} text-right px-0">{{ $date }}</th>
<th class="{{ $class->column_value_width }} text-right px-0 border-top-0">{{ $date }}</th>
@endforeach
<th class="{{ $class->head_column_width }} text-uppercase text-right">
<th class="{{ $class->column_name_width }} text-uppercase text-right border-top-0">
{{ trans_choice('general.totals', 1) }}
</th>
</tr>

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

@ -1,11 +1,11 @@
<tfoot>
<tr class="row rp-border-top-1 font-size-unset px-3">
<th class="{{ $class->head_column_width }} text-uppercase">{{ trans_choice('general.totals', 1) }}</th>
<tr class="row rp-border-top-1 font-size-unset px-3 mb-3">
<th class="{{ $class->column_name_width }} text-uppercase">{{ trans_choice('general.totals', 1) }}</th>
@php $grand_total = 0; @endphp
@foreach($class->footer_totals[$table] as $date => $total)
@php $grand_total += $total; @endphp
<th class="{{ $class->column_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
<th class="{{ $class->head_column_width }} text-right">@money($grand_total, setting('default.currency'), true)</th>
<th class="{{ $class->column_name_width }} text-right">@money($grand_total, setting('default.currency'), true)</th>
</tr>
</tfoot>