kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-26 13:36:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix overview, skip chart for now.

Browse Source
This commit is contained in:
James Cole
2024-12-25 11:59:15 +01:00
parent 399d7968f5
commit 756bb9cf5e
6 changed files with 113 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
resources/views/accounts/show.twig
View File

@@ -11,9 +11,15 @@
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">
{% if balances.balance %}
{{ trans('firefly.chart_account_in_period', {
balance: formatAmountBySymbol(balance, currency.symbol, currency.decimal_places, true),
balance: formatAmountBySymbol(balances.balance, currency.symbol, currency.decimal_places, true),
name: account.name|escape, start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat) })|raw }}
{% elseif balances.native_balance %}
{{ trans('firefly.chart_account_in_period', {
balance: formatAmountBySymbol(balances.native_balance, defaultCurrency.symbol, defaultCurrency.decimal_places, true),
name: account.name|escape, start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat) })|raw }}
{% endif %}
</h3>
<div class="box-tools pull-right">
<div class="btn-group">
@@ -140,7 +146,12 @@
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'transactions'|_ }}
({{ formatAmountBySymbol(balance, currency.symbol, currency.decimal_places, true)|raw }})</h3>
{% if balances.balance %}
({{ formatAmountBySymbol(balances.balance, currency.symbol, currency.decimal_places, true)|raw }})
{% elseif balances.native_balance %}
({{ formatAmountBySymbol(balances.native_balance, defaultCurrency.symbol, defaultCurrency.decimal_places, true)|raw }})
{% endif %}
</h3>
</div>
<div class="box-body">
{% if account.accountType.type == 'Asset account' %}

11
resources/views/list/accounts.twig
View File

@@ -68,8 +68,10 @@
<span style="margin-right:5px;">
{% for key, balance in account.endBalances %}
<span title="{{ key }}">
{% if 'balance' == key or 'native_balance' == key %}
{{ formatAmountBySymbol(balance, defaultCurrency.symbol, defaultCurrency.currency.decimal_places) }}
{% if 'balance' == key %}
{{ formatAmountBySymbol(balance, account.currency.symbol, account.currency.decimal_places) }}
{% elseif 'native_balance' == key %}
{{ formatAmountBySymbol(balance, defaultCurrency.symbol, defaultCurrency.decimal_places) }}
{% else %}
({{ formatAmountByCode(balance, key) }})
{% endif %}
@@ -110,11 +112,14 @@
<td class="hidden-sm hidden-xs hidden-md" style="text-align: right;">
<span style="margin-right:5px;">
{% for key, balance in account.differences %}
<span title="{{ key }}">
{% if 'balance' == key or 'native_balance' == key %}
{{ formatAmountBySymbol(balance, defaultCurrency.symbol, defaultCurrency.currency.decimal_places) }}
{{ formatAmountBySymbol(balance, account.currency.symbol, account.currency.currency.decimal_places) }}
{% else %}
({{ formatAmountByCode(balance, key) }})
{% endif %}
</span>
{% endfor %}
</span>
</td>