diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 94acbf2230..49daf7d145 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -144,7 +144,10 @@ return [ // repeat frequencies: 'repeat_freq_yearly' => 'yearly', + 'repeat_freq_half-year' => 'every half-year', + 'repeat_freq_quarterly' => 'quarterly', 'repeat_freq_monthly' => 'monthly', + 'repeat_freq_weekly' => 'weekly', 'weekly' => 'weekly', 'quarterly' => 'quarterly', 'half-year' => 'every half year', diff --git a/resources/views/reports/partials/bills.twig b/resources/views/reports/partials/bills.twig index c532abd610..5e653a1925 100644 --- a/resources/views/reports/partials/bills.twig +++ b/resources/views/reports/partials/bills.twig @@ -21,6 +21,8 @@ {{ line.getMin|formatAmount }} {{ line.getMax|formatAmount }} + + {# if bill is hit, show hit amount #} {% if line.isHit %} @@ -28,18 +30,18 @@ {% endif %} + {# if not but is active, show "not yet charged #} {% if not line.isHit and line.isActive %} {{ 'notCharged'|_ }} {% endif %} - {% if not line.isActive %} + {% if not line.isActive and not line.isHit %}   {% endif %} - {% if line.isActive %} + {% if line.isHit %} {{ (line.getMax + line.getAmount)|formatAmount }} {% endif %} - {% endfor %}