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

This commit is contained in:
Cüneyt Şentürk
2020-01-18 19:24:41 +03:00
15 changed files with 88 additions and 102 deletions

View File

@@ -1,5 +1,5 @@
<div class="table-responsive overflow-auto mt-4">
<table class="table align-items-center">
<table class="table align-items-center rp-border-collapse">
@include($class->views['table.header'])
<tbody>
@if (!empty($class->rows[$table]))

View File

@@ -1,5 +1,5 @@
<tfoot>
<tr>
<tr class="rp-border-top-1">
<th class="report-column">{{ trans_choice('general.totals', 1) }}</th>
@php $total_total = 0; @endphp
@foreach($class->totals[$table] as $total)

View File

@@ -1,9 +1,9 @@
@php $row_total = 0; @endphp
<tr>
<td class="report-column rp-border-top-1">{{ $class->getTableRowList()[$id] }}</td>
<tr class="rp-border-top-1">
<td class="report-column">{{ $class->getTableRowList()[$id] }}</td>
@foreach($items as $item)
@php $row_total += $item; @endphp
<td class="report-column text-right px-0 rp-border-top-1">@money($item, setting('default.currency'), true)</td>
<td class="report-column text-right px-0">@money($item, setting('default.currency'), true)</td>
@endforeach
<td class="report-column text-right rp-border-top-1">@money($row_total, setting('default.currency'), true)</td>
<td class="report-column text-right">@money($row_total, setting('default.currency'), true)</td>
</tr>