IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-08-26 13:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Expand views.

Browse Source
This commit is contained in:
James Cole
2026-06-27 21:29:05 +02:00
parent 8e8b8f4f7b
commit 829ddaa1d5
22 changed files with 157 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Report/BudgetController.php
+1 -1
View File
@@ -336,7 +336,7 @@ final class BudgetController extends Controller
} catch (Throwable $e) {
Log::error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
Log::error($e->getTraceAsString());
$result = 'Could not render view.';
$result = sprintf('Could not render view: %s', $e->getMessage());
throw new FireflyException($result, 0, $e);
}
resources/views/accounts/edit.blade.php
+1 -1
View File
@@ -94,7 +94,7 @@
<div class="card-body">
{!! ExpandedForm::optionsList('update','account') !!}
</div>
<div class="card-footer text-right">
<div class="card-footer text-end">
<button type="submit" class="btn btn-success">
{{ __('firefly.update_' . $objectType . '_account') }}
</button>
resources/views/components/lists/accounts.blade.php
+1 -1
View File
@@ -115,7 +115,7 @@
</td>
@endif
@endif
<td class="text-right hidden-sm hidden-xs hidden-md">
<td class="text-end hidden-sm hidden-xs hidden-md">
<span class="mr-1">
@foreach($account->differences as $key => $balance)
<span title="{{ $key }}">
resources/views/components/report/partial/journals-audit.blade.php
+6 -6
View File
@@ -5,9 +5,9 @@
<th class="hide-icon">&nbsp;</th>
<th class="hide-description">{{ trans('list.description') }}</th>
<th class="text-right hide-balance_before">{{ trans('list.balance_before') }}</th>
<th class="text-right hide-amount">{{ trans('list.amount') }}</th>
<th class="text-right hide-balance_after">{{ trans('list.balance_after') }}</th>
<th class="text-end hide-balance_before">{{ trans('list.balance_before') }}</th>
<th class="text-end hide-amount">{{ trans('list.amount') }}</th>
<th class="text-end hide-balance_after">{{ trans('list.balance_after') }}</th>
<th class="hide-date">{{ trans('list.date') }}</th>
{{-- new optional fields (3x) --}}
@@ -59,10 +59,10 @@
</a>
</td>
<td class="text-right hide-balance_before">
<td class="text-end hide-balance_before">
{!! format_amount_by_symbol($journal['balance_before'], $auditData[$account->id]['currency']->symbol, $auditData[$account->id]['currency']->decimal_places) !!}
</td>
<td class="text-right hide-amount">
<td class="text-end hide-amount">
@if($auditData[$account->id]['currency']->id == $journal['currency_id'])
@if($account->id == $journal['destination_account_id'] and $journal['transaction_type_type'] == 'Opening balance')
@@ -89,7 +89,7 @@
@endif
</td>
<td class="text-right hide-balance_after">
<td class="text-end hide-balance_after">
{!! format_amount_by_symbol($journal['balance_after'], $auditData[$account->id]['currency']->symbol, $auditData[$account->id]['currency']->decimal_places) !!}
</td>
resources/views/list/accounts.blade.php
+1 -1
View File
@@ -113,7 +113,7 @@
</td>
@endif
@endif
<td class="text-right hidden-sm hidden-xs hidden-md">
<td class="text-end hidden-sm hidden-xs hidden-md">
<span class="mr-1">
{% for key, balance in account.differences %}
<span title="{{ key }}">
resources/views/list/groups.blade.php
+3 -3
View File
@@ -59,7 +59,7 @@
title="{{ group.title }}">{{ group.title }}</a>
</strong></small>
</td>
<td colspan="1" class="text-right top-light-border">
<td colspan="1" class="text-end top-light-border">
{% for sum in group.sums %}
{% if group.transaction_type == 'Deposit' %}
{!! format_amount_by_symbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places) }}
@@ -162,7 +162,7 @@
</a>
@endif
</td>
<td class="{{ className }} text-right">
<td class="{{ className }} text-end">
{{-- deposit --}}
{% if transaction.transaction_type_type == 'Deposit' %}
@@ -275,7 +275,7 @@
@endif
</td>
{% if (fireflyiiiconfig('use_running_balance', true)) %}
<td class=" {{ className }} text-right">
<td class=" {{ className }} text-end">
{{-- RUNNING BALANCE --}}
{% if (null == transaction.balance_dirty or false == transaction.balance_dirty) and null != transaction.destination_balance_after and null != transaction.source_balance_after %}
{% if transaction.transaction_type_type == 'Deposit' %}
resources/views/list/piggy-banks.blade.php
+11 -11
View File
@@ -5,9 +5,9 @@
<th>{{ 'piggy_bank'|_ }}</th>
<th class="text-end">{{ 'saved_so_far'|_ }}</th>
<th colspan="3" class="hidden-sm hidden-xs">&nbsp;</th>
<th class="text-right hidden-sm hidden-xs">{{ 'target_amount'|_ }}</th>
<th class="text-right hidden-sm hidden-xs">{{ 'left_to_save'|_ }}</th>
<th class="text-right hidden-sm hidden-xs">{{ 'suggested_savings_per_month'|_ }}</th>
<th class="text-end hidden-sm hidden-xs">{{ 'target_amount'|_ }}</th>
<th class="text-end hidden-sm hidden-xs">{{ 'left_to_save'|_ }}</th>
<th class="text-end hidden-sm hidden-xs">{{ 'suggested_savings_per_month'|_ }}</th>
</tr>
</thead>
@@ -45,7 +45,7 @@
<span class="bi bi-paperclip"></span>
@endif
</td>
<td class="text-right piggySaved">
<td class="text-end piggySaved">
<span title="Saved so far" class="text-end">
{!! format_amount_by_symbol(piggy.current_amount,piggy.currency_symbol,piggy.currency_decimal_places) }}
{% if convertToPrimary and piggy.currency_id != $primaryCurrency->id and null != piggy.pc_current_amount %}
@@ -53,7 +53,7 @@
@endif
</span>
</td>
<td class="hidden-sm hidden-xs text-right forty-px">
<td class="hidden-sm hidden-xs text-end forty-px">
{% if piggy.current_amount > 0 %}
<a href="{{ route('piggy-banks.remove-money', piggy.id) }}" class="btn btn-outline-secondary btn-xs removeMoney" data-id="{{ piggy.id }}">
<span data-id="{{ piggy.id }}" class="fa fa-minus"></span></a>
@@ -86,7 +86,7 @@
<span data-id="{{ piggy.id }}" class="bi bi-plus-circle"></span></a>
@endif
</td>
<td class="hidden-sm hidden-xs text-right">
<td class="hidden-sm hidden-xs text-end">
{% if null != piggy.target_amount and 0 != piggy.target_amount %}
<span title="{{ 'target_amount'|_ }}">{!! format_amount_by_symbol(piggy.target_amount,piggy.currency_symbol,piggy.currency_decimal_places) }}</span>
{% if convertToPrimary and piggy.currency_id != $primaryCurrency->id and null != piggy.pc_target_amount %}
@@ -94,7 +94,7 @@
@endif
@endif
</td>
<td class="hidden-sm hidden-xs text-right">
<td class="hidden-sm hidden-xs text-end">
{% if piggy.left_to_save > 0 %}
<span title="{{ 'left_to_save'|_ }}">{!! format_amount_by_symbol(piggy.left_to_save,piggy.currency_symbol,piggy.currency_decimal_places) }}</span>
{% if convertToPrimary and piggy.currency_id != $primaryCurrency->id and null != piggy.pc_left_to_save %}
@@ -102,7 +102,7 @@
@endif
@endif
</td>
<td class="hidden-sm hidden-xs text-right">
<td class="hidden-sm hidden-xs text-end">
{% if piggy.target_date and piggy.save_per_month %}
{!! format_amount_by_symbol(piggy.save_per_month, piggy.currency_symbol, piggy.currency_decimal_places) }}
{% if convertToPrimary and piggy.currency_id != $primaryCurrency->id and null != piggy.pc_save_per_month %}
@@ -126,17 +126,17 @@
<td class="hidden-sm hidden-xs">&nbsp;</td> {{-- remove money --}}
<td class="hidden-sm hidden-xs">&nbsp;</td> {{-- progress--}}
<td class="hidden-sm hidden-xs">&nbsp;</td> {{-- add money --}}
<td class="text-right hidden-sm hidden-xs">
<td class="text-end hidden-sm hidden-xs">
{% for sum in objectGroup.sums %}
{!! format_amount_by_symbol(sum.target, sum.currency_symbol, sum.currency_decimal_places) }}<br />
@endforeach
</td>
<td class="text-right hidden-sm hidden-xs">
<td class="text-end hidden-sm hidden-xs">
{% for sum in objectGroup.sums %}
{!! format_amount_by_symbol(sum.left_to_save, sum.currency_symbol, sum.currency_decimal_places) }}<br />
@endforeach
</td>
<td class="text-right hidden-sm hidden-xs">
<td class="text-end hidden-sm hidden-xs">
{% for sum in objectGroup.sums %}
{!! format_amount_by_symbol(sum.save_per_month, sum.currency_symbol, sum.currency_decimal_places) }}<br />
@endforeach
resources/views/partials/boxes.blade.php
+1 -1
View File
@@ -65,7 +65,7 @@
<div class="info-box-content">
<span class="info-box-text">
<a href="{{ route('reports.report.default', ['allAssetAccounts','currentYearStart','currentYearEnd']) }}">{{ 'net_worth'|_ }}</a></span>
<a href="{{ route('reports.report.default', ['allAssetAccounts','currentYearStart','currentYearEnd']) }}">{{ __('firefly.net_worth') }}</a></span>
<span class="info-box-number" id="box-net-worth"></span>
<div class="progress">
resources/views/piggy-banks/index.blade.php
+8 -8
View File
@@ -27,30 +27,30 @@
<thead>
<tr>
<th>{{ __('firefly.account') }}</th>
<th class="text-right hidden-sm hidden-xs">{{ __('firefly.balance') }}</th>
<th class="text-end hidden-sm hidden-xs">{{ __('firefly.balance') }}</th>
<th class="text-end">{{ __('firefly.left_for_piggy_banks') }}</th>
<th class="text-right hidden-sm hidden-xs">{{ __('firefly.sum_of_piggy_banks') }}</th>
<th class="text-right hidden-sm hidden-xs">{{ __('firefly.saved_so_far') }}</th>
<th class="text-right hidden-sm hidden-xs">{{ __('firefly.left_to_save') }}</th>
<th class="text-end hidden-sm hidden-xs">{{ __('firefly.sum_of_piggy_banks') }}</th>
<th class="text-end hidden-sm hidden-xs">{{ __('firefly.saved_so_far') }}</th>
<th class="text-end hidden-sm hidden-xs">{{ __('firefly.left_to_save') }}</th>
</tr>
</thead>
<tbody>
@foreach($accounts as $id => $info)
<tr>
<td><a href="{{ route('accounts.show', $id) }}" title="{{ $info['name'] }}">{{ $info['name'] }}</a></td>
<td class="text-right hidden-sm hidden-xs">
<td class="text-end hidden-sm hidden-xs">
{!! format_amount_by_symbol($info['current_balance'],$info['currency_symbol'],$info['currency_decimal_places']) !!}
</td>
<td class="text-end">
{!! format_amount_by_symbol($info['left'],$info['currency_symbol'],$info['currency_decimal_places']) !!}
</td>
<td class="text-right hidden-sm hidden-xs">
<td class="text-end hidden-sm hidden-xs">
{!! format_amount_by_symbol($info['target'],$info['currency_symbol'],$info['currency_decimal_places']) !!}
</td>
<td class="text-right hidden-sm hidden-xs">
<td class="text-end hidden-sm hidden-xs">
{!! format_amount_by_symbol($info['saved'],$info['currency_symbol'],$info['currency_decimal_places']) !!}
</td>
<td class="text-right hidden-sm hidden-xs">
<td class="text-end hidden-sm hidden-xs">
{!! format_amount_by_symbol($info['to_save'],$info['currency_symbol'],$info['currency_decimal_places']) !!}
</td>
</tr>
resources/views/reports/budget/month.blade.php
+2 -2
View File
@@ -166,8 +166,8 @@
// to report another URL:
var startDate = '{{ $start->format('Ymd') }}';
var endDate = '{{ $end->format('Ymd') }}';
var $accountIds = '{{ $accountIds }}';
var $budgetIds = '{{ $budgetIds }}';
var accountIds = '{{ $accountIds }}';
var budgetIds = '{{ $budgetIds }}';
// html block URL's:
var accountsUrl = '{{ route('report-data.budget.accounts', [$accountIds, $budgetIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
resources/views/reports/category/month.blade.php
+1 -1
View File
@@ -238,7 +238,7 @@
// to report another URL:
var startDate = '{{ $start->format('Ymd') }}';
var endDate = '{{ $end->format('Ymd') }}';
var $accountIds = '{{ $accountIds }}';
var accountIds = '{{ $accountIds }}';
var categoryIds = '{{ $categoryIds }}';
resources/views/reports/default/month.blade.php
+1 -1
View File
@@ -173,7 +173,7 @@
var startDate = '{{ $start->format('Ymd') }}';
var endDate = '{{ $end->format('Ymd') }}';
var reportType = '{{ $reportType }}';
var $accountIds = '{{ $accountIds }}';
var accountIds = '{{ $accountIds }}';
var accountReportUrl = '{{ route('report-data.account.general', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var categoryReportUrl = '{{ route('report-data.category.operations', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
resources/views/reports/default/multi-year.blade.php
+33 -34
View File
@@ -1,7 +1,6 @@
@extends('layout.v3.session')
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, start, end) }}
@section('breadcrumbs')
{{ Breadcrumbs::render(Route::getCurrentRoute()->getName(), $accountIds, $start, $end) }}
@endsection
@section('content')
@@ -9,7 +8,7 @@
{{-- charts --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card" id="year-inc-exp">
<div class="card mb-2" id="year-inc-exp">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.incomeVsExpenses') }}</h3>
</div>
@@ -23,7 +22,7 @@
{{-- balances and income vs. expense. --}}
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
<div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.accountBalances') }}</h3>
</div>
@@ -38,7 +37,7 @@
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
<div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.incomeVsExpenses') }}</h3>
</div>
@@ -57,7 +56,7 @@
{{-- block with income --}}
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
<div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.income') }}</h3>
</div>
@@ -73,7 +72,7 @@
</div>
{{-- block with expenses --}}
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
<div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.expenses') }}</h3>
</div>
@@ -92,16 +91,16 @@
{{-- net worth --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
<div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ 'net_worth'|_ }}</h3>
<h3 class="card-title">{{ __('firefly.net_worth') }}</h3>
</div>
<div class="card-body">
<canvas id="net-worth" class="wide-chart" height="400" width="100%"></canvas>
</div>
<div class="card-footer">
<small>
{{ 'net_filtered_prefs'|_ }}
{{ __('firefly.net_filtered_prefs') }}
</small>
</div>
</div>
@@ -112,11 +111,11 @@
{{-- This is the budget overview generated by budget period report --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
<div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.budgets') }}</h3>
</div>
<div class="box-body no-padding table-responsive" id="budgetPeriodReport">
<div class="card-body p-0" id="budgetPeriodReport">
</div>
{{-- loading indicator --}}
<div class="overlay text-center m-2">
@@ -132,12 +131,12 @@
{{-- This is the chart that belongs to the above overview. --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
<div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ 'chart'|_ }}</h3>
<h3 class="card-title">{{ __('firefly.chart') }}</h3>
</div>
<div class="card-body">
<p id="budget_help" class="text-muted text-center">{{ 'budget_chart_click'|_ }}</p>
<p id="budget_help" class="text-muted text-center">{{ __('firefly.budget_chart_click') }}</p>
<canvas id="budget_chart" class="wide-chart" height="400" width="100%"></canvas>
</div>
</div>
@@ -147,11 +146,11 @@
{{-- same thing but for categories (expenses) --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
<div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.categories') }} ({{ __('firefly.expenses') }})</h3>
</div>
<div class="box-body no-padding table-responsive" id="categoryExpense">
<div class="card-body p-0" id="categoryExpense">
</div>
{{-- loading indicator --}}
<div class="overlay text-center m-2">
@@ -166,11 +165,11 @@
{{-- same thing but for categories (income) --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
<div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.categories') }} ({{ __('firefly.income') }})</h3>
</div>
<div class="box-body no-padding table-responsive" id="categoryIncome">
<div class="card-body p-0" id="categoryIncome">
</div>
{{-- loading indicator --}}
<div class="overlay text-center m-2">
@@ -185,12 +184,12 @@
{{-- and the same chart too! --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
<div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ 'chart'|_ }}</h3>
<h3 class="card-title">{{ __('firefly.chart') }}</h3>
</div>
<div class="card-body">
<p id="category_help" class="text-muted text-center">{{ 'category_chart_click'|_ }}</p>
<p id="category_help" class="text-muted text-center">{{ __('firefly.category_chart_click') }}</p>
<canvas id="category_chart" class="wide-chart" height="400" width="100%"></canvas>
</div>
</div>
@@ -202,7 +201,7 @@
<link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ $FF_BUILD_TIME }}" type="text/css" media="all" nonce="{{ $JS_NONCE }}">
@endsection
@section('scripts')
@vite(['js/pages/generic.js'])
<script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></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>
@@ -214,19 +213,19 @@
// to report another URL:
var startDate = '{{ $start->format('Ymd') }}';
var endDate = '{{ $end->format('Ymd') }}';
var accountIds = '{{ accountIds }}';
var accountIds = '{{ $accountIds }}';
var opChartUrl = '{{ route('chart.report.operations', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var netWorthUrl = '{{ route('chart.report.net-worth', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var opChartUrl = '{{ route('chart.report.operations', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var netWorthUrl = '{{ route('chart.report.net-worth', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var accountReportUrl = '{{ route('report-data.account.general', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var incomeReportUrl = '{{ route('report-data.operations.income', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var expenseReportUrl = '{{ route('report-data.operations.expenses', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var incExpReportUrl = '{{ route('report-data.operations.operations', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var accountReportUrl = '{{ route('report-data.account.general', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var incomeReportUrl = '{{ route('report-data.operations.income', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var expenseReportUrl = '{{ route('report-data.operations.expenses', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var incExpReportUrl = '{{ route('report-data.operations.operations', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var budgetPeriodReportUrl = '{{ route('report-data.budget.period', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var categoryExpenseUrl = '{{ route('report-data.category.expenses', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var categoryIncomeUrl = '{{ route('report-data.category.income', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var budgetPeriodReportUrl = '{{ route('report-data.budget.period', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var categoryExpenseUrl = '{{ route('report-data.category.expenses', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var categoryIncomeUrl = '{{ route('report-data.category.income', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var billReportUrl = '';
</script>
resources/views/reports/default/year.blade.php
+32 -31
View File
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
@section('breadcrumbs')
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, start, end) }}
{{ Breadcrumbs::render(Route::getCurrentRoute()->getName(), $accountIds, $start, $end) }}
@endsection
@section('content')
@@ -8,7 +8,7 @@
{{-- charts --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card" id="year-inc-exp">
<div class="card mb-2" id="year-inc-exp">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.incomeVsExpenses') }}</h3>
</div>
@@ -22,7 +22,7 @@
{{-- balances and inc vs exp --}}
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
<div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.accountBalances') }}</h3>
</div>
@@ -37,7 +37,7 @@
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
<div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.incomeVsExpenses') }}</h3>
</div>
@@ -56,7 +56,7 @@
{{-- income and expenses. --}}
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
<div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.income') }}</h3>
</div>
@@ -71,7 +71,7 @@
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
<div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.expenses') }}</h3>
</div>
@@ -90,16 +90,16 @@
{{-- net worth --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
<div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ 'net_worth'|_ }}</h3>
<h3 class="card-title">{{ __('firefly.net_worth') }}</h3>
</div>
<div class="card-body">
<canvas id="net-worth" class="wide-chart" height="400" width="100%"></canvas>
</div>
<div class="card-footer">
<small>
{{ 'net_filtered_prefs'|_ }}
{{ __('firefly.net_filtered_prefs') }}
</small>
</div>
</div>
@@ -109,11 +109,11 @@
{{-- This is the budget overview generated by budget period report --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
<div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.budgets') }}</h3>
</div>
<div class="box-body no-padding table-responsive" id="budgetPeriodReport">
<div class="card-body p-0" id="budgetPeriodReport">
</div>
{{-- loading indicator --}}
<div class="overlay text-center m-2">
@@ -129,12 +129,12 @@
{{-- This is the chart that belongs to the above overview. --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
<div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ 'chart'|_ }}</h3>
<h3 class="card-title">{{ __('firefly.chart') }}</h3>
</div>
<div class="card-body">
<p id="budget_help" class="text-muted text-center">{{ 'budget_chart_click'|_ }}</p>
<p id="budget_help" class="text-muted text-center">{{ __('firefly.budget_chart_click') }}</p>
<canvas id="budget_chart" class="wide-chart" height="400" width="100%"></canvas>
</div>
</div>
@@ -144,11 +144,11 @@
{{-- same thing but for categories (expenses) --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
<div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.categories') }} ({{ __('firefly.expenses') }})</h3>
</div>
<div class="box-body no-padding table-responsive" id="categoryExpense">
<div class="card-body p-0" id="categoryExpense">
</div>
{{-- loading indicator --}}
<div class="overlay text-center m-2">
@@ -163,11 +163,11 @@
{{-- same thing but for categories (income) --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
<div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.categories') }} ({{ __('firefly.income') }})</h3>
</div>
<div class="box-body no-padding table-responsive" id="categoryIncome">
<div class="card-body p-0" id="categoryIncome">
</div>
{{-- loading indicator --}}
<div class="overlay text-center m-2">
@@ -182,12 +182,12 @@
{{-- and the same chart too! --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
<div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ 'chart'|_ }}</h3>
<h3 class="card-title">{{ __('firefly.chart') }}</h3>
</div>
<div class="card-body">
<p id="category_help" class="text-muted text-center">{{ 'category_chart_click'|_ }}</p>
<p id="category_help" class="text-muted text-center">{{ __('firefly.category_chart_click') }}</p>
<canvas id="category_chart" class="wide-chart" height="400" width="100%"></canvas>
</div>
</div>
@@ -197,6 +197,7 @@
@endsection
@section('scripts')
@vite(['js/pages/generic.js'])
<script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></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>
@@ -207,19 +208,19 @@
// to report another URL:
var startDate = '{{ $start->format('Ymd') }}';
var endDate = '{{ $end->format('Ymd') }}';
var accountIds = '{{ accountIds }}';
var accountIds = '{{ $accountIds }}';
var opChartUrl = '{{ route('chart.report.operations', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var netWorthUrl = '{{ route('chart.report.net-worth', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var opChartUrl = '{{ route('chart.report.operations', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var netWorthUrl = '{{ route('chart.report.net-worth', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var accountReportUrl = '{{ route('report-data.account.general', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var incomeReportUrl = '{{ route('report-data.operations.income', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var expenseReportUrl = '{{ route('report-data.operations.expenses', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var incExpReportUrl = '{{ route('report-data.operations.operations', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var accountReportUrl = '{{ route('report-data.account.general', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var incomeReportUrl = '{{ route('report-data.operations.income', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var expenseReportUrl = '{{ route('report-data.operations.expenses', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var incExpReportUrl = '{{ route('report-data.operations.operations', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var budgetPeriodReportUrl = '{{ route('report-data.budget.period', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var categoryExpenseUrl = '{{ route('report-data.category.expenses', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var categoryIncomeUrl = '{{ route('report-data.category.income', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var budgetPeriodReportUrl = '{{ route('report-data.budget.period', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var categoryExpenseUrl = '{{ route('report-data.category.expenses', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var categoryIncomeUrl = '{{ route('report-data.category.income', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
var billReportUrl = '';
</script>
resources/views/reports/partials/accounts.blade.php
+4 -4
View File
@@ -2,8 +2,8 @@
<thead>
<tr>
<th data-defaultsign="az">{{ __('firefly.name') }}</th>
<th data-defaultsign="_19" class="text-right hidden-xs">{{ __('firefly.balanceStart') }}</th>
<th data-defaultsign="_19" class="text-right hidden-xs">{{ __('firefly.balanceEnd') }}</th>
<th data-defaultsign="_19" class="text-end hidden-xs">{{ __('firefly.balanceStart') }}</th>
<th data-defaultsign="_19" class="text-end hidden-xs">{{ __('firefly.balanceEnd') }}</th>
<th data-defaultsign="_19" class="text-end">{{ __('firefly.difference') }}</th>
</tr>
</thead>
@@ -13,10 +13,10 @@
<td data-value="{{ $account['name'] }}">
<a href="{{ route('accounts.show', $account['id']) }}" title="{{ $account['name'] }}">{{ $account['name'] }}</a>
</td>
<td class="text-right hidden-xs" data-value="{{ $account['start_balance'] }}">
<td class="text-end hidden-xs" data-value="{{ $account['start_balance'] }}">
{!! format_amount_by_symbol($account['start_balance'], $account['currency_symbol'], $account['currency_decimal_places']) !!}
</td>
<td class="text-right hidden-xs" data-value="{{ $account['end_balance'] }}">
<td class="text-end hidden-xs" data-value="{{ $account['end_balance'] }}">
{!! format_amount_by_symbol($account['end_balance'], $account['currency_symbol'], $account['currency_decimal_places']) !!}
</td>
<td class="text-end"
resources/views/reports/partials/balance.blade.php
+1 -1
View File
@@ -4,7 +4,7 @@
<th>{{ __('firefly.budgets') }}</th>
@foreach($report['accounts'] as $account)
@if($account['sum'] !== 0)
<th class="text-right hidden-xs"><a href="{{ route('accounts.show',$account['id']) }}" title="{{ $account['iban'] }}">{{ $account['name'] }}</a></th>
<th class="text-end hidden-xs"><a href="{{ route('accounts.show',$account['id']) }}" title="{{ $account['iban'] }}">{{ $account['name'] }}</a></th>
@endif
@endforeach
<th class="text-end">{{ __('firefly.sum') }}</th>
resources/views/reports/partials/bills.blade.php
+4 -4
View File
@@ -2,8 +2,8 @@
<thead>
<tr>
<th data-defaultsign="az">{{ trans('form.name') }}</th>
<th data-defaultsign="_19" class="text-right hidden-xs">{{ trans('form.amount_min') }}</th>
<th data-defaultsign="_19" class="text-right hidden-xs">{{ trans('form.amount_max') }}</th>
<th data-defaultsign="_19" class="text-end hidden-xs">{{ trans('form.amount_min') }}</th>
<th data-defaultsign="_19" class="text-end hidden-xs">{{ trans('form.amount_max') }}</th>
<th data-defaultsign="_19">{{ trans('form.expected_on') }}</th>
<th data-defaultsign="_19" class="text-end">{{ trans('form.paid') }}</th>
</tr>
@@ -15,10 +15,10 @@
<td>
<a href="{{ route('subscriptions.show', [$bill['id']]) }}">{{ $bill['name'] }}</a>
</td>
<td class="hidden-xs text-right">
<td class="hidden-xs text-end">
{!! format_amount_by_symbol($bill['amount_min'], $bill['currency_symbol'], $bill['currency_decimal_places']) !!}
</td>
<td class="hidden-xs text-right">
<td class="hidden-xs text-end">
{!! format_amount_by_symbol($bill['amount_max'], $bill['currency_symbol'], $bill['currency_decimal_places']) !!}
</td>
<td data-value="{{ $bill['expected_dates'][0]?->format('Y-m-d') }}">
resources/views/reports/partials/budget-period.blade.php
+17 -17
View File
@@ -2,43 +2,43 @@
<thead>
<tr>
<th data-defaultsign="az" colspan="2">{{ __('firefly.budget') }}</th>
{% for period in periods %}
<th data-defaultsign="_19" class="text-end">{{ period }}</th>
@foreach($periods as $period)
<th data-defaultsign="_19" class="text-end">{{ $period }}</th>
@endforeach
<th data-defaultsign="_19" class="text-end">{{ __('firefly.average') }}</th>
<th data-defaultsign="_19" class="text-end">{{ __('firefly.sum') }}</th>
</tr>
</thead>
<tbody>
{% for key, info in report %}
@foreach($report as $info)
<tr>
<td data-value="{{ info.name }}">
{% if info.id != 0 %}
<a class="btn btn-outline-secondary btn-xs" href="{{ route('budgets.show', [info.id]) }}"><span class="fa fa-external-link"></span></a>
<td data-value="{{ $info['name'] }}">
@if($info['id'] !== 0)
<a class="btn btn-outline-secondary btn-xs" href="{{ route('budgets.show', [$info['id']]) }}"><span class="fa fa-external-link"></span></a>
@else
<a class="btn btn-outline-secondary btn-xs" href="{{ route('budgets.no-budget') }}"><span class="fa fa-external-link"></span></a>
@endif
</td>
<td data-value="{{ info.name }}">
<a title="{{ info.name }}" href="#" data-budget="{{ info.id }}" data-currency="{{ info.currency_id }}" class="budget-chart-activate">{{ info.name }}</a>
<td data-value="{{ $info['name'] }}">
<a title="{{ $info['name'] }}" href="#" data-budget="{{ $info['id'] }}" data-currency="{{ $info['currency_id'] }}" class="budget-chart-activate">{{ $info['name'] }}</a>
</td>
{% for key, period in periods %}
{% if(info.entries[key]) %}
<td data-value="{{ info.entries[key] }}" class="text-end">
{!! format_amount_by_symbol(info.entries[key], info.currency_symbol, info.currency_decimal_places) }}
@foreach($periods as $key => $period)
@if(array_key_exists($key, $info['entries']))
<td data-value="{{ $info['entries'][$key] }}" class="text-end">
{!! format_amount_by_symbol($info['entries'][$key], $info['currency_symbol'], $info['currency_decimal_places']) !!}
</td>
@else
<td data-value="0" class="text-end">
{!! format_amount_by_symbol(0, info.currency_symbol, info.currency_decimal_places) }}
{!! format_amount_by_symbol(0, $info['currency_symbol'], $info['currency_decimal_places']) !!}
</td>
@endif
@endforeach
<td data-value="{{ info.avg }}" class="text-end">
{!! format_amount_by_symbol(info.avg, info.currency_symbol, info.currency_decimal_places) }}
<td data-value="{{ $info['avg'] }}" class="text-end">
{!! format_amount_by_symbol($info['avg'], $info['currency_symbol'], $info['currency_decimal_places']) !!}
</td>
<td data-value="{{ info.sum }}" class="text-end">
{!! format_amount_by_symbol(info.sum, info.currency_symbol, info.currency_decimal_places) }}
<td data-value="{{ $info['sum'] }}" class="text-end">
{!! format_amount_by_symbol($info['sum'], $info['currency_symbol'], $info['currency_decimal_places']) !!}
</td>
</tr>
@endforeach
resources/views/reports/partials/budgets.blade.php
+4 -4
View File
@@ -3,12 +3,12 @@
<tr>
<th data-defaultsign="az">{{ __('firefly.budget') }}</th>
<th data-defaultsign="month" class="hidden-xs">{{ __('firefly.date') }}</th>
<th data-defaultsign="_19" class="text-right hidden-xs">{{ __('firefly.budgeted') }}</th>
<th data-defaultsign="_19" class="text-end hidden-xs">{{ __('firefly.budgeted') }}</th>
<th data-defaultsign="_19" class="hidden-xs">{{ trans('list.percentage') }}</th>
<th data-defaultsign="_19" class="text-end">{{ __('firefly.spent') }}</th>
<th data-defaultsign="_19" class="hidden-xs">{{ trans('list.percentage') }}</th>
<th data-defaultsort="disabled" class="hidden-xs">&nbsp;</th>
<th data-defaultsign="_19" class="text-right hidden-xs">{{ __('firefly.left') }}</th>
<th data-defaultsign="_19" class="text-end hidden-xs">{{ __('firefly.left') }}</th>
<th data-defaultsign="_19" class="text-end">{{ __('firefly.overspent') }}</th>
</tr>
</thead>
@@ -37,7 +37,7 @@
</td>
<!-- budgeted, hidden on mobile -->
<td data-value="{{ $budgetLimit['budgeted'] }}" class="text-right hidden-xs">
<td data-value="{{ $budgetLimit['budgeted'] }}" class="text-end hidden-xs">
@if(null !== $budgetLimit['budgeted'])
{!! format_amount_by_symbol($budgetLimit['budgeted'], $budgetLimit['currency_symbol'], $budgetLimit['currency_decimal_places']) !!}
@endif
@@ -67,7 +67,7 @@
<!-- left, hidden on mobile -->
<td data-value="{{ $budgetLimit['left'] }}" class="text-right hidden-xs">
<td data-value="{{ $budgetLimit['left'] }}" class="text-end hidden-xs">
@if(null !== $budgetLimit['left'])
{!! format_amount_by_symbol($budgetLimit['left'], $budgetLimit['currency_symbol'], $budgetLimit['currency_decimal_places']) !!}
@endif
resources/views/reports/partials/category-period.blade.php
+17 -17
View File
@@ -2,46 +2,46 @@
<thead>
<tr>
<th data-defaultsign="az" colspan="2">{{ __('firefly.category') }}</th>
{% for period in periods %}
<th data-defaultsign="_19" class="text-end">{{ period }}</th>
@foreach($periods as $period)
<th data-defaultsign="_19" class="text-end">{{ $period }}</th>
@endforeach
<th data-defaultsign="_19" class="text-end">{{ __('firefly.sum') }}</th>
</tr>
</thead>
<tbody>
{% for info in report %}
@foreach($report as $info)
<tr>
<td data-value="{{ info.title }}">
{% if info.id != 0 %}
<a class="btn btn-outline-secondary btn-xs" href="{{ route('categories.show', [info.id]) }}"><span class="fa fa-external-link"></span></a>
<td data-value="{{ $info['title'] }}">
@if($info['id'] !== 0)
<a class="btn btn-outline-secondary btn-xs" href="{{ route('categories.show', [$info['id']]) }}"><span class="fa fa-external-link"></span></a>
@else
<a class="btn btn-outline-secondary btn-xs" href="{{ route('categories.no-category') }}"><span class="fa fa-external-link"></span></a>
@endif
</td>
<td data-value="{{ info.title }}">
<a title="{{ info.title }}" href="#" data-currency="{{ info.currency_id }}" data-category="{{ info.id }}" class="category-chart-activate">{{ info.title }}</a>
<td data-value="{{ $info['title'] }}">
<a title="{{ $info['title'] }}" href="#" data-currency="{{ $info['currency_id'] }}" data-category="{{ $info['id'] }}" class="category-chart-activate">{{ $info['title'] }}</a>
</td>
{% for key, period in periods %}
@foreach($periods as $key => $period)
{{-- income first --}}
{% if(info.entries[key]) %}
<td data-value="{{ info.entries[key] }}" class="text-end">
{!! format_amount_by_symbol(info.entries[key], info.currency_symbol, info.currency_decimal_places) }}
@if(array_key_exists($key, $info['entries']))
<td data-value="{{ $info['entries'][$key] }}" class="text-end">
{!! format_amount_by_symbol($info['entries'][$key], $info['currency_symbol'], $info['currency_decimal_places']) !!}
</td>
@else
<td data-value="0" class="text-end">
{!! format_amount_by_symbol(0, info.currency_symbol, info.currency_decimal_places) }}
{!! format_amount_by_symbol(0, $info['currency_symbol'], $info['currency_decimal_places']) !!}
</td>
@endif
@endforeach
{{-- if sum of income, display: --}}
{% if info.sum %}
<td data-value="{{ info.sum }}" class="text-end">
{!! format_amount_by_symbol(info.sum, info.currency_symbol, info.currency_decimal_places) }}
@if(null !== $info['sum'])
<td data-value="{{ $info['sum'] }}" class="text-end">
{!! format_amount_by_symbol($info['sum'], $info['currency_symbol'], $info['currency_decimal_places']) !!}
</td>
@else
<td data-value="0" class="text-end">
{!! format_amount_by_symbol(0, info.currency_symbol, info.currency_decimal_places) }}
{!! format_amount_by_symbol(0, $info['currency_symbol'], $info['currency_decimal_places']) !!}
</td>
@endif
</tr>
resources/views/reports/partials/income-expenses.blade.php
+2 -2
View File
@@ -3,7 +3,7 @@
<tr>
<th data-defaultsign="az">{{ __('firefly.name') }}</th>
<th data-defaultsign="_19" class="text-end">{{ __('firefly.total') }}</th>
<th data-defaultsign="_19" class="text-right hidden-xs">{{ __('firefly.average') }}</th>
<th data-defaultsign="_19" class="text-end hidden-xs">{{ __('firefly.average') }}</th>
<th data-defaultsort="disabled"></th>
</tr>
</thead>
@@ -26,7 +26,7 @@
<td data-value="{{ $account['sum'] }}" class="text-end">
{!! format_amount_by_symbol($account['sum'], $account['currency_symbol'], $account['currency_decimal_places']) !!}
</td>
<td class="text-right hidden-xs" data-value="{{ $account['average'] }}">
<td class="text-end hidden-xs" data-value="{{ $account['average'] }}">
@if($account['count'] > 1)
{!! format_amount_by_symbol($account['average'], $account['currency_symbol'], $account['currency_decimal_places']) !!}
@else
resources/views/reports/partials/journals-audit.blade.php
+6 -6
View File
@@ -5,9 +5,9 @@
<th class="hide-icon">&nbsp;</th>
<th class="hide-description">{{ trans('list.description') }}</th>
<th class="text-right hide-balance_before">{{ trans('list.balance_before') }}</th>
<th class="text-right hide-amount">{{ trans('list.amount') }}</th>
<th class="text-right hide-balance_after">{{ trans('list.balance_after') }}</th>
<th class="text-end hide-balance_before">{{ trans('list.balance_before') }}</th>
<th class="text-end hide-amount">{{ trans('list.amount') }}</th>
<th class="text-end hide-balance_after">{{ trans('list.balance_after') }}</th>
<th class="hide-date">{{ trans('list.date') }}</th>
{{-- new optional fields (3x) --}}
@@ -78,10 +78,10 @@
</a>
</td>
<td class="text-right hide-balance_before">
<td class="text-end hide-balance_before">
{!! format_amount_by_symbol(journal.balance_before, auditData[$account->id].currency.symbol, auditData[$account->id].currency.decimal_places) }}
</td>
<td class="text-right hide-amount">
<td class="text-end hide-amount">
{% if auditData[$account->id].currency.id == journal.currency_id %}
{% if $account['id'] == journal.destination_account_id and journal.transaction_type_type == 'Opening balance' %}
@@ -109,7 +109,7 @@
</td>
<td class="text-right hide-balance_after">
<td class="text-end hide-balance_after">
{!! format_amount_by_symbol(journal.balance_after, auditData[$account->id].currency.symbol, auditData[$account->id].currency.decimal_places) }}
</td>