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

Merge pull request #3420 from sephrat/fix#3409

Browse Source 
Display account names only once when displaying split transactions
This commit is contained in:
James Cole
2020-06-02 17:59:52 +02:00
committed by GitHub
parent 0227879a69 6d8fd79922
commit 6191362fe0
2 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
resources/views/v1/transactions/show.twig
View File

@@ -82,19 +82,19 @@
{% if first.transactiontype.type != 'Withdrawal' or splits == 1 %}
<tr>
<td>
{{ trans_choice('firefly.source_accounts', groupArray.transactions|length ) }}
{{ trans_choice('firefly.source_accounts', accounts['source']|length ) }}
</td>
<td>
{% for journal in groupArray.transactions %}
{% if 'Cash account' == journal.source_type %}
{% for account in accounts['source'] %}
{% if 'Cash account' == account.type %}
<span class="text-success">({{ 'cash'|_ }})</span>
{% else %}
<a href="{{ route('accounts.show',journal.source_id) }}"
title="{{ journal.source_iban|default(journal.source_name) }}">
{{ journal.source_name }}
<a href="{{ route('accounts.show',account.id) }}"
title="{{ account.iban|default(account.name) }}">
{{ account.name }}
</a>
{% endif %}
{% if loop.index0 != groupArray.transactions|length -1 %}, {% endif %}
{% if loop.index0 != accounts['source']|length -1 %}, {% endif %}
{% endfor %}
</td>
</tr>
@@ -103,20 +103,20 @@
{% if first.transactiontype.type != 'Deposit' or splits == 1 %}
<tr>
<td>
{{ trans_choice('firefly.destination_accounts', groupArray.transactions|length ) }}
{{ trans_choice('firefly.destination_accounts', accounts['destination']|length ) }}
</td>
<td>
{% for journal in groupArray.transactions %}
{% if 'Cash account' == journal.destination_type %}
{% for account in accounts['destination'] %}
{% if 'Cash account' == account.type %}
<span class="text-success">({{ 'cash'|_ }})</span>
{% else %}
<a href="{{ route('accounts.show',journal.destination_id) }}"
title="{{ journal.destination_iban|default(journal.destination_name) }}">
{{ journal.destination_name }}
<a href="{{ route('accounts.show',account.id) }}"
title="{{ account.iban|default(account.name) }}">
{{ account.name }}
</a>
{% endif %}
{% if loop.index0 != groupArray.transactions|length -1 %}, {% endif %}
{% if loop.index0 != accounts['destination']|length -1 %}, {% endif %}
{% endfor %}
</td>
</tr>