From 5da2276c840ffb1932d6c5e96991a463467b696f Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Fri, 2 Nov 2018 17:50:27 +0300 Subject: [PATCH] close #583 Fixed: Reports page currency issue --- resources/views/reports/expense_summary/body.blade.php | 2 +- .../views/reports/income_expense_summary/body.blade.php | 4 ++-- resources/views/reports/income_summary/body.blade.php | 2 +- resources/views/reports/profit_loss/body.blade.php | 4 ++-- resources/views/reports/tax_summary/body.blade.php | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/views/reports/expense_summary/body.blade.php b/resources/views/reports/expense_summary/body.blade.php index f7849f83c..dc7270fe0 100644 --- a/resources/views/reports/expense_summary/body.blade.php +++ b/resources/views/reports/expense_summary/body.blade.php @@ -19,7 +19,7 @@ {{ $categories[$category_id] }} @foreach($category as $item) - @money($item['amount'], $item['currency_code'], true) + @money($item['amount'], setting('general.default_currency'), true) @endforeach @endforeach diff --git a/resources/views/reports/income_expense_summary/body.blade.php b/resources/views/reports/income_expense_summary/body.blade.php index a5f54f4f3..1fb78a4ec 100644 --- a/resources/views/reports/income_expense_summary/body.blade.php +++ b/resources/views/reports/income_expense_summary/body.blade.php @@ -25,9 +25,9 @@ @endif @foreach($category as $item) @if($type == 'income') - @money($item['amount'], $item['currency_code'], true) + @money($item['amount'], setting('general.default_currency'), true) @else - @money(-$item['amount'], $item['currency_code'], true) + @money(-$item['amount'], setting('general.default_currency'), true) @endif @endforeach diff --git a/resources/views/reports/income_summary/body.blade.php b/resources/views/reports/income_summary/body.blade.php index a9bc3744f..4d6badd44 100644 --- a/resources/views/reports/income_summary/body.blade.php +++ b/resources/views/reports/income_summary/body.blade.php @@ -19,7 +19,7 @@ {{ $categories[$category_id] }} @foreach($category as $item) - @money($item['amount'], $item['currency_code'], true) + @money($item['amount'], setting('general.default_currency'), true) @endforeach @endforeach diff --git a/resources/views/reports/profit_loss/body.blade.php b/resources/views/reports/profit_loss/body.blade.php index c3682ec3d..511f5d4ec 100644 --- a/resources/views/reports/profit_loss/body.blade.php +++ b/resources/views/reports/profit_loss/body.blade.php @@ -23,7 +23,7 @@ {{ $income_categories[$category_id] }} @foreach($category as $i => $item) @php $gross['income'][$i] += $item['amount']; @endphp - @money($item['amount'], $item['currency_code'], true) + @money($item['amount'], setting('general.default_currency'), true) @endforeach @endforeach @@ -49,7 +49,7 @@ {{ $expense_categories[$category_id] }} @foreach($category as $i => $item) @php $gross['expense'][$i] += $item['amount']; @endphp - @money($item['amount'], $item['currency_code'], true) + @money($item['amount'], setting('general.default_currency'), true) @endforeach @endforeach diff --git a/resources/views/reports/tax_summary/body.blade.php b/resources/views/reports/tax_summary/body.blade.php index 59695a1e2..3d9855739 100644 --- a/resources/views/reports/tax_summary/body.blade.php +++ b/resources/views/reports/tax_summary/body.blade.php @@ -22,13 +22,13 @@ {{ trans_choice('general.incomes', 2) }} @foreach($incomes[$tax_name] as $tax_date) - @money($tax_date['amount'], $tax_date['currency_code'], true) + @money($tax_date['amount'], setting('general.default_currency'), true) @endforeach {{ trans_choice('general.expenses', 2) }} @foreach($expenses[$tax_name] as $tax_date) - @money($tax_date['amount'], $tax_date['currency_code'], true) + @money($tax_date['amount'], setting('general.default_currency'), true) @endforeach @@ -36,7 +36,7 @@ {{ trans('reports.net') }} @foreach($totals[$tax_name] as $tax_date) - @money($tax_date['amount'], $tax_date['currency_code'], true) + @money($tax_date['amount'], setting('general.default_currency'), true) @endforeach