kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 01:42:32 +00:00
Code Issues Projects Releases Wiki Activity

Rename bills to subscriptions

Browse Source
This commit is contained in:
James Cole
2024-12-26 13:41:57 +01:00
parent 286a29ca3e
commit 291e73da4b
26 changed files with 161 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@
{% if (bill.expected_dates|length > 0 or bill.paid_moments|length > 0) and bill.active %}
<tr>
<td>
<a href="{{ route('bills.show',bill.id) }}">{{ bill.name }}</a>
<a href="{{ route('subscriptions.show',bill.id) }}">{{ bill.name }}</a>
</td>
<td class="hidden-xs" style="text-align:right;">
{{ formatAmountBySymbol(bill.amount_min, bill.currency_symbol, bill.currency_decimal_places) }}
@@ -49,7 +49,7 @@
{% for line in bills.getBills %}
<tr>
<td data-value="{{ line.getBill.name }}">
<a href="{{ route('bills.show',line.getBill.id) }}">{{ line.getBill.name }}</a>
<a href="{{ route('subscriptions.show',line.getBill.id) }}">{{ line.getBill.name }}</a>
<small class="text-muted"><br/>
{{ trans('firefly.bill_expected_between', {start: line.getPayDate.isoFormat(monthAndDayFormat), end: line.getEndOfPayDate.isoFormat(monthAndDayFormat) }) }}
</small>

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

@@ -134,7 +134,7 @@
</td>
<td class="hide-bill">
{% if journal.bill_id %}
<a href="{{ route('bills.show', [journal.bill_id]) }}" title="{{ journal.bill_name }}">{{ journal.bill_name }}</a>
<a href="{{ route('subscriptions.show', [journal.bill_id]) }}" title="{{ journal.bill_name }}">{{ journal.bill_name }}</a>
{% endif %}
</td>