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

Fix https://github.com/firefly-iii/firefly-iii/issues/7818

Browse Source
This commit is contained in:
James Cole
2023-08-04 19:11:01 +02:00
parent 0c087f33c2
commit b4a6c6fcbe
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,35 +18,35 @@
<ul class="dropdown-menu">
{# edit + delete #}
<li><a href="{{ route('transactions.edit', [transactionGroup.id]) }}"><span
class="fa fa-pencil"></span> {{ 'edit'|_ }}</a></li>
class="fa fa-pencil"></span> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('transactions.delete', [transactionGroup.id]) }}"><span
class="fa fa-trash"></span> {{ 'delete'|_ }}</a></li>
class="fa fa-trash"></span> {{ 'delete'|_ }}</a></li>
<li role="separator" class="divider"></li>
{# convert to different type #}
{% if groupArray.transactions[0].type != 'withdrawal' %}
<li>
<a href="{{ route('transactions.convert.index', ['withdrawal', transactionGroup.id]) }}"><span
class="fa fa-exchange"></span> {{ 'convert_to_withdrawal'|_ }}</a></li>
class="fa fa-exchange"></span> {{ 'convert_to_withdrawal'|_ }}</a></li>
{% endif %}
{% if groupArray.transactions[0].type != 'deposit' %}
<li>
<a href="{{ route('transactions.convert.index', ['deposit', transactionGroup.id]) }}"><span
class="fa fa-exchange"></span> {{ 'convert_to_deposit'|_ }}</a></li>
class="fa fa-exchange"></span> {{ 'convert_to_deposit'|_ }}</a></li>
{% endif %}
{% if groupArray.transactions[0].type != 'transfer' %}
<li>
<a href="{{ route('transactions.convert.index', ['transfer', transactionGroup.id]) }}"><span
class="fa fa-exchange"></span> {{ 'convert_to_transfer'|_ }}</a></li>
class="fa fa-exchange"></span> {{ 'convert_to_transfer'|_ }}</a></li>
{% endif %}
{# clone #}
{% if groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'reconciliation' %}
<li role="separator" class="divider"></li>
<li><a href="#" class="clone-transaction" data-id="{{ transactionGroup.id }}"><span
class="fa fa-copy"></span> {{ 'clone'|_ }}</a></li>
class="fa fa-copy"></span> {{ 'clone'|_ }}</a></li>
{% endif %}
</ul>
@@ -147,8 +147,10 @@
<td style="width:30%;">{{ 'total_amount'|_ }}</td>
<td>
{% for amount in amounts %}
{% if first.transactiontype.type == 'Withdrawal' or first.transactiontype.type == 'Deposit' %}
{% if first.transactiontype.type == 'Withdrawal' %}
{{ formatAmountBySymbol(amount.amount*-1,amount.symbol, amount.decimal_places) }}{% if loop.index0 != amounts|length -1 %}, {% endif %}
{% elseif first.transactiontype.type == 'Deposit' %}
{{ formatAmountBySymbol(amount.amount,amount.symbol, amount.decimal_places) }}{% if loop.index0 != amounts|length -1 %}, {% endif %}
{% elseif first.transactiontype.type == 'Transfer' %}
<span class="text-info money-transfer">
{{ formatAmountBySymbol(amount.amount, amount.symbol, amount.decimal_places, false) }}{% if loop.index0 != amounts|length -1 %}, {% endif %}
@@ -213,29 +215,29 @@
<ul class="dropdown-menu">
{# edit + delete #}
<li><a href="{{ route('transactions.edit', [transactionGroup.id]) }}"><span
class="fa fa-pencil"></span> {{ 'edit'|_ }}</a></li>
class="fa fa-pencil"></span> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('transactions.delete', [transactionGroup.id]) }}"><span
class="fa fa-trash"></span> {{ 'delete'|_ }}</a></li>
class="fa fa-trash"></span> {{ 'delete'|_ }}</a></li>
<li role="separator" class="divider"></li>
{# convert to different type #}
{% if groupArray.transactions[0].type != 'withdrawal' %}
<li>
<a href="{{ route('transactions.convert.index', ['withdrawal', transactionGroup.id]) }}"><span
class="fa fa-exchange"></span> {{ 'convert_to_withdrawal'|_ }}</a>
class="fa fa-exchange"></span> {{ 'convert_to_withdrawal'|_ }}</a>
</li>
{% endif %}
{% if groupArray.transactions[0].type != 'deposit' %}
<li>
<a href="{{ route('transactions.convert.index', ['deposit', transactionGroup.id]) }}"><span
class="fa fa-exchange"></span> {{ 'convert_to_deposit'|_ }}</a></li>
class="fa fa-exchange"></span> {{ 'convert_to_deposit'|_ }}</a></li>
{% endif %}
{% if groupArray.transactions[0].type != 'transfer' %}
<li>
<a href="{{ route('transactions.convert.index', ['transfer', transactionGroup.id]) }}"><span
class="fa fa-exchange"></span> {{ 'convert_to_transfer'|_ }}</a>
class="fa fa-exchange"></span> {{ 'convert_to_transfer'|_ }}</a>
</li>
{% endif %}
@@ -243,20 +245,20 @@
{% if groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'reconciliation' %}
<li role="separator" class="divider"></li>
<li><a href="#" data-id="{{ transactionGroup.id }}" class="clone-transaction"><span
class="fa fa-copy"></span> {{ 'clone'|_ }}</a></li>
class="fa fa-copy"></span> {{ 'clone'|_ }}</a></li>
{% endif %}
<li><a href="#" class="link-modal"
data-journal="{{ journal.transaction_journal_id }}"><span
class="fa fa-fw fa-link"></span>{{ 'link_transaction'|_ }}</a></li>
class="fa fa-fw fa-link"></span>{{ 'link_transaction'|_ }}</a></li>
<li role="separator" class="divider"></li>
<li>
<a href="{{ route('rules.create-from-journal', [journal.transaction_journal_id]) }}"><span
class="fa fa-fw fa-random"></span>{{ 'create_rule_from_transaction'|_ }}
class="fa fa-fw fa-random"></span>{{ 'create_rule_from_transaction'|_ }}
</a></li>
<li>
<a href="{{ route('recurring.create-from-journal', [journal.transaction_journal_id]) }}"><span
class="fa fa-fw fa-paint-brush"></span>{{ 'create_recurring_from_transaction'|_ }}
class="fa fa-fw fa-paint-brush"></span>{{ 'create_recurring_from_transaction'|_ }}
</a></li>
</ul>
</div>
@@ -411,7 +413,7 @@
<td style="width:120px;">
<div class="btn-group btn-group-xs">
<a href="#" class="btn btn-default switch-link" data-id="{{ link.id }}"><span
class="fa fa-fw fa-arrows-h"></span></a>
class="fa fa-fw fa-arrows-h"></span></a>
<a href="{{ route('transactions.link.delete', [link.id]) }}"
class="btn btn-danger"><span class="fa fa-trash"></span></a>
</div>