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

Code for #833

Browse Source
This commit is contained in:
James Cole
2018-08-12 10:06:20 +02:00
parent b95ca98be9
commit dd95776144
8 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resources/views/bills/show.twig
View File

@@ -27,7 +27,7 @@
<table class="table table-striped">
<tr>
<td colspan="2">
{{ trans('firefly.match_between_amounts', {low: object.data.amount_min|formatAmount, high: object.data.amount_max|formatAmount })|raw }}
{{ trans('firefly.match_between_amounts', {low: formatAmountByCurrency(object.data.currency,object.data.amount_min), high: formatAmountByCurrency(object.data.currency,object.data.amount_max) })|raw }}
{{ 'repeats'|_ }}
{{ trans('firefly.repeat_freq_' ~object.data.repeat_freq) }}.
</td>
@@ -55,11 +55,11 @@
</tr>
<tr>
<td>{{ trans('firefly.average_bill_amount_year', {year: year}) }}</td>
<td>{{ yearAverage|formatAmount }}</td>
<td>{{ formatAmountByCurrency(object.data.currency,yearAverage) }}</td>
</tr>
<tr>
<td>{{ 'average_bill_amount_overall'|_ }}</td>
<td>{{ overallAverage|formatAmount }}</td>
<td>{{ formatAmountByCurrency(object.data.currency, overallAverage) }}</td>
</tr>
</table>
</div>
@@ -174,6 +174,7 @@
{% block scripts %}
<script type="text/javascript">
var billCurrencySymbol = "{{ object.data.currency.symbol }}";
var billUri = '{{ route('chart.bill.single', [object.data.id]) }}';
</script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}"></script>