IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed various currency displays.

Browse Source
This commit is contained in:
James Cole
2017-06-06 07:18:09 +02:00
parent a7412e43b3
commit 5329e026dc
6 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,13 +119,13 @@
{% if period.spent != 0 %}
<tr>
<td style="width:33%;">{{ 'spent'|_ }}</td>
<td style="text-align: right;">{{ period.spent|formatAmount }}</td>
<td style="text-align: right;">{{ formatAmountByCurrency(currency, period.spent) }}</td>
</tr>
{% endif %}
{% if period.earned != 0 %}
<tr>
<td style="width: 33%;">{{ 'earned'|_ }}</td>
<td style="text-align: right;">{{ period.earned|formatAmount }}</td>
<td style="text-align: right;">{{ formatAmountByCurrency(currency, period.earned) }}</td>
</tr>
{% endif %}
</table>

4
resources/views/reports/audit/report.twig
View File

@@ -59,7 +59,7 @@
account_name: account.name,
url: url,
end: auditData[account.id].end,
balance: auditData[account.id].endBalance|formatAmount
balance: formatAmountByAccount(account,auditData[account.id].endBalance)
})|raw }}
</p>
{% include 'reports.partials.journals-audit' with {'journals': auditData[account.id].journals,'account':account} %}
@@ -69,7 +69,7 @@
account_name: account.name,
url: url,
end: auditData[account.id].dayBefore,
balance: auditData[account.id].dayBeforeBalance|formatAmount
balance: formatAmountByAccount(account, auditData[account.id].dayBeforeBalance)
})|raw }}
</p>
</div>

4
resources/views/reports/partials/journals-audit.twig
View File

@@ -57,11 +57,11 @@
{% endif %}
</a>
</td>
<td class="hide-balance_before" style="text-align: right;">{{ transaction.before|formatAmount }}</td>
<td class="hide-balance_before" style="text-align: right;">{{ formatAmountByCurrency(transaction.currency, transaction.before) }}</td>
<td class="hide-amount" style="text-align: right;">
{{ transactionAmount(transaction) }}
</td>
<td class="hide-balance_after" style="text-align: right;">{{ transaction.after|formatAmount }}</td>
<td class="hide-balance_after" style="text-align: right;">{{ formatAmountByCurrency(transaction.currency, transaction.after) }}</td>
<td class="hide-date">{{ transaction.date.formatLocalized(monthAndDayFormat) }}</td>
<td class="hide-book_date">