Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
View updates
Sander Dorigo7e46b1d9476a
diff --git a/resources/views/budgets/budget-limits/create.twig b/resources/views/budgets/budget-limits/create.blade.phpsimilarity index 52%rename from resources/views/budgets/budget-limits/create.twigrename to resources/views/budgets/budget-limits/create.blade.phpindex 44c61d6ed1..3b192599f0 100644--- a/resources/views/budgets/budget-limits/create.twig+++ b/resources/views/budgets/budget-limits/create.blade.php@@ -1,38 +1,37 @@<div class="modal-dialog"><div class="modal-content"><div class="modal-header">- <button type="button" class="close" data-dismiss="modal"><span>×</span><span class="sr-only">{{ 'close'|_ }}</span>- </button>- <h4 class="modal-title">+ <h5 class="modal-title">{{ trans('firefly.set_budget_limit_title',- {start: start.isoFormat($monthAndDayFormat), end: end.isoFormat($monthAndDayFormat), budget: budget.name}) }}- </h4>+ ['start' => $start->isoFormat($monthAndDayFormat), 'end' => $end->isoFormat($monthAndDayFormat), 'budget' => $budget->name]) }}+ </h5>+ <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{{ __('firefly.close') }}"></button></div><form class="inline" id="income" action="{{ route('budget-limits.store') }}" method="POST"><div class="modal-body"><input type="hidden" name="_token" value="{{ csrf_token() }}"/>- <input type="hidden" name="start" value="{{ start.format('Y-m-d') }}"/>- <input type="hidden" name="end" value="{{ end.format('Y-m-d') }}"/>- <input type="hidden" name="budget_id" value="{{ budget.id }}"/>- <div class="form-group">+ <input type="hidden" name="start" value="{{ $start->format('Y-m-d') }}"/>+ <input type="hidden" name="end" value="{{ $end->format('Y-m-d') }}"/>+ <input type="hidden" name="budget_id" value="{{ $budget->id }}"/>+ <div class="form-group mb-3"><select class="form-control" name="transaction_currency_id">- {% for currency in currencies %}- <option label="{{ currency.name }}" value="{{ currency.id }}">{{ currency.name }}</option>+ @foreach($currencies as $currency)+ <option label="{{ $currency->name }}" value="{{ $currency->id }}">{{ $currency->name }}</option>@endforeach</select></div>- <div class="form-group">+ <div class="form-group mb-3"><input step="any" class="form-control" id="amount" value="" autocomplete="off" name="amount" type="number"/></div>- <div class="form-group">+ <div class="form-group mb-3"><textarea name="notes" class="form-control" rows="3" placeholder="{{ __('firefly.notes') }}"></textarea>- <span class="help-block">{{ trans('firefly.field_supports_markdown')|raw }}</span>+ <span class="help-block">{!! trans('firefly.field_supports_markdown')!!} </span></div></div><div class="modal-footer">- <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ 'close'|_ }}</button>- <button type="submit" class="btn btn-primary">{{ 'set_budget_limit'|_ }}</button>+ <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">{{ __('firefly.close') }}</button>+ <button type="submit" class="btn btn-primary">{{ __('firefly.set_budget_limit') }}</button></div></form></div>diff --git a/resources/views/budgets/budget-limits/edit.twig b/resources/views/budgets/budget-limits/edit.blade.phpsimilarity index 53%rename from resources/views/budgets/budget-limits/edit.twigrename to resources/views/budgets/budget-limits/edit.blade.phpindex f422e5b1f9..8cb31d6b0d 100644--- a/resources/views/budgets/budget-limits/edit.twig+++ b/resources/views/budgets/budget-limits/edit.blade.php@@ -1,26 +1,25 @@<div class="modal-dialog"><div class="modal-content"><div class="modal-header">- <button type="button" class="close" data-dismiss="modal"><span>×</span><span class="sr-only">{{ 'close'|_ }}</span>- </button>- <h4 class="modal-title">+ <h5 class="modal-title">{{ trans('firefly.edit_bl_notes') }}- </h4>+ </h5>+ <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{{ __('firefly.close') }}"></button></div>- <form class="inline" action="{{ route('budget-limits.update', [budgetLimit.id]) }}" method="POST">+ <form class="inline" action="{{ route('budget-limits.update', [$budgetLimit->id]) }}" method="POST"><div class="modal-body"><input type="hidden" name="_token" value="{{ csrf_token() }}"/><input type="hidden" name="redirect" value="true"/>- <input type="hidden" name="amount" value="{{ budgetLimit.amount }}"/>- <div class="form-group">- <textarea name="notes" class="form-control" rows="3" placeholder="{{ __('firefly.notes') }}">{{ notes }}</textarea>- <span class="help-block">{{ trans('firefly.field_supports_markdown')|raw }}</span>+ <input type="hidden" name="amount" value="{{ $budgetLimit->amount }}"/>+ <div class="form-group mb-3">+ <textarea name="notes" class="form-control" rows="3" placeholder="{{ __('firefly.notes') }}">{{ $notes }}</textarea>+ <span class="help-block">{!! trans('firefly.field_supports_markdown') !!}</span></div></div><div class="modal-footer">- <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ 'close'|_ }}</button>- <button type="submit" class="btn btn-primary">{{ 'update_bl_notes'|_ }}</button>+ <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">{{ __('firefly.close') }}</button>+ <button type="submit" class="btn btn-primary">{{ __('firefly.update_bl_notes') }}</button></div></form></div>diff --git a/resources/views/budgets/budget-limits/show.twig b/resources/views/budgets/budget-limits/show.blade.phpsimilarity index 59%rename from resources/views/budgets/budget-limits/show.twigrename to resources/views/budgets/budget-limits/show.blade.phpindex be046184f1..410efafea1 100644--- a/resources/views/budgets/budget-limits/show.twig+++ b/resources/views/budgets/budget-limits/show.blade.php@@ -1,19 +1,19 @@<div class="modal-dialog"><div class="modal-content"><div class="modal-header">- <button type="button" class="close" data-dismiss="modal"><span>×</span><span class="sr-only">{{ 'close'|_ }}</span></button>- <h4 class="modal-title">+ <h5 class="modal-title">{{ trans('firefly.set_budget_limit_notes') }}- </h4>+ </h5>+ <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{{ __('firefly.close') }}"></button></div><div class="modal-body"><div>- {{ notes|markdown }}+ {!! parse_markdown($notes) !!}</div></div><div class="modal-footer">- <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ 'close'|_ }}</button>+ <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">{{ __('firefly.close') }}</button></div></div></div>diff --git a/resources/views/budgets/index.blade.php b/resources/views/budgets/index.blade.phpindex b3c8e4b677..036405861a 100644--- a/resources/views/budgets/index.blade.php+++ b/resources/views/budgets/index.blade.php@@ -201,7 +201,7 @@</tr></thead><tbody>- {{-- {{-- START OF BUDGET ROW --}} --}}+ {{-- START OF BUDGET ROW --}}@foreach($budgets as $budget)<tr data-id="{{ $budget['id'] }}">@@ -440,7 +440,6 @@<script src="v1/js/lib/jquery-ui.min.js?v={{ $FF_BUILD_TIME }}" type="text/javascript" nonce="{{ $JS_NONCE }}"></script><script type="text/javascript" nonce="{{ $JS_NONCE }}">-// index route.var budgetIndexUrl = "{{ route('budgets.index',['START','END']) }}";diff --git a/resources/views/budgets/partials/amount-left.twig b/resources/views/budgets/partials/unused-amount-left.twigsimilarity index 100%rename from resources/views/budgets/partials/amount-left.twigrename to resources/views/budgets/partials/unused-amount-left.twigdiff --git a/resources/views/budgets/partials/amount-spent.twig b/resources/views/budgets/partials/unused-amount-spent.twigsimilarity index 100%rename from resources/views/budgets/partials/amount-spent.twigrename to resources/views/budgets/partials/unused-amount-spent.twigdiff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twigindex 448939388d..d1e05e1e0e 100644--- a/resources/views/categories/show.twig+++ b/resources/views/categories/show.twig@@ -12,7 +12,7 @@<div class="card"><div class="card-header"><h3 class="card-title">- {{ trans('firefly.chart_category_in_period', {name: category.name, start: start.isoFormat($monthAndDayFormat), end: end.isoFormat($monthAndDayFormat) }) }}+ {{ trans('firefly.chart_category_in_period', {name: category.name, start: $start->isoFormat($monthAndDayFormat), end: $end->isoFormat($monthAndDayFormat) }) }}</h3></div><div class="card-body">@@ -111,7 +111,7 @@<script type="text/javascript" nonce="{{ $JS_NONCE }}">var current = '{{ route('chart.category.current', [category.id]) }}';var everything = '{{ route('chart.category.all', [category.id]) }}';- var specific = '{{ route('chart.category.specific', [category.id, start.format('Ymd')]) }}';+ var specific = '{{ route('chart.category.specific', [category.id, $start->format('Ymd')]) }}';</script><script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script><script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twigindex f327a981d2..f7c2723f1d 100644--- a/resources/views/layout/default.twig+++ b/resources/views/layout/default.twig@@ -223,7 +223,7 @@<small class="pull-left">{{ trans('firefly.reenable_intro_text')|raw }}</small>- <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ 'close'|_ }}</button>+ <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ __('firefly.close') }}</button></div></div></div>diff --git a/resources/views/partials/flashes.twig b/resources/views/partials/flashes.twigindex 2ef891ef26..99d4edf6f6 100644--- a/resources/views/partials/flashes.twig+++ b/resources/views/partials/flashes.twig@@ -2,7 +2,7 @@{% if invalidMonetaryLocale %}<div class="alert alert-info alert-dismissible" role="alert"><button type="button" class="close" data-dismiss="alert">- <span>×</span><span class="sr-only">{{ 'close'|_ }}</span>+ <span>×</span><span class="sr-only">{{ __('firefly.close') }}</span></button><strong>{{ 'invalid_server_configuration'|_ }}:</strong> <span class="bi bi-cash"></span> {{ 'invalid_locale_settings'|_ }}</div>@@ -19,7 +19,7 @@{% if session_has('success') %}<div class="alert alert-success alert-dismissible" role="alert"><button type="button" class="close" data-dismiss="alert">- <span>×</span><span class="sr-only">{{ 'close'|_ }}</span>+ <span>×</span><span class="sr-only">{{ __('firefly.close') }}</span></button><strong>{{ 'flash_success'|_ }}</strong>{% if session_has('success_url') %}@@ -37,7 +37,7 @@{% if session_has('info') %}<div class="alert alert-info alert-dismissible" role="alert"><button type="button" class="close" data-dismiss="alert">- <span>×</span><span class="sr-only">{{ 'close'|_ }}</span>+ <span>×</span><span class="sr-only">{{ __('firefly.close') }}</span></button>{{-- MULTIPLE INFO MESSAGE --}}@@ -73,7 +73,7 @@{% if session_has('warning') %}<div class="alert alert-warning alert-dismissible" role="alert"><button type="button" class="close" data-dismiss="alert">- <span>×</span><span class="sr-only">{{ 'close'|_ }}</span>+ <span>×</span><span class="sr-only">{{ __('firefly.close') }}</span></button><strong>{{ 'flash_warning'|_ }}</strong> {{ session('warning') }}</div>@@ -83,7 +83,7 @@{% if session_has('error') %}<div class="alert alert-danger alert-dismissible" role="alert"><button type="button" class="close" data-dismiss="alert">- <span>×</span><span class="sr-only">{{ 'close'|_ }}</span>+ <span>×</span><span class="sr-only">{{ __('firefly.close') }}</span></button>{{-- MULTIPLE ERRORS (BAD) --}}diff --git a/resources/views/partials/old-password-modal.twig b/resources/views/partials/old-password-modal.twigindex 8ffd89eb28..7bdf1e2698 100644--- a/resources/views/partials/old-password-modal.twig+++ b/resources/views/partials/old-password-modal.twig@@ -5,7 +5,7 @@<h5 class="modal-title">{{ 'secure_pw_title'|_ }}</h5>- <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}">+ <button type="button" class="close" data-dismiss="modal" aria-label="{{ __('firefly.close') }}"><span aria-hidden="true">×</span></button></div>@@ -30,7 +30,7 @@</p></div><div class="modal-footer">- <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ 'close'|_ }}</button>+ <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ __('firefly.close') }}</button></div></div></div>diff --git a/resources/views/piggy-banks/add.twig b/resources/views/piggy-banks/add.twigindex f546570c3e..60ed3a1913 100644--- a/resources/views/piggy-banks/add.twig+++ b/resources/views/piggy-banks/add.twig@@ -1,7 +1,7 @@<div class="modal-dialog"><div class="modal-content"><div class="modal-header">- <button type="button" class="close" data-dismiss="modal"><span>×</span><span class="sr-only">{{ 'close'|_ }}</span>+ <button type="button" class="close" data-dismiss="modal"><span>×</span><span class="sr-only">{{ __('firefly.close') }}</span></button><h4 class="modal-title">{{ trans('firefly.add_money_to_piggy_title', {name: piggyBank.name}) }}</h4></div>@@ -18,7 +18,7 @@@endforeach</div><div class="modal-footer">- <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ 'close'|_ }}</button>+ <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ __('firefly.close') }}</button><button type="submit" class="btn btn-primary">{{ 'add'|_ }}</button></div></form>@@ -27,7 +27,7 @@<p class="text-danger">{{ 'no_money_for_piggy'|_ }}</p></div><div class="modal-footer">- <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ 'close'|_ }}</button>+ <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ __('firefly.close') }}</button></div>@endif</div>diff --git a/resources/views/piggy-banks/remove.twig b/resources/views/piggy-banks/remove.twigindex b9fc1bfac2..61fcbf7d67 100644--- a/resources/views/piggy-banks/remove.twig+++ b/resources/views/piggy-banks/remove.twig@@ -4,7 +4,7 @@<input type="hidden" name="_token" value="{{ csrf_token() }}"/><div class="modal-header">- <button type="button" class="close" data-dismiss="modal"><span>×</span><span class="sr-only">{{ 'close'|_ }}</span>+ <button type="button" class="close" data-dismiss="modal"><span>×</span><span class="sr-only">{{ __('firefly.close') }}</span></button><h4 class="modal-title">{{ trans('firefly.remove_money_from_piggy_title', {name: piggyBank.name}) }}</h4></div>@@ -22,7 +22,7 @@@endforeach</div><div class="modal-footer">- <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ 'close'|_ }}</button>+ <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ __('firefly.close') }}</button><button type="submit" class="btn btn-primary">{{ 'remove'|_ }}</button></div></form>diff --git a/resources/views/popup/report/balance-amount.twig b/resources/views/popup/report/balance-amount.twigindex 07b3804539..e884528217 100644--- a/resources/views/popup/report/balance-amount.twig+++ b/resources/views/popup/report/balance-amount.twig@@ -1,9 +1,9 @@<div class="modal-dialog modal-lg" role="document"><div class="modal-content"><div class="modal-header">- <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span>×</span></button>+ <button type="button" class="close" data-dismiss="modal" aria-label="{{ __('firefly.close') }}"><span>×</span></button><h4 class="modal-title" id="balanceAmountTitle">{{ trans('firefly.balance_amount',- {budget: budget.name, account: account.name, start: start.isoFormat($monthAndDayFormat), end: end.isoFormat($monthAndDayFormat)}+ {budget: budget.name, account: account.name, start: $start->isoFormat($monthAndDayFormat), end: $end->isoFormat($monthAndDayFormat)}) }}</h4></div><div class="modal-body">@@ -12,7 +12,7 @@{% include 'popup.list.journals' %}</div><div class="modal-footer">- <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ 'close'|_ }}</button>+ <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ __('firefly.close') }}</button></div></div></div>diff --git a/resources/views/popup/report/budget-spent-amount.twig b/resources/views/popup/report/budget-spent-amount.twigindex 93fed5d8d6..24340d2778 100644--- a/resources/views/popup/report/budget-spent-amount.twig+++ b/resources/views/popup/report/budget-spent-amount.twig@@ -1,9 +1,9 @@<div class="modal-dialog modal-lg" role="document"><div class="modal-content"><div class="modal-header">- <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span>×</span></button>+ <button type="button" class="close" data-dismiss="modal" aria-label="{{ __('firefly.close') }}"><span>×</span></button><h4 class="modal-title" id="budgetSpentAmountLabel">- {{ trans('firefly.budget_spent_amount', {start: start.isoFormat($monthAndDayFormat), end: end.isoFormat($monthAndDayFormat), budget: budget.name}) }}+ {{ trans('firefly.budget_spent_amount', {start: $start->isoFormat($monthAndDayFormat), end: $end->isoFormat($monthAndDayFormat), budget: budget.name}) }}</h4></div><div class="modal-body">@@ -11,7 +11,7 @@{% include 'popup.list.journals' %}</div><div class="modal-footer">- <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ 'close'|_ }}</button>+ <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ __('firefly.close') }}</button></div></div></div>diff --git a/resources/views/popup/report/category-entry.twig b/resources/views/popup/report/category-entry.twigindex 6d0f6f1186..2274171292 100644--- a/resources/views/popup/report/category-entry.twig+++ b/resources/views/popup/report/category-entry.twig@@ -1,16 +1,16 @@<div class="modal-dialog modal-lg" role="document"><div class="modal-content"><div class="modal-header">- <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span>×</span></button>+ <button type="button" class="close" data-dismiss="modal" aria-label="{{ __('firefly.close') }}"><span>×</span></button><h4 class="modal-title"- id="expenseEntryTitle">{{ trans('firefly.category_entry', {name: category.name, start: start.isoFormat($monthAndDayFormat), end: end.isoFormat($monthAndDayFormat)}) }}</h4>+ id="expenseEntryTitle">{{ trans('firefly.category_entry', {name: category.name, start: $start->isoFormat($monthAndDayFormat), end: $end->isoFormat($monthAndDayFormat)}) }}</h4></div><div class="modal-body">{% set hideCategory = true %}{% include 'popup.list.journals' %}</div><div class="modal-footer">- <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ 'close'|_ }}</button>+ <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ __('firefly.close') }}</button></div></div></div>diff --git a/resources/views/popup/report/expense-entry.twig b/resources/views/popup/report/expense-entry.twigindex 116502bcef..c108751cc9 100644--- a/resources/views/popup/report/expense-entry.twig+++ b/resources/views/popup/report/expense-entry.twig@@ -1,16 +1,16 @@<div class="modal-dialog modal-lg" role="document"><div class="modal-content"><div class="modal-header">- <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span>×</span></button>+ <button type="button" class="close" data-dismiss="modal" aria-label="{{ __('firefly.close') }}"><span>×</span></button><h4 class="modal-title"- id="expenseEntryTitle">{{ trans('firefly.expense_entry', {name: account.name, start: start.isoFormat($monthAndDayFormat), end: end.isoFormat($monthAndDayFormat)}) }}</h4>+ id="expenseEntryTitle">{{ trans('firefly.expense_entry', {name: account.name, start: $start->isoFormat($monthAndDayFormat), end: $end->isoFormat($monthAndDayFormat)}) }}</h4></div><div class="modal-body">{% set hideDestination = true %}{% include 'popup.list.journals' %}</div><div class="modal-footer">- <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ 'close'|_ }}</button>+ <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ __('firefly.close') }}</button></div></div></div>diff --git a/resources/views/popup/report/income-entry.twig b/resources/views/popup/report/income-entry.twigindex f38704ab49..8f02d34638 100644--- a/resources/views/popup/report/income-entry.twig+++ b/resources/views/popup/report/income-entry.twig@@ -1,9 +1,9 @@<div class="modal-dialog modal-lg" role="document"><div class="modal-content"><div class="modal-header">- <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span>×</span></button>+ <button type="button" class="close" data-dismiss="modal" aria-label="{{ __('firefly.close') }}"><span>×</span></button><h4 class="modal-title"- id="incomeEntryTitle">{{ trans('firefly.income_entry', {name: account.name, start: start.isoFormat($monthAndDayFormat), end: end.isoFormat($monthAndDayFormat)}) }}</h4>+ id="incomeEntryTitle">{{ trans('firefly.income_entry', {name: account.name, start: $start->isoFormat($monthAndDayFormat), end: $end->isoFormat($monthAndDayFormat)}) }}</h4></div><div class="modal-body">{% set hideBudget = true %}@@ -13,7 +13,7 @@{% include 'popup.list.journals' %}</div><div class="modal-footer">- <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ 'close'|_ }}</button>+ <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ __('firefly.close') }}</button></div></div></div>diff --git a/resources/views/reports/audit/report.twig b/resources/views/reports/audit/report.twigindex 13da0533a4..d9a7365a88 100644--- a/resources/views/reports/audit/report.twig+++ b/resources/views/reports/audit/report.twig@@ -44,8 +44,8 @@{account_name: account.name|escape,url: url,- start: start.isoFormat($monthAndDayFormat),- end: end.isoFormat($monthAndDayFormat),+ start: $start->isoFormat($monthAndDayFormat),+ end: $end->isoFormat($monthAndDayFormat),})|raw }}</em>diff --git a/resources/views/reports/budget/month.twig b/resources/views/reports/budget/month.twigindex d82ca78c47..a356d5f6ca 100644--- a/resources/views/reports/budget/month.twig+++ b/resources/views/reports/budget/month.twig@@ -116,7 +116,7 @@<h3 class="card-title">{{ 'expenses'|_ }} ({{ budget.name }})</h3></div><div class="card-body">- <canvas class="main_budget_canvas" data-url="{{ route('chart.budget.main', [accountIds, budget.id, start.format('Ymd'), end.format('Ymd')]) }}" id="in-out-chart-{{ budget.id }}" class="wide-chart" height="400" width="100%"></canvas>+ <canvas class="main_budget_canvas" data-url="{{ route('chart.budget.main', [accountIds, budget.id, $start->format('Ymd'), $end->format('Ymd')]) }}" id="in-out-chart-{{ budget.id }}" class="wide-chart" height="400" width="100%"></canvas></div></div></div>@@ -166,22 +166,22 @@<script type="text/javascript" nonce="{{ $JS_NONCE }}">// to report another URL:- var startDate = '{{ start.format('Ymd') }}';- var endDate = '{{ end.format('Ymd') }}';+ var startDate = '{{ $start->format('Ymd') }}';+ var endDate = '{{ $end->format('Ymd') }}';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')]) }}';- var budgetsUrl = '{{ route('report-data.budget.budgets', [accountIds, budgetIds, start.format('Ymd'), end.format('Ymd')]) }}';- var accountPerBudgetUrl = '{{ route('report-data.budget.account-per-budget', [accountIds, budgetIds, start.format('Ymd'), end.format('Ymd')]) }}';- var avgExpensesUrl = '{{ route('report-data.budget.avg-expenses', [accountIds, budgetIds, start.format('Ymd'), end.format('Ymd')]) }}';- var topExpensesUrl = '{{ route('report-data.budget.top-expenses', [accountIds, budgetIds, start.format('Ymd'), end.format('Ymd')]) }}';+ var accountsUrl = '{{ route('report-data.budget.accounts', [accountIds, budgetIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var budgetsUrl = '{{ route('report-data.budget.budgets', [accountIds, budgetIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var accountPerBudgetUrl = '{{ route('report-data.budget.account-per-budget', [accountIds, budgetIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var avgExpensesUrl = '{{ route('report-data.budget.avg-expenses', [accountIds, budgetIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var topExpensesUrl = '{{ route('report-data.budget.top-expenses', [accountIds, budgetIds, $start->format('Ymd'), $end->format('Ymd')]) }}';- var budgetExpenseUrl = '{{ route('chart.budget.budget-expense', [accountIds, budgetIds, start.format('Ymd'), end.format('Ymd')]) }}';- var categoryExpenseUrl = '{{ route('chart.budget.category-expense', [accountIds, budgetIds, start.format('Ymd'), end.format('Ymd')]) }}';- var sourceExpenseUrl = '{{ route('chart.budget.source-account-expense', [accountIds, budgetIds, start.format('Ymd'), end.format('Ymd')]) }}';- var destinationExpenseUrl = '{{ route('chart.budget.destination-account-expense', [accountIds, budgetIds, start.format('Ymd'), end.format('Ymd')]) }}';+ var budgetExpenseUrl = '{{ route('chart.budget.budget-expense', [accountIds, budgetIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var categoryExpenseUrl = '{{ route('chart.budget.category-expense', [accountIds, budgetIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var sourceExpenseUrl = '{{ route('chart.budget.source-account-expense', [accountIds, budgetIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var destinationExpenseUrl = '{{ route('chart.budget.destination-account-expense', [accountIds, budgetIds, $start->format('Ymd'), $end->format('Ymd')]) }}';</script>diff --git a/resources/views/reports/category/month.twig b/resources/views/reports/category/month.twigindex 37a62113bf..357080aa79 100644--- a/resources/views/reports/category/month.twig+++ b/resources/views/reports/category/month.twig@@ -154,7 +154,7 @@<h3 class="card-title">{{ 'income_and_expenses'|_ }} ({{ category.name }})</h3></div><div class="card-body">- <canvas class="main_category_canvas" data-url="{{ route('chart.category.main', [accountIds, category.id, start.format('Ymd'), end.format('Ymd')]) }}" id="in-out-chart-{{ category.id }}" class="wide-chart" height="400" width="100%"></canvas>+ <canvas class="main_category_canvas" data-url="{{ route('chart.category.main', [accountIds, category.id, $start->format('Ymd'), $end->format('Ymd')]) }}" id="in-out-chart-{{ category.id }}" class="wide-chart" height="400" width="100%"></canvas></div></div></div>@@ -236,29 +236,29 @@<script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script><script type="text/javascript" nonce="{{ $JS_NONCE }}">// to report another URL:- var startDate = '{{ start.format('Ymd') }}';- var endDate = '{{ end.format('Ymd') }}';+ var startDate = '{{ $start->format('Ymd') }}';+ var endDate = '{{ $end->format('Ymd') }}';var accountIds = '{{ accountIds }}';var categoryIds = '{{ categoryIds }}';- var accountsUrl = '{{ route('report-data.category.accounts', [accountIds, categoryIds, start.format('Ymd'), end.format('Ymd')]) }}';- var categoriesUrl = '{{ route('report-data.category.categories', [accountIds, categoryIds, start.format('Ymd'), end.format('Ymd')]) }}';- var accountPerCategoryUrl = '{{ route('report-data.category.account-per-category', [accountIds, categoryIds, start.format('Ymd'), end.format('Ymd')]) }}';+ var accountsUrl = '{{ route('report-data.category.accounts', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var categoriesUrl = '{{ route('report-data.category.categories', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var accountPerCategoryUrl = '{{ route('report-data.category.account-per-category', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';// pie charts:- var categoryOutUrl = '{{ route('chart.category.category-expense', [accountIds, categoryIds, start.format('Ymd'), end.format('Ymd')]) }}';- var categoryInUrl = '{{ route('chart.category.category-income', [accountIds, categoryIds, start.format('Ymd'), end.format('Ymd')]) }}';- var budgetsOutUrl = '{{ route('chart.category.budget-expense', [accountIds, categoryIds, start.format('Ymd'), end.format('Ymd')]) }}';- var sourceOutUrl = '{{ route('chart.category.source-expense', [accountIds, categoryIds, start.format('Ymd'), end.format('Ymd')]) }}';- var sourceInUrl = '{{ route('chart.category.source-income', [accountIds, categoryIds, start.format('Ymd'), end.format('Ymd')]) }}';- var destOutUrl = '{{ route('chart.category.dest-expense', [accountIds, categoryIds, start.format('Ymd'), end.format('Ymd')]) }}';- var destInUrl = '{{ route('chart.category.dest-income', [accountIds, categoryIds, start.format('Ymd'), end.format('Ymd')]) }}';+ var categoryOutUrl = '{{ route('chart.category.category-expense', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var categoryInUrl = '{{ route('chart.category.category-income', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var budgetsOutUrl = '{{ route('chart.category.budget-expense', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var sourceOutUrl = '{{ route('chart.category.source-expense', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var sourceInUrl = '{{ route('chart.category.source-income', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var destOutUrl = '{{ route('chart.category.dest-expense', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var destInUrl = '{{ route('chart.category.dest-income', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';- var avgExpensesUrl = '{{ route('report-data.category.avg-expenses', [accountIds, categoryIds, start.format('Ymd'), end.format('Ymd')]) }}';- var topExpensesUrl = '{{ route('report-data.category.top-expenses', [accountIds, categoryIds, start.format('Ymd'), end.format('Ymd')]) }}';- var avgIncomeUrl = '{{ route('report-data.category.avg-income', [accountIds, categoryIds, start.format('Ymd'), end.format('Ymd')]) }}';- var topIncomeUrl = '{{ route('report-data.category.top-income', [accountIds, categoryIds, start.format('Ymd'), end.format('Ymd')]) }}';+ var avgExpensesUrl = '{{ route('report-data.category.avg-expenses', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var topExpensesUrl = '{{ route('report-data.category.top-expenses', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var avgIncomeUrl = '{{ route('report-data.category.avg-income', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var topIncomeUrl = '{{ route('report-data.category.top-income', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';</script><script type="text/javascript" src="v1/js/ff/reports/category/month.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>diff --git a/resources/views/reports/default/month.twig b/resources/views/reports/default/month.twigindex fec12ef7bd..b6c1f712cb 100644--- a/resources/views/reports/default/month.twig+++ b/resources/views/reports/default/month.twig@@ -167,25 +167,25 @@<script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script><script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script><script type="text/javascript" nonce="{{ $JS_NONCE }}">- var year = {{ start.year }};- var month = {{ start.month }};+ var year = {{ $start->year }};+ var month = {{ $start->month }};// to report another URL:- var startDate = '{{ start.format('Ymd') }}';- var endDate = '{{ end.format('Ymd') }}';+ var startDate = '{{ $start->format('Ymd') }}';+ var endDate = '{{ $end->format('Ymd') }}';var reportType = '{{ reportType }}';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')]) }}';- var budgetReportUrl = '{{ route('report-data.budget.general', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';- var balanceReportUrl = '{{ route('report-data.balance.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 billReportUrl = '{{ route('report-data.bills.overview', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';+ 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')]) }}';+ var budgetReportUrl = '{{ route('report-data.budget.general', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var balanceReportUrl = '{{ route('report-data.balance.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 billReportUrl = '{{ route('report-data.bills.overview', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';- var accountChartUrl = '{{ route('chart.account.report', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';+ var accountChartUrl = '{{ route('chart.account.report', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';</script><script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>diff --git a/resources/views/reports/default/multi-year.twig b/resources/views/reports/default/multi-year.twigindex cef2ba80c6..7571d62ffe 100644--- a/resources/views/reports/default/multi-year.twig+++ b/resources/views/reports/default/multi-year.twig@@ -208,25 +208,25 @@<script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script><script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script><script type="text/javascript" nonce="{{ $JS_NONCE }}">- var year = {{ start.year }};- var month = {{ start.month }};+ var year = {{ $start->year }};+ var month = {{ $start->month }};// to report another URL:- var startDate = '{{ start.format('Ymd') }}';- var endDate = '{{ end.format('Ymd') }}';+ var startDate = '{{ $start->format('Ymd') }}';+ var endDate = '{{ $end->format('Ymd') }}';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 = '';</script>diff --git a/resources/views/reports/default/year.twig b/resources/views/reports/default/year.twigindex 38ec774626..7ed6dd2e8b 100644--- a/resources/views/reports/default/year.twig+++ b/resources/views/reports/default/year.twig@@ -203,24 +203,24 @@<script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script><script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script><script type="text/javascript" nonce="{{ $JS_NONCE }}">- var year = '{{ start.year }}';+ var year = '{{ $start->year }}';// to report another URL:- var startDate = '{{ start.format('Ymd') }}';- var endDate = '{{ end.format('Ymd') }}';+ var startDate = '{{ $start->format('Ymd') }}';+ var endDate = '{{ $end->format('Ymd') }}';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 = '';</script>diff --git a/resources/views/reports/double/report.twig b/resources/views/reports/double/report.twigindex 4c714d1565..cc7f601a4a 100644--- a/resources/views/reports/double/report.twig+++ b/resources/views/reports/double/report.twig@@ -126,7 +126,7 @@</div><div class="card-body"><canvas class="main_double_canvas"- data-url="{{ route('chart.double.main', [accountIds, account.id, start.format('Ymd'), end.format('Ymd')]) }}"+ data-url="{{ route('chart.double.main', [accountIds, account.id, $start->format('Ymd'), $end->format('Ymd')]) }}"id="in-out-chart-{{ account.id }}" class="wide-chart" height="400" width="100%"></canvas></div></div>@@ -211,27 +211,27 @@<script type="text/javascript" nonce="{{ $JS_NONCE }}">// to report another URL:- var startDate = '{{ start.format('Ymd') }}';- var endDate = '{{ end.format('Ymd') }}';+ var startDate = '{{ $start->format('Ymd') }}';+ var endDate = '{{ $end->format('Ymd') }}';var accountIds = '{{ accountIds }}';var doubleIds = '{{ doubleIds }}';// html blocks.- var opsAccountsUrl = '{{ route('report-data.double.operations', [accountIds, doubleIds, start.format('Ymd'), end.format('Ymd')]) }}';- var opsAccountsAssetUrl = '{{ route('report-data.double.ops-asset', [accountIds, doubleIds, start.format('Ymd'), end.format('Ymd')]) }}';+ var opsAccountsUrl = '{{ route('report-data.double.operations', [accountIds, doubleIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var opsAccountsAssetUrl = '{{ route('report-data.double.ops-asset', [accountIds, doubleIds, $start->format('Ymd'), $end->format('Ymd')]) }}';// pie charts:- var categoryOutUrl = '{{ route('chart.double.category-expense', [accountIds, doubleIds, start.format('Ymd'), end.format('Ymd')]) }}';- var categoryInUrl = '{{ route('chart.double.category-income', [accountIds, doubleIds, start.format('Ymd'), end.format('Ymd')]) }}';- var budgetsOutUrl = '{{ route('chart.double.budget-expense', [accountIds, doubleIds, start.format('Ymd'), end.format('Ymd')]) }}';- var tagOutUrl = '{{ route('chart.double.tag-expense', [accountIds, doubleIds, start.format('Ymd'), end.format('Ymd')]) }}';- var tagInUrl = '{{ route('chart.double.tag-income', [accountIds, doubleIds, start.format('Ymd'), end.format('Ymd')]) }}';-- var avgExpensesUrl = '{{ route('report-data.double.avg-expenses', [accountIds, doubleIds, start.format('Ymd'), end.format('Ymd')]) }}';- var topExpensesUrl = '{{ route('report-data.double.top-expenses', [accountIds, doubleIds, start.format('Ymd'), end.format('Ymd')]) }}';- var avgIncomeUrl = '{{ route('report-data.double.avg-income', [accountIds, doubleIds, start.format('Ymd'), end.format('Ymd')]) }}';- var topIncomeUrl = '{{ route('report-data.double.top-income', [accountIds, doubleIds, start.format('Ymd'), end.format('Ymd')]) }}';+ var categoryOutUrl = '{{ route('chart.double.category-expense', [accountIds, doubleIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var categoryInUrl = '{{ route('chart.double.category-income', [accountIds, doubleIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var budgetsOutUrl = '{{ route('chart.double.budget-expense', [accountIds, doubleIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var tagOutUrl = '{{ route('chart.double.tag-expense', [accountIds, doubleIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var tagInUrl = '{{ route('chart.double.tag-income', [accountIds, doubleIds, $start->format('Ymd'), $end->format('Ymd')]) }}';++ var avgExpensesUrl = '{{ route('report-data.double.avg-expenses', [accountIds, doubleIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var topExpensesUrl = '{{ route('report-data.double.top-expenses', [accountIds, doubleIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var avgIncomeUrl = '{{ route('report-data.double.avg-income', [accountIds, doubleIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var topIncomeUrl = '{{ route('report-data.double.top-income', [accountIds, doubleIds, $start->format('Ymd'), $end->format('Ymd')]) }}';</script><script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>diff --git a/resources/views/reports/tag/month.twig b/resources/views/reports/tag/month.twigindex 245b6ea152..8e3515cc94 100644--- a/resources/views/reports/tag/month.twig+++ b/resources/views/reports/tag/month.twig@@ -181,7 +181,7 @@</div><div class="card-body"><canvas class="main_tag_canvas"- data-url="{{ route('chart.tag.main', [accountIds, tag.id, start.format('Ymd'), end.format('Ymd')]) }}"+ data-url="{{ route('chart.tag.main', [accountIds, tag.id, $start->format('Ymd'), $end->format('Ymd')]) }}"id="in-out-chart-{{ tag.id }}" class="wide-chart" height="400" width="100%"></canvas></div><div class="card-footer">@@ -267,31 +267,31 @@<script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script><script type="text/javascript" nonce="{{ $JS_NONCE }}">// to report another URL:- var startDate = '{{ start.format('Ymd') }}';- var endDate = '{{ end.format('Ymd') }}';+ var startDate = '{{ $start->format('Ymd') }}';+ var endDate = '{{ $end->format('Ymd') }}';var accountIds = '{{ accountIds }}';var tagIds = '{{ tagIds }}';- var accountsUrl = '{{ route('report-data.tag.accounts', [accountIds, tagIds, start.format('Ymd'), end.format('Ymd')]) }}';- var tagsUrl = '{{ route('report-data.tag.tags', [accountIds, tagIds, start.format('Ymd'), end.format('Ymd')]) }}';- var accountPerTagUrl = '{{ route('report-data.tag.account-per-tag', [accountIds, tagIds, start.format('Ymd'), end.format('Ymd')]) }}';+ var accountsUrl = '{{ route('report-data.tag.accounts', [accountIds, tagIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var tagsUrl = '{{ route('report-data.tag.tags', [accountIds, tagIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var accountPerTagUrl = '{{ route('report-data.tag.account-per-tag', [accountIds, tagIds, $start->format('Ymd'), $end->format('Ymd')]) }}';// pie charts:- var tagOutUrl = '{{ route('chart.tag.tag-expense', [accountIds, tagIds, start.format('Ymd'), end.format('Ymd')]) }}';- var tagInUrl = '{{ route('chart.tag.tag-income', [accountIds, tagIds, start.format('Ymd'), end.format('Ymd')]) }}';- var categoryOutUrl = '{{ route('chart.tag.category-expense', [accountIds, tagIds, start.format('Ymd'), end.format('Ymd')]) }}';- var categoryInUrl = '{{ route('chart.tag.category-income', [accountIds, tagIds, start.format('Ymd'), end.format('Ymd')]) }}';- var budgetsOutUrl = '{{ route('chart.tag.budget-expense', [accountIds, tagIds, start.format('Ymd'), end.format('Ymd')]) }}';- var sourceOutUrl = '{{ route('chart.tag.source-expense', [accountIds, tagIds, start.format('Ymd'), end.format('Ymd')]) }}';- var sourceInUrl = '{{ route('chart.tag.source-income', [accountIds, tagIds, start.format('Ymd'), end.format('Ymd')]) }}';- var destOutUrl = '{{ route('chart.tag.dest-expense', [accountIds, tagIds, start.format('Ymd'), end.format('Ymd')]) }}';- var destInUrl = '{{ route('chart.tag.dest-income', [accountIds, tagIds, start.format('Ymd'), end.format('Ymd')]) }}';+ var tagOutUrl = '{{ route('chart.tag.tag-expense', [accountIds, tagIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var tagInUrl = '{{ route('chart.tag.tag-income', [accountIds, tagIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var categoryOutUrl = '{{ route('chart.tag.category-expense', [accountIds, tagIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var categoryInUrl = '{{ route('chart.tag.category-income', [accountIds, tagIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var budgetsOutUrl = '{{ route('chart.tag.budget-expense', [accountIds, tagIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var sourceOutUrl = '{{ route('chart.tag.source-expense', [accountIds, tagIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var sourceInUrl = '{{ route('chart.tag.source-income', [accountIds, tagIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var destOutUrl = '{{ route('chart.tag.dest-expense', [accountIds, tagIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var destInUrl = '{{ route('chart.tag.dest-income', [accountIds, tagIds, $start->format('Ymd'), $end->format('Ymd')]) }}';- var avgExpensesUrl = '{{ route('report-data.tag.avg-expenses', [accountIds, tagIds, start.format('Ymd'), end.format('Ymd')]) }}';- var topExpensesUrl = '{{ route('report-data.tag.top-expenses', [accountIds, tagIds, start.format('Ymd'), end.format('Ymd')]) }}';- var avgIncomeUrl = '{{ route('report-data.tag.avg-income', [accountIds, tagIds, start.format('Ymd'), end.format('Ymd')]) }}';- var topIncomeUrl = '{{ route('report-data.tag.top-income', [accountIds, tagIds, start.format('Ymd'), end.format('Ymd')]) }}';+ var avgExpensesUrl = '{{ route('report-data.tag.avg-expenses', [accountIds, tagIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var topExpensesUrl = '{{ route('report-data.tag.top-expenses', [accountIds, tagIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var avgIncomeUrl = '{{ route('report-data.tag.avg-income', [accountIds, tagIds, $start->format('Ymd'), $end->format('Ymd')]) }}';+ var topIncomeUrl = '{{ route('report-data.tag.top-income', [accountIds, tagIds, $start->format('Ymd'), $end->format('Ymd')]) }}';</script><script type="text/javascript" src="v1/js/ff/reports/tag/month.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>diff --git a/resources/views/rules/partials/test-trigger-modal.twig b/resources/views/rules/partials/test-trigger-modal.twigindex 2631a1af34..9dcb94a540 100644--- a/resources/views/rules/partials/test-trigger-modal.twig+++ b/resources/views/rules/partials/test-trigger-modal.twig@@ -14,7 +14,7 @@</div></div><div class="modal-footer">- <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ 'close'|_ }}</button>+ <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ __('firefly.close') }}</button></div></div></div>diff --git a/resources/views/transactions/links/modal.twig b/resources/views/transactions/links/modal.twigindex f3565f013c..3c9b0af826 100644--- a/resources/views/transactions/links/modal.twig+++ b/resources/views/transactions/links/modal.twig@@ -44,7 +44,7 @@</div><div class="modal-footer">- <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ 'close'|_ }}</button>+ <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{ __('firefly.close') }}</button><button type="submit" class="btn btn-primary">{{ 'submit'|_ }}</button></div></div>diff --git a/resources/views/transactions/old-index.twig b/resources/views/transactions/old-index.twigindex c32a2f35a0..27b45c8349 100644--- a/resources/views/transactions/old-index.twig+++ b/resources/views/transactions/old-index.twig@@ -125,10 +125,10 @@<script type="text/javascript" nonce="{{ $JS_NONCE }}">var showAll = @if(count($periods) > 0)false@elsetrue@endif;- var categoryChartUrl = '{{ route('chart.transactions.categories', [objectType, start.format('Y-m-d'), end.format('Y-m-d')]) }}';- var budgetChartUrl = '{{ route('chart.transactions.budgets', [start.format('Y-m-d'), end.format('Y-m-d')]) }}';- var destinationChartUrl = '{{ route('chart.transactions.destinationAccounts', [objectType, start.format('Y-m-d'), end.format('Y-m-d')]) }}';- var sourceChartUrl = '{{ route('chart.transactions.sourceAccounts', [objectType, start.format('Y-m-d'), end.format('Y-m-d')]) }}';+ var categoryChartUrl = '{{ route('chart.transactions.categories', [objectType, $start->format('Y-m-d'), $end->format('Y-m-d')]) }}';+ var budgetChartUrl = '{{ route('chart.transactions.budgets', [start.format('Y-m-d'), $end->format('Y-m-d')]) }}';+ var destinationChartUrl = '{{ route('chart.transactions.destinationAccounts', [objectType, $start->format('Y-m-d'), $end->format('Y-m-d')]) }}';+ var sourceChartUrl = '{{ route('chart.transactions.sourceAccounts', [objectType, $start->format('Y-m-d'), $end->format('Y-m-d')]) }}';</script><script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>