kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 02:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix #1012

Browse Source
This commit is contained in:
James Cole
2017-11-22 21:54:58 +01:00
parent 8f80ee25c2
commit 8198d86934
2 changed files with 163 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources/lang/en_US/firefly.php
View File

@@ -633,6 +633,7 @@ return [
'store_reconcile' => 'Store reconciliation', 'store_reconcile' => 'Store reconciliation',
'reconciliation_transaction' => 'Reconciliation transaction', 'reconciliation_transaction' => 'Reconciliation transaction',
'Reconciliation' => 'Reconciliation', 'Reconciliation' => 'Reconciliation',
'reconciliation' => 'Reconciliation',
'reconcile_options' => 'Reconciliation options', 'reconcile_options' => 'Reconciliation options',
'reconcile_range' => 'Reconciliation range', 'reconcile_range' => 'Reconciliation range',
'start_reconcile' => 'Start reconciling', 'start_reconcile' => 'Start reconciling',

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

@@ -19,44 +19,47 @@
<li><a href="{{ route('transactions.edit',journal.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit'|_ }}</a></li> <li><a href="{{ route('transactions.edit',journal.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('transactions.delete',journal.id) }}"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }}</a></li> <li><a href="{{ route('transactions.delete',journal.id) }}"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }}</a></li>
{# convert to withdrawal #} {# convert to withdrawal #}
{% if journal.transactionType.type != "Withdrawal" %} {% if journal.transactionType.type != 'Reconciliation' %}
{% if journal.transactionType.type != "Withdrawal" %}
<li>
<a href="{{ route('transactions.convert.index', ['withdrawal', journal.id]) }}">
<i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_withdrawal')|_ }}
</a>
</li>
{% endif %}
{# convert to deposit #}
{% if journal.transactionType.type != "Deposit" %}
<li>
<a href="{{ route('transactions.convert.index', ['deposit', journal.id]) }}">
<i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_deposit')|_ }}
</a>
</li>
{% endif %}
{# convert to transfer#}
{% if journal.transactionType.type != "Transfer" %}
<li>
<a href="{{ route('transactions.convert.index', ['transfer', journal.id]) }}">
<i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_transfer')|_ }}
</a>
</li>
{% endif %}
{# other options #}
<li> <li>
<a href="{{ route('transactions.convert.index', ['withdrawal', journal.id]) }}"> <a href="{{ route('transactions.clone', [journal.id]) }}">
<i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_withdrawal')|_ }} <i class="fa fa-copy fa-fw"></i> {{ ('clone_'~journal.transactionType.type|lower)|_ }}
</a>
</li>
<li>
<a href="{{ route('transactions.split.edit', journal.id) }}">
<i class="fa fa-unsorted fa-fw"></i> {{ ('split_this_'~what)|_ }}
</a>
</li>
<li>
<a href="#" data-toggle="modal" data-target="#linkJournalModal"><i
class="fa fa-fw fa-link"></i> {{ 'link_transaction'|_ }}
</a> </a>
</li> </li>
{% endif %} {% endif %}
{# convert to deposit #}
{% if journal.transactionType.type != "Deposit" %}
<li>
<a href="{{ route('transactions.convert.index', ['deposit', journal.id]) }}">
<i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_deposit')|_ }}
</a>
</li>
{% endif %}
{# convert to transfer#}
{% if journal.transactionType.type != "Transfer" %}
<li>
<a href="{{ route('transactions.convert.index', ['transfer', journal.id]) }}">
<i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_transfer')|_ }}
</a>
</li>
{% endif %}
{# other options #}
<li>
<a href="{{ route('transactions.clone', [journal.id]) }}">
<i class="fa fa-copy fa-fw"></i> {{ ('clone_'~journal.transactionType.type|lower)|_ }}
</a>
</li>
<li>
<a href="{{ route('transactions.split.edit', journal.id) }}">
<i class="fa fa-unsorted fa-fw"></i> {{ ('split_this_'~what)|_ }}
</a>
</li>
<li>
<a href="#" data-toggle="modal" data-target="#linkJournalModal"><i class="fa fa-fw fa-link"></i> {{ 'link_transaction'|_ }}
</a>
</li>
</ul> </ul>
</div> </div>
</div> </div>
@@ -73,17 +76,19 @@
<td>{{ trans('list.description') }}</td> <td>{{ trans('list.description') }}</td>
<td>{{ journal.description }}</td> <td>{{ journal.description }}</td>
</tr> </tr>
<!-- source(s) --> {% if journal.transactionType.type != 'Reconciliation' %}
<tr> <!-- source(s) -->
<td>{{ 'source_accounts'|_ }}</td> <tr>
<td>{{ sourceAccount(journal)|raw }}</td> <td>{{ 'source_accounts'|_ }}</td>
</tr> <td>{{ sourceAccount(journal)|raw }}</td>
</tr>
<!-- destination(s) --> <!-- destination(s) -->
<tr> <tr>
<td>{{ 'destination_accounts'|_ }}</td> <td>{{ 'destination_accounts'|_ }}</td>
<td>{{ destinationAccount(journal)|raw }}</td> <td>{{ destinationAccount(journal)|raw }}</td>
</tr> </tr>
{% endif %}
<!-- total amount --> <!-- total amount -->
<tr> <tr>
<td>{{ 'total_amount'|_ }}</td> <td>{{ 'total_amount'|_ }}</td>
@@ -108,50 +113,55 @@
<div class="pull-right"> <div class="pull-right">
<div class="btn-group"> <div class="btn-group">
<a class="btn btn-default" href="{{ route('transactions.edit',journal.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit'|_ }}</a> <a class="btn btn-default" href="{{ route('transactions.edit',journal.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit'|_ }}</a>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> {% if journal.transactionType.type != 'Reconciliation' %}
<i class="fa fa-cog fa-fw"></i> {{ 'options'|_ }} <span class="caret"></span> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
</button> <i class="fa fa-cog fa-fw"></i> {{ 'options'|_ }} <span class="caret"></span>
<ul class="dropdown-menu"> </button>
{# convert to withdrawal #} <ul class="dropdown-menu">
{% if journal.transactionType.type != "Withdrawal" %}
{# convert to withdrawal #}
{% if journal.transactionType.type != "Withdrawal" %}
<li>
<a href="{{ route('transactions.convert.index', ['withdrawal', journal.id]) }}">
<i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_withdrawal')|_ }}
</a>
</li>
{% endif %}
{# convert to deposit #}
{% if journal.transactionType.type != "Deposit" %}
<li>
<a href="{{ route('transactions.convert.index', ['deposit', journal.id]) }}">
<i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_deposit')|_ }}
</a>
</li>
{% endif %}
{# convert to transfer#}
{% if journal.transactionType.type != "Transfer" %}
<li>
<a href="{{ route('transactions.convert.index', ['transfer', journal.id]) }}">
<i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_transfer')|_ }}
</a>
</li>
{% endif %}
{# other options #}
<li> <li>
<a href="{{ route('transactions.convert.index', ['withdrawal', journal.id]) }}"> <a href="{{ route('transactions.clone', [journal.id]) }}">
<i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_withdrawal')|_ }} <i class="fa fa-copy fa-fw"></i> {{ ('clone_'~journal.transactionType.type|lower)|_ }}
</a> </a>
</li> </li>
{% endif %}
{# convert to deposit #}
{% if journal.transactionType.type != "Deposit" %}
<li> <li>
<a href="{{ route('transactions.convert.index', ['deposit', journal.id]) }}"> <a href="{{ route('transactions.split.edit', journal.id) }}">
<i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_deposit')|_ }} <i class="fa fa-unsorted fa-fw"></i> {{ ('split_this_'~what)|_ }}
</a> </a>
</li> </li>
{% endif %}
{# convert to transfer#}
{% if journal.transactionType.type != "Transfer" %}
<li> <li>
<a href="{{ route('transactions.convert.index', ['transfer', journal.id]) }}"> <a href="#" data-toggle="modal" data-target="#linkJournalModal"><i
<i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_transfer')|_ }} class="fa fa-fw fa-link"></i> {{ 'link_transaction'|_ }}
</a> </a>
</li> </li>
{% endif %}
{# other options #} </ul>
<li> {% endif %}
<a href="{{ route('transactions.clone', [journal.id]) }}">
<i class="fa fa-copy fa-fw"></i> {{ ('clone_'~journal.transactionType.type|lower)|_ }}
</a>
</li>
<li>
<a href="{{ route('transactions.split.edit', journal.id) }}">
<i class="fa fa-unsorted fa-fw"></i> {{ ('split_this_'~what)|_ }}
</a>
</li>
<li>
<a href="#" data-toggle="modal" data-target="#linkJournalModal"><i class="fa fa-fw fa-link"></i> {{ 'link_transaction'|_ }}
</a>
</li>
</ul>
<a href="{{ route('transactions.delete',journal.id) }}" class="btn btn-danger"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }} <a href="{{ route('transactions.delete',journal.id) }}" class="btn btn-danger"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }}
</a> </a>
</div> </div>
@@ -184,10 +194,12 @@
<td>{{ 'categories'|_ }}</td> <td>{{ 'categories'|_ }}</td>
<td>{{ journalCategories(journal)|raw }}</td> <td>{{ journalCategories(journal)|raw }}</td>
</tr> </tr>
<tr> {% if journal.transactionType.type != 'Reconciliation' %}
<td>{{ 'budgets'|_ }}</td> <tr>
<td>{{ journalBudgets(journal)|raw }}</td> <td>{{ 'budgets'|_ }}</td>
</tr> <td>{{ journalBudgets(journal)|raw }}</td>
</tr>
{% endif %}
{% if journal.hasMeta('interest_date') %} {% if journal.hasMeta('interest_date') %}
<tr> <tr>
@@ -328,7 +340,8 @@
<td> <td>
<div class="btn-group btn-group-xs"> <div class="btn-group btn-group-xs">
<a href="{{ route('transactions.link.delete', [link.id]) }}" class="btn btn-danger"><i class="fa fa-trash"></i></a> <a href="{{ route('transactions.link.delete', [link.id]) }}" class="btn btn-danger"><i class="fa fa-trash"></i></a>
<a href="{{ route('transactions.link.switch', [link.id]) }}" class="btn btn-default"><i class="fa fa-fw fa-arrows-h"></i></a> <a href="{{ route('transactions.link.switch', [link.id]) }}" class="btn btn-default"><i
class="fa fa-fw fa-arrows-h"></i></a>
</div> </div>
</td> </td>
<td> <td>
@@ -360,74 +373,75 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
{% if journal.transactionType.type != 'Reconciliation' %}
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-12 col-md-12 col-sm-12">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'transactions'|_ }}</h3> <h3 class="box-title">{{ 'transactions'|_ }}</h3>
</div> </div>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<thead> <thead>
<tr>
<th class="hidden-md hidden-sm hidden-xs">{{ trans('list.description') }}</th>
<th>{{ trans('list.source_account') }}</th>
<th class="hidden-sm hidden-xs">&#916;</th>
<th>{{ trans('list.destination_account') }}</th>
<th class="hidden-sm hidden-xs">&#916;</th>
<th>{{ trans('list.amount') }}</th>
<th class="hidden-md hidden-xs">{{ trans('list.budget') }}</th>
<th class="hidden-md hidden-xs">{{ trans('list.category') }}</th>
</tr>
</thead>
<tbody>
{% for transaction in transactions %}
<tr> <tr>
<td class="hidden-md hidden-sm hidden-xs"> <th class="hidden-md hidden-sm hidden-xs">{{ trans('list.description') }}</th>
{% if transaction.description == "" %} <th>{{ trans('list.source_account') }}</th>
{{ journal.description }} <th class="hidden-sm hidden-xs">&#916;</th>
{% else %} <th>{{ trans('list.destination_account') }}</th>
{{ transaction.description }} <th class="hidden-sm hidden-xs">&#916;</th>
{% endif %} <th>{{ trans('list.amount') }}</th>
</td> <th class="hidden-md hidden-xs">{{ trans('list.budget') }}</th>
<td> <th class="hidden-md hidden-xs">{{ trans('list.category') }}</th>
{% if transaction.source_account_type == 'Cash account' %}
<span class="text-success">({{ 'cash'|_ }})</span>
{% else %}
<a href="{{ route('accounts.show', transaction.source_account_id) }}">{{ transaction.source_account_name }}</a>
{% endif %}
</td>
<td class="hidden-sm hidden-xs">
{{ formatSourceBefore(transaction) }} &rarr; {{ formatSourceAfter(transaction) }}
</td>
<td>
{% if transaction.destination_account_type == 'Cash account' %}
<span class="text-success">({{ 'cash'|_ }})</span>
{% else %}
<a href="{{ route('accounts.show', transaction.destination_account_id) }}">{{ transaction.destination_account_name }}</a>
{% endif %}
</td>
<td class="hidden-sm hidden-xs">
{{ formatDestinationBefore(transaction) }} &rarr; {{ formatDestinationAfter(transaction) }}
</td>
<td>
{{ transaction|transactionArrayAmount }}
</td>
<td class="hidden-md hidden-xs">
{{ transaction.source|transactionBudgets }}
</td>
<td class="hidden-md hidden-xs">
{{ transaction.source|transactionCategories }}
</td>
</tr> </tr>
{% endfor %} </thead>
</tbody> <tbody>
</table> {% for transaction in transactions %}
<tr>
<td class="hidden-md hidden-sm hidden-xs">
{% if transaction.description == "" %}
{{ journal.description }}
{% else %}
{{ transaction.description }}
{% endif %}
</td>
<td>
{% if transaction.source_account_type == 'Cash account' %}
<span class="text-success">({{ 'cash'|_ }})</span>
{% else %}
<a href="{{ route('accounts.show', transaction.source_account_id) }}">{{ transaction.source_account_name }}</a>
{% endif %}
</td>
<td class="hidden-sm hidden-xs">
{{ formatSourceBefore(transaction) }} &rarr; {{ formatSourceAfter(transaction) }}
</td>
<td>
{% if transaction.destination_account_type == 'Cash account' %}
<span class="text-success">({{ 'cash'|_ }})</span>
{% else %}
<a href="{{ route('accounts.show', transaction.destination_account_id) }}">{{ transaction.destination_account_name }}</a>
{% endif %}
</td>
<td class="hidden-sm hidden-xs">
{{ formatDestinationBefore(transaction) }} &rarr; {{ formatDestinationAfter(transaction) }}
</td>
<td>
{{ transaction|transactionArrayAmount }}
</td>
<td class="hidden-md hidden-xs">
{{ transaction.source|transactionBudgets }}
</td>
<td class="hidden-md hidden-xs">
{{ transaction.source|transactionCategories }}
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div> </div>
</div> </div>
</div> {% endif %}
{# link journal modal:#} {# link journal modal:#}
<div class="modal fade" tabindex="-1" role="dialog" id="linkJournalModal"> <div class="modal fade" tabindex="-1" role="dialog" id="linkJournalModal">