Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
New stuff
Sander Dorigo422762fb3e32
diff --git a/resources/views/bills/show.blade.php b/resources/views/bills/show.blade.phpindex b89801133c..5b1f25537b 100644--- a/resources/views/bills/show.blade.php+++ b/resources/views/bills/show.blade.php@@ -172,7 +172,7 @@<h3 class="card-title">{{ __('firefly.connected_journals') }}</h3></div><div class="card-body">- {% include 'list.groups' %}+ <x-lists.groups-large :groups="$groups" /></div></div></div>diff --git a/resources/views/budgets/create.twig b/resources/views/budgets/create.blade.phpsimilarity index 83%rename from resources/views/budgets/create.twigrename to resources/views/budgets/create.blade.phpindex 9fefd1372c..2c8466effd 100644--- a/resources/views/budgets/create.twig+++ b/resources/views/budgets/create.blade.php@@ -1,11 +1,5 @@@extends('layout.v3.session')--- {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}-@endsection-@section('content')-<form method="POST" action="{{ route('budgets.store') }}" accept-charset="UTF-8" class="form-horizontal" id="store" enctype="multipart/form-data"><input name="_token" type="hidden" value="{{ csrf_token() }}"><input name="active" type="hidden" value="1">@@ -17,7 +11,7 @@<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3></div><div class="card-body">- {!! ExpandedForm::text('name') }}+ {!! ExpandedForm::text('name') !!}</div></div></div>@@ -28,11 +22,11 @@<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3></div><div class="card-body">- {!! ExpandedForm::select('auto_budget_type', autoBudgetTypes,null, {helpText: trans('firefly.auto_budget_help')}) }}- {!! CurrencyForm::currencyList('auto_budget_currency_id') }}- {!! ExpandedForm::amountNoCurrency('auto_budget_amount') }}- {!! ExpandedForm::select('auto_budget_period', autoBudgetPeriods, null) }}- {!! ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}+ {!! ExpandedForm::select('auto_budget_type', $autoBudgetTypes,null, ['helpText' => trans('firefly.auto_budget_help')]) !!}+ {!! CurrencyForm::currencyList('auto_budget_currency_id') !!}+ {!! ExpandedForm::amountNoCurrency('auto_budget_amount') !!}+ {!! ExpandedForm::select('auto_budget_period', $autoBudgetPeriods, null) !!}+ {!! ExpandedForm::file('attachments[]', ['multiple' => 'multiple','helpText' => trans('firefly.upload_max_file_size', ['size' => print_nice_filesize($uploadSize)])]) !!}</div></div></div>@@ -45,13 +39,12 @@<h3 class="card-title">{{ __('firefly.options') }}</h3></div><div class="card-body">- {!! ExpandedForm::optionsList('create','budget') }}+ {!! ExpandedForm::optionsList('create','budget') !!}</div><div class="card-footer">- <button type="submit" class="btn text-end btn-success">{{ 'store_new_budget'|_ }}</button>+ <button type="submit" class="btn text-end btn-success">{{ __('firefly.store_new_budget') }}</button></div></div>-</div></div>@@ -60,5 +53,6 @@@endsection@section('scripts')+ @vite(['js/pages/generic.js'])<script type="text/javascript" src="v1/js/ff/budgets/create.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/budgets/delete.twig b/resources/views/budgets/delete.blade.phpsimilarity index 70%rename from resources/views/budgets/delete.twigrename to resources/views/budgets/delete.blade.phpindex 54a2bb999f..917efe10d9 100644--- a/resources/views/budgets/delete.twig+++ b/resources/views/budgets/delete.blade.php@@ -1,19 +1,12 @@@extends('layout.v3.session')--- {{ Breadcrumbs.render(Route.getCurrentRoute.getName, budget) }}-@endsection-@section('content')-- <form method="POST" action="{{ route('budgets.destroy',budget.id) }}" accept-charset="UTF-8" class="form-horizontal" id="destroy">+ <form method="POST" action="{{ route('budgets.destroy',$budget->id) }}" accept-charset="UTF-8" class="form-horizontal" id="destroy"><input name="_token" type="hidden" value="{{ csrf_token() }}">-<div class="row"><div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12"><div class="card card-danger card-outline"><div class="card-header">- <h3 class="card-title">{{ trans('form.delete_budget', {'name': budget.name}) }}</h3>+ <h3 class="card-title">{{ trans('form.delete_budget', ['name' => $budget->name]) }}</h3></div><div class="card-body"><p class="text-danger">@@ -21,12 +14,12 @@</p><p>- {{ trans('form.budget_areYouSure', {'name': budget.name}) }}+ {{ trans('form.budget_areYouSure', ['name' => $budget->name]) }}</p><p>- {% if budget.transactionjournals.count() > 0 %}- {{ Lang::choice('form.budget_keep_transactions', budget.transactionjournals.count(), {count: budget.transactionjournals.count() }) }}+ @if($budget->transactionjournals->count() > 0)+ {{ Lang::choice('form.budget_keep_transactions', $budget->transactionjournals->count(), ['count' => $budget->transactionjournals->count()]) }}@endif</p>diff --git a/resources/views/budgets/edit.twig b/resources/views/budgets/edit.blade.phpsimilarity index 70%rename from resources/views/budgets/edit.twigrename to resources/views/budgets/edit.blade.phpindex e039672e74..51306119a6 100644--- a/resources/views/budgets/edit.twig+++ b/resources/views/budgets/edit.blade.php@@ -1,14 +1,9 @@@extends('layout.v3.session')--- {{ Breadcrumbs.render(Route.getCurrentRoute.getName, budget) }}-@endsection-@section('content')- <form method="post" action="{{ route('budgets.update',budget.id) }}" class="form-horizontal" accept-charset="UTF-8"+ <form method="post" action="{{ route('budgets.update',$budget->id) }}" class="form-horizontal" accept-charset="UTF-8"enctype="multipart/form-data"><input type="hidden" name="_token" value="{{ csrf_token() }}"/>- <input type="hidden" name="id" value="{{ budget.id }}"/>+ <input type="hidden" name="id" value="{{ $budget->id }}"/><div class="row"><div class="col-lg-6 col-md-6 col-sm-12 col-xs-12"><div class="card">@@ -16,9 +11,8 @@<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3></div><div class="card-body">- {{-- only correct way to do active checkbox --}}- {!! ExpandedForm::checkbox('active', 1) }}- {!! ExpandedForm::text('name', budget.name) }}+ {!! ExpandedForm::checkbox('active', 1) !!}+ {!! ExpandedForm::text('name', $budget->name) !!}</div></div>@@ -30,12 +24,12 @@<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3></div><div class="card-body">- {!! ExpandedForm::select('auto_budget_type', autoBudgetTypes, autoBudget.auto_budget_type) }}- {!! CurrencyForm::currencyList('auto_budget_currency_id', autoBudget.transaction_currency_id) }}- {!! ExpandedForm::amountNoCurrency('auto_budget_amount', preFilled.auto_budget_amount) }}- {!! ExpandedForm::select('auto_budget_period', autoBudgetPeriods, autoBudget.period) }}- {!! ExpandedForm::textarea('notes',preFilled.notes,{helpText: trans('firefly.field_supports_markdown')}) }}- {!! ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}+ {!! ExpandedForm::select('auto_budget_type', $autoBudgetTypes, $autoBudget?->auto_budget_type) !!}+ {!! CurrencyForm::currencyList('auto_budget_currency_id', $autoBudget?->transaction_currency_id) !!}+ {!! ExpandedForm::amountNoCurrency('auto_budget_amount', $preFilled['auto_budget_amount'] ?? '') !!}+ {!! ExpandedForm::select('auto_budget_period', $autoBudgetPeriods, $autoBudget?->period) !!}+ {!! ExpandedForm::textarea('notes',$preFilled['notes'],['helpText' => trans('firefly.field_supports_markdown')]) !!}+ {!! ExpandedForm::file('attachments[]', ['multiple' => 'multiple','helpText' => trans('firefly.upload_max_file_size', ['size' => print_nice_filesize($uploadSize)])]) !!}</div></div></div>@@ -48,10 +42,10 @@<h3 class="card-title">{{ __('firefly.options') }}</h3></div><div class="card-body">- {!! ExpandedForm::optionsList('update','budget') }}+ {!! ExpandedForm::optionsList('update','budget') !!}</div><div class="card-footer">- <button type="submit" class="btn text-end btn-success">{{ 'update_budget'|_ }}</button>+ <button type="submit" class="btn text-end btn-success">{{ __('firefly.update_budget') }}</button></div></div></div>@@ -61,5 +55,6 @@@endsection@section('scripts')+ @vite(['js/pages/generic.js'])<script type="text/javascript" src="v1/js/ff/budgets/edit.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/budgets/no-budget.twig b/resources/views/budgets/no-budget.blade.phpsimilarity index 58%rename from resources/views/budgets/no-budget.twigrename to resources/views/budgets/no-budget.blade.phpindex 4fd0c77b00..a74736baae 100644--- a/resources/views/budgets/no-budget.twig+++ b/resources/views/budgets/no-budget.blade.php@@ -1,36 +1,31 @@@extends('layout.v3.session')--- {{ Breadcrumbs.render(Route.getCurrentRoute.getName, start, end) }}-@endsection-@section('content'){{-- upper show-all instruction --}}- @if(count($periods) > 0)+ @if(null !== ($periods ?? null) && count($periods) > 0)<div class="row">- <div class="col-lg-offset-9 col-lg-3 col-md-offset-9 col-md-3 col-sm-12 col-xs-12">- <p class="small text-center"><a href="{{ route('budgets.no-budget',['all']) }}">{{ 'showEverything'|_ }}</a></p>+ <div class="offset-lg-9 offset-lg-9 col-lg-3 offset-md-9 col-md-3 col-sm-12 col-xs-12">+ <p class="small text-center"><a href="{{ route('budgets.no-budget',['all']) }}">{{ __('firefly.showEverything') }}</a></p></div></div>@endif<div class="row">- <div class="@if(count($periods) > 0)col-lg-9 col-md-9 col-sm-12@elsecol-lg-12 col-md-12 col-sm-12@endif">+ <div class="@if(null !== ($periods ?? null) && count($periods) > 0)col-lg-9 col-md-9 col-sm-12 @else col-lg-12 col-md-12 col-sm-12 @endif "><div class="card"><div class="card-header">- <h3 class="card-title">{{ subTitle }}</h3>+ <h3 class="card-title">{{ $subTitle }}</h3></div><div class="box-body ">- @if(count($periods) > 0)- {% include 'list.groups' %}+ @if(null !== ($periods ?? null) && count($periods) > 0)+ <x-lists.groups-large :groups="$groups" /><p><span class="bi bi-calendar"></span><a href="{{ route('budgets.no-budget-all') }}">{{ __('firefly.show_all_no_filter') }}</a></p>@else- {% include 'list.groups' %}+ <x-lists.groups-large :groups="$groups" /><p><span class="bi bi-calendar"></span><a href="{{ route('budgets.no-budget') }}">{{ __('firefly.show_the_current_period_and_overview') }}</a>@@ -40,25 +35,26 @@</div></div>- @if(count($periods) > 0)+ @if(null !== ($periods ?? null) && count($periods) > 0)<div class="col-lg-3 col-md-3 col-sm-12 col-xs-12">- {% include 'list.periods' %}+ <x-lists.periods :periods="$periods" /></div>@endif</div>{{-- lower show-all instruction --}}- @if(count($periods) > 0)+ @if(null !== ($periods ?? null) && count($periods) > 0)<div class="row">- <div class="col-lg-offset-9 col-lg-3 col-md-offset-9 col-md-3 col-sm-12 col-xs-12">- <p class="small text-center"><a href="{{ route('budgets.no-budget-all') }}">{{ 'showEverything'|_ }}</a></p>+ <div class="offset-lg-9 col-lg-3 offset-md-9 col-md-3 col-sm-12 col-xs-12">+ <p class="small text-center"><a href="{{ route('budgets.no-budget-all') }}">{{ __('firefly.showEverything') }}</a></p></div></div>@endif@endsection@section('scripts')+ @vite(['js/pages/generic.js']){{-- required for groups.twig --}}<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/budgets/show.blade.php b/resources/views/budgets/show.blade.phpnew file mode 100644index 0000000000..7176c7da8b--- /dev/null+++ b/resources/views/budgets/show.blade.php@@ -0,0 +1,245 @@+@extends('layout.v3.session')+@section('content')+ <div class="row">+ <div class="@if($attachments->count() == 0)col-lg-12 col-md-12 col-sm-12 col-xs-12 @else col-lg-8 col-md-6 col-sm-12 col-xs-12 @endif ">+ <div class="card mb-2">+ <div class="card-header">+ <div class="row">+ <div class="col-9">+ <h3 class="card-title">+ @if(null !== ($budgetLimit ?? null))+ {{ trans('firefly.chart_budget_in_period', ['name' => $budget->name, 'start' => $budgetLimit->start_date->isoFormat($monthAndDayFormat), 'end' => $budgetLimit->end_date->isoFormat($monthAndDayFormat), 'currency' => $budgetLimit->transactionCurrency->name]) }}+ @else+ {{ trans('firefly.chart_all_journals_for_budget', ['name' => $budget->name]) }}+ @endif+ </h3>+ </div>+ <div class="col text-end">+ <button class="btn btn-sm btn-secondary-outline dropdown-toggle" type="button" id="card_header_menu" data-bs-toggle="dropdown" aria-expanded="false">+ <span class="bi bi-list"></span>+ </button>+ <ul class="dropdown-menu" aria-labelledby="card_header_menu">+ <li><a class="dropdown-item" href="{{ route('budgets.edit',$budget->id) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>+ <li><a class="dropdown-item" href="{{ route('budgets.delete',$budget->id) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>+ </ul>+ </div>+ </div>+ </div>+ <div class="card-body">+ <canvas id="budgetOverview" class="wide-chart" height="400" width="100%"></canvas>+ </div>+ @if(null !== ($budgetLimit ?? null))+ <div class="card-footer">+ <p class="text-muted">+ {{ trans('firefly.chart_budget_in_period_only_currency', ['currency' => $budgetLimit->transactionCurrency->name]) }}+ </p>+ </div>+ @endif+ </div>+ </div>+ @if($attachments->count() > 0)+ <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">+ <div class="card mb-2">+ <div class="card-header">+ <h3 class="card-title">+ {{ __('firefly.attachments') }}+ </h3>+ </div>+ <div class="card-body p-0">+ {% include 'list.attachments' %}+ </div>+ </div>+ </div>+ @endif+ </div>+ <div class="row">+ <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">+ <div class="card mb-2">+ <div class="card-header">+ <h3 class="card-title">{{ __('firefly.expenses_by_category') }}</h3>+ </div>+ <div class="card-body">+ <div class="center-chart">+ <canvas id="budget-cat-out" class="medium-chart" height="250"></canvas>+ </div>+ </div>+ @if(null !== ($budgetLimit ?? null))+ <div class="card-footer">+ <p class="text-muted">+ {{ trans('firefly.chart_budget_in_period_only_currency', ['currency' => $budgetLimit->transactionCurrency->name]) }}+ </p>+ </div>+ @endif+ </div>+ </div>+ <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">+ <div class="card mb-2">+ <div class="card-header">+ <h3 class="card-title">{{ __('firefly.expenses_by_asset_account') }}</h3>+ </div>+ <div class="card-body">+ <div class="center-chart">+ <canvas id="budget-asset-out" class="medium-chart" height="250"></canvas>+ </div>+ </div>+ @if(null !== ($budgetLimit ?? null))+ <div class="card-footer">+ <p class="text-muted">+ {{ trans('firefly.chart_budget_in_period_only_currency', ['currency' => $budgetLimit->transactionCurrency->name]) }}+ </p>+ </div>+ @endif+ </div>+ </div>+ <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">+ <div class="card mb-2">+ <div class="card-header">+ <h3 class="card-title">{{ __('firefly.expenses_by_expense_account') }}</h3>+ </div>+ <div class="card-body">+ <div class="center-chart">+ <canvas id="budget-expense-out" class="medium-chart" height="250"></canvas>+ </div>+ </div>+ @if(null !== ($budgetLimit ?? null))+ <div class="card-footer">+ <p class="text-muted">+ {{ trans('firefly.chart_budget_in_period_only_currency', ['currency' => $budgetLimit->transactionCurrency->name]) }}+ </p>+ </div>+ @endif+ </div>+ </div>+ </div>+ @if(count($limits) > 0)+ <div class="row">+ <div class="offset-lg-9 col-lg-3 offset-md-9 col-md-3 col-sm-12 col-xs-12">+ <p class="small text-center"><a href="{{ route('budgets.show',$budget->id) }}">{{ __('firefly.showEverything') }}</a></p>+ </div>+ </div>+ @endif++ <div class="row">+ <div class="@if(count($limits) > 0) col-lg-9 col-md-9 col-sm-12 col-xs-12 @else col-lg-12 col-md-12 col-sm-12 col-xs-12 @endif ">++ <div class="card mb-2">+ <div class="card-header">+ <h3 class="card-title">{{ __('firefly.transactions') }}</h3>+ </div>+ <div class="card-body">+ <x-lists.groups-large :groups="$groups" />+ @if(null !== ($budgetLimit ?? null))+ <p>+ <span class="bi bi-calendar"></span>+ <a href="{{ route('budgets.show', [$budget->id]) }}">+ {{ __('firefly.show_all_no_filter') }}+ </a>+ </p>+ @endif+ </div>+ </div>+ </div>+ @if(count($limits) > 0)+ <div class="col-lg-3 col-md-3 col-sm-12 col-xs-12">+ @foreach($limits as $limit)+ <div class="card @if($limit->start_date == $budgetLimit->start_date) card-primary card-outline @endif">+ <div class="card-header">+ <h3 class="card-title"><a href="{{ route('budgets.show.limit',[$budget->id,$limit->id]) }}">{{ $limit->start_date->isoFormat($monthAndDayFormat) }} —{{ $limit->end_date->isoFormat($monthAndDayFormat) }}+ </a>+ </h3>+ </div>+ <div class="card-body p-0">+ <table class="table table-hover">+ <tr>+ <td class="third">{{ __('firefly.amount') }}</td>+ <td>+ {!! format_amount_by_symbol($limit->amount, $limit->transactionCurrency->symbol, $limit->transactionCurrency->decimal_places) !!}+ @if($convertToPrimary && null !== $limit->native_amount)+ ({!! format_amount_by_symbol($limit->native_amount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})+ @endif+ </td>+ </tr>+ <tr>+ <td class="third">{{ __('firefly.spent') }}</td>+ <td>+ @if($convertToPrimary)+ {!! format_amount_by_symbol($limit->spent, $limit->transactionCurrency->symbol, $limit->transactionCurrency->decimal_places) !!}+ @if($limit->pc_spent)+ ({!! format_amount_by_symbol($limit->pc_spent, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})+ @endif+ @else+ {!! format_amount_by_symbol($limit->spent, $limit->transactionCurrency->symbol, $limit->transactionCurrency->decimal_places) !!}+ @endif+ </td>+ </tr>+ @if(0 !== bccomp('0', $limit->spent))+ <tr>+ <td colspan="2">+ @php+ $overspent = $limit->amount + $limit->spent < 0;+ @endphp+ @if($overspent)+ @php+ // must have -1 here+ $pct = ($limit->spent != 0 ? ($limit->amount / ($limit->spent*-1))*100 : 0);+ @endphp++ <div class="progress progress-striped">+ <div class="progress-bar progress-bar-warning w-{{ round($pct) }}" role="progressbar" aria-valuenow="{{ round($pct) }}"+ aria-valuemin="0"+ aria-valuemax="100"></div>+ <div class="progress-bar progress-bar-danger w-{{ round(100-$pct) }}" role="progressbar" aria-valuenow="{{ round(100-$pct) }}"+ aria-valuemin="0" aria-valuemax="100"></div>+ </div>+ @else+ @php+ // must have -1 here+ $pct = ($limit->amount != 0 ? ((($limit->spent*-1) / $limit->amount)*100) : 0);+ @endphp++ <div class="progress progress-striped">+ <div class="progress-bar progress-bar-success w-{{ round($pct) }}" role="progressbar" aria-valuenow="{{ round($pct) }}"+ aria-valuemin="0"+ aria-valuemax="100"></div>+ </div>+ @endif+ </td>+ </tr>+ @endif+ </table>+ </div>+ </div>+ @endforeach+ <p class="small text-center"><a href="{{ route('budgets.show',$budget->id) }}">{{ __('firefly.showEverything') }}</a></p>+ </div>+ @endif+ </div>++@endsection+@section('scripts')+ @vite(['js/pages/generic.js'])+ <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ var budgetID = {{ $budget->id }};+ var budgetLimitID = 0;+ @if($budgetLimit?->id)+ budgetLimitID = {{ $budgetLimit->id }};+ var budgetChartUrl = '{{ route('chart.budget.budget-limit', [$budget->id, $budgetLimit->id] ) }}';+ var currencySymbol = '{{ $currencySymbol }}';+ var expenseCategoryUrl = '{{ route('chart.budget.expense-category', [$budget->id, $budgetLimit->id]) }}';+ var expenseAssetUrl = '{{ route('chart.budget.expense-asset', [$budget->id, $budgetLimit->id]) }}';+ var expenseExpenseUrl = '{{ route('chart.budget.expense-expense', [$budget->id, $budgetLimit->id]) }}';+ @else+ var budgetChartUrl = '{{ route('chart.budget.budget', [$budget->id] ) }}';+ var expenseCategoryUrl = '{{ route('chart.budget.expense-category', [$budget->id]) }}';+ var expenseAssetUrl = '{{ route('chart.budget.expense-asset', [$budget->id]) }}';+ var expenseExpenseUrl = '{{ route('chart.budget.expense-expense', [$budget->id]) }}';+ @endif+ </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>+ <script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/budgets/show.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ {{-- required for groups.twig --}}+ <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+@endsectiondiff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twigdeleted file mode 100644index 5b60ab9c47..0000000000--- a/resources/views/budgets/show.twig+++ /dev/null@@ -1,239 +0,0 @@-@extends('layout.v3.session')--- {{ Breadcrumbs.render(Route.getCurrentRoute.getName, budget, budgetLimit) }}-@endsection--@section('content')- <div class="row">- <div class="{% if attachments.count() == 0 %}col-lg-12 col-md-12 col-sm-12 col-xs-12@elsecol-lg-8 col-md-6 col-sm-12 col-xs-12@endif">- <div class="card">- <div class="card-header">- <h3 class="card-title">- {% if budgetLimit %}- {{ trans('firefly.chart_budget_in_period', {name: budget.name, start: budgetLimit.start_date.isoFormat($monthAndDayFormat), end: budgetLimit.end_date.isoFormat($monthAndDayFormat),currency: budgetLimit.transactionCurrency.name }) }}- @else- {{ trans('firefly.chart_all_journals_for_budget', {name:budget.name}) }}- @endif- </h3>- <div class="box-tools text-end">- <div class="btn-group">- <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="bi bi-list"></span></button>- <ul class="dropdown-menu" role="menu">- <li><a href="{{ route('budgets.edit',budget.id) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>- <li><a href="{{ route('budgets.delete',budget.id) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>- </ul>- </div>- </div>- </div>- <div class="card-body">- <canvas id="budgetOverview" class="wide-chart" height="400" width="100%"></canvas>- </div>- {% if budgetLimit %}- <div class="card-footer">- <p class="text-muted">- {{ trans('firefly.chart_budget_in_period_only_currency', {currency: budgetLimit.transactionCurrency.name}) }}- </p>- </div>- @endif- </div>- </div>- {% if attachments.count() > 0 %}- <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">- <div class="card">- <div class="card-header">- <h3 class="card-title">- {{ __('firefly.attachments') }}- </h3>- </div>- <div class="card-body p-0">- {% include 'list.attachments' %}- </div>- </div>- </div>- @endif- </div>- <div class="row">- <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">- <div class="card">- <div class="card-header">- <h3 class="card-title">{{ 'expenses_by_category'|_ }}</h3>- </div>- <div class="card-body">- <div class="center-chart">- <canvas id="budget-cat-out" class="medium-chart" height="250"></canvas>- </div>- </div>- {% if budgetLimit %}- <div class="card-footer">- <p class="text-muted">- {{ trans('firefly.chart_budget_in_period_only_currency', {currency: budgetLimit.transactionCurrency.name}) }}- </p>- </div>- @endif- </div>- </div>- <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">- <div class="card">- <div class="card-header">- <h3 class="card-title">{{ 'expenses_by_asset_account'|_ }}</h3>- </div>- <div class="card-body">- <div class="center-chart">- <canvas id="budget-asset-out" class="medium-chart" height="250"></canvas>- </div>- </div>- {% if budgetLimit %}- <div class="card-footer">- <p class="text-muted">- {{ trans('firefly.chart_budget_in_period_only_currency', {currency: budgetLimit.transactionCurrency.name}) }}- </p>- </div>- @endif- </div>- </div>- <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">- <div class="card">- <div class="card-header">- <h3 class="card-title">{{ 'expenses_by_expense_account'|_ }}</h3>- </div>- <div class="card-body">- <div class="center-chart">- <canvas id="budget-expense-out" class="medium-chart" height="250"></canvas>- </div>- </div>- {% if budgetLimit %}- <div class="card-footer">- <p class="text-muted">- {{ trans('firefly.chart_budget_in_period_only_currency', {currency: budgetLimit.transactionCurrency.name}) }}- </p>- </div>- @endif- </div>- </div>- </div>- {% if limits|length > 0 %}- <div class="row">- <div class="col-lg-offset-9 col-lg-3 col-md-offset-9 col-md-3 col-sm-12 col-xs-12">- <p class="small text-center"><a href="{{ route('budgets.show',budget.id) }}">{{ 'showEverything'|_ }}</a></p>- </div>- </div>- @endif-- <div class="row">- <div class="{% if limits|length > 0 %}col-lg-9 col-md-9 col-sm-12 col-xs-12@elsecol-lg-12 col-md-12 col-sm-12 col-xs-12@endif">-- <div class="card">- <div class="card-header">- <h3 class="card-title">{{ __('firefly.transactions') }}</h3>- </div>- <div class="card-body">- {% include 'list.groups' %}- {% if budgetLimit %}- <p>- <span class="bi bi-calendar"></span>- <a href="{{ route('budgets.show', [budget.id]) }}">- {{ __('firefly.show_all_no_filter') }}- </a>- </p>- @endif- </div>- </div>- </div>- {% if limits|length > 0 %}- <div class="col-lg-3 col-md-3 col-sm-12 col-xs-12">- {% for limit in limits %}- <div class="box {% if limit.start_date == budgetLimit.start_date %}box-primary box-solid@endif">- <div class="card-header">- <h3 class="card-title"><a- href="{{ route('budgets.show.limit',[budget.id,limit.id]) }}">- {{ limit.start_date.isoFormat($monthAndDayFormat) }} —- {{ limit.end_date.isoFormat($monthAndDayFormat) }}- </a>- </h3>- </div>- <div class="card-body p-0">- <table class="table table-hover">- <tr>- <td class="third">{{ 'amount'|_ }}</td>- <td>- {{ format_amount_by_symbol(limit.amount, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }}- {% if convertToPrimary and null != limit.native_amount %}- ({{ format_amount_by_symbol(limit.native_amount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})- @endif- </td>- </tr>- <tr>- <td class="third">{{ 'spent'|_ }}</td>- <td>- {% if convertToPrimary %}- {{ format_amount_by_symbol(limit.spent, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }}- {% if limit.pc_spent %}- ({{ format_amount_by_symbol(limit.pc_spent, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})- @endif- @else- {{ format_amount_by_symbol(limit.spent, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }}- @endif- </td>- </tr>- {% if 0 != bccomp('0', limit.spent) %}- <tr>- <td colspan="2">- {% set overspent = limit.amount + limit.spent < 0 %}-- {% if overspent %}- {% set pct = (limit.spent != 0 ? (limit.amount / (limit.spent*-1))*100 : 0) %} {{-- must have -1 here --}}- <div class="progress progress-striped">- <div class="progress-bar progress-bar-warning width-{{ pct|round }}" role="progressbar" aria-valuenow="{{ pct|round }}"- aria-valuemin="0"- aria-valuemax="100"></div>- <div class="progress-bar progress-bar-danger width-{{ 100-pct|round }}" role="progressbar" aria-valuenow="{{ (100-pct)|round }}"- aria-valuemin="0" aria-valuemax="100"></div>- </div>- @else- {% set pct = (limit.amount != 0 ? (((limit.spent*-1) / limit.amount)*100) : 0) %} {{-- must have -1 here --}}- <div class="progress progress-striped">- <div class="progress-bar progress-bar-success width-{{ pct|round }}" role="progressbar" aria-valuenow="{{ pct|round }}"- aria-valuemin="0"- aria-valuemax="100"></div>- </div>- @endif- </td>- </tr>- @endif- </table>- </div>- </div>- @endforeach- <p class="small text-center"><a href="{{ route('budgets.show',budget.id) }}">{{ 'showEverything'|_ }}</a></p>- </div>- @endif- </div>--@endsection-@section('scripts')- <script type="text/javascript" nonce="{{ $JS_NONCE }}">- var budgetID = {{ budget.id }};- var budgetLimitID = 0;- {% if budgetLimit.id %}- budgetLimitID = {{ budgetLimit.id }};- var budgetChartUrl = '{{ route('chart.budget.budget-limit', [budget.id, budgetLimit.id] ) }}';- var currencySymbol = '{{ currencySymbol }}';- var expenseCategoryUrl = '{{ route('chart.budget.expense-category', [budget.id, budgetLimit.id]) }}';- var expenseAssetUrl = '{{ route('chart.budget.expense-asset', [budget.id, budgetLimit.id]) }}';- var expenseExpenseUrl = '{{ route('chart.budget.expense-expense', [budget.id, budgetLimit.id]) }}';- @else- var budgetChartUrl = '{{ route('chart.budget.budget', [budget.id] ) }}';- var expenseCategoryUrl = '{{ route('chart.budget.expense-category', [budget.id]) }}';- var expenseAssetUrl = '{{ route('chart.budget.expense-asset', [budget.id]) }}';- var expenseExpenseUrl = '{{ route('chart.budget.expense-expense', [budget.id]) }}';- @endif- </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>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/budgets/show.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- {{-- required for groups.twig --}}- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>-@endsectiondiff --git a/resources/views/categories/no-category.twig b/resources/views/categories/no-category.twigindex de9fbdf6a6..0d8f65286d 100644--- a/resources/views/categories/no-category.twig+++ b/resources/views/categories/no-category.twig@@ -9,8 +9,8 @@{{-- upper show-all instruction --}}@if(count($periods) > 0)<div class="row">- <div class="col-lg-offset-10 col-lg-2 col-md-offset-9 col-md-3 col-sm-12 col-xs-12">- <p class="small text-center"><a href="{{ route('categories.no-category.all') }}">{{ 'showEverything'|_ }}</a></p>+ <div class="col-lg-offset-10 col-lg-2 offset-md-9 col-md-3 col-sm-12 col-xs-12">+ <p class="small text-center"><a href="{{ route('categories.no-category.all') }}">{{ __('firefly.showEverything') }}</a></p></div></div>@endif@@ -19,18 +19,18 @@<div class="@if(count($periods) > 0)col-lg-10 col-md-9 col-sm-12 col-xs-12@elsecol-lg-12 col-md-12 col-sm-12 col-xs-12@endif"><div class="card"><div class="card-header">- <h3 class="card-title">{{ subTitle }}</h3>+ <h3 class="card-title">{{ $subTitle }}</h3></div><div class="box-body ">@if(count($periods) > 0)- {% include 'list.groups' %}+ <x-lists.groups-large :groups="$groups" /><p><span class="bi bi-calendar"></span><a href="{{ route('categories.no-category.all') }}">{{ __('firefly.show_all_no_filter') }}</a></p>@else- {% include 'list.groups' %}+ <x-lists.groups-large :groups="$groups" /><p><span class="bi bi-calendar"></span><a href="{{ route('categories.no-category') }}">{{ __('firefly.show_the_current_period_and_overview') }}</a>@@ -42,7 +42,7 @@@if(count($periods) > 0)<div class="col-lg-2 col-md-4 col-sm-12 col-xs-12">- {% include 'list.periods' %}+ <x-lists.periods :periods="$periods" /></div>@endif@@ -51,8 +51,8 @@{{-- lower show-all instruction --}}@if(count($periods) > 0)<div class="row">- <div class="col-lg-offset-10 col-lg-2 col-md-offset-9 col-md-3 col-sm-12 col-xs-12">- <p class="small text-center"><a href="{{ route('categories.no-category',['all']) }}">{{ 'showEverything'|_ }}</a></p>+ <div class="col-lg-offset-10 col-lg-2 offset-md-9 col-md-3 col-sm-12 col-xs-12">+ <p class="small text-center"><a href="{{ route('categories.no-category',['all']) }}">{{ __('firefly.showEverything') }}</a></p></div></div>@endifdiff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twigindex d1e05e1e0e..f6390d6d26 100644--- a/resources/views/categories/show.twig+++ b/resources/views/categories/show.twig@@ -48,7 +48,7 @@</div></div>@endif- {% if attachments.count() > 0 %}+ @if($attachments->count() > 0)<div class="col-lg-4 col-md-12 col-sm-12 col-xs-12"><div class="card"><div class="card-header">@@ -66,7 +66,7 @@@if(count($periods) > 0)<div class="row"><div class="col-lg-offset-10 col-lg-2 col-md-offset-10 col-md-2 col-sm-12 col-xs-12">- <p class="small text-center"><a href="{{ route('categories.show.all',[category.id]) }}">{{ 'showEverything'|_ }}</a></p>+ <p class="small text-center"><a href="{{ route('categories.show.all',[category.id]) }}">{{ __('firefly.showEverything') }}</a></p></div></div>@endif@@ -80,7 +80,7 @@</div><div class="card-body">@if(count($periods) > 0)- {% include 'list.groups' %}+ <x-lists.groups-large :groups="$groups" /><p><span class="bi bi-calendar"></span><a href="{{ route('categories.show.all', [category.id]) }}">@@ -88,7 +88,7 @@</a></p>@else- {% include 'list.groups' %}+ <x-lists.groups-large :groups="$groups" /><p><span class="bi bi-calendar"></span><a href="{{ route('categories.show', [category.id]) }}">@@ -101,7 +101,7 @@</div>@if(count($periods) > 0)<div class="col-lg-2 col-md-4 col-sm-12 col-xs-12">- {% include 'list.periods' %}+ <x-lists.periods :periods="$periods" /></div>@endif</div>diff --git a/resources/views/form/help.blade.php b/resources/views/form/help.blade.phpindex 1749d93939..e969605e4f 100644--- a/resources/views/form/help.blade.php+++ b/resources/views/form/help.blade.php@@ -1,3 +1,3 @@@if(array_key_exists('helpText', $options) && '' !== $options['helpText'])- <p class="form-text"{{ $options['helpText'] }}</p>+ <p class="form-text">{!! $options['helpText'] !!}</p>@endifdiff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twigindex f7c2723f1d..a00be0264d 100644--- a/resources/views/layout/default.twig+++ b/resources/views/layout/default.twig@@ -17,7 +17,7 @@{{ pageTitle }} »@endif{% if subTitle and not pageTitle %}- {{ subTitle }} »+ {{ $subTitle }} »@endif{% if title != "Firefly III" %}{{ title }} »diff --git a/resources/views/layout/guest.twig b/resources/views/layout/guest.twigindex 504064bb81..ad3179bff6 100644--- a/resources/views/layout/guest.twig+++ b/resources/views/layout/guest.twig@@ -13,7 +13,7 @@@endif{% if subTitle %}- // {{ subTitle }}+ // {{ $subTitle }}@endif</title><meta http-equiv="X-UA-Compatible" content="IE=edge">diff --git a/resources/views/list/periods.twig b/resources/views/list/periods.twigindex 957ffbe277..c2a496f6cf 100644--- a/resources/views/list/periods.twig+++ b/resources/views/list/periods.twig@@ -15,7 +15,7 @@{% for entry in period.spent %}{% if entry.amount != 0 %}<tr>- <td class="third">{{ 'spent'|_ }}</td>+ <td class="third">{{ __('firefly.spent') }}</td><td class="text-right"><span title="{{ entry.count }}">{{ format_amount_by_symbol(entry.amount, entry.currency_symbol, entry.currency_decimal_places) }}diff --git a/resources/views/partials/page-header.twig b/resources/views/partials/page-header.twigindex 1ba3b3644a..b93f874c0c 100644--- a/resources/views/partials/page-header.twig+++ b/resources/views/partials/page-header.twig@@ -8,7 +8,7 @@{% if subTitleIcon %}<span class="hidden-xs fa {{ subTitleIcon }}"></span>@endif- {{ subTitle }}+ {{ $subTitle }}</small>@endif</h1>diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twigindex fbab8ba8e7..0665f84bcb 100644--- a/resources/views/piggy-banks/show.twig+++ b/resources/views/piggy-banks/show.twig@@ -137,7 +137,7 @@</div>@endif- {% if attachments.count() > 0 %}+ @if($attachments->count() > 0)<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12"><div class="card"><div class="card-header">diff --git a/resources/views/recurring/show.twig b/resources/views/recurring/show.twigindex 49fa493b38..c32b7803e8 100644--- a/resources/views/recurring/show.twig+++ b/resources/views/recurring/show.twig@@ -205,7 +205,7 @@</h3></div><div class="card-body">- {% include 'list.groups' %}+ <x-lists.groups-large :groups="$groups" /></div></div></div>diff --git a/resources/views/reports/budget/partials/accounts.twig b/resources/views/reports/budget/partials/accounts.twigindex 1090688355..d69bd3137a 100644--- a/resources/views/reports/budget/partials/accounts.twig+++ b/resources/views/reports/budget/partials/accounts.twig@@ -2,7 +2,7 @@<thead><tr><th data-defaultsign="az">{{ 'name'|_ }}</th>- <th data-defaultsign="_19" class="text-right">{{ 'spent'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ __('firefly.spent') }}</th></tr></thead><tbody>diff --git a/resources/views/reports/budget/partials/budgets.twig b/resources/views/reports/budget/partials/budgets.twigindex a3539ab4ed..4db8b10e18 100644--- a/resources/views/reports/budget/partials/budgets.twig+++ b/resources/views/reports/budget/partials/budgets.twig@@ -2,7 +2,7 @@<thead><tr><th data-defaultsign="az">{{ 'name'|_ }}</th>- <th data-defaultsign="_19" class="text-right">{{ 'spent'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ __('firefly.spent') }}</th><th data-defaultsign="_19">{{ trans('list.percentage') }}</th></tr></thead>diff --git a/resources/views/reports/budget/partials/top-expenses.twig b/resources/views/reports/budget/partials/top-expenses.twigindex 854b363556..34e315464b 100644--- a/resources/views/reports/budget/partials/top-expenses.twig+++ b/resources/views/reports/budget/partials/top-expenses.twig@@ -5,7 +5,7 @@<th data-defaultsign="month">{{ 'date'|_ }}</th><th data-defaultsign="az">{{ 'account'|_ }}</th><th data-defaultsign="az">{{ __('firefly.budget') }}</th>- <th data-defaultsign="_19" class="text-right">{{ 'amount'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ __('firefly.amount') }}</th></tr></thead><tbody>diff --git a/resources/views/reports/category/partials/account-per-category.twig b/resources/views/reports/category/partials/account-per-category.twigindex 39c24277b9..e9fec9ce40 100644--- a/resources/views/reports/category/partials/account-per-category.twig+++ b/resources/views/reports/category/partials/account-per-category.twig@@ -17,7 +17,7 @@{% for category in categories %}<td class="text-right">{% if currency.categories[category.id] %}- <span title="{{ 'earned'|_ }}: {{ format_amount_by_symbol(currency.categories[category.id].earned, currency.currency_symbol, currency.currency_decimal_places, false) }}, {{ 'spent'|_ }}: {{ format_amount_by_symbol(currency.categories[category.id].spent, currency.currency_symbol, currency.currency_decimal_places, false) }}"+ <span title="{{ 'earned'|_ }}: {{ format_amount_by_symbol(currency.categories[category.id].earned, currency.currency_symbol, currency.currency_decimal_places, false) }}, {{ __('firefly.spent') }}: {{ format_amount_by_symbol(currency.categories[category.id].spent, currency.currency_symbol, currency.currency_decimal_places, false) }}"{{ format_amount_by_symbol(currency.categories[category.id].sum, currency.currency_symbol, currency.currency_decimal_places) }}@else—diff --git a/resources/views/reports/category/partials/accounts.twig b/resources/views/reports/category/partials/accounts.twigindex e4eb3c4e81..cd822c0094 100644--- a/resources/views/reports/category/partials/accounts.twig+++ b/resources/views/reports/category/partials/accounts.twig@@ -2,7 +2,7 @@<thead><tr><th data-defaultsign="az">{{ 'name'|_ }}</th>- <th data-defaultsign="_19" class="text-right">{{ 'spent'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ __('firefly.spent') }}</th><th data-defaultsign="_19" class="text-right">{{ 'earned'|_ }}</th><th data-defaultsign="_19" class="text-right">{{ 'sum'|_ }}</th></tr>diff --git a/resources/views/reports/category/partials/categories.twig b/resources/views/reports/category/partials/categories.twigindex d0195bbcad..c231bd8d36 100644--- a/resources/views/reports/category/partials/categories.twig+++ b/resources/views/reports/category/partials/categories.twig@@ -2,7 +2,7 @@<thead><tr><th data-defaultsign="az">{{ 'name'|_ }}</th>- <th data-defaultsign="_19" class="text-right">{{ 'spent'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ __('firefly.spent') }}</th><th data-defaultsign="_19" class="text-right">{{ 'earned'|_ }}</th><th data-defaultsign="_19" class="text-right">{{ 'sum'|_ }}</th></tr>diff --git a/resources/views/reports/category/partials/top-expenses.twig b/resources/views/reports/category/partials/top-expenses.twigindex 7861ea2eaf..7bd0754400 100644--- a/resources/views/reports/category/partials/top-expenses.twig+++ b/resources/views/reports/category/partials/top-expenses.twig@@ -5,7 +5,7 @@<th data-defaultsign="month">{{ 'date'|_ }}</th><th data-defaultsign="az">{{ 'account'|_ }}</th><th data-defaultsign="az">{{ __('firefly.category') }}</th>- <th data-defaultsign="_19" class="text-right">{{ 'amount'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ __('firefly.amount') }}</th></tr></thead><tbody>diff --git a/resources/views/reports/category/partials/top-income.twig b/resources/views/reports/category/partials/top-income.twigindex 132842b909..68f071ee2a 100644--- a/resources/views/reports/category/partials/top-income.twig+++ b/resources/views/reports/category/partials/top-income.twig@@ -5,7 +5,7 @@<th data-defaultsign="month">{{ 'date'|_ }}</th><th data-defaultsign="az">{{ 'account'|_ }}</th><th data-defaultsign="az">{{ __('firefly.category') }}</th>- <th data-defaultsign="_19" class="text-right">{{ 'amount'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ __('firefly.amount') }}</th></tr></thead><tbody>diff --git a/resources/views/reports/double/partials/accounts-per-asset.twig b/resources/views/reports/double/partials/accounts-per-asset.twigindex ee7393b70c..c780718283 100644--- a/resources/views/reports/double/partials/accounts-per-asset.twig+++ b/resources/views/reports/double/partials/accounts-per-asset.twig@@ -2,7 +2,7 @@<thead><tr><th data-defaultsign="az">{{ 'name'|_ }}</th>- <th data-defaultsign="_19" class="text-right">{{ 'spent'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ __('firefly.spent') }}</th><th data-defaultsign="_19" class="text-right">{{ 'earned'|_ }}</th><th data-defaultsign="_19" class="text-right">{{ 'sum'|_ }}</th></tr>diff --git a/resources/views/reports/double/partials/accounts.twig b/resources/views/reports/double/partials/accounts.twigindex faf134e763..b98fcc07ef 100644--- a/resources/views/reports/double/partials/accounts.twig+++ b/resources/views/reports/double/partials/accounts.twig@@ -2,7 +2,7 @@<thead><tr><th data-defaultsign="az">{{ 'name'|_ }}</th>- <th data-defaultsign="_19" class="text-right">{{ 'spent'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ __('firefly.spent') }}</th><th data-defaultsign="_19" class="text-right">{{ 'earned'|_ }}</th><th data-defaultsign="_19" class="text-right">{{ 'sum'|_ }}</th></tr>diff --git a/resources/views/reports/double/partials/top-expenses.twig b/resources/views/reports/double/partials/top-expenses.twigindex e92954fefb..e1ab3f02e3 100644--- a/resources/views/reports/double/partials/top-expenses.twig+++ b/resources/views/reports/double/partials/top-expenses.twig@@ -5,7 +5,7 @@<th data-defaultsign="month">{{ 'date'|_ }}</th><th data-defaultsign="az">{{ 'source_account'|_ }}</th><th data-defaultsign="az">{{ 'destination_account'|_ }}</th>- <th data-defaultsign="_19" class="text-right">{{ 'amount'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ __('firefly.amount') }}</th></tr></thead><tbody>diff --git a/resources/views/reports/double/partials/top-income.twig b/resources/views/reports/double/partials/top-income.twigindex e92954fefb..e1ab3f02e3 100644--- a/resources/views/reports/double/partials/top-income.twig+++ b/resources/views/reports/double/partials/top-income.twig@@ -5,7 +5,7 @@<th data-defaultsign="month">{{ 'date'|_ }}</th><th data-defaultsign="az">{{ 'source_account'|_ }}</th><th data-defaultsign="az">{{ 'destination_account'|_ }}</th>- <th data-defaultsign="_19" class="text-right">{{ 'amount'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ __('firefly.amount') }}</th></tr></thead><tbody>diff --git a/resources/views/reports/partials/budgets.twig b/resources/views/reports/partials/budgets.twigindex ea45a7718e..8f2f9e938b 100644--- a/resources/views/reports/partials/budgets.twig+++ b/resources/views/reports/partials/budgets.twig@@ -5,7 +5,7 @@<th data-defaultsign="month" class="hidden-xs">{{ 'date'|_ }}</th><th data-defaultsign="_19" class="text-right hidden-xs">{{ 'budgeted'|_ }}</th><th data-defaultsign="_19" class="hidden-xs">{{ trans('list.percentage') }}</th>- <th data-defaultsign="_19" class="text-right">{{ 'spent'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ __('firefly.spent') }}</th><th data-defaultsign="_19" class="hidden-xs">{{ trans('list.percentage') }}</th><th data-defaultsort="disabled" class="hidden-xs"> </th><th data-defaultsign="_19" class="text-right hidden-xs">{{ 'left'|_ }}</th>diff --git a/resources/views/reports/partials/categories.twig b/resources/views/reports/partials/categories.twigindex 9981ca97c3..5e4b835833 100644--- a/resources/views/reports/partials/categories.twig+++ b/resources/views/reports/partials/categories.twig@@ -2,7 +2,7 @@<thead><tr><th data-defaultsign="az">{{ __('firefly.category') }}</th>- <th data-defaultsign="_19" class="text-right">{{ 'spent'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ __('firefly.spent') }}</th><th data-defaultsign="_19" class="text-right">{{ 'earned'|_ }}</th><th data-defaultsign="_19" class="text-right">{{ 'sum'|_ }}</th><th data-defaultsort="disabled"> </th>diff --git a/resources/views/reports/partials/exp-budgets.twig b/resources/views/reports/partials/exp-budgets.twigindex 24814a52bb..5297be80fc 100644--- a/resources/views/reports/partials/exp-budgets.twig+++ b/resources/views/reports/partials/exp-budgets.twig@@ -2,7 +2,7 @@<thead><tr><th class="sixty-six" data-defaultsign="az" data-defaultsort="asc">{{ __('firefly.category') }}</th>- <th class="third" data-defaultsign="_19">{{ 'spent'|_ }}</th>+ <th class="third" data-defaultsign="_19">{{ __('firefly.spent') }}</th></tr></thead><tbody>diff --git a/resources/views/reports/partials/exp-categories.twig b/resources/views/reports/partials/exp-categories.twigindex 1471453ab8..2fa689a13c 100644--- a/resources/views/reports/partials/exp-categories.twig+++ b/resources/views/reports/partials/exp-categories.twig@@ -2,7 +2,7 @@<thead><tr><th class="half" data-defaultsign="az" data-defaultsort="asc">{{ __('firefly.category') }}</th>- <th class="quarter" data-defaultsign="_19">{{ 'spent'|_ }}</th>+ <th class="quarter" data-defaultsign="_19">{{ __('firefly.spent') }}</th><th class="quarter" data-defaultsign="_19">{{ 'earned'|_ }}</th></tr></thead>diff --git a/resources/views/reports/partials/exp-not-grouped.twig b/resources/views/reports/partials/exp-not-grouped.twigindex 506f6b07ec..f5b4bb3633 100644--- a/resources/views/reports/partials/exp-not-grouped.twig+++ b/resources/views/reports/partials/exp-not-grouped.twig@@ -2,7 +2,7 @@<thead><tr><th class="half" data-defaultsign="az">{{ 'name'|_ }}</th>- <th class="quarter" class="hidden-xs" data-defaultsign="_19">{{ 'spent'|_ }}</th>+ <th class="quarter" class="hidden-xs" data-defaultsign="_19">{{ __('firefly.spent') }}</th><th class="quarter" class="hidden-xs" data-defaultsign="_19">{{ 'earned'|_ }}</th></tr></thead>diff --git a/resources/views/reports/partials/top-transactions.twig b/resources/views/reports/partials/top-transactions.twigindex 4f458f849c..c31fbe05c9 100644--- a/resources/views/reports/partials/top-transactions.twig+++ b/resources/views/reports/partials/top-transactions.twig@@ -4,7 +4,7 @@<th data-defaultsign="az">{{ 'account'|_ }}</th><th data-defaultsign="az">{{ 'description'|_ }}</th><th data-defaultsign="month">{{ 'date'|_ }}</th>- <th class="quarter" class="hidden-xs" data-defaultsign="_19">{{ 'amount'|_ }}</th>+ <th class="quarter" class="hidden-xs" data-defaultsign="_19">{{ __('firefly.amount') }}</th></tr></thead><tbody>diff --git a/resources/views/reports/tag/partials/account-per-tag.twig b/resources/views/reports/tag/partials/account-per-tag.twigindex 58e364eee1..3f5f76c59d 100644--- a/resources/views/reports/tag/partials/account-per-tag.twig+++ b/resources/views/reports/tag/partials/account-per-tag.twig@@ -17,7 +17,7 @@{% for tag in tags %}<td class="text-right">{% if currency.tags[tag.id] %}- <span title="{{ 'earned'|_ }}: {{ format_amount_by_symbol(currency.tags[tag.id].earned, currency.currency_symbol, currency.currency_decimal_places, false) }}, {{ 'spent'|_ }}: {{ format_amount_by_symbol(currency.tags[tag.id].spent, currency.currency_symbol, currency.currency_decimal_places, false) }}"+ <span title="{{ 'earned'|_ }}: {{ format_amount_by_symbol(currency.tags[tag.id].earned, currency.currency_symbol, currency.currency_decimal_places, false) }}, {{ __('firefly.spent') }}: {{ format_amount_by_symbol(currency.tags[tag.id].spent, currency.currency_symbol, currency.currency_decimal_places, false) }}"{{ format_amount_by_symbol(currency.tags[tag.id].sum, currency.currency_symbol, currency.currency_decimal_places) }}@else—diff --git a/resources/views/reports/tag/partials/accounts.twig b/resources/views/reports/tag/partials/accounts.twigindex e4eb3c4e81..cd822c0094 100644--- a/resources/views/reports/tag/partials/accounts.twig+++ b/resources/views/reports/tag/partials/accounts.twig@@ -2,7 +2,7 @@<thead><tr><th data-defaultsign="az">{{ 'name'|_ }}</th>- <th data-defaultsign="_19" class="text-right">{{ 'spent'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ __('firefly.spent') }}</th><th data-defaultsign="_19" class="text-right">{{ 'earned'|_ }}</th><th data-defaultsign="_19" class="text-right">{{ 'sum'|_ }}</th></tr>diff --git a/resources/views/reports/tag/partials/tags.twig b/resources/views/reports/tag/partials/tags.twigindex 6730888af4..e09638e859 100644--- a/resources/views/reports/tag/partials/tags.twig+++ b/resources/views/reports/tag/partials/tags.twig@@ -2,7 +2,7 @@<thead><tr><th data-defaultsign="az">{{ 'name'|_ }}</th>- <th data-defaultsign="_19" class="text-right">{{ 'spent'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ __('firefly.spent') }}</th><th data-defaultsign="_19" class="text-right">{{ 'earned'|_ }}</th><th data-defaultsign="_19" class="text-right">{{ 'sum'|_ }}</th></tr>diff --git a/resources/views/reports/tag/partials/top-expenses.twig b/resources/views/reports/tag/partials/top-expenses.twigindex e20f30e375..96742616f4 100644--- a/resources/views/reports/tag/partials/top-expenses.twig+++ b/resources/views/reports/tag/partials/top-expenses.twig@@ -5,7 +5,7 @@<th data-defaultsign="month">{{ 'date'|_ }}</th><th data-defaultsign="az">{{ 'account'|_ }}</th><th data-defaultsign="az">{{ 'tag'|_ }}</th>- <th data-defaultsign="_19" class="text-right">{{ 'amount'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ __('firefly.amount') }}</th></tr></thead><tbody>diff --git a/resources/views/reports/tag/partials/top-income.twig b/resources/views/reports/tag/partials/top-income.twigindex 683678fab5..d7e582c05b 100644--- a/resources/views/reports/tag/partials/top-income.twig+++ b/resources/views/reports/tag/partials/top-income.twig@@ -5,7 +5,7 @@<th data-defaultsign="month">{{ 'date'|_ }}</th><th data-defaultsign="az">{{ 'account'|_ }}</th><th data-defaultsign="az">{{ 'tag'|_ }}</th>- <th data-defaultsign="_19" class="text-right">{{ 'amount'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ __('firefly.amount') }}</th></tr></thead><tbody>diff --git a/resources/views/rules/rule-group/select-transactions.twig b/resources/views/rules/rule-group/select-transactions.twigindex 820d4f5691..0ad5090268 100644--- a/resources/views/rules/rule-group/select-transactions.twig+++ b/resources/views/rules/rule-group/select-transactions.twig@@ -15,7 +15,7 @@<div class="card"><div class="card-header">- <h3 class="card-title">{{ subTitle }}</h3>+ <h3 class="card-title">{{ $subTitle }}</h3></div><div class="card-body"><div id="form-body">diff --git a/resources/views/rules/rule/select-transactions.twig b/resources/views/rules/rule/select-transactions.twigindex c86d2e2918..4b130bc08d 100644--- a/resources/views/rules/rule/select-transactions.twig+++ b/resources/views/rules/rule/select-transactions.twig@@ -14,7 +14,7 @@<div class="card"><div class="card-header">- <h3 class="card-title">{{ subTitle }}</h3>+ <h3 class="card-title">{{ $subTitle }}</h3></div><div class="card-body"><div id="form-body">diff --git a/resources/views/search/search.twig b/resources/views/search/search.twigindex 47eeb641ed..97b5048210 100644--- a/resources/views/search/search.twig+++ b/resources/views/search/search.twig@@ -8,4 +8,4 @@@endif</p>-{% include 'list.groups' %}+<x-lists.groups-large :groups="$groups" />diff --git a/resources/views/tags/show.twig b/resources/views/tags/show.twigindex 195b8edd32..e3f93dda30 100644--- a/resources/views/tags/show.twig+++ b/resources/views/tags/show.twig@@ -203,7 +203,7 @@</div></div></div>- {% if attachments.count() > 0 %}+ @if($attachments->count() > 0)<div class="row"><div class="col-lg-6 col-md-6 col-sm-12 col-xs-12"><div class="card">@@ -224,7 +224,7 @@<div class="row"><div class="col-lg-offset-10 col-lg-2 col-md-offset-10 col-md-2 col-sm-12 col-xs-12"><p class="small text-center"><a- href="{{ route('tags.show',[tag.id,'all']) }}">{{ 'showEverything'|_ }}</a></p>+ href="{{ route('tags.show',[tag.id,'all']) }}">{{ __('firefly.showEverything') }}</a></p></div></div>@endif@@ -273,14 +273,14 @@</div>@if(count($periods) > 0)<div class="col-lg-2 col-md-2 col-sm-12 col-xs-12">- {% include 'list.periods' %}+ <x-lists.periods :periods="$periods" /></div>@endif</div>@if(count($periods) > 0)<div class="row"><div class="col-lg-offset-10 col-lg-2 col-md-offset-10 col-md-2 col-sm-12 col-xs-12">- <p class="small text-center"><a href="{{ route('tags.show',[tag.id]) }}">{{ 'showEverything'|_ }}</a>+ <p class="small text-center"><a href="{{ route('tags.show',[tag.id]) }}">{{ __('firefly.showEverything') }}</a></p></div></div>diff --git a/resources/views/transactions/old-index.twig b/resources/views/transactions/old-index.twigindex 27b45c8349..4049aba94c 100644--- a/resources/views/transactions/old-index.twig+++ b/resources/views/transactions/old-index.twig@@ -10,7 +10,7 @@@if(count($periods) > 0)<div class="row"><div class="col-lg-offset-10 col-lg-2 col-md-offset-10 col-md-2 col-sm-12 col-xs-12">- <p class="small text-center"><a href="{{ route('transactions.index.all',[objectType]) }}">{{ 'showEverything'|_ }}</a></p>+ <p class="small text-center"><a href="{{ route('transactions.index.all',[objectType]) }}">{{ __('firefly.showEverything') }}</a></p></div></div>@endif@@ -74,14 +74,14 @@<div class="@if(count($periods) > 0)col-lg-10 col-md-10 col-sm-12@elsecol-lg-12 col-md-12 col-sm-12@endif"><div class="card"><div class="card-header">- <h3 class="card-title">{{ subTitle }}</h3>+ <h3 class="card-title">{{ $subTitle }}</h3></div><div class="card-body p-0"><div class="p-2"><a href="{{ route('transactions.create', [objectType]) }}" class="btn btn-success"><span class="bi bi-plus-circle"></span> {{ 'create_new_transaction'|_ }}</a></div>{{-- actual list --}}- {% include 'list.groups' %}+ <x-lists.groups-large :groups="$groups" /></div><div class="card-footer">{{-- links for other views --}}@@ -103,7 +103,7 @@{{-- boxes with info --}}@if(count($periods) > 0)<div class="col-lg-2 col-md-2 col-sm-12 col-xs-12">- {% include 'list.periods' %}+ <x-lists.periods :periods="$periods" /></div>@endif@@ -113,7 +113,7 @@@if(count($periods) > 0)<div class="row"><div class="col-lg-offset-10 col-lg-2 col-md-offset-10 col-md-2 col-sm-12 col-xs-12">- <p class="small text-center"><a href="{{ route('transactions.index.all', [objectType]) }}">{{ 'showEverything'|_ }}</a></p>+ <p class="small text-center"><a href="{{ route('transactions.index.all', [objectType]) }}">{{ __('firefly.showEverything') }}</a></p></div></div>@endif