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 @@ - - +
+ + + + + + + + + + + {% for bill in report.bills %} + {% if (bill.expected_dates|length > 0 or bill.paid_moments|length > 0) and bill.active %} - - - - - + + + + + - - - {% for bill in report.bills %} - {% if (bill.expected_dates|length > 0 or bill.paid_moments|length > 0) and bill.active %} - - - - - - - + {% endif %} + {% endfor %} + + + {% for line in bills.getBills %} + + + + + + {# if bill is hit, show hit amount #} + {% if line.isHit %} + + {% endif %} + {# if not but is active, show "not yet charged #} + {% if not line.isHit and line.isActive %} + + {% endif %} + {% if not line.isActive and not line.isHit %} + + {% endif %} + + - - {% for line in bills.getBills %} - - - - - - {# if bill is hit, show hit amount #} - {% if line.isHit %} - - {% endif %} - {# if not but is active, show "not yet charged #} - {% if not line.isHit and line.isActive %} - - {% endif %} - {% if not line.isActive and not line.isHit %} - - {% endif %} - - - - {% endfor %} - -
{{ trans('form.name') }}{{ trans('form.expected_on') }}{{ trans('form.paid') }}
{{ trans('form.name') }}{{ 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.getAmount) }} + + {{ 'notCharged'|_ }} 
- {{ line.getBill.name }} -
- {{ trans('firefly.bill_expected_between', {start: line.getPayDate.formatLocalized(monthAndDayFormat), end: line.getEndOfPayDate.formatLocalized(monthAndDayFormat) }) }} -
-
- - {{ formatAmountByCurrency(line.getCurrency, line.getAmount) }} - - {{ 'notCharged'|_ }} 
+ {% endfor %} + + diff --git a/resources/views/v1/reports/partials/categories.twig b/resources/views/v1/reports/partials/categories.twig index ce258de07f..18ebf6b465 100644 --- a/resources/views/v1/reports/partials/categories.twig +++ b/resources/views/v1/reports/partials/categories.twig @@ -1,11 +1,11 @@ - +
- - - - - + + + + + @@ -15,12 +15,12 @@ {% else %} {% 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 @@ - +
+ - - - - + + + + + + {% for sum in sums %} - - - {% endfor %} +
{{'currency'|_}}{{ 'money_flowing_in'|_ }}{{ 'money_flowing_out'|_ }}{{ 'difference'|_ }}{{'currency'|_}}{{ 'money_flowing_in'|_ }}{{ 'money_flowing_out'|_ }}{{ 'difference'|_ }}
{{ sum.currency_name }} ({{ sum.currency_symbol }}) + {{ formatAmountBySymbol(sum.in, sum.currency_symbol, sum.currency_decimal_places) }} + {{ formatAmountBySymbol(sum.out, sum.currency_symbol, sum.currency_decimal_places) }} + {{ formatAmountBySymbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}