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

close #583 Fixed: Reports page currency issue

Browse Source
This commit is contained in:
cuneytsenturk 2018-11-02 17:50:27 +03:00
parent dd836a943b
commit 5da2276c84
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/reports/expense_summary/body.blade.php
View File

@ -19,7 +19,7 @@
<tr> <tr>
<td>{{ $categories[$category_id] }}</td> <td>{{ $categories[$category_id] }}</td>
@foreach($category as $item) @foreach($category as $item)
<td class="text-right">@money($item['amount'], $item['currency_code'], true)</td> <td class="text-right">@money($item['amount'], setting('general.default_currency'), true)</td>
@endforeach @endforeach
</tr> </tr>
@endforeach @endforeach

4
resources/views/reports/income_expense_summary/body.blade.php
View File

@ -25,9 +25,9 @@
@endif @endif
@foreach($category as $item) @foreach($category as $item)
@if($type == 'income') @if($type == 'income')
<td class="text-right">@money($item['amount'], $item['currency_code'], true)</td> <td class="text-right">@money($item['amount'], setting('general.default_currency'), true)</td>
@else @else
<td class="text-right">@money(-$item['amount'], $item['currency_code'], true)</td> <td class="text-right">@money(-$item['amount'], setting('general.default_currency'), true)</td>
@endif @endif
@endforeach @endforeach
</tr> </tr>

2
resources/views/reports/income_summary/body.blade.php
View File

@ -19,7 +19,7 @@
<tr> <tr>
<td>{{ $categories[$category_id] }}</td> <td>{{ $categories[$category_id] }}</td>
@foreach($category as $item) @foreach($category as $item)
<td class="text-right">@money($item['amount'], $item['currency_code'], true)</td> <td class="text-right">@money($item['amount'], setting('general.default_currency'), true)</td>
@endforeach @endforeach
</tr> </tr>
@endforeach @endforeach

4
resources/views/reports/profit_loss/body.blade.php
View File

@ -23,7 +23,7 @@
<td class="col-sm-2">{{ $income_categories[$category_id] }}</td> <td class="col-sm-2">{{ $income_categories[$category_id] }}</td>
@foreach($category as $i => $item) @foreach($category as $i => $item)
@php $gross['income'][$i] += $item['amount']; @endphp @php $gross['income'][$i] += $item['amount']; @endphp
<td class="col-sm-2 text-right">@money($item['amount'], $item['currency_code'], true)</td> <td class="col-sm-2 text-right">@money($item['amount'], setting('general.default_currency'), true)</td>
@endforeach @endforeach
</tr> </tr>
@endforeach @endforeach
@ -49,7 +49,7 @@
<td class="col-sm-2">{{ $expense_categories[$category_id] }}</td> <td class="col-sm-2">{{ $expense_categories[$category_id] }}</td>
@foreach($category as $i => $item) @foreach($category as $i => $item)
@php $gross['expense'][$i] += $item['amount']; @endphp @php $gross['expense'][$i] += $item['amount']; @endphp
<td class="col-sm-2 text-right">@money($item['amount'], $item['currency_code'], true)</td> <td class="col-sm-2 text-right">@money($item['amount'], setting('general.default_currency'), true)</td>
@endforeach @endforeach
</tr> </tr>
@endforeach @endforeach

6
resources/views/reports/tax_summary/body.blade.php
View File

@ -22,13 +22,13 @@
<tr> <tr>
<td style="width: 120px;">{{ trans_choice('general.incomes', 2) }}</td> <td style="width: 120px;">{{ trans_choice('general.incomes', 2) }}</td>
@foreach($incomes[$tax_name] as $tax_date) @foreach($incomes[$tax_name] as $tax_date)
<td class="text-right">@money($tax_date['amount'], $tax_date['currency_code'], true)</td> <td class="text-right">@money($tax_date['amount'], setting('general.default_currency'), true)</td>
@endforeach @endforeach
</tr> </tr>
<tr> <tr>
<td style="width: 120px;">{{ trans_choice('general.expenses', 2) }}</td> <td style="width: 120px;">{{ trans_choice('general.expenses', 2) }}</td>
@foreach($expenses[$tax_name] as $tax_date) @foreach($expenses[$tax_name] as $tax_date)
<td class="text-right">@money($tax_date['amount'], $tax_date['currency_code'], true)</td> <td class="text-right">@money($tax_date['amount'], setting('general.default_currency'), true)</td>
@endforeach @endforeach
</tr> </tr>
</tbody> </tbody>
@ -36,7 +36,7 @@
<tr> <tr>
<th style="width: 120px;">{{ trans('reports.net') }}</th> <th style="width: 120px;">{{ trans('reports.net') }}</th>
@foreach($totals[$tax_name] as $tax_date) @foreach($totals[$tax_name] as $tax_date)
<th class="text-right">@money($tax_date['amount'], $tax_date['currency_code'], true)</th> <th class="text-right">@money($tax_date['amount'], setting('general.default_currency'), true)</th>
@endforeach @endforeach
</tr> </tr>
</tfoot> </tfoot>