kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-09 23:41:10 +00:00
Code Issues Projects Releases Wiki Activity

Clean up some money formatting routines.

Browse Source
This commit is contained in:
James Cole
2016-12-29 09:02:23 +01:00
parent eaefb7136a
commit de56c18c6e
9 changed files with 75 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
resources/views/transactions/show.twig
View File

@@ -285,8 +285,9 @@
</td>
<td>
{{ formatAmountWithCode(transaction.source_account_before,journal.transactionCurrency.code) }}
&longrightarrow; {{ formatAmountWithCode(transaction.source_account_after,journal.transactionCurrency.code) }}
{{ formatAnything(journal.transactionCurrency, transaction.source_account_before) }}
&longrightarrow; {{ formatAnything(journal.transactionCurrency, transaction.source_account_after) }}
</td>
<td>
{% if transaction.destination_account_type == 'Cash account' %}
@@ -297,23 +298,26 @@
</td>
<td>
{{ formatAmountWithCode(transaction.destination_account_before,journal.transactionCurrency.code) }}
&longrightarrow; {{ formatAmountWithCode(transaction.destination_account_after,journal.transactionCurrency.code) }}
{{ formatAnything(journal.transactionCurrency, transaction.destination_account_before) }}
&longrightarrow; {{ formatAnything(journal.transactionCurrency, transaction.destination_account_after) }}
</td>
<td>
{% if journal.transactiontype.type == 'Deposit' %}
<!-- deposit, positive amount with correct currency -->
{{ formatAmountWithCode(transaction.destination_amount, journal.transactionCurrency.code) }}
{{ formatAnything(journal.transactionCurrency, transaction.destination_amount) }}
{% endif %}
{% if journal.transactiontype.type == 'Withdrawal' %}
<!-- withdrawal, negative amount with correct currency -->
{{ formatAmountWithCode(transaction.source_amount, journal.transactionCurrency.code) }}
{{ formatAnything(journal.transactionCurrency, transaction.source_amount) }}
{% endif %}
{% if journal.transactiontype.type == 'Transfer' %}
<!-- transfer, positive amount in blue -->
<span class="text-info">{{ formatAmountPlainWithCode(transaction.destination_amount, journal.transactionCurrency.code) }}</span>
<span class="text-info">
{{ formatAnythingPlain(journal.transactionCurrency, transaction.destination_amount) }}
</span>
{% endif %}
</td>
<td>