kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 02:36:28 +00:00
Code Issues Projects Releases Wiki Activity

Replace deprecated function.

Browse Source
This commit is contained in:
James Cole
2022-03-27 20:33:25 +02:00
parent cbf14f541c
commit 2be7813a67
40 changed files with 74 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/reports/audit/report.twig
View File

@@ -44,8 +44,8 @@
{
account_name: account.name|escape,
url: url,
start: start.formatLocalized(monthAndDayFormat),
end: end.formatLocalized(monthAndDayFormat),
start: start.isoFormat(monthAndDayFormat),
end: end.isoFormat(monthAndDayFormat),
})|raw }}
</em>

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

@@ -23,7 +23,7 @@
</td>
<td data-value="{{ bill.expected_dates[0].format('Y-m-d')|default('0000-00-00') }}">
{% for date in bill.expected_dates %}
{{ date.formatLocalized(monthAndDayFormat) }}<br/>
{{ date.isoFormat(monthAndDayFormat) }}<br/>
{% endfor %}
</td>
<td style="text-align:right;">
@@ -31,7 +31,7 @@
{% for journals in bill.paid_moments %}
{% for journal in journals %}
{% set hitCount = hitCount+1 %}
<a title="{{ journal.date.formatLocalized(monthAndDayFormat) }}"
<a title="{{ journal.date.isoFormat(monthAndDayFormat) }}"
href="{{ route('transactions.show', [journal.transaction_group_id]) }}">{{ journal.description }}</a>,
{{ formatAmountBySymbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places) }}
<br/>
@@ -51,7 +51,7 @@
<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) }) }}
{{ trans('firefly.bill_expected_between', {start: line.getPayDate.isoFormat(monthAndDayFormat), end: line.getEndOfPayDate.isoFormat(monthAndDayFormat) }) }}
</small>
</td>
<td class="hidden-xs" data-value="{{ line.getMin }}" style="text-align: right;">{{ formatAmountByCurrency(line.getCurrency, line.getMin) }}</td>

4
resources/views/reports/partials/budgets.twig
View File

@@ -29,9 +29,9 @@
<td class="hidden-xs" data-value="{{ budget_limit.start_date.format('Y-m-d')|default('0000-00-00') }}">
{% if null != budget_limit.budget_limit_id %}
<a href="{{ route('budgets.show.limit', [budget.budget_id, budget_limit.budget_limit_id]) }}">
{{ budget_limit.start_date.formatLocalized(monthAndDayFormat) }}
{{ budget_limit.start_date.isoFormat(monthAndDayFormat) }}
&mdash;
{{ budget_limit.end_date.formatLocalized(monthAndDayFormat) }}
{{ budget_limit.end_date.isoFormat(monthAndDayFormat) }}
</a>
{% endif %}
</td>

18
resources/views/reports/partials/journals-audit.twig
View File

@@ -111,7 +111,7 @@
{{ formatAmountBySymbol(journal.balance_after, auditData[account.id].currency.symbol, auditData[account.id].currency.decimal_places) }}
</td>
<td class="hide-date">{{ journal.date.formatLocalized(monthAndDayFormat) }}</td>
<td class="hide-date">{{ journal.date.isoFormat(monthAndDayFormat) }}</td>
<td class="hide-from">
<a href="{{ route('accounts.show', [journal.source_account_id]) }}" title="{{ journal.source_account_iban|default(journal.source_account_name) }}">{{ journal.source_account_name }}</a>
@@ -138,42 +138,42 @@
<!-- new optional fields (2x) -->
<td class="hide-create_date">
{{ journal.created_at.formatLocalized(dateTimeFormat) }}
{{ journal.created_at.isoFormat(dateTimeFormat) }}
</td>
<td class="hide-update_date">
{{ journal.updated_at.formatLocalized(dateTimeFormat) }}
{{ journal.updated_at.isoFormat(dateTimeFormat) }}
</td>
<!-- more new dates -->
<td class="hide-interest_date">
{% if null != journal.interest_date %}
{{ journal.interest_date.formatLocalized(monthAndDayFormat) }}
{{ journal.interest_date.isoFormat(monthAndDayFormat) }}
{% endif %}
</td>
<td class="hide-book_date">
{% if null != journal.book_date %}
{{ journal.book_date.formatLocalized(monthAndDayFormat) }}
{{ journal.book_date.isoFormat(monthAndDayFormat) }}
{% endif %}
</td>
<td class="hide-process_date">
{% if null != journal.process_date %}
{{ journal.process_date.formatLocalized(monthAndDayFormat) }}
{{ journal.process_date.isoFormat(monthAndDayFormat) }}
{% endif %}
</td>
<td class="hide-due_date">
{% if null != journal.due_date %}
{{ journal.due_date.formatLocalized(monthAndDayFormat) }}
{{ journal.due_date.isoFormat(monthAndDayFormat) }}
{% endif %}
</td>
<td class="hide-payment_date">
{% if null != journal.payment_date %}
{{ journal.payment_date.formatLocalized(monthAndDayFormat) }}
{{ journal.payment_date.isoFormat(monthAndDayFormat) }}
{% endif %}
</td>
<td class="hide-invoice_date">
{% if null != journal.invoice_date %}
{{ journal.invoice_date.formatLocalized(monthAndDayFormat) }}
{{ journal.invoice_date.isoFormat(monthAndDayFormat) }}
{% endif %}
</td>
</tr>

2
resources/views/reports/partials/top-transactions.twig
View File

@@ -15,7 +15,7 @@
</td>
<td data-value="{{ transaction.description }}">{{ transaction.description }}</td>
<td data-value="{{ transaction.date.format('Y-m-d') }}">
{{ transaction.date.formatLocalized(monthAndDayFormat) }}
{{ transaction.date.isoFormat(monthAndDayFormat) }}
</td><!-- See reference nr. 3 -->
<td style="text-align: right;" data-value="{{ transaction.amount}}"><span
style="margin-right:5px;">