diff --git a/resources/views/v1/reports/partials/bills.twig b/resources/views/v1/reports/partials/bills.twig index 1e523a1dbf..583491f47e 100644 --- a/resources/views/v1/reports/partials/bills.twig +++ b/resources/views/v1/reports/partials/bills.twig @@ -1,84 +1,84 @@ -
{{ trans('form.name') }} | +{{ trans('form.amount_min') }} | +{{ trans('form.amount_max') }} | +{{ trans('form.expected_on') }} | +{{ trans('form.paid') }} | +|||||
---|---|---|---|---|---|---|---|---|---|
{{ trans('form.name') }} | -{{ trans('form.amount_min') }} | -{{ trans('form.amount_max') }} | -{{ trans('form.expected_on') }} | -{{ trans('form.paid') }} | ++ {{ bill.name }} + | ++ {{ formatAmountBySymbol(bill.amount_min, bill.currency_symbol, bill.currency_decimal_places) }} + | ++ {{ formatAmountBySymbol(bill.amount_max, bill.currency_symbol, bill.currency_decimal_places) }} + | +
+ {% for date in bill.expected_dates %}
+ {{ date.formatLocalized(monthAndDayFormat) }} + {% endfor %} + |
+
+ {% set hitCount = 0 %}
+ {% for journals in bill.paid_moments %}
+ {% for journal in journals %}
+ {% set hitCount = hitCount+1 %}
+ {{ journal.description }},
+ {{ formatAmountBySymbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places) }}
+ + {% endfor %} + {% endfor %} + {% if hitCount == 0 %} + {{ 'notCharged'|_ }} + {% endif %} + |
- {{ bill.name }} - | -- {{ formatAmountBySymbol(bill.amount_min, bill.currency_symbol, bill.currency_decimal_places) }} - | -- {{ formatAmountBySymbol(bill.amount_max, bill.currency_symbol, bill.currency_decimal_places) }} - | -
- {% for date in bill.expected_dates %}
- {{ date.formatLocalized(monthAndDayFormat) }} - {% endfor %} - |
-
- {% set hitCount = 0 %}
- {% for journals in bill.paid_moments %}
- {% for journal in journals %}
- {% set hitCount = hitCount+1 %}
- {{ journal.description }},
- {{ formatAmountBySymbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places) }}
- - {% endfor %} - {% endfor %} - {% if hitCount == 0 %} - {{ 'notCharged'|_ }} - {% endif %} - |
- |||||
+ {{ line.getBill.name }}
+ + {{ trans('firefly.bill_expected_between', {start: line.getPayDate.formatLocalized(monthAndDayFormat), end: line.getEndOfPayDate.formatLocalized(monthAndDayFormat) }) }} + + |
+ {{ formatAmountByCurrency(line.getCurrency, line.getMin) }} | +{{ formatAmountByCurrency(line.getCurrency, line.getMax) }} | + + {# if bill is hit, show hit amount #} + {% if line.isHit %} ++ + {{ formatAmountByCurrency(line.getCurrency, line.getAmount) }} + + | + {% endif %} + {# if not but is active, show "not yet charged #} + {% if not line.isHit and line.isActive %} +{{ 'notCharged'|_ }} | + {% endif %} + {% if not line.isActive and not line.isHit %} ++ {% endif %} + | + {% if line.isHit %} + {{ formatAmountByCurrency(line.getCurrency, (line.getMax + line.getAmount)) }} {% endif %} - {% endfor %} + | +|||
- {{ line.getBill.name }}
- - {{ trans('firefly.bill_expected_between', {start: line.getPayDate.formatLocalized(monthAndDayFormat), end: line.getEndOfPayDate.formatLocalized(monthAndDayFormat) }) }} - - |
- {{ formatAmountByCurrency(line.getCurrency, line.getMin) }} | -{{ formatAmountByCurrency(line.getCurrency, line.getMax) }} | - - {# if bill is hit, show hit amount #} - {% if line.isHit %} -- - {{ formatAmountByCurrency(line.getCurrency, line.getAmount) }} - - | - {% endif %} - {# if not but is active, show "not yet charged #} - {% if not line.isHit and line.isActive %} -{{ 'notCharged'|_ }} | - {% endif %} - {% if not line.isActive and not line.isHit %} -- {% endif %} - | - {% if line.isHit %} - {{ formatAmountByCurrency(line.getCurrency, (line.getMax + line.getAmount)) }} - {% endif %} - | -
{{ 'category'|_ }} | -{{ 'spent'|_ }} | -{{ 'earned'|_ }} | -{{ 'sum'|_ }} | -+ | {{ 'category'|_ }} | +{{ 'spent'|_ }} | +{{ 'earned'|_ }} | +{{ 'sum'|_ }} | +|||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
+ | {{ category.title }} | -{{ formatAmountBySymbol(category.spent, category.currency_symbol, category.currency_decimal_places, true) }} | -{{ formatAmountBySymbol(category.earned, category.currency_symbol, category.currency_decimal_places, true) }} | -{{ formatAmountBySymbol(category.sum, category.currency_symbol, category.currency_decimal_places, true) }} | +{{ formatAmountBySymbol(category.spent, category.currency_symbol, category.currency_decimal_places, true) }} | +{{ formatAmountBySymbol(category.earned, category.currency_symbol, category.currency_decimal_places, true) }} | +{{ formatAmountBySymbol(category.sum, category.currency_symbol, category.currency_decimal_places, true) }} |
diff --git a/resources/views/v1/reports/partials/operations.twig b/resources/views/v1/reports/partials/operations.twig
index e0e772e938..70dc36bb87 100644
--- a/resources/views/v1/reports/partials/operations.twig
+++ b/resources/views/v1/reports/partials/operations.twig
@@ -1,22 +1,26 @@
-
|