kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-25 21:16:47 +00:00
Code Issues Projects Releases Wiki Activity

Expand accounts page.

Browse Source
This commit is contained in:
James Cole
2024-03-23 20:37:15 +01:00
parent 4dcb38290e
commit 0310186fb7
70 changed files with 486 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/assets/v2/pages/accounts/index.js
View File

@@ -58,6 +58,10 @@ let index = function () {
sortDirection: '',
accounts: [],
accountRole(roleName) {
return i18next.t('firefly.account_role_' + roleName);
},
sort(column) {
this.sortingColumn = column;
this.sortDirection = this.sortDirection === 'asc' ? 'desc' : 'asc';
@@ -144,7 +148,7 @@ let index = function () {
currency_code: current.attributes.currency_code,
native_current_balance: current.attributes.native_current_balance,
native_currency_code: current.attributes.native_currency_code,
last_activity: null === current.attributes.last_activity ? '' : format(new Date(current.attributes.last_activity), 'P'),
last_activity: null === current.attributes.last_activity ? '' : format(new Date(current.attributes.last_activity), i18next.t('config.month_and_day_fns')),
};
this.accounts.push(account);
}

1
resources/lang/en_US/firefly.php
View File

@@ -2234,6 +2234,7 @@ return [
'description' => 'Description',
'sum_of_period' => 'Sum of period',
'average_in_period' => 'Average in period',
'no_account_role' => '(no role)',
'account_role_defaultAsset' => 'Default asset account',
'account_role_sharedAsset' => 'Shared asset account',
'account_role_savingAsset' => 'Savings account',

8
resources/views/v2/accounts/index.blade.php
View File

@@ -116,8 +116,12 @@
</div>
</td>
<td>
<span x-text="account.type"></span>
<span x-text="account.role"></span>
<template x-if="null === account.role || '' === account.role">
<span><em>{{ __('firefly.no_account_role') }}</em></span>
</template>
<template x-if="null !== account.role && '' !== account.role">
<span x-text="accountRole(account.role)"></span>"
</template>
</td>
<td>
<!-- IBAN and no account nr -->

22
resources/views/v2/partials/layout/sidebar.blade.php
View File

@@ -50,7 +50,7 @@
</li>
<li class="nav-header">{{ strtoupper(__('firefly.accounting')) }}</li>
<li class="nav-item @partialroute('transactions') menu-open @endpartialroute">
<a href="#" class="nav-link">
<a href="#" class="nav-link @partialroute('transactions') active @endpartialroute">
<em class="nav-icon fa-solid fa-arrow-right-arrow-left"></em>
<p>
{{ __('firefly.transactions') }}
@@ -59,25 +59,25 @@
</a>
<ul class="nav nav-treeview">
<li class="nav-item">
<a href="{{ route('transactions.index',['withdrawal']) }}" class="nav-link">
<a href="{{ route('transactions.index',['withdrawal']) }}" class="nav-link @partialroute('transactions', 'withdrawal') active @endpartialroute">
<em class="nav-icon fa-solid fa-arrow-left"></em>
<p>{{ __('firefly.expenses') }}</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('transactions.index', ['deposit']) }}" class="nav-link">
<a href="{{ route('transactions.index', ['deposit']) }}" class="nav-link @partialroute('transactions', 'deposit') active @endpartialroute">
<em class="nav-icon fa-solid fa-arrow-right"></em>
<p>{{ __('firefly.income') }}</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('transactions.index', ['transfers']) }}" class="nav-link">
<a href="{{ route('transactions.index', ['transfers']) }}" class="nav-link @partialroute('transactions', 'transfers') active @endpartialroute">
<i class="nav-icon fa-solid fa-arrows-rotate"></i>
<p>{{ __('firefly.transfers') }}</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('transactions.index', ['all']) }}" class="nav-link">
<a href="{{ route('transactions.index', ['all']) }}" class="nav-link @partialroute('transactions', 'all') active @endpartialroute">
<i class="nav-icon fa-solid fa-arrows-turn-to-dots"></i>
<p>{{ __('firefly.all_transactions') }}</p>
</a>
@@ -114,8 +114,8 @@
</ul>
</li>
<li class="nav-header">{{ strtoupper(__('firefly.others')) }}</li>
<li class="nav-item">
<a href="#" class="nav-link">
<li class="nav-item @partialroute('accounts') menu-open @endpartialroute">
<a href="#" class="nav-link @partialroute('accounts') active @endpartialroute">
<i class="nav-icon fa-regular fa-credit-card"></i>
<p>
{{ __('firefly.accounts') }}
@@ -124,25 +124,25 @@
</a>
<ul class="nav nav-treeview">
<li class="nav-item">
<a href="{{ route('accounts.index', ['asset']) }}" class="nav-link">
<a href="{{ route('accounts.index', ['asset']) }}" class="nav-link @partialroute('accounts', 'asset') active @endpartialroute">
<i class="nav-icon fa-solid fa-money-bills"></i>
<p>{{ __('firefly.asset_accounts') }}</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('accounts.index', ['expense']) }}" class="nav-link">
<a href="{{ route('accounts.index', ['expense']) }}" class="nav-link @partialroute('accounts', 'expense') active @endpartialroute">
<i class="nav-icon fa-solid fa-cart-shopping"></i>
<p>{{ __('firefly.expense_accounts') }}</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('accounts.index', ['revenue']) }}" class="nav-link">
<a href="{{ route('accounts.index', ['revenue']) }}" class="nav-link @partialroute('accounts', 'assset') revenue @endpartialroute">
<i class="nav-icon fa-solid fa-money-bill-trend-up"></i>
<p>{{ __('firefly.revenue_accounts') }}</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('accounts.index', ['liabilities']) }}" class="nav-link">
<a href="{{ route('accounts.index', ['liabilities']) }}" class="nav-link @partialroute('accounts', 'liabilities') active @endpartialroute">
<i class="nav-icon fa-solid fa-landmark"></i>
<p>{{ __('firefly.liabilities') }}</p>
</a>