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

Updates to bill code for #1029

Browse Source
This commit is contained in:
James Cole
2017-12-02 07:10:36 +01:00
parent 8eded63055
commit efaa69cba1
5 changed files with 112 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -589,6 +589,7 @@ return [
'not_or_not_yet' => 'Not (yet)',
'not_expected_period' => 'Not expected this period',
'bill_is_active' => 'Bill is active',
'bill_expected_between' => 'Expeced between :start and :end',
'bill_will_automatch' => 'Bill will automatically linked to matching transactions',
'skips_over' => 'skips over',

3
resources/views/reports/partials/bills.twig
View File

@@ -18,6 +18,9 @@
<tr>
<td data-value="{{ line.getBill.name }}">
<a href="{{ route('bills.show',line.getBill.id) }}">{{ line.getBill.name }}</a>
<small class="text-muted"><br />
{{ trans('firefly.bill_expected_between', {start: line.getPayDate.formatLocalized(monthAndDayFormat), end: line.getEndOfPayDate.formatLocalized(monthAndDayFormat) }) }}
</small>
</td>
<td class="hidden-xs" data-value="{{ line.getMin }}" style="text-align: right;">{{ line.getMin|formatAmount }}</td>
<td class="hidden-xs" data-value="{{ line.getMax }}" style="text-align: right;">{{ line.getMax|formatAmount }}</td>