diff --git a/resources/views/partials/reports/table/footer.blade.php b/resources/views/partials/reports/table/footer.blade.php index 2bce5b020..9d804562d 100644 --- a/resources/views/partials/reports/table/footer.blade.php +++ b/resources/views/partials/reports/table/footer.blade.php @@ -1,11 +1,11 @@ - {{ trans_choice('general.totals', 1) }} + {{ trans_choice('general.totals', 1) }} @php $total_total = 0; @endphp @foreach($class->totals[$table] as $total) @php $total_total += $total; @endphp - @money($total, setting('default.currency'), true) + @money($total, setting('default.currency'), true) @endforeach - @money($total_total, setting('default.currency'), true) + @money($total_total, setting('default.currency'), true) diff --git a/resources/views/partials/reports/table/header.blade.php b/resources/views/partials/reports/table/header.blade.php index db3501d5d..265f7aa44 100644 --- a/resources/views/partials/reports/table/header.blade.php +++ b/resources/views/partials/reports/table/header.blade.php @@ -3,10 +3,10 @@ @if ($table == 'default') {{ $class->groups[$class->report->group] }} @else - {{ $table }} + {{ $table }} @endif @foreach($class->dates as $date) - {{ $date }} + {{ $date }} @endforeach {{ trans_choice('general.totals', 1) }} diff --git a/resources/views/partials/reports/table/rows.blade.php b/resources/views/partials/reports/table/rows.blade.php index 7b5eb0ece..565686ca5 100644 --- a/resources/views/partials/reports/table/rows.blade.php +++ b/resources/views/partials/reports/table/rows.blade.php @@ -1,9 +1,9 @@ @php $row_total = 0; @endphp - {{ $class->getTableRowList()[$id] }} + {{ $class->getTableRowList()[$id] }} @foreach($items as $item) @php $row_total += $item; @endphp - @money($item, setting('default.currency'), true) + @money($item, setting('default.currency'), true) @endforeach - @money($row_total, setting('default.currency'), true) + @money($row_total, setting('default.currency'), true) diff --git a/resources/views/reports/profit_loss/content/footer.blade.php b/resources/views/reports/profit_loss/content/footer.blade.php index 039b9d5ac..f981059d3 100644 --- a/resources/views/reports/profit_loss/content/footer.blade.php +++ b/resources/views/reports/profit_loss/content/footer.blade.php @@ -2,11 +2,11 @@ - + @foreach($class->net_profit as $profit) - + @endforeach - diff --git a/resources/views/reports/profit_loss/content/header.blade.php b/resources/views/reports/profit_loss/content/header.blade.php index f9421e3a3..f2e545811 100644 --- a/resources/views/reports/profit_loss/content/header.blade.php +++ b/resources/views/reports/profit_loss/content/header.blade.php @@ -2,12 +2,12 @@
{{ trans('reports.net_profit') }}{{ trans('reports.net_profit') }}@money($profit, setting('default.currency'), true)@money($profit, setting('default.currency'), true) + @money(array_sum($class->net_profit), setting('default.currency'), true)
- + @foreach($class->dates as $date) - + @endforeach - diff --git a/resources/views/reports/profit_loss/table/footer.blade.php b/resources/views/reports/profit_loss/table/footer.blade.php index 386d749cd..db27d06f1 100644 --- a/resources/views/reports/profit_loss/table/footer.blade.php +++ b/resources/views/reports/profit_loss/table/footer.blade.php @@ -1,11 +1,11 @@ - + @php $total_total = 0; @endphp @foreach($class->totals[$table] as $date => $total) @php $total_total += $total; @endphp - + @endforeach - + diff --git a/resources/views/reports/tax_summary/content/header.blade.php b/resources/views/reports/tax_summary/content/header.blade.php index f9421e3a3..86b878948 100644 --- a/resources/views/reports/tax_summary/content/header.blade.php +++ b/resources/views/reports/tax_summary/content/header.blade.php @@ -2,11 +2,11 @@
{{ $date }}{{ $date }} -
{{ trans_choice('general.totals', 1) }}
+ 		+ {{ trans_choice('general.totals', 1) }}
{{ trans_choice('general.totals', 1) }}{{ trans_choice('general.totals', 1) }}@money($total, setting('default.currency'), true)@money($total, setting('default.currency'), true)@money($total_total, setting('default.currency'), true)@money($total_total, setting('default.currency'), true)
- + @foreach($class->dates as $date) - + @endforeach - diff --git a/resources/views/reports/tax_summary/table/footer.blade.php b/resources/views/reports/tax_summary/table/footer.blade.php index 51c39daab..755cbb94c 100644 --- a/resources/views/reports/tax_summary/table/footer.blade.php +++ b/resources/views/reports/tax_summary/table/footer.blade.php @@ -1,11 +1,11 @@ - + @php $total_total = 0; @endphp @foreach($class->totals[$table] as $total) @php $total_total += $total; @endphp - + @endforeach - +
{{ $date }}{{ $date }} +
{{ trans_choice('general.totals', 1) }}
{{ trans('reports.net') }}{{ trans('reports.net') }}@money($total, setting('default.currency'), true)@money($total, setting('default.currency'), true)@money($total_total, setting('default.currency'), true)@money($total_total, setting('default.currency'), true)