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

Refer to correct field name.

Browse Source
This commit is contained in:
James Cole
2018-12-21 06:51:21 +01:00
parent a7585e3040
commit 8ede404b8a
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Support/Twig/Extension/Transaction.php
View File

@@ -104,7 +104,7 @@ class Transaction extends Twig_Extension
// first display amount: // first display amount:
$amount = (string)$transaction['amount']; $amount = (string)$transaction['amount'];
$fakeCurrency = new TransactionCurrency; $fakeCurrency = new TransactionCurrency;
$fakeCurrency->decimal_places = $transaction['currency_dp']; $fakeCurrency->decimal_places = $transaction['currency_decimal_places'];
$fakeCurrency->symbol = $transaction['currency_symbol']; $fakeCurrency->symbol = $transaction['currency_symbol'];
$string = app('amount')->formatAnything($fakeCurrency, $amount, true); $string = app('amount')->formatAnything($fakeCurrency, $amount, true);
@@ -112,7 +112,7 @@ class Transaction extends Twig_Extension
if (null !== $transaction['foreign_amount']) { if (null !== $transaction['foreign_amount']) {
$amount = (string)$transaction['foreign_amount']; $amount = (string)$transaction['foreign_amount'];
$fakeCurrency = new TransactionCurrency; $fakeCurrency = new TransactionCurrency;
$fakeCurrency->decimal_places = $transaction['foreign_currency_dp']; $fakeCurrency->decimal_places = $transaction['foreign_currency_decimal_places'];
$fakeCurrency->symbol = $transaction['foreign_currency_symbol']; $fakeCurrency->symbol = $transaction['foreign_currency_symbol'];
$string .= ' (' . app('amount')->formatAnything($fakeCurrency, $amount, true) . ')'; $string .= ' (' . app('amount')->formatAnything($fakeCurrency, $amount, true) . ')';
} }

8
resources/views/v1/list/piggy-banks.twig
View File

@@ -39,7 +39,7 @@
<a href="{{ route('piggy-banks.show', piggy.id) }}" title="{{ piggy.account_name }}">{{ piggy.name }}</a> <a href="{{ route('piggy-banks.show', piggy.id) }}" title="{{ piggy.account_name }}">{{ piggy.name }}</a>
</td> </td>
<td style="text-align: right;" class="piggySaved"> <td style="text-align: right;" class="piggySaved">
<span title="Saved so far" style="text-align:right;">{{ formatAmountBySymbol(piggy.current_amount,piggy.currency_symbol,piggy.currency_dp) }}</span> <span title="Saved so far" style="text-align:right;">{{ formatAmountBySymbol(piggy.current_amount,piggy.currency_symbol,piggy.currency_decimal_places) }}</span>
</td> </td>
<td class="hidden-sm hidden-xs" style="text-align:right;width:40px;"> <td class="hidden-sm hidden-xs" style="text-align:right;width:40px;">
{% if piggy.current_amount > 0 %} {% if piggy.current_amount > 0 %}
@@ -73,16 +73,16 @@
{% endif %} {% endif %}
</td> </td>
<td class="hidden-sm hidden-xs" style="text-align:right;"> <td class="hidden-sm hidden-xs" style="text-align:right;">
<span title="{{ 'target_amount'|_ }}">{{ formatAmountBySymbol(piggy.target_amount,piggy.currency_symbol,piggy.currency_dp) }}</span> <span title="{{ 'target_amount'|_ }}">{{ formatAmountBySymbol(piggy.target_amount,piggy.currency_symbol,piggy.currency_decimal_places) }}</span>
</td> </td>
<td class="hidden-sm hidden-xs" style="text-align:right;"> <td class="hidden-sm hidden-xs" style="text-align:right;">
{% if piggy.left_to_save > 0 %} {% if piggy.left_to_save > 0 %}
<span title="{{ 'left_to_save'|_ }}">{{ formatAmountBySymbol(piggy.left_to_save,piggy.currency_symbol,piggy.currency_dp) }}</span> <span title="{{ 'left_to_save'|_ }}">{{ formatAmountBySymbol(piggy.left_to_save,piggy.currency_symbol,piggy.currency_decimal_places) }}</span>
{% endif %} {% endif %}
</td> </td>
<td class="hidden-sm hidden-xs" style="text-align:right;"> <td class="hidden-sm hidden-xs" style="text-align:right;">
{% if piggy.target_date %} {% if piggy.target_date %}
{{ formatAmountBySymbol(piggy.save_per_month, piggy.currency_symbol, piggy.currency_dp) }} {{ formatAmountBySymbol(piggy.save_per_month, piggy.currency_symbol, piggy.currency_decimal_places) }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

10
resources/views/v1/piggy-banks/index.twig
View File

@@ -50,19 +50,19 @@
<tr> <tr>
<td><a href="{{ route('accounts.show',id) }}" title="{{ info.name }}">{{ info.name }}</a></td> <td><a href="{{ route('accounts.show',id) }}" title="{{ info.name }}">{{ info.name }}</a></td>
<td style="text-align:right;" class="hidden-sm hidden-xs"> <td style="text-align:right;" class="hidden-sm hidden-xs">
{{ formatAmountBySymbol(info.current_balance,info.currency_symbol,info.currency_dp) }} {{ formatAmountBySymbol(info.current_balance,info.currency_symbol,info.currency_decimal_places) }}
</td> </td>
<td style="text-align:right;"> <td style="text-align:right;">
{{ formatAmountBySymbol(info.left,info.currency_symbol,info.currency_dp) }} {{ formatAmountBySymbol(info.left,info.currency_symbol,info.currency_decimal_places) }}
</td> </td>
<td style="text-align:right;" class="hidden-sm hidden-xs"> <td style="text-align:right;" class="hidden-sm hidden-xs">
{{ formatAmountBySymbol(info.target,info.currency_symbol,info.currency_dp) }} {{ formatAmountBySymbol(info.target,info.currency_symbol,info.currency_decimal_places) }}
</td> </td>
<td style="text-align:right;" class="hidden-sm hidden-xs"> <td style="text-align:right;" class="hidden-sm hidden-xs">
{{ formatAmountBySymbol(info.saved,info.currency_symbol,info.currency_dp) }} {{ formatAmountBySymbol(info.saved,info.currency_symbol,info.currency_decimal_places) }}
</td> </td>
<td style="text-align:right;" class="hidden-sm hidden-xs"> <td style="text-align:right;" class="hidden-sm hidden-xs">
{{ formatAmountBySymbol(info.to_save,info.currency_symbol,info.currency_dp) }} {{ formatAmountBySymbol(info.to_save,info.currency_symbol,info.currency_decimal_places) }}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}

8
resources/views/v1/piggy-banks/show.twig
View File

@@ -41,19 +41,19 @@
<tr> <tr>
<td>{{ 'target_amount'|_ }}</td> <td>{{ 'target_amount'|_ }}</td>
<td> <td>
{{ formatAmountBySymbol(piggy.target_amount, piggy.currency_symbol, piggy.currency_dp) }} {{ formatAmountBySymbol(piggy.target_amount, piggy.currency_symbol, piggy.currency_decimal_places) }}
</td> </td>
</tr> </tr>
<tr> <tr>
<td>{{ 'saved_so_far'|_ }}</td> <td>{{ 'saved_so_far'|_ }}</td>
<td> <td>
{{ formatAmountBySymbol(piggy.current_amount, piggy.currency_symbol, piggy.currency_dp) }} {{ formatAmountBySymbol(piggy.current_amount, piggy.currency_symbol, piggy.currency_decimal_places) }}
</td> </td>
</tr> </tr>
<tr> <tr>
<td>{{ 'left_to_save'|_ }}</td> <td>{{ 'left_to_save'|_ }}</td>
<td> <td>
{{ formatAmountBySymbol(piggy.left_to_save, piggy.currency_symbol, piggy.currency_dp) }} {{ formatAmountBySymbol(piggy.left_to_save, piggy.currency_symbol, piggy.currency_decimal_places) }}
</td> </td>
</tr> </tr>
<tr> <tr>
@@ -80,7 +80,7 @@
<tr> <tr>
<td>{{ 'suggested_amount'|_ }}</td> <td>{{ 'suggested_amount'|_ }}</td>
<td> <td>
{{ formatAmountBySymbol(piggy.save_per_month, piggy.currency_symbol, piggy.currency_dp) }} {{ formatAmountBySymbol(piggy.save_per_month, piggy.currency_symbol, piggy.currency_decimal_places) }}
</td> </td>
</tr> </tr>

4
resources/views/v1/recurring/index.twig
View File

@@ -69,11 +69,11 @@
{% for rtt in rt.transactions %} {% for rtt in rt.transactions %}
<li> <li>
{# normal amount + comma#} {# normal amount + comma#}
{{ formatAmountBySymbol(rtt['amount'],rtt['currency_symbol'],rtt['currency_dp']) }}{% if rtt['foreign_amount'] == null %},{% endif %} {{ formatAmountBySymbol(rtt['amount'],rtt['currency_symbol'],rtt['currency_decimal_places']) }}{% if rtt['foreign_amount'] == null %},{% endif %}
{# foreign amount + comma #} {# foreign amount + comma #}
{% if null != rtt['foreign_amount'] %} {% if null != rtt['foreign_amount'] %}
({{ formatAmountBySymbol(rtt['foreign_amount'],rtt['foreign_currency_symbol'],rtt['foreign_currency_dp']) }}), ({{ formatAmountBySymbol(rtt['foreign_amount'],rtt['foreign_currency_symbol'],rtt['foreign_currency_decimal_places']) }}),
{% endif %} {% endif %}
<a href="{{ route('accounts.show', rtt['source_id']) }}">{{ rtt['source_name'] }}</a> <a href="{{ route('accounts.show', rtt['source_id']) }}">{{ rtt['source_name'] }}</a>
&rarr; &rarr;

4
resources/views/v1/recurring/show.twig
View File

@@ -112,9 +112,9 @@
<a href="{{ route('accounts.show', [transaction.destination_id]) }}">{{ transaction.destination_name }}</a> <a href="{{ route('accounts.show', [transaction.destination_id]) }}">{{ transaction.destination_name }}</a>
</td> </td>
<td> <td>
{{ formatAmountBySymbol(transaction.amount,transaction.currency_symbol,transaction.currency_dp) }} {{ formatAmountBySymbol(transaction.amount,transaction.currency_symbol,transaction.currency_decimal_places) }}
{% if null != transaction.foreign_amount %} {% if null != transaction.foreign_amount %}
({{ formatAmountBySymbol(transaction.foreign_amount,transaction.foreign_currency_symbol,transaction.foreign_currency_dp) }}) ({{ formatAmountBySymbol(transaction.foreign_amount,transaction.foreign_currency_symbol,transaction.foreign_currency_decimal_places) }})
{% endif %} {% endif %}
</td> </td>
<td data-value="{% for meta in transaction.meta %}{% if meta.name == 'category_name' %}{{ meta.category_id }}{% endif %}{% endfor %}"> <td data-value="{% for meta in transaction.meta %}{% if meta.name == 'category_name' %}{{ meta.category_id }}{% endif %}{% endfor %}">

4
resources/views/v1/transactions/split/edit.twig
View File

@@ -56,7 +56,7 @@
<label for="ffInput_journal_amount" class="col-sm-4 control-label">{{ trans('form.amount') }}</label> <label for="ffInput_journal_amount" class="col-sm-4 control-label">{{ trans('form.amount') }}</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p id="ffInput_journal_amount" class="form-control-static"> <p id="ffInput_journal_amount" class="form-control-static">
{{ formatAmountBySymbol(preFilled.journal_amount|default("0"), preFilled.transactions[0].currency_symbol|default("x"), preFilled.transactions[0].currency_dp) }} {{ formatAmountBySymbol(preFilled.journal_amount|default("0"), preFilled.transactions[0].currency_symbol|default("x"), preFilled.transactions[0].currency_decimal_places) }}
</p> </p>
</div> </div>
</div> </div>
@@ -67,7 +67,7 @@
<label for="ffInput_foreign_journal_amount" class="col-sm-4 control-label">{{ trans('form.foreign_amount') }}</label> <label for="ffInput_foreign_journal_amount" class="col-sm-4 control-label">{{ trans('form.foreign_amount') }}</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p id="ffInput_foreign_journal_amount" class="form-control-static"> <p id="ffInput_foreign_journal_amount" class="form-control-static">
{{ formatAmountBySymbol(preFilled.journal_foreign_amount, preFilled.transactions[0].foreign_currency_symbol, preFilled.transactions[0].foreign_currency_dp) }} {{ formatAmountBySymbol(preFilled.journal_foreign_amount, preFilled.transactions[0].foreign_currency_symbol, preFilled.transactions[0].foreign_currency_decimal_places) }}
</p> </p>
</div> </div>
</div> </div>