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

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source
This commit is contained in:
Cüneyt Şentürk 2020-03-10 17:43:30 +03:00
commit ebb096c22f
9 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,6 @@
@php $grand_total += $total; @endphp
<th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
@endforeach
<th class="{{ $class->column_name_width }} text-right">@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>
</tfoot>

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

@ -8,6 +8,6 @@
@foreach($class->dates as $date)
<th class="{{ $class->column_value_width }} text-right px-0">{{ $date }}</th>
@endforeach
<th class="{{ $class->column_name_width }} text-right">{{ trans_choice('general.totals', 1) }}</th>
<th class="{{ $class->column_name_width }} text-right pl-0 pr-4">{{ trans_choice('general.totals', 1) }}</th>
</tr>
</thead>

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

@ -5,5 +5,5 @@
@php $row_total += $row; @endphp
<td class="{{ $class->column_value_width }} text-right px-0">@money($row, setting('default.currency'), true)</td>
@endforeach
<td class="{{ $class->column_name_width }} text-right">@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>

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

@ -6,9 +6,7 @@
@foreach($class->net_profit as $profit)
<th class="{{ $class->column_value_width }} text-right px-0 border-top-0">@money($profit, setting('default.currency'), true)</th>
@endforeach
<th class="{{ $class->column_name_width }} text-right border-top-0">
@money(array_sum($class->net_profit), setting('default.currency'), true)
</th>
<th class="{{ $class->column_name_width }} text-right pl-0 pr-4 border-top-0">@money(array_sum($class->net_profit), setting('default.currency'), true)</th>
</tr>
</tfoot>
</table>

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

@ -6,9 +6,7 @@
@foreach($class->dates as $date)
<th class="{{ $class->column_value_width }} text-right px-0 border-top-0">{{ $date }}</th>
@endforeach
<th class="{{ $class->column_name_width }} text-uppercase text-right border-top-0">
{{ trans_choice('general.totals', 1) }}
</th>
<th class="{{ $class->column_name_width }} text-uppercase text-right pl-0 pr-4 border-top-0">{{ trans_choice('general.totals', 1) }}</th>
</tr>
</thead>
</table>

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

@ -6,6 +6,6 @@
@php $grand_total += $total; @endphp
<th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
@endforeach
<th class="{{ $class->column_name_width }} text-right">@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>
</tfoot>

1
resources/views/reports/tax_summary/content/footer.blade.php
View File

@ -1 +0,0 @@
<div>&nbsp;</div>

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

@ -1,12 +1,12 @@
<div class="table-responsive overflow-auto mt-4">
<div class="table-responsive">
<table class="table table-hover align-items-center rp-border-collapse">
<thead class="border-top-style">
<tr>
<th class="report-column text-right rp-border-bottom-1"></th>
<tr class="row rp-border-bottom-1 font-size-unset px-3">
<th class="{{ $class->column_name_width }} text-right border-top-0 rp-border-bottom-1"></th>
@foreach($class->dates as $date)
<th class="report-column text-right px-0 rp-border-bottom-1">{{ $date }}</th>
<th class="{{ $class->column_value_width }} text-right px-0 border-top-0 rp-border-bottom-1">{{ $date }}</th>
@endforeach
<th class="report-column text-right rp-border-bottom-1">{{ trans_choice('general.totals', 1) }}</th>
<th class="{{ $class->column_name_width }} text-right pl-0 pr-4 border-top-0 rp-border-bottom-1">{{ trans_choice('general.totals', 1) }}</th>
</tr>
</thead>
</table>

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

@ -1,11 +1,11 @@
<tfoot>
<tr class="rp-border-top-1">
<th class="report-column text-left">{{ trans('reports.net') }}</th>
<tr class="row rp-border-bottom-1 font-size-unset px-3">
<th class="{{ $class->column_name_width }} text-left">{{ trans('reports.net') }}</th>
@php $grand_total = 0; @endphp
@foreach($class->footer_totals[$table] as $total)
@php $grand_total += $total; @endphp
<th class="report-column 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="report-column text-right">@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>
</tfoot>