kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-15 19:09:50 +00:00
Code Issues Projects Releases Wiki Activity

Various cleanup in transaction and journal display code.

Browse Source
This commit is contained in:
James Cole
2017-11-04 07:10:21 +01:00
parent b4dc70244a
commit bb46d034cd
25 changed files with 885 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,11 +88,13 @@
<tr>
<td>{{ 'total_amount'|_ }}</td>
<td>
{{ journalAmount(journal) }}
{{ journal|journalTotalAmount }}
{# if more transactions, list each one: #}
{% if transactions|length > 1 %}
({{ journalTotalAmount(journal) }})
({% for transaction in transactions %}{{ transaction|transactionArrayAmount }}{% if loop.index != loop.length %}, {% endif %}{% endfor %})
{% endif %}
</td>
</tr>
<tr>
@@ -336,12 +338,12 @@
<a href="{{ route('transactions.show',link.destination.id) }}">
#{{ link.destination.id }}: {{ link.destination.description }}
</a>
({{ journalAmount(link.destination) }})
({{ link.destination|journalTotalAmount }})
{% else %}
{{ journalLinkTranslation('inward', link.linkType.inward) }}
<a href="{{ route('transactions.show',link.source.id) }}">
#{{ link.source.id }}: {{ link.source.description }}</a>
({{ journalAmount(link.source) }})
({{ link.source|journalTotalAmount }})
{% endif %}
{% if link.comment != "" %}
<br/><em>{{ link.comment }}</em>