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

Make sure amounts are formatted, and fixed some issues.

Browse Source
This commit is contained in:
James Cole
2017-06-04 23:39:26 +02:00
parent 82e74a2afd
commit a487c7b4b2
15 changed files with 301 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
resources/views/transactions/mass-delete.twig
View File

@@ -29,7 +29,7 @@
<tr>
<th>&nbsp;</th>
<th>{{ trans('list.description') }}</th>
<th>{{ trans('list.amount') }}</th>
<th>{{ trans('list.total_amount') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.date') }}</th>
<th class="hidden-xs">{{ trans('list.from') }}</th>
<th class="hidden-xs">{{ trans('list.to') }}</th>
@@ -43,8 +43,7 @@
<a href="{{ route('transactions.show',journal.id) }}" title="{{ journal.description }}">{{ journal.description }}</a>
</td>
<td>
{# TODO fix amount display #}
XX.XX
{{ journalAmount(journal) }}
</td>
<td>
{{ journal.date.formatLocalized(monthAndDayFormat) }}

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

@@ -37,8 +37,7 @@
<tr>
<td>{{ 'total_amount'|_ }}</td>
<td>
{# TODO fix amount display #}
XX.XX
{{ journalAmount(journal) }}
</td>
</tr>
<tr>
@@ -299,8 +298,7 @@
</td>
<td>
{# TODO replace with new display: #}
XX.XX
{{ formatSourceBefore(transaction) }} &rarr; {{ formatSourceAfter(transaction) }}
</td>
<td>
{% if transaction.destination_account_type == 'Cash account' %}
@@ -311,29 +309,10 @@
</td>
<td>
{# TODO replace with new format code #}
XX.XX
{{ formatDestinationBefore(transaction) }} &rarr; {{ formatDestinationAfter(transaction) }}
</td>
<td>
{% if journal.transactiontype.type == 'Deposit' %}
<!-- deposit, positive amount with correct currency -->
{# TODO replace with new format code #}
XX.XX
{% endif %}
{% if journal.transactiontype.type == 'Withdrawal' %}
<!-- withdrawal, negative amount with correct currency -->
{# TODO replace with new format code #}
XX.XX
{% endif %}
{% if journal.transactiontype.type == 'Transfer' %}
<!-- transfer, positive amount in blue -->
<span class="text-info">
{# TODO replace with new format code #}
XX.XX
</span>
{% endif %}
{{ journalAmount(journal) }}
</td>
<td>
{{ transactionIdBudgets(transaction.source_id) }}