Skip to content

Firefly III: a personal finances manager

new views

Sander Dorigoc238bab1561b
diff --git a/resources/assets/v3/js/pages/recurring/index.js b/resources/assets/v3/js/pages/recurring/index.js
new file mode 100644
index 0000000000..217ae6c5fb
--- /dev/null
+++ b/resources/assets/v3/js/pages/recurring/index.js
@@ -0,0 +1,61 @@
+/*
+ * dashboard.js
+ * Copyright (c) 2026 [email protected]
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+// CSS
+import '../../boot/bootstrap.js';
+import sidebar from '../../pages/shared/sidebar.js';
+import dates from '../shared/dates.js';
+
+let index = function () {
+ return {
+ foo2: 'bar2',
+ init() {
+ console.log('init op index xxx');
+ }
+ }
+};
+
+
+const comps = {
+ index,
+ sidebar,
+ dates
+};
+
+function loadPage(comps) {
+ console.log('loadPage');
+ Object.keys(comps).forEach(comp => {
+ let data = comps[comp]();
+ Alpine.data(comp, () => data);
+ console.log(comp);
+ });
+ Alpine.start();
+}
+
+// wait for load until bootstrapped event is received.
+document.addEventListener('firefly-iii-bootstrapped', () => {
+ console.log('Loaded through event listener.');
+ loadPage(comps);
+});
+// or is bootstrapped before event is triggered.
+if (window.bootstrapped) {
+ console.log('Loaded through window variable.');
+ loadPage(comps);
+}
diff --git a/resources/assets/v3/vite.config.js b/resources/assets/v3/vite.config.js
index 174a61e0d3..e23864330e 100644
--- a/resources/assets/v3/vite.config.js
+++ b/resources/assets/v3/vite.config.js
@@ -56,6 +56,9 @@ export default defineConfig(({command, mode, isSsrBuild, isPreview}) => {
// rules
'js/pages/rules/index.js',
+ // recurring transactions
+ 'js/pages/recurring/index.js',
+
// subscriptions
'js/pages/subscriptions/index.js',
diff --git a/resources/views/accounts/reconcile/show.twig b/resources/views/accounts/reconcile/show.twig
index e71ac83208..72a6264744 100644
--- a/resources/views/accounts/reconcile/show.twig
+++ b/resources/views/accounts/reconcile/show.twig
@@ -16,8 +16,8 @@
<button id="transaction_menu" class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span>
</button>
<ul class="dropdown-menu" role="menu">
- <li><a href="{{ route('transactions.edit',journal.id) }}"><span class="bi bi-pencil fa-fw"></span> {{ 'edit'|_ }}</a></li>
- <li><a href="{{ route('transactions.delete',journal.id) }}"><span class="bi bi-trash fa-fw"></span> {{ 'delete'|_ }}</a></li>
+ <li><a href="{{ route('transactions.edit',journal.id) }}"><span class="bi bi-pencil fa-fw"></span> {{ __('firefly.edit') }}</a></li>
+ <li><a href="{{ route('transactions.delete',journal.id) }}"><span class="bi bi-trash fa-fw"></span> {{ __('firefly.delete') }}</a></li>
</ul>
</div>
</div>
@@ -52,8 +52,8 @@
<div class="box-footer">
<div class="pull-right">
<div class="btn-group">
- <a class="btn btn-default" href="{{ route('transactions.edit',journal.id) }}"><span class="bi bi-pencil fa-fw"></span> {{ 'edit'|_ }}</a>
- <a href="{{ route('transactions.delete',journal.id) }}" class="btn btn-danger"><span class="bi bi-trash fa-fw"></span> {{ 'delete'|_ }}
+ <a class="btn btn-default" href="{{ route('transactions.edit',journal.id) }}"><span class="bi bi-pencil fa-fw"></span> {{ __('firefly.edit') }}</a>
+ <a href="{{ route('transactions.delete',journal.id) }}" class="btn btn-danger"><span class="bi bi-trash fa-fw"></span> {{ __('firefly.delete') }}
</a>
</div>
</div>
diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig
index 0f64db0c4b..1b9cbcd9ed 100644
--- a/resources/views/accounts/show.twig
+++ b/resources/views/accounts/show.twig
@@ -31,9 +31,9 @@
class="fa fa-ellipsis-v"></span></button>
<ul class="dropdown-menu" role="menu">
<li><a href="{{ route('accounts.edit', account.id) }}"><span
- class="bi bi-pencil fa-fw"></span> {{ 'edit'|_ }}</a></li>
+ class="bi bi-pencil fa-fw"></span> {{ __('firefly.edit') }}</a></li>
<li><a href="{{ route('accounts.delete', account.id) }}"><span
- class="bi bi-trash fa-fw"></span> {{ 'delete'|_ }}</a></li>
+ class="bi bi-trash fa-fw"></span> {{ __('firefly.delete') }}</a></li>
<li>
<a href="{{ route('accounts.reconcile',account.id) }}"><span class="fa fa-fw fa-check"></span> {{ 'reconcile_this_account'|_ }}</a>
</li>
diff --git a/resources/views/bills/show.twig b/resources/views/bills/show.twig
index 24e9360149..08859715ae 100644
--- a/resources/views/bills/show.twig
+++ b/resources/views/bills/show.twig
@@ -16,8 +16,8 @@
<div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
<ul class="dropdown-menu" role="menu">
- <li><a href="{{ route('subscriptions.edit', object.data.id) }}"><span class="bi bi-pencil"></span> {{ 'edit'|_ }}</a></li>
- <li><a href="{{ route('subscriptions.delete', object.data.id) }}"><span class="bi bi-trash-o"></span> {{ 'delete'|_ }}</a></li>
+ <li><a href="{{ route('subscriptions.edit', object.data.id) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>
+ <li><a href="{{ route('subscriptions.delete', object.data.id) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>
</ul>
</div>
</div>
@@ -93,8 +93,8 @@
</div>
<div class="box-footer">
<div class="btn-group">
- <a class="btn btn-default" href="{{ route('subscriptions.edit', [object.data.id]) }}">{{ 'edit'|_ }}</a>
- <a class="btn btn-danger" href="{{ route('subscriptions.delete', [object.data.id]) }}">{{ 'delete'|_ }}</a>
+ <a class="btn btn-default" href="{{ route('subscriptions.edit', [object.data.id]) }}">{{ __('firefly.edit') }}</a>
+ <a class="btn btn-danger" href="{{ route('subscriptions.delete', [object.data.id]) }}">{{ __('firefly.delete') }}</a>
</div>
</div>
</div>
diff --git a/resources/views/budgets/old-index.twig b/resources/views/budgets/old-index.twig
index 54d3303973..629aa1110f 100644
--- a/resources/views/budgets/old-index.twig
+++ b/resources/views/budgets/old-index.twig
@@ -225,7 +225,7 @@
<div class="btn-group btn-group-sm">
<a href="#" class="handle object-handle btn btn-default"><span class="fa fa-fw fa-bars"></span></a>
<a href="{{ route('budgets.edit', budget.id) }}" class="btn btn-xs btn-default"><span class="bi bi-pencil"></span></a>
- <a href="{{ route('budgets.delete', budget.id) }}" class="btn btn-xs btn-danger"><span class="bi bi-trash-o"></span></a>
+ <a href="{{ route('budgets.delete', budget.id) }}" class="btn btn-xs btn-danger"><span class="bi bi-trash"></span></a>
</div>
</td>
<td>
@@ -256,7 +256,7 @@
{% endif %}
{% endif %}
{% if budget.attachments.count() > 0 %}
- <span class="fa fa-paperclip"></span>
+ <span class="bi bi-paperclip"></span>
{% endif %}
</td>
<td>
diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twig
index 5129640e16..b74b14761b 100644
--- a/resources/views/budgets/show.twig
+++ b/resources/views/budgets/show.twig
@@ -20,8 +20,8 @@
<div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
<ul class="dropdown-menu" role="menu">
- <li><a href="{{ route('budgets.edit',budget.id) }}"><span class="bi bi-pencil fa-fw"></span> {{ 'edit'|_ }}</a></li>
- <li><a href="{{ route('budgets.delete',budget.id) }}"><span class="bi bi-trash fa-fw"></span> {{ 'delete'|_ }}</a></li>
+ <li><a href="{{ route('budgets.edit',budget.id) }}"><span class="bi bi-pencil fa-fw"></span> {{ __('firefly.edit') }}</a></li>
+ <li><a href="{{ route('budgets.delete',budget.id) }}"><span class="bi bi-trash fa-fw"></span> {{ __('firefly.delete') }}</a></li>
</ul>
</div>
</div>
diff --git a/resources/views/components/layout/sidebar.blade.php b/resources/views/components/layout/sidebar.blade.php
index 61bf3d3e66..6bfeb7a770 100644
--- a/resources/views/components/layout/sidebar.blade.php
+++ b/resources/views/components/layout/sidebar.blade.php
@@ -106,14 +106,14 @@
</a>
</li>
<li class="nav-item">
- <a href="{{ route('recurring.index') }}" class="nav-link">
+ <a href="{{ route('recurring.index') }}" class="nav-link {{ menu_item_active_partial('recurrinng.') }}">
<em class="nav-icon bi bi-paint-bucket"></em>
<p>{{__('firefly.recurrences') }}</p>
</a>
</li>
@if(true === $featuringWebhooks)
<li class="nav-item">
- <a href="{{ route('webhooks.index') }}" class="nav-link">
+ <a href="{{ route('webhooks.index') }}" class="nav-link {{ menu_item_active_partial('webhooks.') }}">
<em class="nav-icon bi bi-lightning"></em>
<p>{{ __('firefly.webhooks') }}</p>
</a>
@@ -121,10 +121,10 @@
@endif
@if(false === $featuringWebhooks)
<li class="nav-item">
- <a href="#" class="nav-link">
+ <span class="nav-link">
<em class="nav-icon bi bi-lightning"></em>
<p>{{ __('firefly.webhooks') }} ({{ trans('firefly.webhooks_menu_disabled') }})</p>
- </a>
+ </span>
</li>
@endif
</ul>
diff --git a/resources/views/components/lists/piggy-banks.blade.php b/resources/views/components/lists/piggy-banks.blade.php
index 53e2441a12..4fa31b6730 100644
--- a/resources/views/components/lists/piggy-banks.blade.php
+++ b/resources/views/components/lists/piggy-banks.blade.php
@@ -39,7 +39,7 @@
<td>
<a href="{{ route('piggy-banks.show', $piggy['id']) }}" title="{{ $piggy['name'] }}">{{ $piggy['name'] }}</a>
@if(count($piggy['attachments']) > 0)
- <span class="fa fa-fw fa-paperclip"></span>
+ <span class="bi bi-paperclip"></span>
@endif
</td>
<td class="text-end piggySaved">
diff --git a/resources/views/list/accounts.twig b/resources/views/list/accounts.twig
index 5242e50ba8..17b6bffe6a 100644
--- a/resources/views/list/accounts.twig
+++ b/resources/views/list/accounts.twig
@@ -45,7 +45,7 @@
<span class="fa fa-fw fa-map-marker"></span>
{% endif %}
{% if account.attachments.count() > 0 %}
- <span class="fa fa-fw fa-paperclip"></span>
+ <span class="bi bi-paperclip"></span>
{% endif %}
</td>
{% if objectType == "asset" %}
@@ -137,8 +137,8 @@
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{ 'actions'|_ }} <span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
- <li><a href="{{ route('accounts.edit',account.id) }}"><span class="bi bi-pencil"></span> {{ 'edit'|_ }}</a></li>
- <li><a href="{{ route('accounts.delete',account.id) }}"><span class="bi bi-trash"></span> {{ 'delete'|_ }}</a></li>
+ <li><a href="{{ route('accounts.edit',account.id) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>
+ <li><a href="{{ route('accounts.delete',account.id) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>
{% if objectType == 'asset' %}
<li><a href="{{ route('accounts.reconcile',account.id) }}"><span class="fa fa-fw fa-check"></span> {{ 'reconcile_this_account'|_ }}</a></li>
{% endif %}
diff --git a/resources/views/list/bills.twig b/resources/views/list/bills.twig
index f025df8bb0..883025d317 100644
--- a/resources/views/list/bills.twig
+++ b/resources/views/list/bills.twig
@@ -35,7 +35,7 @@
class="btn btn-default btn-xs"><span
class="bi bi-pencil"></span></a><a
href="{{ route('subscriptions.delete',entry.id) }}" class="btn btn-danger btn-xs"><span
- class="bi bi-trash-o"></span></a></div>
+ class="bi bi-trash"></span></a></div>
</td>
<td>
{% if not entry.active %}
@@ -44,7 +44,7 @@
<a href="{{ route('subscriptions.show',entry.id) }}" title="{{ entry.name }}">{{ entry.name }}</a>
{# count attachments #}
{% if entry.attachments.count() > 0 %}
- <span class="fa fa-paperclip"></span>
+ <span class="bi bi-paperclip"></span>
{% endif %}
</td>
diff --git a/resources/views/list/categories.twig b/resources/views/list/categories.twig
index dad57d0235..821b376736 100644
--- a/resources/views/list/categories.twig
+++ b/resources/views/list/categories.twig
@@ -20,13 +20,13 @@
<td>
<div class="btn-group btn-group-sm">
<a href="{{ route('categories.edit', category.id) }}" class="btn btn-default btn-xs"><span class="bi bi-pencil"></span></a>
- <a href="{{ route('categories.delete', category.id) }}" class="btn btn-danger btn-xs"><span class="bi bi-trash-o"></span></a>
+ <a href="{{ route('categories.delete', category.id) }}" class="btn btn-danger btn-xs"><span class="bi bi-trash"></span></a>
</div>
</td>
<td data-value="{{ category.name }}">
<a href="{{ route('categories.show', category.id) }}" title="{{ category.name }}">{{ category.name }}</a>
{% if category.attachments.count() > 0 %}
- <span class="fa fa-fw fa-paperclip"></span>
+ <span class="bi bi-paperclip"></span>
{% endif %}
</td>
{% if category.lastActivity %}
diff --git a/resources/views/list/groups.twig b/resources/views/list/groups.twig
index 64d4f422c8..435c962456 100644
--- a/resources/views/list/groups.twig
+++ b/resources/views/list/groups.twig
@@ -98,9 +98,9 @@
{{ 'actions'|_ }} <span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
<li><a href="{{ route('transactions.edit', [group.id]) }}"><span
- class="bi bi-pencil"></span> {{ 'edit'|_ }}</a></li>
+ class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>
<li><a href="{{ route('transactions.delete', [group.id]) }}"><span
- class="bi bi-trash"></span> {{ 'delete'|_ }}</a></li>
+ class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>
<li><a href="#" data-id="{{ group.id }}" class="clone-transaction"><span
class="fa fa-copy fa-fw"></span> {{ 'clone'|_ }}</a></li>
<li><a href="#" data-id="{{ group.id }}" class="clone-transaction-and-edit"><span
@@ -152,7 +152,7 @@
<span class="fa fa-check"></span>
{% endif %}
{% if transaction.attachments|length > 0 %}
- <span class="fa fa-paperclip"></span>
+ <span class="bi bi-paperclip"></span>
{% endif %}
{% if group.count == 1 %}
<a href="{{ route('transactions.show', [group.id]) }}" title="{{ transaction.description }}">
@@ -387,10 +387,10 @@
{{ 'actions'|_ }} <span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
<li><a href="{{ route('transactions.edit', [group.id]) }}"><span
- class="bi bi-pencil"></span> {{ 'edit'|_ }}</a></li>
+ class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>
{% if transaction.transaction_type_type != 'Opening balance' and transaction.transaction_type_type != 'Liability credit' %}
<li><a href="{{ route('transactions.delete', [group.id]) }}"><span
- class="bi bi-trash"></span> {{ 'delete'|_ }}</a></li>
+ class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>
{% endif %}
{% if transaction.transaction_type_type != 'Reconciliation' and transaction.transaction_type_type != 'Opening balance' and transaction.transaction_type_type != 'Liability credit' %}
<li><a href="#" data-id="{{ group.id }}" class="clone-transaction"><span
diff --git a/resources/views/list/piggy-banks.twig b/resources/views/list/piggy-banks.twig
index be616daa47..730169f226 100644
--- a/resources/views/list/piggy-banks.twig
+++ b/resources/views/list/piggy-banks.twig
@@ -42,7 +42,7 @@
<td>
<a href="{{ route('piggy-banks.show', piggy.id) }}" title="{{ piggy.account_name }}">{{ piggy.name }}</a>
{% if piggy.attachments.count() > 0 %}
- <span class="fa fa-fw fa-paperclip"></span>
+ <span class="bi bi-paperclip"></span>
{% endif %}
</td>
<td class="text-right piggySaved">
diff --git a/resources/views/old-index.twig b/resources/views/old-index.twig
index 4b45efeabb..cb55792365 100644
--- a/resources/views/old-index.twig
+++ b/resources/views/old-index.twig
@@ -116,10 +116,10 @@
<a href="{{ route('accounts.reconcile', [data.account.id]) }}">{{ 'reconcile'|_ }}</a>
</li>
<li>
- <a href="{{ route('accounts.edit', [data.account.id]) }}">{{ 'edit'|_ }}</a>
+ <a href="{{ route('accounts.edit', [data.account.id]) }}">{{ __('firefly.edit') }}</a>
</li>
<li>
- <a href="{{ route('accounts.delete', [data.account.id]) }}">{{ 'delete'|_ }}</a>
+ <a href="{{ route('accounts.delete', [data.account.id]) }}">{{ __('firefly.delete') }}</a>
</li>
</ul>
</div>
diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twig
index 35f60e098c..711da37761 100644
--- a/resources/views/piggy-banks/show.twig
+++ b/resources/views/piggy-banks/show.twig
@@ -24,8 +24,8 @@
<div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
<ul class="dropdown-menu" role="menu">
- <li><a href="{{ route('piggy-banks.edit', piggy.id) }}"><span class="bi bi-pencil fa-fw"></span> {{ 'edit'|_ }}</a></li>
- <li><a href="{{ route('piggy-banks.delete', piggy.id) }}"><span class="bi bi-trash fa-fw"></span> {{ 'delete'|_ }}</a></li>
+ <li><a href="{{ route('piggy-banks.edit', piggy.id) }}"><span class="bi bi-pencil fa-fw"></span> {{ __('firefly.edit') }}</a></li>
+ <li><a href="{{ route('piggy-banks.delete', piggy.id) }}"><span class="bi bi-trash fa-fw"></span> {{ __('firefly.delete') }}</a></li>
</ul>
</div>
</div>
diff --git a/resources/views/recurring/index.blade.php b/resources/views/recurring/index.blade.php
new file mode 100644
index 0000000000..9a8d2d3eef
--- /dev/null
+++ b/resources/views/recurring/index.blade.php
@@ -0,0 +1,145 @@
+@extends('layout.v3.session')
+@section('content')
+ @if(0 === $total && 1 === $page)
+ @php
+ $shownDemo = true
+ @endphp
+ <x-empty-page :route="route('recurring.create')" type="recurring" object-type="default" />
+ @endif
+ @if($total > 0)
+ <!-- block with list of recurring transaction -->
+ <div class="row">
+ <div class="col-lg-12 col-md-12 col-sm-12">
+ <div class="card">
+ <x-elements.card-header-with-menu
+ :cardTitle="trans('firefly.recurrences')" :route="route('recurring.create')" :linkTitle="__('firefly.make_new_recurring')"
+ />
+
+ <div class="card-body p-0">
+ <!-- list of recurring here -->
+ <div class="pl-2">
+ {{ $paginator->links('pagination.bootstrap-4') }}
+ </div>
+ <table class="table table-responsive table-hover sortable">
+ <thead>
+ <tr>
+ <th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th>
+ <th data-defaultsign="az">{{ trans('list.title') }}</th>
+ <th data-defaultsort="disabled">{{ trans('list.transaction_s') }}</th>
+ <th data-defaultsort="disabled">{{ trans('list.repetitions') }}</th>
+ <th data-defaultsign="month" data-dateformat="{{ $madMomentJS }}">{{ trans('list.next_due') }}</th>
+ </tr>
+ </thead>
+ <tbody>
+ @foreach($paginator as $rt)
+ <tr>
+ <td class="hidden-sm hidden-xs">
+ <div class="btn-group btn-group-sm edit_tr_buttons">
+ <a class="btn btn-default btn-xs" title="{{ __('firefly.edit') }}" href="{{ route('recurring.edit',$rt['id']) }}"><span
+ class="bi bi-pencil"></span></a><a class="btn btn-danger btn-xs" title="{{ __('firefly.delete') }}"
+ href="{{ route('recurring.delete',$rt['id']) }}"><span
+ class="bi bi-trash"></span></a>
+ </div>
+ </td>
+ <td data-value="{{ $rt['title'] }}">
+ @if($rt['attachments'] > 0)
+ <span class="bi bi-paperclip"></span>
+ @endif
+ @if(false === $rt['active'])<s>@endif
+ {{ __('firefly.'.$rt['type']) }}:
+ <a href="{{ route('recurring.show', $rt['id']) }}">{{ $rt['title'] }}</a>
+ @if(false === $rt['active'])</s> ({{ strtolower(__('firefly.inactive')) }})@endif
+ @if(strlen($rt['description']) > 0)
+ <small><br>{{ $rt['description'] }}</small>
+ @endif
+ </td>
+ <td data-value="0">
+ <ol>
+ @foreach($rt['transactions'] as $rtt)
+ <li>
+ {{-- normal amount + comma --}}
+ {!! format_amount_by_symbol($rtt['amount'],$rtt['currency_symbol'],$rtt['currency_decimal_places']) !!}@if(null === $rtt['foreign_amount']),@endif
+
+ {{-- foreign amount + comma --}}
+ @if('' !== (string) $rtt['foreign_amount'])
+ ({!! format_amount_by_symbol($rtt['foreign_amount'],$rtt['foreign_currency_symbol'],$rtt['foreign_currency_decimal_places']) !!}),
+ @endif
+ <a href="{{ route('accounts.show', $rtt['source_id']) }}">{{ $rtt['source_name'] }}</a>
+ &rarr;
+ <a href="{{ route('accounts.show', $rtt['destination_id']) }}">{{ $rtt['destination_name'] }}</a>
+ </li>
+ @endforeach
+ </ol>
+ </td>
+ <td>
+ @if(null !== $rt['repeat_until'] && $today > $rt['repeat_until'])
+ <span class="text-danger">
+ {{ trans('firefly.repeat_until_in_past', ['date' => $rt['repeat_until']->isoFormat($monthAndDayFormat)]) }}
+ </span>
+ @endif
+ <ul>
+ @foreach($rt['repetitions'] as $rep)
+ <li>{{ $rep['description'] }}
+ @if(1 === $rep['skip'])
+ ({{ strtolower(trans('firefly.recurring_skips_one')) }}).
+ @endif
+ @if($rep['skip'] > 1)
+ ({{ strtolower(trans('firefly.recurring_skips_more', ['count' => $rep['repetition_skip']])) }}).
+ @endif
+ @if(3 === $rep['weekend'])
+ <br>{{ __('firefly.will_jump_friday') }}
+ @endif
+ @if(4 === $rep['weekend'])
+ <br>{{ __('firefly.will_jump_monday') }}
+ @endif
+ @if(2 === $rep['weekend'])
+ <br>{{ __('firefly.except_weekends') }}
+ @endif
+ </li>
+ @endforeach
+ </ul>
+ <p>
+ @if(null === $rt['repeat_until'] && 0 === $rt['repetitions'])
+ {{ __('firefly.recurring_repeats_forever') }}.
+ @endif
+ @if(null !== $rt['repeat_until'] && 0 === $rt['repetitions'])
+ {{ trans('firefly.recurring_repeats_until', ['date' => $rt['repeat_until']->isoFormat($monthAndDayFormat)]) }}.
+ @endif
+ @if(null === $rt['repeat_until'] && 0 !== (int)$rt['nr_of_repetitions'])
+ {{ trans_choice('firefly.recurring_repeats_x_times', $rt['nr_of_repetitions']) }}.
+ @endif
+ </p>
+ </td>
+ <td>
+ <ul>
+ @foreach($rt['repetitions'] as $rep)
+ @foreach($rep['occurrences'] as $occ)
+ @if($loop->index < 2)
+ <li>{{ $occ->isoFormat($monthAndDayFormat) }}</li>
+ @endif
+ @endforeach
+ @endforeach
+ </ul>
+ </td>
+ </tr>
+ @endforeach
+ </tbody>
+ </table>
+ <div class="pl-2">
+ {{ $paginator->links('pagination.bootstrap-4') }}
+ </div>
+ </div>
+ <x-elements.card-footer-with-menu :route="route('recurring.create')" :linkTitle="__('firefly.make_new_recurring')" />
+ </div>
+ </div>
+ </div>
+@endif
+@endsection
+@section('styles')
+ <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ $FF_BUILD_TIME }}" type="text/css" media="all" nonce="{{ $JS_NONCE }}">
+@endsection
+
+@section('scripts')
+ @vite(['js/pages/recurring/index.js'])
+ <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
+@endsection
diff --git a/resources/views/recurring/index.twig b/resources/views/recurring/old-index.twig
similarity index 97%
rename from resources/views/recurring/index.twig
rename to resources/views/recurring/old-index.twig
index 2f5f8120d2..915d2e31ef 100644
--- a/resources/views/recurring/index.twig
+++ b/resources/views/recurring/old-index.twig
@@ -49,15 +49,15 @@
<tr>
<td class="hidden-sm hidden-xs">
<div class="btn-group btn-group-sm edit_tr_buttons">
- <a class="btn btn-default btn-xs" title="{{ 'edit'|_ }}" href="{{ route('recurring.edit',rt.id) }}"><span
- class="bi bi-pencil"></span></a><a class="btn btn-danger btn-xs" title="{{ 'delete'|_ }}"
+ <a class="btn btn-default btn-xs" title="{{ __('firefly.edit') }}" href="{{ route('recurring.edit',rt.id) }}"><span
+ class="bi bi-pencil"></span></a><a class="btn btn-danger btn-xs" title="{{ __('firefly.delete') }}"
href="{{ route('recurring.delete',rt.id) }}"><span
- class="bi bi-trash-o"></span></a>
+ class="bi bi-trash"></span></a>
</div>
</td>
<td data-value="{{ rt.title }}">
{% if rt.attachments > 0 %}
- <span class="fa fa-fw fa-paperclip"></span>
+ <span class="bi bi-paperclip"></span>
{% endif %}
{% if rt.active == false %}<s>{% endif %}
{{ rt.type|_ }}:
diff --git a/resources/views/recurring/show.twig b/resources/views/recurring/show.twig
index 7e2f22d2d7..cc8ec9d9e6 100644
--- a/resources/views/recurring/show.twig
+++ b/resources/views/recurring/show.twig
@@ -52,8 +52,8 @@
<div class="box-footer">
<div class="btn-group">
<a href="{{ route('recurring.edit', [array.id]) }}" class="btn btn-sm btn-default"><span
- class="bi bi-pencil"></span> {{ 'edit'|_ }}</a>
- <a href="{{ route('recurring.delete', [array.id]) }}" class="btn btn-sm btn-danger">{{ 'delete'|_ }}
+ class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a>
+ <a href="{{ route('recurring.delete', [array.id]) }}" class="btn btn-sm btn-danger">{{ __('firefly.delete') }}
<span class="bi bi-trash"></span></a>
</div>
</div>
diff --git a/resources/views/reports/partials/journals-audit.twig b/resources/views/reports/partials/journals-audit.twig
index 24fb157ad3..9c9e2e63cc 100644
--- a/resources/views/reports/partials/journals-audit.twig
+++ b/resources/views/reports/partials/journals-audit.twig
@@ -41,7 +41,7 @@
<td class="hide-buttons">
<div class="btn-group btn-group-sm">
<a href="{{ route('transactions.edit',journal.transaction_group_id) }}" class="btn btn-xs btn-default"><span class="bi bi-pencil"></span></a>
- <a href="{{ route('transactions.delete',journal.transaction_group_id) }}" class="btn btn-xs btn-danger"><span class="bi bi-trash-o"></span></a>
+ <a href="{{ route('transactions.delete',journal.transaction_group_id) }}" class="btn btn-xs btn-danger"><span class="bi bi-trash"></span></a>
</div>
</td>
diff --git a/resources/views/rules/index.blade.php b/resources/views/rules/index.blade.php
index 2706f07403..86c31d583e 100644
--- a/resources/views/rules/index.blade.php
+++ b/resources/views/rules/index.blade.php
@@ -33,8 +33,8 @@ $shownDemo = true
class="bi bi-power"></span> {{ trans('firefly.apply_rule_group_selection', ['title' => $ruleGroup->title]) }}
</a></li>
- <li><a class="dropdown-item" href="{{ route('rule-groups.create') }}"><em class="bi bi-plus"></em> {{ __('firefly.new_rule_group') }}</a></li>
- <li><a href="{{ route('rules.create', $ruleGroup->id) }}" class="dropdown-item new_rule"><em class="bi bi-plus"></em> {{ __('firefly.new_rule') }}</a></li>
+ <li><a class="dropdown-item" href="{{ route('rule-groups.create') }}"><em class="bi bi-plus-circle"></em> {{ __('firefly.new_rule_group') }}</a></li>
+ <li><a href="{{ route('rules.create', $ruleGroup->id) }}" class="dropdown-item new_rule"><em class="bi bi-plus-circle"></em> {{ __('firefly.new_rule') }}</a></li>
@if($ruleGroup->order > 1)
<li><a href="#" class="dropdown-item move-group" data-direction="up" data-id="{{ $ruleGroup->id }}"><span
diff --git a/resources/views/rules/old-index.twig b/resources/views/rules/old-index.twig
index df206530c3..7d6d2891f7 100644
--- a/resources/views/rules/old-index.twig
+++ b/resources/views/rules/old-index.twig
@@ -42,8 +42,8 @@
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span
class="fa fa-ellipsis-v"></span></button>
<ul class="dropdown-menu" role="menu">
- <li><a href="{{ route('rule-groups.edit',ruleGroup.id) }}"><span class="bi bi-pencil"></span> {{ 'edit'|_ }}</a></li>
- <li><a href="{{ route('rule-groups.delete',ruleGroup.id) }}"><span class="bi bi-trash"></span> {{ 'delete'|_ }}</a></li>
+ <li><a href="{{ route('rule-groups.edit',ruleGroup.id) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>
+ <li><a href="{{ route('rule-groups.delete',ruleGroup.id) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>
<li><a href="{{ route('rule-groups.select-transactions',ruleGroup.id) }}"><span
class="fa fa-fw fa-power-off"></span> {{ trans('firefly.apply_rule_group_selection', {title: ruleGroup.title}) }}
</a></li>
@@ -92,10 +92,10 @@
</td>
<td>
<div class="btn-group btn-group-sm edit_buttons">
- <a title="{{ 'edit'|_ }}" href="{{ route('rules.edit', rule.id) }}"
+ <a title="{{ __('firefly.edit') }}" href="{{ route('rules.edit', rule.id) }}"
class="btn btn-default"><span
class="bi bi-pencil"></span></a>
- <a title="{{ 'delete'|_ }}"
+ <a title="{{ __('firefly.delete') }}"
href="{{ route('rules.delete', rule.id) }}"
class="btn btn-danger"><span
class="bi bi-trash"></span></a>
diff --git a/resources/views/settings/link/index.twig b/resources/views/settings/link/index.twig
index dfc9589448..11b64d2462 100644
--- a/resources/views/settings/link/index.twig
+++ b/resources/views/settings/link/index.twig
@@ -30,7 +30,7 @@
<a class="btn btn-default btn-xs" href="{{ route('settings.links.edit',linkType.id) }}"><span
class="bi bi-pencil"></span></a>
<a class="btn btn-danger btn-xs" href="{{ route('settings.links.delete',linkType.id) }}"><span
- class="bi bi-trash-o"></span></a>
+ class="bi bi-trash"></span></a>
</div>
{% endif %}
</td>
diff --git a/resources/views/tags/index.twig b/resources/views/tags/index.twig
index 4a0d477a81..1dcc1825b4 100644
--- a/resources/views/tags/index.twig
+++ b/resources/views/tags/index.twig
@@ -35,7 +35,7 @@
class="label label-success bold-label"
title="{{ tagInfo.created_at.isoFormat(monthAndDayFormat) }}"
- href="{{ route('tags.show',tagInfo.id) }}">{% if tagInfo.location %}<span class="fa fa-fw fa-map-marker"></span>{% endif %}<span class="fa fa-fw fa-tag"></span>{{ tagInfo.tag }}{% if tagInfo.attachments.count() > 0 %}<span class="fa fa-fw fa-paperclip"></span>{% endif %}</a></div>
+ href="{{ route('tags.show',tagInfo.id) }}">{% if tagInfo.location %}<span class="fa fa-fw fa-map-marker"></span>{% endif %}<span class="fa fa-fw fa-tag"></span>{{ tagInfo.tag }}{% if tagInfo.attachments.count() > 0 %}<span class="bi bi-paperclip"></span>{% endif %}</a></div>
{% endfor %}
</div>
diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig
index bb2ab6a672..b9f421dc23 100644
--- a/resources/views/transactions/show.twig
+++ b/resources/views/transactions/show.twig
@@ -18,10 +18,10 @@
<ul class="dropdown-menu">
{# edit + delete #}
<li><a href="{{ route('transactions.edit', [transactionGroup.id]) }}"><span
- class="bi bi-pencil"></span> {{ 'edit'|_ }}</a></li>
+ class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>
{% if groupArray.transactions[0].type != 'reconciliation' and groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'liability credit' %}
<li><a href="{{ route('transactions.delete', [transactionGroup.id]) }}"><span
- class="bi bi-trash"></span> {{ 'delete'|_ }}</a></li>
+ class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>
{% endif %}
{% if groupArray.transactions[0].type != 'reconciliation' and groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'liability credit' %}
<li role="separator" class="divider"></li>
@@ -231,10 +231,10 @@
<ul class="dropdown-menu">
{# edit + delete #}
<li><a href="{{ route('transactions.edit', [transactionGroup.id]) }}"><span
- class="bi bi-pencil"></span> {{ 'edit'|_ }}</a></li>
+ class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>
{% if groupArray.transactions[0].type != 'reconciliation' and groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'liability credit' %}
<li><a href="{{ route('transactions.delete', [transactionGroup.id]) }}"><span
- class="bi bi-trash"></span> {{ 'delete'|_ }}</a></li>
+ class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>
{% endif %}
{% if journal.reconciled %}
<li><a class="reconcile-button" href="{{ route('transactions.unreconcile', [journal.transaction_journal_id]) }}"><span