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 #974

Browse Source
This commit is contained in:
James Cole 2017-11-03 06:42:36 +01:00
parent 6a91ca0f9b
commit 0e34302898
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,7 +144,10 @@ return [
// repeat frequencies: // repeat frequencies:
'repeat_freq_yearly' => 'yearly', 'repeat_freq_yearly' => 'yearly',
'repeat_freq_half-year' => 'every half-year',
'repeat_freq_quarterly' => 'quarterly',
'repeat_freq_monthly' => 'monthly', 'repeat_freq_monthly' => 'monthly',
'repeat_freq_weekly' => 'weekly',
'weekly' => 'weekly', 'weekly' => 'weekly',
'quarterly' => 'quarterly', 'quarterly' => 'quarterly',
'half-year' => 'every half year', 'half-year' => 'every half year',

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

@ -21,6 +21,8 @@
</td> </td>
<td class="hidden-xs" data-value="{{ line.getMin }}" style="text-align: right;">{{ line.getMin|formatAmount }}</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> <td class="hidden-xs" data-value="{{ line.getMax }}" style="text-align: right;">{{ line.getMax|formatAmount }}</td>
{# if bill is hit, show hit amount #}
{% if line.isHit %} {% if line.isHit %}
<td data-value="{{ line.getAmount }}" style="text-align: right;"> <td data-value="{{ line.getAmount }}" style="text-align: right;">
<a href="{{ route('transactions.show', line.getTransactionJournalId) }}"> <a href="{{ route('transactions.show', line.getTransactionJournalId) }}">
@ -28,18 +30,18 @@
</a> </a>
</td> </td>
{% endif %} {% endif %}
{# if not but is active, show "not yet charged #}
{% if not line.isHit and line.isActive %} {% if not line.isHit and line.isActive %}
<td data-value="0" class="bg-success">{{ 'notCharged'|_ }}</td> <td data-value="0" class="bg-success">{{ 'notCharged'|_ }}</td>
{% endif %} {% endif %}
{% if not line.isActive %} {% if not line.isActive and not line.isHit %}
<td data-value="-1">&nbsp;</td> <td data-value="-1">&nbsp;</td>
{% endif %} {% endif %}
<td data-value="{{ (line.getMax - line.getAmount) }}" style="text-align: right;" class="hidden-xs"> <td data-value="{{ (line.getMax - line.getAmount) }}" style="text-align: right;" class="hidden-xs">
{% if line.isActive %} {% if line.isHit %}
{{ (line.getMax + line.getAmount)|formatAmount }} {{ (line.getMax + line.getAmount)|formatAmount }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}