IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2702

Browse Source
This commit is contained in:
James Cole 2019-12-20 20:21:31 +01:00
parent 7431e18e4b
commit b4af70421d
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Repositories/Tag/TagRepository.php
View File

@ -301,9 +301,11 @@ class TagRepository implements TagRepositoryInterface
$journals = $collector->getExtractedJournals(); $journals = $collector->getExtractedJournals();
$sums = [ $sums = [
TransactionType::WITHDRAWAL => '0', TransactionType::WITHDRAWAL => '0',
TransactionType::DEPOSIT => '0', TransactionType::DEPOSIT => '0',
TransactionType::TRANSFER => '0', TransactionType::TRANSFER => '0',
TransactionType::RECONCILIATION => '0',
TransactionType::OPENING_BALANCE => '0',
]; ];
/** @var array $journal */ /** @var array $journal */

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

@ -105,6 +105,7 @@ return [
'sum_withdrawals' => 'Sum of withdrawals', 'sum_withdrawals' => 'Sum of withdrawals',
'sum_deposits' => 'Sum of deposits', 'sum_deposits' => 'Sum of deposits',
'sum_transfers' => 'Sum of transfers', 'sum_transfers' => 'Sum of transfers',
'sum_reconciliations' => 'Sum of reconciliations',
'reconcile' => 'Reconcile', 'reconcile' => 'Reconcile',
'account_on_spectre' => 'Account (Spectre)', 'account_on_spectre' => 'Account (Spectre)',
'account_on_ynab' => 'Account (YNAB)', 'account_on_ynab' => 'Account (YNAB)',

20
resources/views/v1/tags/show.twig
View File

@ -60,10 +60,18 @@
<td>{{ trans('list.sum_deposits') }}</td> <td>{{ trans('list.sum_deposits') }}</td>
<td> {{ sums.Deposit|formatAmount }}</td> <td> {{ sums.Deposit|formatAmount }}</td>
</tr> </tr>
<tr> {% if sums.Transfer != 0 %}
<td>{{ trans('list.sum_transfers') }}</td> <tr>
<td> {{ sums.Transfer|formatAmount }}</td> <td>{{ trans('list.sum_transfers') }}</td>
</tr> <td> {{ sums.Transfer|formatAmount }}</td>
</tr>
{% endif %}
{% if sums.Reconciliation != 0 %}
<tr>
<td>{{ trans('list.sum_reconciliations') }}</td>
<td> {{ sums.Reconciliation|formatAmount }}</td>
</tr>
{% endif %}
</table> </table>
</div> </div>
<div class="box-footer"> <div class="box-footer">
@ -81,8 +89,6 @@
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'location'|_ }}</h3> <h3 class="box-title">{{ 'location'|_ }}</h3>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button> <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
@ -132,7 +138,7 @@
</div> </div>
</div> </div>
<div class="box-body"> <div class="box-body">
{% include 'list/groups' %} {% include 'list.groups' with {showBudget:true, showCategory: true} %}
{% if periods|length > 0 %} {% if periods|length > 0 %}
<p> <p>