diff --git a/app/Http/Controllers/Report/BudgetController.php b/app/Http/Controllers/Report/BudgetController.php index 5296011487..766cbb14f6 100644 --- a/app/Http/Controllers/Report/BudgetController.php +++ b/app/Http/Controllers/Report/BudgetController.php @@ -336,7 +336,7 @@ final class BudgetController extends Controller } catch (Throwable $e) { Log::error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage())); Log::error($e->getTraceAsString()); - $result = 'Could not render view.'; + $result = sprintf('Could not render view: %s', $e->getMessage()); throw new FireflyException($result, 0, $e); } diff --git a/resources/views/accounts/edit.blade.php b/resources/views/accounts/edit.blade.php index b3c3d4ac95..b7935df8bc 100644 --- a/resources/views/accounts/edit.blade.php +++ b/resources/views/accounts/edit.blade.php @@ -94,7 +94,7 @@
{!! ExpandedForm::optionsList('update','account') !!}
-
+
diff --git a/resources/views/components/lists/accounts.blade.php b/resources/views/components/lists/accounts.blade.php index 8c455a6657..33b4e570b3 100644 --- a/resources/views/components/lists/accounts.blade.php +++ b/resources/views/components/lists/accounts.blade.php @@ -115,7 +115,7 @@ @endif @endif - + @foreach($account->differences as $key => $balance) diff --git a/resources/views/components/report/partial/journals-audit.blade.php b/resources/views/components/report/partial/journals-audit.blade.php index a1de513c25..3c73cdb87c 100644 --- a/resources/views/components/report/partial/journals-audit.blade.php +++ b/resources/views/components/report/partial/journals-audit.blade.php @@ -5,9 +5,9 @@   {{ trans('list.description') }} - {{ trans('list.balance_before') }} - {{ trans('list.amount') }} - {{ trans('list.balance_after') }} + {{ trans('list.balance_before') }} + {{ trans('list.amount') }} + {{ trans('list.balance_after') }} {{ trans('list.date') }} {{-- new optional fields (3x) --}} @@ -59,10 +59,10 @@ - + {!! format_amount_by_symbol($journal['balance_before'], $auditData[$account->id]['currency']->symbol, $auditData[$account->id]['currency']->decimal_places) !!} - + @if($auditData[$account->id]['currency']->id == $journal['currency_id']) @if($account->id == $journal['destination_account_id'] and $journal['transaction_type_type'] == 'Opening balance') @@ -89,7 +89,7 @@ @endif - + {!! format_amount_by_symbol($journal['balance_after'], $auditData[$account->id]['currency']->symbol, $auditData[$account->id]['currency']->decimal_places) !!} diff --git a/resources/views/list/accounts.blade.php b/resources/views/list/accounts.blade.php index 3dca806a34..98a0a38f5c 100644 --- a/resources/views/list/accounts.blade.php +++ b/resources/views/list/accounts.blade.php @@ -113,7 +113,7 @@ @endif @endif - + {% for key, balance in account.differences %} diff --git a/resources/views/list/groups.blade.php b/resources/views/list/groups.blade.php index 36230c8ccb..45f3e019ca 100644 --- a/resources/views/list/groups.blade.php +++ b/resources/views/list/groups.blade.php @@ -59,7 +59,7 @@ title="{{ group.title }}">{{ group.title }} - + {% for sum in group.sums %} {% if group.transaction_type == 'Deposit' %} {!! format_amount_by_symbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places) }} @@ -162,7 +162,7 @@ @endif - + {{-- deposit --}} {% if transaction.transaction_type_type == 'Deposit' %} @@ -275,7 +275,7 @@ @endif {% if (fireflyiiiconfig('use_running_balance', true)) %} - + {{-- RUNNING BALANCE --}} {% if (null == transaction.balance_dirty or false == transaction.balance_dirty) and null != transaction.destination_balance_after and null != transaction.source_balance_after %} {% if transaction.transaction_type_type == 'Deposit' %} diff --git a/resources/views/list/piggy-banks.blade.php b/resources/views/list/piggy-banks.blade.php index e7c8b84c22..9de8db4fba 100644 --- a/resources/views/list/piggy-banks.blade.php +++ b/resources/views/list/piggy-banks.blade.php @@ -5,9 +5,9 @@ {{ 'piggy_bank'|_ }} {{ 'saved_so_far'|_ }}   - {{ 'target_amount'|_ }} - {{ 'left_to_save'|_ }} - {{ 'suggested_savings_per_month'|_ }} + {{ 'target_amount'|_ }} + {{ 'left_to_save'|_ }} + {{ 'suggested_savings_per_month'|_ }} @@ -45,7 +45,7 @@ @endif - + {!! format_amount_by_symbol(piggy.current_amount,piggy.currency_symbol,piggy.currency_decimal_places) }} {% if convertToPrimary and piggy.currency_id != $primaryCurrency->id and null != piggy.pc_current_amount %} @@ -53,7 +53,7 @@ @endif - + {% if piggy.current_amount > 0 %} @@ -86,7 +86,7 @@ @endif - + {% if null != piggy.target_amount and 0 != piggy.target_amount %} {!! format_amount_by_symbol(piggy.target_amount,piggy.currency_symbol,piggy.currency_decimal_places) }} {% if convertToPrimary and piggy.currency_id != $primaryCurrency->id and null != piggy.pc_target_amount %} @@ -94,7 +94,7 @@ @endif @endif - + {% if piggy.left_to_save > 0 %} {!! format_amount_by_symbol(piggy.left_to_save,piggy.currency_symbol,piggy.currency_decimal_places) }} {% if convertToPrimary and piggy.currency_id != $primaryCurrency->id and null != piggy.pc_left_to_save %} @@ -102,7 +102,7 @@ @endif @endif - + {% if piggy.target_date and piggy.save_per_month %} {!! format_amount_by_symbol(piggy.save_per_month, piggy.currency_symbol, piggy.currency_decimal_places) }} {% if convertToPrimary and piggy.currency_id != $primaryCurrency->id and null != piggy.pc_save_per_month %} @@ -126,17 +126,17 @@   {{-- remove money --}}   {{-- progress--}}   {{-- add money --}} - + {% for sum in objectGroup.sums %} {!! format_amount_by_symbol(sum.target, sum.currency_symbol, sum.currency_decimal_places) }}
@endforeach - + {% for sum in objectGroup.sums %} {!! format_amount_by_symbol(sum.left_to_save, sum.currency_symbol, sum.currency_decimal_places) }}
@endforeach - + {% for sum in objectGroup.sums %} {!! format_amount_by_symbol(sum.save_per_month, sum.currency_symbol, sum.currency_decimal_places) }}
@endforeach diff --git a/resources/views/partials/boxes.blade.php b/resources/views/partials/boxes.blade.php index 4ff496d28b..1d87b4d38d 100644 --- a/resources/views/partials/boxes.blade.php +++ b/resources/views/partials/boxes.blade.php @@ -65,7 +65,7 @@
- {{ 'net_worth'|_ }} + {{ __('firefly.net_worth') }}
diff --git a/resources/views/piggy-banks/index.blade.php b/resources/views/piggy-banks/index.blade.php index 0259211c97..32bcc1f2b1 100644 --- a/resources/views/piggy-banks/index.blade.php +++ b/resources/views/piggy-banks/index.blade.php @@ -27,30 +27,30 @@ {{ __('firefly.account') }} - {{ __('firefly.balance') }} + {{ __('firefly.balance') }} {{ __('firefly.left_for_piggy_banks') }} - {{ __('firefly.sum_of_piggy_banks') }} - {{ __('firefly.saved_so_far') }} - {{ __('firefly.left_to_save') }} + {{ __('firefly.sum_of_piggy_banks') }} + {{ __('firefly.saved_so_far') }} + {{ __('firefly.left_to_save') }} @foreach($accounts as $id => $info) {{ $info['name'] }} - + {!! format_amount_by_symbol($info['current_balance'],$info['currency_symbol'],$info['currency_decimal_places']) !!} {!! format_amount_by_symbol($info['left'],$info['currency_symbol'],$info['currency_decimal_places']) !!} - + {!! format_amount_by_symbol($info['target'],$info['currency_symbol'],$info['currency_decimal_places']) !!} - + {!! format_amount_by_symbol($info['saved'],$info['currency_symbol'],$info['currency_decimal_places']) !!} - + {!! format_amount_by_symbol($info['to_save'],$info['currency_symbol'],$info['currency_decimal_places']) !!} diff --git a/resources/views/reports/budget/month.blade.php b/resources/views/reports/budget/month.blade.php index 8ce8a2fa51..8d13aa84c1 100644 --- a/resources/views/reports/budget/month.blade.php +++ b/resources/views/reports/budget/month.blade.php @@ -166,8 +166,8 @@ // to report another URL: var startDate = '{{ $start->format('Ymd') }}'; var endDate = '{{ $end->format('Ymd') }}'; - var $accountIds = '{{ $accountIds }}'; - var $budgetIds = '{{ $budgetIds }}'; + var accountIds = '{{ $accountIds }}'; + var budgetIds = '{{ $budgetIds }}'; // html block URL's: var accountsUrl = '{{ route('report-data.budget.accounts', [$accountIds, $budgetIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; diff --git a/resources/views/reports/category/month.blade.php b/resources/views/reports/category/month.blade.php index 20a23fa2bb..e85a9c4808 100644 --- a/resources/views/reports/category/month.blade.php +++ b/resources/views/reports/category/month.blade.php @@ -238,7 +238,7 @@ // to report another URL: var startDate = '{{ $start->format('Ymd') }}'; var endDate = '{{ $end->format('Ymd') }}'; - var $accountIds = '{{ $accountIds }}'; + var accountIds = '{{ $accountIds }}'; var categoryIds = '{{ $categoryIds }}'; diff --git a/resources/views/reports/default/month.blade.php b/resources/views/reports/default/month.blade.php index 95225574cd..1907b5be0a 100644 --- a/resources/views/reports/default/month.blade.php +++ b/resources/views/reports/default/month.blade.php @@ -173,7 +173,7 @@ var startDate = '{{ $start->format('Ymd') }}'; var endDate = '{{ $end->format('Ymd') }}'; var reportType = '{{ $reportType }}'; - var $accountIds = '{{ $accountIds }}'; + var accountIds = '{{ $accountIds }}'; var accountReportUrl = '{{ route('report-data.account.general', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; var categoryReportUrl = '{{ route('report-data.category.operations', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; diff --git a/resources/views/reports/default/multi-year.blade.php b/resources/views/reports/default/multi-year.blade.php index ab1af190d7..c11f864ff4 100644 --- a/resources/views/reports/default/multi-year.blade.php +++ b/resources/views/reports/default/multi-year.blade.php @@ -1,7 +1,6 @@ @extends('layout.v3.session') - - - {{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, start, end) }} +@section('breadcrumbs') + {{ Breadcrumbs::render(Route::getCurrentRoute()->getName(), $accountIds, $start, $end) }} @endsection @section('content') @@ -9,7 +8,7 @@ {{-- charts --}}
-
+

{{ __('firefly.incomeVsExpenses') }}

@@ -23,7 +22,7 @@ {{-- balances and income vs. expense. --}}
-
+

{{ __('firefly.accountBalances') }}

@@ -38,7 +37,7 @@
-
+

{{ __('firefly.incomeVsExpenses') }}

@@ -57,7 +56,7 @@ {{-- block with income --}}
-
+

{{ __('firefly.income') }}

@@ -73,7 +72,7 @@
{{-- block with expenses --}}
-
+

{{ __('firefly.expenses') }}

@@ -92,16 +91,16 @@ {{-- net worth --}}
-
+
-

{{ 'net_worth'|_ }}

+

{{ __('firefly.net_worth') }}

- {{ 'net_filtered_prefs'|_ }} + {{ __('firefly.net_filtered_prefs') }}
@@ -112,11 +111,11 @@ {{-- This is the budget overview generated by budget period report --}}
-
+

{{ __('firefly.budgets') }}

-
+
{{-- loading indicator --}}
@@ -132,12 +131,12 @@ {{-- This is the chart that belongs to the above overview. --}}
-
+
-

{{ 'chart'|_ }}

+

{{ __('firefly.chart') }}

-

{{ 'budget_chart_click'|_ }}

+

{{ __('firefly.budget_chart_click') }}

@@ -147,11 +146,11 @@ {{-- same thing but for categories (expenses) --}}
-
+

{{ __('firefly.categories') }} ({{ __('firefly.expenses') }})

-
+
{{-- loading indicator --}}
@@ -166,11 +165,11 @@ {{-- same thing but for categories (income) --}}
-
+

{{ __('firefly.categories') }} ({{ __('firefly.income') }})

-
+
{{-- loading indicator --}}
@@ -185,12 +184,12 @@ {{-- and the same chart too! --}}
-
+
-

{{ 'chart'|_ }}

+

{{ __('firefly.chart') }}

-

{{ 'category_chart_click'|_ }}

+

{{ __('firefly.category_chart_click') }}

@@ -202,7 +201,7 @@ @endsection @section('scripts') - + @vite(['js/pages/generic.js']) @@ -214,19 +213,19 @@ // to report another URL: var startDate = '{{ $start->format('Ymd') }}'; var endDate = '{{ $end->format('Ymd') }}'; - var accountIds = '{{ accountIds }}'; + var accountIds = '{{ $accountIds }}'; - var opChartUrl = '{{ route('chart.report.operations', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; - var netWorthUrl = '{{ route('chart.report.net-worth', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; + var opChartUrl = '{{ route('chart.report.operations', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; + var netWorthUrl = '{{ route('chart.report.net-worth', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; - var accountReportUrl = '{{ route('report-data.account.general', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; - var incomeReportUrl = '{{ route('report-data.operations.income', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; - var expenseReportUrl = '{{ route('report-data.operations.expenses', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; - var incExpReportUrl = '{{ route('report-data.operations.operations', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; + var accountReportUrl = '{{ route('report-data.account.general', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; + var incomeReportUrl = '{{ route('report-data.operations.income', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; + var expenseReportUrl = '{{ route('report-data.operations.expenses', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; + var incExpReportUrl = '{{ route('report-data.operations.operations', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; - var budgetPeriodReportUrl = '{{ route('report-data.budget.period', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; - var categoryExpenseUrl = '{{ route('report-data.category.expenses', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; - var categoryIncomeUrl = '{{ route('report-data.category.income', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; + var budgetPeriodReportUrl = '{{ route('report-data.budget.period', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; + var categoryExpenseUrl = '{{ route('report-data.category.expenses', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; + var categoryIncomeUrl = '{{ route('report-data.category.income', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; var billReportUrl = ''; diff --git a/resources/views/reports/default/year.blade.php b/resources/views/reports/default/year.blade.php index 80a253aaec..b0516f38f9 100644 --- a/resources/views/reports/default/year.blade.php +++ b/resources/views/reports/default/year.blade.php @@ -1,6 +1,6 @@ @extends('layout.v3.session') @section('breadcrumbs') - {{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, start, end) }} + {{ Breadcrumbs::render(Route::getCurrentRoute()->getName(), $accountIds, $start, $end) }} @endsection @section('content') @@ -8,7 +8,7 @@ {{-- charts --}}
-
+

{{ __('firefly.incomeVsExpenses') }}

@@ -22,7 +22,7 @@ {{-- balances and inc vs exp --}}
-
+

{{ __('firefly.accountBalances') }}

@@ -37,7 +37,7 @@
-
+

{{ __('firefly.incomeVsExpenses') }}

@@ -56,7 +56,7 @@ {{-- income and expenses. --}}
-
+

{{ __('firefly.income') }}

@@ -71,7 +71,7 @@
-
+

{{ __('firefly.expenses') }}

@@ -90,16 +90,16 @@ {{-- net worth --}}
-
+
-

{{ 'net_worth'|_ }}

+

{{ __('firefly.net_worth') }}

- {{ 'net_filtered_prefs'|_ }} + {{ __('firefly.net_filtered_prefs') }}
@@ -109,11 +109,11 @@ {{-- This is the budget overview generated by budget period report --}}
-
+

{{ __('firefly.budgets') }}

-
+
{{-- loading indicator --}}
@@ -129,12 +129,12 @@ {{-- This is the chart that belongs to the above overview. --}}
-
+
-

{{ 'chart'|_ }}

+

{{ __('firefly.chart') }}

-

{{ 'budget_chart_click'|_ }}

+

{{ __('firefly.budget_chart_click') }}

@@ -144,11 +144,11 @@ {{-- same thing but for categories (expenses) --}}
-
+

{{ __('firefly.categories') }} ({{ __('firefly.expenses') }})

-
+
{{-- loading indicator --}}
@@ -163,11 +163,11 @@ {{-- same thing but for categories (income) --}}
-
+

{{ __('firefly.categories') }} ({{ __('firefly.income') }})

-
+
{{-- loading indicator --}}
@@ -182,12 +182,12 @@ {{-- and the same chart too! --}}
-
+
-

{{ 'chart'|_ }}

+

{{ __('firefly.chart') }}

-

{{ 'category_chart_click'|_ }}

+

{{ __('firefly.category_chart_click') }}

@@ -197,6 +197,7 @@ @endsection @section('scripts') + @vite(['js/pages/generic.js']) @@ -207,19 +208,19 @@ // to report another URL: var startDate = '{{ $start->format('Ymd') }}'; var endDate = '{{ $end->format('Ymd') }}'; - var accountIds = '{{ accountIds }}'; + var accountIds = '{{ $accountIds }}'; - var opChartUrl = '{{ route('chart.report.operations', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; - var netWorthUrl = '{{ route('chart.report.net-worth', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; + var opChartUrl = '{{ route('chart.report.operations', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; + var netWorthUrl = '{{ route('chart.report.net-worth', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; - var accountReportUrl = '{{ route('report-data.account.general', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; - var incomeReportUrl = '{{ route('report-data.operations.income', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; - var expenseReportUrl = '{{ route('report-data.operations.expenses', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; - var incExpReportUrl = '{{ route('report-data.operations.operations', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; + var accountReportUrl = '{{ route('report-data.account.general', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; + var incomeReportUrl = '{{ route('report-data.operations.income', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; + var expenseReportUrl = '{{ route('report-data.operations.expenses', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; + var incExpReportUrl = '{{ route('report-data.operations.operations', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; - var budgetPeriodReportUrl = '{{ route('report-data.budget.period', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; - var categoryExpenseUrl = '{{ route('report-data.category.expenses', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; - var categoryIncomeUrl = '{{ route('report-data.category.income', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; + var budgetPeriodReportUrl = '{{ route('report-data.budget.period', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; + var categoryExpenseUrl = '{{ route('report-data.category.expenses', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; + var categoryIncomeUrl = '{{ route('report-data.category.income', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}'; var billReportUrl = ''; diff --git a/resources/views/reports/partials/accounts.blade.php b/resources/views/reports/partials/accounts.blade.php index b8d826bcce..8efb212871 100644 --- a/resources/views/reports/partials/accounts.blade.php +++ b/resources/views/reports/partials/accounts.blade.php @@ -2,8 +2,8 @@ {{ __('firefly.name') }} - {{ __('firefly.balanceStart') }} - {{ __('firefly.balanceEnd') }} + {{ __('firefly.balanceStart') }} + {{ __('firefly.balanceEnd') }} {{ __('firefly.difference') }} @@ -13,10 +13,10 @@ {{ $account['name'] }} - + {!! format_amount_by_symbol($account['start_balance'], $account['currency_symbol'], $account['currency_decimal_places']) !!} - + {!! format_amount_by_symbol($account['end_balance'], $account['currency_symbol'], $account['currency_decimal_places']) !!} {{ __('firefly.budgets') }} @foreach($report['accounts'] as $account) @if($account['sum'] !== 0) - {{ $account['name'] }} + {{ $account['name'] }} @endif @endforeach {{ __('firefly.sum') }} diff --git a/resources/views/reports/partials/bills.blade.php b/resources/views/reports/partials/bills.blade.php index 9324ac8b86..ab1d8cc403 100644 --- a/resources/views/reports/partials/bills.blade.php +++ b/resources/views/reports/partials/bills.blade.php @@ -2,8 +2,8 @@ {{ trans('form.name') }} - {{ trans('form.amount_min') }} - {{ trans('form.amount_max') }} + {{ trans('form.amount_min') }} + {{ trans('form.amount_max') }} {{ trans('form.expected_on') }} {{ trans('form.paid') }} @@ -15,10 +15,10 @@ {{ $bill['name'] }} - + {!! format_amount_by_symbol($bill['amount_min'], $bill['currency_symbol'], $bill['currency_decimal_places']) !!} - + {!! format_amount_by_symbol($bill['amount_max'], $bill['currency_symbol'], $bill['currency_decimal_places']) !!} diff --git a/resources/views/reports/partials/budget-period.blade.php b/resources/views/reports/partials/budget-period.blade.php index ca19aac14a..d1d3698dde 100644 --- a/resources/views/reports/partials/budget-period.blade.php +++ b/resources/views/reports/partials/budget-period.blade.php @@ -2,43 +2,43 @@ {{ __('firefly.budget') }} - {% for period in periods %} - {{ period }} + @foreach($periods as $period) + {{ $period }} @endforeach {{ __('firefly.average') }} {{ __('firefly.sum') }} - {% for key, info in report %} + @foreach($report as $info) - - {% if info.id != 0 %} - + + @if($info['id'] !== 0) + @else @endif - - {{ info.name }} + + {{ $info['name'] }} - {% for key, period in periods %} - {% if(info.entries[key]) %} - - {!! format_amount_by_symbol(info.entries[key], info.currency_symbol, info.currency_decimal_places) }} + @foreach($periods as $key => $period) + @if(array_key_exists($key, $info['entries'])) + + {!! format_amount_by_symbol($info['entries'][$key], $info['currency_symbol'], $info['currency_decimal_places']) !!} @else - {!! format_amount_by_symbol(0, info.currency_symbol, info.currency_decimal_places) }} + {!! format_amount_by_symbol(0, $info['currency_symbol'], $info['currency_decimal_places']) !!} @endif @endforeach - - {!! format_amount_by_symbol(info.avg, info.currency_symbol, info.currency_decimal_places) }} + + {!! format_amount_by_symbol($info['avg'], $info['currency_symbol'], $info['currency_decimal_places']) !!} - - {!! format_amount_by_symbol(info.sum, info.currency_symbol, info.currency_decimal_places) }} + + {!! format_amount_by_symbol($info['sum'], $info['currency_symbol'], $info['currency_decimal_places']) !!} @endforeach diff --git a/resources/views/reports/partials/budgets.blade.php b/resources/views/reports/partials/budgets.blade.php index 5af3952bfa..008c9868d9 100644 --- a/resources/views/reports/partials/budgets.blade.php +++ b/resources/views/reports/partials/budgets.blade.php @@ -3,12 +3,12 @@ {{ __('firefly.budget') }} {{ __('firefly.date') }} - {{ __('firefly.budgeted') }} + {{ __('firefly.budgeted') }} {{ trans('list.percentage') }} {{ __('firefly.spent') }} {{ trans('list.percentage') }}   - {{ __('firefly.left') }} + {{ __('firefly.left') }} {{ __('firefly.overspent') }} @@ -37,7 +37,7 @@ - + @if(null !== $budgetLimit['budgeted']) {!! format_amount_by_symbol($budgetLimit['budgeted'], $budgetLimit['currency_symbol'], $budgetLimit['currency_decimal_places']) !!} @endif @@ -67,7 +67,7 @@ - + @if(null !== $budgetLimit['left']) {!! format_amount_by_symbol($budgetLimit['left'], $budgetLimit['currency_symbol'], $budgetLimit['currency_decimal_places']) !!} @endif diff --git a/resources/views/reports/partials/category-period.blade.php b/resources/views/reports/partials/category-period.blade.php index 5ac178980a..bdde1dd860 100644 --- a/resources/views/reports/partials/category-period.blade.php +++ b/resources/views/reports/partials/category-period.blade.php @@ -2,46 +2,46 @@ {{ __('firefly.category') }} - {% for period in periods %} - {{ period }} + @foreach($periods as $period) + {{ $period }} @endforeach {{ __('firefly.sum') }} - {% for info in report %} + @foreach($report as $info) - - {% if info.id != 0 %} - + + @if($info['id'] !== 0) + @else @endif - - {{ info.title }} + + {{ $info['title'] }} - {% for key, period in periods %} + @foreach($periods as $key => $period) {{-- income first --}} - {% if(info.entries[key]) %} - - {!! format_amount_by_symbol(info.entries[key], info.currency_symbol, info.currency_decimal_places) }} + @if(array_key_exists($key, $info['entries'])) + + {!! format_amount_by_symbol($info['entries'][$key], $info['currency_symbol'], $info['currency_decimal_places']) !!} @else - {!! format_amount_by_symbol(0, info.currency_symbol, info.currency_decimal_places) }} + {!! format_amount_by_symbol(0, $info['currency_symbol'], $info['currency_decimal_places']) !!} @endif @endforeach {{-- if sum of income, display: --}} - {% if info.sum %} - - {!! format_amount_by_symbol(info.sum, info.currency_symbol, info.currency_decimal_places) }} + @if(null !== $info['sum']) + + {!! format_amount_by_symbol($info['sum'], $info['currency_symbol'], $info['currency_decimal_places']) !!} @else - {!! format_amount_by_symbol(0, info.currency_symbol, info.currency_decimal_places) }} + {!! format_amount_by_symbol(0, $info['currency_symbol'], $info['currency_decimal_places']) !!} @endif diff --git a/resources/views/reports/partials/income-expenses.blade.php b/resources/views/reports/partials/income-expenses.blade.php index 4cbdf28eb0..86966450dd 100644 --- a/resources/views/reports/partials/income-expenses.blade.php +++ b/resources/views/reports/partials/income-expenses.blade.php @@ -3,7 +3,7 @@ {{ __('firefly.name') }} {{ __('firefly.total') }} - {{ __('firefly.average') }} + {{ __('firefly.average') }} @@ -26,7 +26,7 @@ {!! format_amount_by_symbol($account['sum'], $account['currency_symbol'], $account['currency_decimal_places']) !!} - + @if($account['count'] > 1) {!! format_amount_by_symbol($account['average'], $account['currency_symbol'], $account['currency_decimal_places']) !!} @else diff --git a/resources/views/reports/partials/journals-audit.blade.php b/resources/views/reports/partials/journals-audit.blade.php index f5db2cb2bf..fbfd260583 100644 --- a/resources/views/reports/partials/journals-audit.blade.php +++ b/resources/views/reports/partials/journals-audit.blade.php @@ -5,9 +5,9 @@   {{ trans('list.description') }} - {{ trans('list.balance_before') }} - {{ trans('list.amount') }} - {{ trans('list.balance_after') }} + {{ trans('list.balance_before') }} + {{ trans('list.amount') }} + {{ trans('list.balance_after') }} {{ trans('list.date') }} {{-- new optional fields (3x) --}} @@ -78,10 +78,10 @@ - + {!! format_amount_by_symbol(journal.balance_before, auditData[$account->id].currency.symbol, auditData[$account->id].currency.decimal_places) }} - + {% if auditData[$account->id].currency.id == journal.currency_id %} {% if $account['id'] == journal.destination_account_id and journal.transaction_type_type == 'Opening balance' %} @@ -109,7 +109,7 @@ - + {!! format_amount_by_symbol(journal.balance_after, auditData[$account->id].currency.symbol, auditData[$account->id].currency.decimal_places) }}