Skip to content

Firefly III: a personal finances manager

expand views

Sander Dorigo533eebc8d485
diff --git a/resources/assets/v3/js/pages/subscriptions/create.js b/resources/assets/v3/js/pages/subscriptions/create.js
new file mode 100644
index 0000000000..dc39b3511b
--- /dev/null
+++ b/resources/assets/v3/js/pages/subscriptions/create.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 edit');
+ }
+ }
+};
+
+
+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/js/pages/subscriptions/delete.js b/resources/assets/v3/js/pages/subscriptions/delete.js
new file mode 100644
index 0000000000..dc39b3511b
--- /dev/null
+++ b/resources/assets/v3/js/pages/subscriptions/delete.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 edit');
+ }
+ }
+};
+
+
+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/js/pages/subscriptions/edit.js b/resources/assets/v3/js/pages/subscriptions/edit.js
new file mode 100644
index 0000000000..dc39b3511b
--- /dev/null
+++ b/resources/assets/v3/js/pages/subscriptions/edit.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 edit');
+ }
+ }
+};
+
+
+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/js/pages/subscriptions/show.js b/resources/assets/v3/js/pages/subscriptions/show.js
new file mode 100644
index 0000000000..dc39b3511b
--- /dev/null
+++ b/resources/assets/v3/js/pages/subscriptions/show.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 edit');
+ }
+ }
+};
+
+
+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 3afad4d8a4..1d24eea20f 100644
--- a/resources/assets/v3/vite.config.js
+++ b/resources/assets/v3/vite.config.js
@@ -79,6 +79,10 @@ export default defineConfig(({command, mode, isSsrBuild, isPreview}) => {
// subscriptions
'js/pages/subscriptions/index.js',
+ 'js/pages/subscriptions/create.js',
+ 'js/pages/subscriptions/edit.js',
+ 'js/pages/subscriptions/show.js',
+ 'js/pages/subscriptions/delete.js',
// transaction currencies
'js/pages/currencies/index.js',
diff --git a/resources/views/bills/create.twig b/resources/views/bills/create.blade.php
similarity index 64%
rename from resources/views/bills/create.twig
rename to resources/views/bills/create.blade.php
index 453f263360..beeee1c8ba 100644
--- a/resources/views/bills/create.twig
+++ b/resources/views/bills/create.blade.php
@@ -1,9 +1,4 @@
@extends('layout.v3.session')
-
-{% block breadcrumbs %}
- {{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}
-@endsection
-
@section('content')
<form method="POST" action="{{ route('subscriptions.store') }}" accept-charset="UTF-8" class="form-horizontal" id="store" enctype="multipart/form-data">
@@ -16,13 +11,13 @@
<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::text('name') }}
- {{ CurrencyForm::currencyList('transaction_currency_id', primaryCurrency.id) }}
- {{ ExpandedForm::amountNoCurrency('amount_min') }}
- {{ ExpandedForm::amountNoCurrency('amount_max') }}
- {{ ExpandedForm::date('date',phpdate('Y-m-d')) }}
- {{ ExpandedForm::select('repeat_freq',periods,'monthly') }}
- {{ ExpandedForm.integer('skip',0, {'helpText': trans('firefly.skip_help_text')}) }}
+ {!! ExpandedForm::text('name') !!}
+ {!! CurrencyForm::currencyList('transaction_currency_id', $primaryCurrency->id) !!}
+ {!! ExpandedForm::amountNoCurrency('amount_min') !!}
+ {!! ExpandedForm::amountNoCurrency('amount_max') !!}
+ {!! ExpandedForm::date('date',date('Y-m-d')) !!}
+ {!! ExpandedForm::select('repeat_freq',$periods,'monthly') !!}
+ {!! ExpandedForm::integer('skip',0, ['helpText' => trans('firefly.skip_help_text')]) !!}
</div>
</div>
@@ -33,13 +28,13 @@
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::date('bill_end_date',null, {'helpText': trans('firefly.bill_end_date_help')}) }}
- {{ ExpandedForm::date('extension_date',null,{'helpText': trans('firefly.bill_extension_date_help')} ) }}
+ {!! ExpandedForm::date('bill_end_date',null, ['helpText' => trans('firefly.bill_end_date_help')]) !!}
+ {!! ExpandedForm::date('extension_date',null,['helpText' => trans('firefly.bill_extension_date_help')] ) !!}
- {{ ExpandedForm::textarea('notes',null,{helpText: trans('firefly.field_supports_markdown')}) }}
- {{ ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
- {{ ExpandedForm.objectGroup() }}
+ {!! ExpandedForm::textarea('notes',null,['helpText' => trans('firefly.field_supports_markdown')]) !!}
+ {!! ExpandedForm::file('attachments[]', ['multiple' => 'multiple', 'helpText' => trans('firefly.upload_max_file_size', ['size' => print_nice_filesize($uploadSize)])]) !!}
+ {!! ExpandedForm::objectGroup() !!}
</div>
</div>
</div>
@@ -52,11 +47,11 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::optionsList('create','bill') }}
+ {!! ExpandedForm::optionsList('create','bill') !!}
</div>
- <div class="card-footer">
- <button type="submit" class="btn text-end btn-success">
- {{ 'store_new_bill'|_ }}
+ <div class="card-footer text-end">
+ <button type="submit" class="btn btn-success">
+ {{ __('firefly.store_new_bill') }}
</button>
</div>
</div>
@@ -73,12 +68,13 @@
<link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ $FF_BUILD_TIME }}" type="text/css" rel="stylesheet" media="all" nonce="{{ $JS_NONCE }}">
@endsection
@section('scripts')
+ @vite(['js/pages/subscriptions/create.js'])
<script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/ff/bills/create.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
- {# auto complete for object groups --}}
+ {{-- auto complete for object groups --}}
<script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/ff/object-groups/create-edit.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
@endsection
diff --git a/resources/views/bills/delete.twig b/resources/views/bills/delete.blade.php
similarity index 67%
rename from resources/views/bills/delete.twig
rename to resources/views/bills/delete.blade.php
index 1e02a298e0..91e4360c47 100644
--- a/resources/views/bills/delete.twig
+++ b/resources/views/bills/delete.blade.php
@@ -1,18 +1,14 @@
@extends('layout.v3.session')
-
-{% block breadcrumbs %}
- {{ Breadcrumbs.render(Route.getCurrentRoute.getName, bill) }}
-@endsection
-
@section('content')
- <form method="POST" action="{{ route('subscriptions.destroy',bill.id) }}" accept-charset="UTF-8" class="form-horizontal" id="destroy">
+ <form method="POST" action="{{ route('subscriptions.destroy',$bill->id) }}" accept-charset="UTF-8" class="form-horizontal" id="destroy">
<input name="_token" type="hidden" value="{{ csrf_token() }}">
<div class="row">
<div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12">
- <div class="box box-danger">
+ <div class="card card-danger card-outline">
+
<div class="card-header">
- <h3 class="card-title">{{ trans('form.delete_bill', {'name': bill.name}) }}</h3>
+ <h3 class="card-title">{{ trans('form.delete_bill', ['name' => $bill->name]) }}</h3>
</div>
<div class="card-body">
<p class="text-danger">
@@ -20,12 +16,12 @@
</p>
<p>
- {{ trans('form.bill_areYouSure', {'name': bill.name}) }}
+ {{ trans('form.bill_areYouSure', ['name' => $bill->name]) }}
</p>
<p>
- {% if bill.transactionjournals.count() > 0 %}
- {{ Lang.choice('form.bill_keep_transactions', bill.transactionjournals.count(),{count: bill.transactionjournals.count()}) }}
+ @if($bill->transactionjournals->count() > 0)
+ {{ Lang::choice('form.bill_keep_transactions', $bill->transactionjournals->count(),['count' => $bill->transactionjournals->count()]) }}
@endif
</p>
</div>
@@ -38,3 +34,6 @@
</div>
</form>
@endsection
+@section('scripts')
+ @vite(['js/pages/subscriptions/delete.js'])
+@endsection
diff --git a/resources/views/bills/edit.twig b/resources/views/bills/edit.blade.php
similarity index 59%
rename from resources/views/bills/edit.twig
rename to resources/views/bills/edit.blade.php
index 40f7cdbe0b..c25e73ab62 100644
--- a/resources/views/bills/edit.twig
+++ b/resources/views/bills/edit.blade.php
@@ -1,15 +1,10 @@
@extends('layout.v3.session')
-
-{% block breadcrumbs %}
- {{ Breadcrumbs.render(Route.getCurrentRoute.getName, bill) }}
-@endsection
-
@section('content')
- <form method="post" action="{{ route('subscriptions.update', bill.id) }}" class="form-horizontal" accept-charset="UTF-8"
+ <form method="post" action="{{ route('subscriptions.update', $bill->id) }}" class="form-horizontal" accept-charset="UTF-8"
enctype="multipart/form-data">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
- <input type="hidden" name="id" value="{{ bill.id }}"/>
+ <input type="hidden" name="id" value="{{ $bill->id }}"/>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
@@ -18,17 +13,17 @@
<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3>
</div>
<div class="card-body">
- {% if rules.count() > 0 %}
- {{ ExpandedForm::text('name', bill.name, {helpText: trans_choice('firefly.bill_edit_rules', rules.count())}) }}
+ @if($rules->count() > 0)
+ {!! ExpandedForm::text('name', $bill->name, ['helpText' => trans_choice('firefly.bill_edit_rules', $rules->count())]) !!}
@else
- {{ ExpandedForm::text('name', bill.name) }}
+ {!! ExpandedForm::text('name', $bill->name) !!}
@endif
- {{ CurrencyForm::currencyList('transaction_currency_id') }}
- {{ ExpandedForm::amountNoCurrency('amount_min', bill.amount_min) }}
- {{ ExpandedForm::amountNoCurrency('amount_max', bill.amount_max) }}
- {{ ExpandedForm::date('date',bill.date.format('Y-m-d')) }}
- {{ ExpandedForm::select('repeat_freq', periods, bill.repeat_freq) }}
- {{ ExpandedForm.integer('skip', bill.skip, {'helpText': trans('firefly.skip_help_text')}) }}
+ {!! CurrencyForm::currencyList('transaction_currency_id') !!}
+ {!! ExpandedForm::amountNoCurrency('amount_min', $bill->amount_min) !!}
+ {!! ExpandedForm::amountNoCurrency('amount_max', $bill->amount_max) !!}
+ {!! ExpandedForm::date('date',$bill->date->format('Y-m-d')) !!}
+ {!! ExpandedForm::select('repeat_freq', $periods, $bill->repeat_freq) !!}
+ {!! ExpandedForm::integer('skip', $bill->skip, ['helpText' => trans('firefly.skip_help_text')]) !!}
</div>
</div>
@@ -40,14 +35,13 @@
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::date('bill_end_date',null, {'helpText': trans('firefly.bill_end_date_help')}) }}
- {{ ExpandedForm::date('extension_date',null,{'helpText': trans('firefly.bill_extension_date_help')} ) }}
+ {!! ExpandedForm::date('bill_end_date',null, ['helpText' => trans('firefly.bill_end_date_help')]) !!}
+ {!! ExpandedForm::date('extension_date',null,['helpText' => trans('firefly.bill_extension_date_help')] ) !!}
- {{ ExpandedForm::textarea('notes',null,{helpText: trans('firefly.field_supports_markdown')}) }}
- {{ ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
- {{ ExpandedForm.objectGroup() }}
- {{-- only correct way to do active checkbox --}}
- {{ ExpandedForm::checkbox('active', 1) }}
+ {!! ExpandedForm::textarea('notes',null,['helpText' => trans('firefly.field_supports_markdown')]) !!}
+ {!! ExpandedForm::file('attachments[]', ['multiple' => 'multiple','helpText' => trans('firefly.upload_max_file_size', ['size' => print_nice_filesize($uploadSize)])]) !!}
+ {!! ExpandedForm::objectGroup() !!}
+ {!! ExpandedForm::checkbox('active', 1) !!}
</div>
</div>
@@ -60,11 +54,11 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::optionsList('update','bill') }}
+ {!! ExpandedForm::optionsList('update','bill') !!}
</div>
- <div class="card-footer">
- <button type="submit" class="btn text-end btn-success">
- {{ 'update_bill'|_ }}
+ <div class="card-footer text-end">
+ <button type="submit" class="btn btn-success">
+ {{ __('firefly.update_bill') }}
</button>
</div>
</div>
@@ -82,6 +76,7 @@
media="all" nonce="{{ $JS_NONCE }}">
@endsection
@section('scripts')
+ @vite(['js/pages/subscriptions/edit.js'])
<script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ $FF_BUILD_TIME }}"
nonce="{{ $JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ $FF_BUILD_TIME }}"
diff --git a/resources/views/bills/show.blade.php b/resources/views/bills/show.blade.php
new file mode 100644
index 0000000000..cf0403a79a
--- /dev/null
+++ b/resources/views/bills/show.blade.php
@@ -0,0 +1,195 @@
+@extends('layout.v3.session')
+@section('content')
+ <div class="row">
+ <div class="col-lg-6 col-sm-12 col-md-12">
+ <div class="card mb-2" id="billInfo">
+ <div class="card-header">
+ <div class="row">
+ <div class="col">
+ <h3 class="card-title">{{ $object['data']['name'] }}</h3>
+ </div>
+ <div class="col text-end">
+ <button class="btn btn-sm btn-secondary-outline dropdown-toggle" type="button" id="card_header_menu" data-bs-toggle="dropdown" aria-expanded="false">
+ <span class="bi bi-list"></span></button>
+ <ul class="dropdown-menu" aria-labelledby="card_header_menu">
+ <li><a class="dropdown-item" href="{{ route('subscriptions.edit', $object['data']['id']) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>
+ <li><a class="dropdown-item" href="{{ route('subscriptions.delete', $object['data']['id']) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ <div class="card-body p-0">
+ <table class="table table-striped">
+ <tr>
+ <td colspan="2">
+ @php
+ $lowAmount = format_amount_by_currency($object['data']['currency'],$object['data']['amount_min']);
+ $highAmount = format_amount_by_currency($object['data']['currency'],$object['data']['amount_max']);
+ @endphp
+ @if(null !== $object['data']['pc_amount_min']))
+ @php
+ $lowAmount = $lowAmount . ' (' . format_amount_by_code($object['data']['pc_amount_min'], $primaryCurrency->code) . ')';
+ @endphp
+ @endif
+ @if(null !== $object['data']['pc_amount_max']))
+ @php
+ $highAmount = $highAmount . ' (' . format_amount_by_code($object['data']['pc_amount_max'], $primaryCurrency->code) . ')';
+ @endphp
+ @endif
+ {!! trans('firefly.match_between_amounts', ['low' => $lowAmount, 'high' => $highAmount]) !!}
+ {{ __('firefly.repeats') }}
+ {{ trans('firefly.repeat_freq_' . $object['data']['repeat_freq']) }}.
+ </td>
+ </tr>
+
+ <tr>
+ <td class="half">{{ __('firefly.bill_is_active') }}</td>
+ <td>
+ @if($object['data']['active'])
+ <span class="bi bi-check" title="{{ __('firefly.active') }}"></span> {{ __('firefly.yes') }}
+ @else
+ <span class="bi bi-x" title="{{ __('firefly.inactive') }}"></span> {{ __('firefly.no') }}
+ @endif
+ </td>
+ </tr>
+ <tr>
+ <td>{{ __('firefly.next_expected_match') }}</td>
+ <td>
+
+ @if(count($object['data']['pay_dates']) > 0)
+ {{ new \Carbon\Carbon($object['data']['pay_dates'][0])->isoFormat($monthAndDayFormat) }}
+ @else
+ {{ __('firefly.unknown') }}
+ @endif
+ </td>
+ </tr>
+ <tr>
+ <td>{{ trans('firefly.average_bill_amount_year', ['year' => $year]) }}</td>
+ <td>
+ @foreach($yearAverage as $avg)
+ {!! format_amount_by_symbol($avg['avg'], $avg['currency_symbol'], $avg['currency_decimal_places'], true) !!}
+ @if($convertToPrimary && 0 !== $ag['pc_avg'])
+ ({!! format_amount_by_symbol($avg['pc_avg'], $primaryCurrency->symbol, $primaryCurrency->decimal_places, true) !!})
+ @endif
+ <br>
+ @endforeach
+ </td>
+ </tr>
+ <tr>
+ <td>{{ __('firefly.average_bill_amount_overall') }}</td>
+ <td>
+ @foreach($overallAverage as $avg)
+ {!! format_amount_by_symbol($avg['avg'], $avg['currency_symbol'], $avg['currency_decimal_places'], true) !!}
+ @if($convertToPrimary && 0 !== $ag['pc_avg'])
+ ({!! format_amount_by_symbol($avg['pc_avg'], $primaryCurrency->symbol, $primaryCurrency->decimal_places, true) !!})
+ @endif
+ <br>
+ @endforeach
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div class="card-footer">
+ <div class="btn-group">
+ <a class="btn btn-outline-secondary" 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>
+ </div>
+ <div class="col-lg-6 col-sm-12 col-md-12">
+ <div class="card mb-2">
+ <div class="card-header">
+ <h3 class="card-title">{{ __('firefly.bill_related_rules') }}</h3>
+ </div>
+ <div class="card-body">
+ @if($rules->count() > 0)
+ <ul>
+ @foreach($rules as $rule)
+ <li><a href="{{ route('rules.edit', [$rule->id]) }}">{{ $rule->title }}</a>
+ @if(!$rule->active)({{ strtolower(__('firefly.list_inactive_rule')) }})@endif
+ </li>
+ @endforeach
+ </ul>
+ @endif
+ </div>
+ <div class="card-footer">
+ <form action="{{ route('subscriptions.rescan',$object['data']['id']) }}" method="post">
+ <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
+ <p>
+ <input type="submit" name="submit" value="{{ __('firefly.rescan_old') }}" class="btn btn-outline-secondary"/>
+ </p>
+ </form>
+
+ <p><small class="text-muted">
+ {{ __('firefly.running_again_loss') }}
+ </small>
+
+ </p>
+ </div>
+ </div>
+ @if($object['data']['notes'])
+ <div class="card mb-2">
+ <div class="card-header">
+ <h3 class="card-title">{{ __('firefly.notes') }}</h3>
+ </div>
+ <div class="card-body">
+ {{parse_markdown($object['data']['notes']) }}
+ </div>
+ </div>
+ @endif
+
+ @if($attachments->count() > 0)
+ <div class="card mb-2">
+ <div class="card-header">
+ <h3 class="card-title">{{ __('firefly.attachments') }}</h3>
+ </div>
+ <div class="card-body p-0">
+ {% include 'list.attachments' %}
+ </div>
+ </div>
+ @endif
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-lg-12 col-sm-12 col-md-12">
+ <div class="card mb-2" id="billChart">
+ <div class="card-header">
+ <h3 class="card-title">{{ __('firefly.chart') }}</h3>
+ </div>
+ <div class="card-body">
+ <canvas id="bill-overview" class="wide-chart" height="400" width="100%"></canvas>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-lg-12 col-sm-12 col-md-12">
+ <div class="card mb-2">
+ <div class="card-header">
+ <h3 class="card-title">{{ __('firefly.connected_journals') }}</h3>
+ </div>
+ <div class="card-body">
+ {% include 'list.groups' %}
+ </div>
+ </div>
+ </div>
+ </div>
+
+@endsection
+
+@section('scripts')
+ @vite(['js/pages/subscriptions/show.js'])
+ <script type="text/javascript" nonce="{{ $JS_NONCE }}">
+ var billCurrencySymbol = "{{ $convertToPrimary ? $primaryCurrency->symbol : $object['data']['currency']['symbol'] }}";
+ var billUrl = '{{ route('chart.bill.single', [$object['data']['id']]) }}';
+ </script>
+ <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
+ <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
+ <script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
+ <script type="text/javascript" src="v1/js/ff/bills/show.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
+ {{-- required for groups.twig --}}
+ <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
+@endsection
diff --git a/resources/views/bills/show.twig b/resources/views/bills/show.twig
deleted file mode 100644
index 6239df1425..0000000000
--- a/resources/views/bills/show.twig
+++ /dev/null
@@ -1,197 +0,0 @@
-@extends('layout.v3.session')
-
-{% block breadcrumbs %}
- {{ Breadcrumbs.render(Route.getCurrentRoute.getName, bill) }}
-@endsection
-
-@section('content')
-
- <div class="row">
- <div class="col-lg-6 col-sm-12 col-md-12">
- <div class="box" id="billInfo">
- <div class="card-header">
- <h3 class="card-title">{{ object.data.name }}</h3>
-
- <div class="box-tools text-end">
- <div class="btn-group">
- <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="bi bi-list"></span></button>
- <ul class="dropdown-menu" role="menu">
- <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>
-
- </div>
- <div class="card-body">
- <table class="table table-striped">
- <tr>
- <td colspan="2">
- {% set lowAmount = formatAmountByCurrency(object.data.currency,object.data.amount_min) %}
- {% set highAmount = formatAmountByCurrency(object.data.currency,object.data.amount_max) %}
- {% if(0 != object.data.pc_amount_min) %}
- {% set lowAmount = lowAmount ~ ' (' ~ formatAmountByCode(object.data.pc_amount_min, primaryCurrency.code) ~ ')' %}
- @endif
- {% if(0 != object.data.pc_amount_max) %}
- {% set highAmount = highAmount ~ ' (' ~ formatAmountByCode(object.data.pc_amount_max, primaryCurrency.code) ~ ')' %}
- @endif
- {{ trans('firefly.match_between_amounts', {low: lowAmount, high: highAmount })|raw }}
- {{ 'repeats'|_ }}
- {{ trans('firefly.repeat_freq_' ~object.data.repeat_freq) }}.
- </td>
- </tr>
-
- <tr>
- <td class="half">{{ 'bill_is_active'|_ }}</td>
- <td>
- {% if object.data.active %}
- <span class="bi bi-check" title="{{ 'active'|_ }}"></span> {{ 'yes'|_ }}
- @else
- <span class="bi bi-x" title="{{ 'inactive'|_ }}"></span> {{ 'no'|_ }}
- @endif
- </td>
- </tr>
- <tr>
- <td>{{ 'next_expected_match'|_ }}</td>
- <td>
-
- {% if object.data.pay_dates|length > 0 %}
- {{ formatDate(object.data.pay_dates[0], monthAndDayFormat) }}
- @else
- {{ 'unknown'|_ }}
- @endif
- </td>
- </tr>
- <tr>
- <td>{{ trans('firefly.average_bill_amount_year', {year: year}) }}</td>
- <td>
- {% for avg in yearAverage %}
- {{ format_amount_by_symbol(avg.avg, avg.currency_symbol, avg.currency_decimal_places, true) }}
- {% if convertToPrimary and 0 != avg.pc_avg %}
- ({{ format_amount_by_symbol(avg.pc_avg,
- primaryCurrency.symbol, primaryCurrency.decimal_places, true) }})
- @endif
- <br>
-
- @endforeach
- </td>
- </tr>
- <tr>
- <td>{{ 'average_bill_amount_overall'|_ }}</td>
- <td>
- {% for avg in overallAverage %}
- {{ format_amount_by_symbol(avg.avg, avg.currency_symbol, avg.currency_decimal_places, true) }}
- {% if convertToPrimary and 0 != avg.pc_avg %}
- ({{ format_amount_by_symbol(avg.pc_avg,
- primaryCurrency.symbol, primaryCurrency.decimal_places, true) }})
- @endif
- <br>
- @endforeach
- </td>
- </tr>
- </table>
- </div>
- <div class="card-footer">
- <div class="btn-group">
- <a class="btn btn-outline-secondary" 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>
- </div>
- <div class="col-lg-6 col-sm-12 col-md-12">
- <div class="card">
- <div class="card-header">
- <h3 class="card-title">{{ 'bill_related_rules'|_ }}</h3>
- </div>
- <div class="card-body">
- {% if rules.count() > 0 %}
- <ul>
- {% for rule in rules %}
- <li><a href="{{ route('rules.edit', [rule.id]) }}">{{ rule.title }}</a>
- {% if not rule.active %}({{ 'list_inactive_rule'|_|lower }})@endif
- </li>
- @endforeach
- </ul>
- @endif
- </div>
- <div class="card-footer">
- <form action="{{ route('subscriptions.rescan',object.data.id) }}" method="post">
- <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
- <p>
- <input type="submit" name="submit" value="{{ 'rescan_old'|_ }}" class="btn btn-outline-secondary"/>
- </p>
- </form>
-
- <p><small class="text-muted">
- {{ 'running_again_loss'|_ }}
- </small>
-
- </p>
- </div>
- </div>
- {% if object.data.notes %}
- <div class="card">
- <div class="card-header">
- <h3 class="card-title">{{ __('firefly.notes') }}</h3>
- </div>
- <div class="card-body">
- {{ object.data.notes|default('')|markdown }}
- </div>
- </div>
- @endif
-
-
- {% if attachments.count() > 0 %}
- <div class="card">
- <div class="card-header">
- <h3 class="card-title">{{ __('firefly.attachments') }}</h3>
- </div>
- <div class="card-body p-0">
- {% include 'list.attachments' %}
- </div>
- </div>
- @endif
- </div>
- </div>
-
- <div class="row">
- <div class="col-lg-12 col-sm-12 col-md-12">
- <div class="box" id="billChart">
- <div class="card-header">
- <h3 class="card-title">{{ 'chart'|_ }}</h3>
- </div>
- <div class="card-body">
- <canvas id="bill-overview" class="wide-chart" height="400" width="100%"></canvas>
- </div>
- </div>
- </div>
- </div>
-
- <div class="row">
- <div class="col-lg-12 col-sm-12 col-md-12">
- <div class="card">
- <div class="card-header">
- <h3 class="card-title">{{ 'connected_journals'|_ }}</h3>
- </div>
- <div class="card-body">
- {% include 'list.groups' %}
- </div>
- </div>
- </div>
- </div>
-
-@endsection
-
-@section('scripts')
- <script type="text/javascript" nonce="{{ $JS_NONCE }}">
- var billCurrencySymbol = "{{ convertToPrimary ? primaryCurrency.symbol : object.data.currency.symbol }}";
- var billUrl = '{{ route('chart.bill.single', [object.data.id]) }}';
- </script>
- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
- <script type="text/javascript" src="v1/js/ff/bills/show.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
- {{-- required for groups.twig #}
- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
-@endsection
diff --git a/resources/views/budgets/create.twig b/resources/views/budgets/create.twig
index 2d1cf9bdea..9fefd1372c 100644
--- a/resources/views/budgets/create.twig
+++ b/resources/views/budgets/create.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
@@ -17,7 +17,7 @@
<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::text('name') }}
+ {!! ExpandedForm::text('name') }}
</div>
</div>
</div>
@@ -28,11 +28,11 @@
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::select('auto_budget_type', autoBudgetTypes,null, {helpText: trans('firefly.auto_budget_help')}) }}
- {{ CurrencyForm::currencyList('auto_budget_currency_id') }}
- {{ ExpandedForm::amountNoCurrency('auto_budget_amount') }}
- {{ ExpandedForm::select('auto_budget_period', autoBudgetPeriods, null) }}
- {{ ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
+ {!! ExpandedForm::select('auto_budget_type', autoBudgetTypes,null, {helpText: trans('firefly.auto_budget_help')}) }}
+ {!! CurrencyForm::currencyList('auto_budget_currency_id') }}
+ {!! ExpandedForm::amountNoCurrency('auto_budget_amount') }}
+ {!! ExpandedForm::select('auto_budget_period', autoBudgetPeriods, null) }}
+ {!! ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
</div>
</div>
</div>
@@ -45,7 +45,7 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::optionsList('create','budget') }}
+ {!! ExpandedForm::optionsList('create','budget') }}
</div>
<div class="card-footer">
<button type="submit" class="btn text-end btn-success">{{ 'store_new_budget'|_ }}</button>
diff --git a/resources/views/budgets/delete.twig b/resources/views/budgets/delete.twig
index 736c0b0d44..54a2bb999f 100644
--- a/resources/views/budgets/delete.twig
+++ b/resources/views/budgets/delete.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, budget) }}
@endsection
@@ -11,7 +11,7 @@
<div class="row">
<div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12">
- <div class="box box-danger">
+ <div class="card card-danger card-outline">
<div class="card-header">
<h3 class="card-title">{{ trans('form.delete_budget', {'name': budget.name}) }}</h3>
</div>
@@ -26,7 +26,7 @@
<p>
{% if budget.transactionjournals.count() > 0 %}
- {{ Lang.choice('form.budget_keep_transactions', budget.transactionjournals.count(), {count: budget.transactionjournals.count() }) }}
+ {{ Lang::choice('form.budget_keep_transactions', budget.transactionjournals.count(), {count: budget.transactionjournals.count() }) }}
@endif
</p>
diff --git a/resources/views/budgets/edit.twig b/resources/views/budgets/edit.twig
index 1512970bd9..e039672e74 100644
--- a/resources/views/budgets/edit.twig
+++ b/resources/views/budgets/edit.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, budget) }}
@endsection
@@ -17,8 +17,8 @@
</div>
<div class="card-body">
{{-- only correct way to do active checkbox --}}
- {{ ExpandedForm::checkbox('active', 1) }}
- {{ ExpandedForm::text('name', budget.name) }}
+ {!! ExpandedForm::checkbox('active', 1) }}
+ {!! ExpandedForm::text('name', budget.name) }}
</div>
</div>
@@ -30,12 +30,12 @@
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::select('auto_budget_type', autoBudgetTypes, autoBudget.auto_budget_type) }}
- {{ CurrencyForm::currencyList('auto_budget_currency_id', autoBudget.transaction_currency_id) }}
- {{ ExpandedForm::amountNoCurrency('auto_budget_amount', preFilled.auto_budget_amount) }}
- {{ ExpandedForm::select('auto_budget_period', autoBudgetPeriods, autoBudget.period) }}
- {{ ExpandedForm::textarea('notes',preFilled.notes,{helpText: trans('firefly.field_supports_markdown')}) }}
- {{ ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
+ {!! ExpandedForm::select('auto_budget_type', autoBudgetTypes, autoBudget.auto_budget_type) }}
+ {!! CurrencyForm::currencyList('auto_budget_currency_id', autoBudget.transaction_currency_id) }}
+ {!! ExpandedForm::amountNoCurrency('auto_budget_amount', preFilled.auto_budget_amount) }}
+ {!! ExpandedForm::select('auto_budget_period', autoBudgetPeriods, autoBudget.period) }}
+ {!! ExpandedForm::textarea('notes',preFilled.notes,{helpText: trans('firefly.field_supports_markdown')}) }}
+ {!! ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
</div>
</div>
</div>
@@ -48,7 +48,7 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::optionsList('update','budget') }}
+ {!! ExpandedForm::optionsList('update','budget') }}
</div>
<div class="card-footer">
<button type="submit" class="btn text-end btn-success">{{ 'update_budget'|_ }}</button>
diff --git a/resources/views/budgets/no-budget.twig b/resources/views/budgets/no-budget.twig
index 2c91a109ee..4fd0c77b00 100644
--- a/resources/views/budgets/no-budget.twig
+++ b/resources/views/budgets/no-budget.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, start, end) }}
@endsection
diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twig
index 562911440d..5b60ab9c47 100644
--- a/resources/views/budgets/show.twig
+++ b/resources/views/budgets/show.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, budget, budgetLimit) }}
@endsection
@@ -159,7 +159,7 @@
<td>
{{ format_amount_by_symbol(limit.amount, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }}
{% if convertToPrimary and null != limit.native_amount %}
- ({{ format_amount_by_symbol(limit.native_amount, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+ ({{ format_amount_by_symbol(limit.native_amount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
@endif
</td>
</tr>
@@ -169,7 +169,7 @@
{% if convertToPrimary %}
{{ format_amount_by_symbol(limit.spent, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }}
{% if limit.pc_spent %}
- ({{ format_amount_by_symbol(limit.pc_spent, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+ ({{ format_amount_by_symbol(limit.pc_spent, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
@endif
@else
{{ format_amount_by_symbol(limit.spent, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }}
diff --git a/resources/views/categories/create.twig b/resources/views/categories/create.twig
index e74d159527..4cd32c906e 100644
--- a/resources/views/categories/create.twig
+++ b/resources/views/categories/create.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
@@ -15,7 +15,7 @@
<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::text('name') }}
+ {!! ExpandedForm::text('name') }}
</div>
</div>
</div>
@@ -26,8 +26,8 @@
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::textarea('notes', null, {helpText: trans('firefly.field_supports_markdown')} ) }}
- {{ ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
+ {!! ExpandedForm::textarea('notes', null, {helpText: trans('firefly.field_supports_markdown')} ) }}
+ {!! ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
</div>
</div>
</div>
@@ -40,7 +40,7 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::optionsList('create','category') }}
+ {!! ExpandedForm::optionsList('create','category') }}
</div>
<div class="card-footer">
<button type="submit" class="btn text-end btn-success">
diff --git a/resources/views/categories/delete.twig b/resources/views/categories/delete.twig
index 93e0a83deb..73045d344f 100644
--- a/resources/views/categories/delete.twig
+++ b/resources/views/categories/delete.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, category) }}
@endsection
@@ -10,7 +10,7 @@
<input name="_token" type="hidden" value="{{ csrf_token() }}">
<div class="row">
<div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12">
- <div class="box box-danger">
+ <div class="card card-danger card-outline">
<div class="card-header">
<h3 class="card-title">{{ trans('form.delete_category', {'name': category.name}) }}</h3>
</div>
@@ -25,7 +25,7 @@
<p>
{% if category.transactionjournals.count() > 0 %}
- {{ Lang.choice('form.category_keep_transactions', category.transactionjournals.count(), {count: category.transactionjournals.count() }) }}
+ {{ Lang::choice('form.category_keep_transactions', category.transactionjournals.count(), {count: category.transactionjournals.count() }) }}
@endif
</p>
</div>
diff --git a/resources/views/categories/edit.twig b/resources/views/categories/edit.twig
index 9e46f6d4b5..c160f53c99 100644
--- a/resources/views/categories/edit.twig
+++ b/resources/views/categories/edit.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, category) }}
@endsection
@@ -19,7 +19,7 @@
<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::text('name', category.name) }}
+ {!! ExpandedForm::text('name', category.name) }}
</div>
</div>
</div>
@@ -30,8 +30,8 @@
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::textarea('notes', preFilled.notes, {helpText: trans('firefly.field_supports_markdown')} ) }}
- {{ ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
+ {!! ExpandedForm::textarea('notes', preFilled.notes, {helpText: trans('firefly.field_supports_markdown')} ) }}
+ {!! ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
</div>
</div>
</div>
@@ -46,7 +46,7 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::optionsList('update','category') }}
+ {!! ExpandedForm::optionsList('update','category') }}
</div>
<div class="card-footer">
<button type="submit" class="btn text-end btn-success">
diff --git a/resources/views/categories/no-category.twig b/resources/views/categories/no-category.twig
index 123a68ffe2..de9fbdf6a6 100644
--- a/resources/views/categories/no-category.twig
+++ b/resources/views/categories/no-category.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, start, end) }}
@endsection
diff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twig
index 323abf0318..448939388d 100644
--- a/resources/views/categories/show.twig
+++ b/resources/views/categories/show.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, category, start, end) }}
@endsection
diff --git a/resources/views/components/generic/amount.blade.php b/resources/views/components/generic/amount.blade.php
index fd21a47e2a..44fc0daad8 100644
--- a/resources/views/components/generic/amount.blade.php
+++ b/resources/views/components/generic/amount.blade.php
@@ -109,7 +109,7 @@
({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
@endif
{% if convertToPrimary and null != transaction.pc_amount %}
- ({{ format_amount_by_symbol(transaction.pc_amount, primaryCurrency.symbol, foreign_currency_.decimal_places) }})
+ ({{ format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
@endif
@endif
</span>
diff --git a/resources/views/currencies/create.twig b/resources/views/currencies/create.twig
index 8d3f0b9b23..31390c7977 100644
--- a/resources/views/currencies/create.twig
+++ b/resources/views/currencies/create.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
@@ -14,10 +14,10 @@
<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::text('name',null,{'maxlength' : 48}) }}
- {{ ExpandedForm::text('symbol',null,{'maxlength': 51}) }}
- {{ ExpandedForm::text('code',null,{'maxlength' : 51}) }}
- {{ ExpandedForm.integer('decimal_places',2,{'maxlength' : 2,'min': 0,'max': 12}) }}
+ {!! ExpandedForm::text('name',null,{'maxlength' : 48}) }}
+ {!! ExpandedForm::text('symbol',null,{'maxlength': 51}) }}
+ {!! ExpandedForm::text('code',null,{'maxlength' : 51}) }}
+ {!! ExpandedForm::integer('decimal_places',2,{'maxlength' : 2,'min': 0,'max': 12}) }}
</div>
</div>
@@ -32,7 +32,7 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::optionsList('create','currency') }}
+ {!! ExpandedForm::optionsList('create','currency') }}
</div>
<div class="card-footer">
<button type="submit" class="btn text-end btn-success">
diff --git a/resources/views/currencies/delete.twig b/resources/views/currencies/delete.twig
index 8affef2a1b..17c81ed87c 100644
--- a/resources/views/currencies/delete.twig
+++ b/resources/views/currencies/delete.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, currency) }}
@endsection
@@ -10,7 +10,7 @@
<input name="_token" type="hidden" value="{{ csrf_token() }}">
<div class="row">
<div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12">
- <div class="box box-danger">
+ <div class="card card-danger card-outline">
<div class="card-header">
<h3 class="card-title">{{ trans('form.delete_currency', {'name': currency.name}) }}</h3>
</div>
diff --git a/resources/views/currencies/edit.twig b/resources/views/currencies/edit.twig
index 27d1048f81..b57ff37a5c 100644
--- a/resources/views/currencies/edit.twig
+++ b/resources/views/currencies/edit.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, currency) }}
@endsection
@@ -18,11 +18,11 @@
<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::text('name', currency.name,{'maxlength' : 48}) }}
- {{ ExpandedForm::text('symbol', currency.symbol,{'maxlength' : 51}) }}
- {{ ExpandedForm::text('code', currency.code,{'maxlength' : 51}) }}
- {{ ExpandedForm.integer('decimal_places', currency.decimal_places,{'maxlength' : 2,'min': 0,'max': 12}) }}
- {{ ExpandedForm::checkbox('enabled', null, currency.enabled) }}
+ {!! ExpandedForm::text('name', currency.name,{'maxlength' : 48}) }}
+ {!! ExpandedForm::text('symbol', currency.symbol,{'maxlength' : 51}) }}
+ {!! ExpandedForm::text('code', currency.code,{'maxlength' : 51}) }}
+ {!! ExpandedForm::integer('decimal_places', currency.decimal_places,{'maxlength' : 2,'min': 0,'max': 12}) }}
+ {!! ExpandedForm::checkbox('enabled', null, currency.enabled) }}
</div>
</div>
</div>
@@ -36,7 +36,7 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::optionsList('update','currency') }}
+ {!! ExpandedForm::optionsList('update','currency') }}
</div>
<div class="card-footer">
<button type="submit" class="btn btn-success text-end">
diff --git a/resources/views/exchange-rates/rates.twig b/resources/views/exchange-rates/rates.twig
index eddec6e182..2caaa7cb37 100644
--- a/resources/views/exchange-rates/rates.twig
+++ b/resources/views/exchange-rates/rates.twig
@@ -1,6 +1,6 @@
{% set VUE_SCRIPT_NAME = 'exchange-rates/rates' %}
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, from, to) }}
@endsection
diff --git a/resources/views/form/balance.twig b/resources/views/form/balance.twig
index ac0bfec5ba..843d3f53db 100644
--- a/resources/views/form/balance.twig
+++ b/resources/views/form/balance.twig
@@ -8,7 +8,7 @@
class="btn btn-outline-secondary dropdown-toggle currency-dropdown" id="currency_dropdown_{{ name }}"
data-toggle="dropdown"
aria-expanded="false">
- <span id="currency_select_symbol_{{ name }}">{{ primaryCurrency.symbol|raw }}</span> <span
+ <span id="currency_select_symbol_{{ name }}">{{ $primaryCurrency->symbol|raw }}</span> <span
class="caret"></span>
</button>
<ul class="dropdown-menu currency-dropdown-menu" role="menu">
@@ -30,5 +30,5 @@
@include('form.feedback')
</div>
- <input type="hidden" name="amount_currency_id_{{ name }}" value="{{ primaryCurrency.id }}"/>
+ <input type="hidden" name="amount_currency_id_{{ name }}" value="{{ $primaryCurrency->id }}"/>
</div>
diff --git a/resources/views/form/integer.blade.php b/resources/views/form/integer.blade.php
new file mode 100644
index 0000000000..4ce53f74b6
--- /dev/null
+++ b/resources/views/form/integer.blade.php
@@ -0,0 +1,11 @@
+<div class="row mb-3" id="{{ $name }}_holder">
+ <div class="input-group has-validation">
+ <label for="{{ $options['id'] }}" class="col-sm-3 col-form-label has-validation">{{ $label }}</label>
+
+ <div class="col-sm-9">
+ {{ Html::input('number', $name, $value)->id($options['id'])->attribute('step',$options['step'])->attribute('autocomplete','off')->attribute('spellcheck', 'false')->class($errors->has($name) ? 'is-invalid form-control' : 'form-control')->attribute('placeholder',$options['placeholder']) }}
+ @include('form.feedback')
+ @include('form.help')
+ </div>
+</div>
+</div>
diff --git a/resources/views/form/integer.twig b/resources/views/form/integer.twig
deleted file mode 100644
index ea2c448f20..0000000000
--- a/resources/views/form/integer.twig
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="{{ classes }}" id="{{ name }}_holder">
- <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
-
- <div class="col-sm-8">
- {{ Html::input('number', name, value).id(options.id).attribute('step',options.step).attribute('autocomplete','off').attribute('spellcheck', 'false').class('form-control').attribute('placeholder',options.placeholder) }}
- @include('form.help')
- @include('form.feedback')
- </div>
-</div>
diff --git a/resources/views/form/object-group.blade.php b/resources/views/form/object-group.blade.php
new file mode 100644
index 0000000000..f94d64bfb3
--- /dev/null
+++ b/resources/views/form/object-group.blade.php
@@ -0,0 +1,11 @@
+<div class="row mb-3" id="{{ $name }}_holder">
+ <div class="input-group has-validation">
+ <label for="{{ $options['id'] }}" class="col-sm-3 col-form-label has-validation">{{ $label }}</label>
+
+ <div class="col-sm-9">
+ {{ Html::input('text', $name, $value)->id($options['id'])->class($errors->has($name) ? 'is-invalid form-control' : 'form-control')->attribute('autocomplete','off')->attribute('spellcheck','false')->attribute('placeholder', $options['placeholder']) }}
+ @include('form.help')
+ @include('form.feedback')
+ </div>
+</div>
+</div>
diff --git a/resources/views/form/object_group.twig b/resources/views/form/object_group.twig
deleted file mode 100644
index 7bf22103a4..0000000000
--- a/resources/views/form/object_group.twig
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="{{ classes }}" id="{{ name }}_holder">
- <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
-
- <div class="col-sm-8">
- {{ Html::input('text', name, value).id(options.id).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder',options.placeholder) }}
- @include('form.help')
- @include('form.feedback')
- </div>
-</div>
diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig
index 73d2991ef4..f327a981d2 100644
--- a/resources/views/layout/default.twig
+++ b/resources/views/layout/default.twig
@@ -172,7 +172,7 @@
<div class="content-wrapper">
<section class="content-header">
{% include('partials.page-header') %}
- {% block breadcrumbs %}@endsection
+ @endsection
</section>
<section class="content">
diff --git a/resources/views/list/accounts.twig b/resources/views/list/accounts.twig
index a281e65528..e215ae09d5 100644
--- a/resources/views/list/accounts.twig
+++ b/resources/views/list/accounts.twig
@@ -74,7 +74,7 @@
@endif
{% elseif 'pc_balance' == key %}
{% if convertToPrimary %}
- {{ format_amount_by_symbol(balance, primaryCurrency.symbol, primaryCurrency.decimal_places) }}
+ {{ format_amount_by_symbol(balance, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }}
@endif
@else
({{ formatAmountByCode(balance, key) }})
@@ -123,7 +123,7 @@
@endif
{% elseif 'pc_balance' == key %}
{% if convertToPrimary %}
- {{ format_amount_by_symbol(balance, primaryCurrency.symbol, primaryCurrency.decimal_places) }}
+ {{ format_amount_by_symbol(balance, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }}
@endif
@else
({{ formatAmountByCode(balance, key) }})
diff --git a/resources/views/list/bills.twig b/resources/views/list/bills.twig
index 650ca25ed4..c10f04c61e 100644
--- a/resources/views/list/bills.twig
+++ b/resources/views/list/bills.twig
@@ -67,7 +67,7 @@
~ {{ format_amount_by_symbol((entry.amount_max + entry.amount_min)/2, entry.currency_symbol, entry.currency_decimal_places) }}
{% if '0' != entry.pc_amount_max and null != entry.pc_amount_max %}
- (~ {{ format_amount_by_symbol((entry.pc_amount_max + entry.pc_amount_min)/2, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+ (~ {{ format_amount_by_symbol((entry.pc_amount_max + entry.pc_amount_min)/2, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
@endif
</span>
</td>
diff --git a/resources/views/list/groups-tiny.twig b/resources/views/list/groups-tiny.twig
index 600367e1a4..1323a5982b 100644
--- a/resources/views/list/groups-tiny.twig
+++ b/resources/views/list/groups-tiny.twig
@@ -13,7 +13,7 @@
({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
@endif
{% if convertToPrimary and null != transaction.pc_amount %}
- ({{ format_amount_by_symbol(transaction.pc_amount*-1, primaryCurrency.symbol, foreign_currency_.decimal_places) }})
+ ({{ format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
@endif
{% elseif transaction.transaction_type_type == 'Transfer' %}
@@ -25,7 +25,7 @@
({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
@endif
{% if convertToPrimary and null != transaction.pc_amount %}
- ({{ format_amount_by_symbol(transaction.pc_amount*-1, primaryCurrency.symbol, foreign_currency_.decimal_places) }})
+ ({{ format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
@endif
@else
{{ format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
@@ -33,7 +33,7 @@
({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
@endif
{% if convertToPrimary and null != transaction.pc_amount %}
- ({{ format_amount_by_symbol(transaction.pc_amount*-1, primaryCurrency.symbol, foreign_currency_.decimal_places) }})
+ ({{ format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
@endif
@endif
{{-- transfer to --}}
@@ -45,7 +45,7 @@
({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
@endif
{% if convertToPrimary and null != transaction.pc_amount %}
- ({{ format_amount_by_symbol(transaction.pc_amount*-1, primaryCurrency.symbol, foreign_currency_.decimal_places) }})
+ ({{ format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
@endif
@else
{{ format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
@@ -53,7 +53,7 @@
({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
@endif
{% if convertToPrimary and null != transaction.pc_amount %}
- ({{ format_amount_by_symbol(transaction.pc_amount, primaryCurrency.symbol, foreign_currency_.decimal_places) }})
+ ({{ format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
@endif
@endif
{% elseif transaction.transaction_type_type == 'Reconciliation' %}
@@ -63,7 +63,7 @@
({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
@endif
{% if convertToPrimary and null != transaction.pc_amount %}
- ({{ format_amount_by_symbol(transaction.pc_amount*-1, primaryCurrency.symbol, foreign_currency_.decimal_places) }})
+ ({{ format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
@endif
@else
{{ format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
@@ -71,7 +71,7 @@
({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
@endif
{% if convertToPrimary and null != transaction.pc_amount %}
- ({{ format_amount_by_symbol(transaction.pc_amount, primaryCurrency.symbol, foreign_currency_.decimal_places) }})
+ ({{ format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
@endif
@endif
@else
@@ -80,7 +80,7 @@
({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
@endif
{% if convertToPrimary and null != transaction.pc_amount %}
- ({{ format_amount_by_symbol(transaction.pc_amount, primaryCurrency.symbol, foreign_currency_.decimal_places) }})
+ ({{ format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
@endif
@endif
</span>
diff --git a/resources/views/list/groups.twig b/resources/views/list/groups.twig
index fa3302fd18..7806663f1a 100644
--- a/resources/views/list/groups.twig
+++ b/resources/views/list/groups.twig
@@ -64,7 +64,7 @@
{% if group.transaction_type == 'Deposit' %}
{{ format_amount_by_symbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places) }}
{% if convertToPrimary and 0 != sum.pc_amount %}
- (~ {{ format_amount_by_symbol(sum.pc_amount*-1, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+ (~ {{ format_amount_by_symbol(sum.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
@endif
{% if loop.index != group.sums|length %},@endif
@@ -72,14 +72,14 @@
<span class="text-info money-transfer">
{{ format_amount_by_symbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places, false) }}
{% if convertToPrimary and 0 != sum.pc_amount %}
- (~ {{ format_amount_by_symbol(sum.pc_amount*-1, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+ (~ {{ format_amount_by_symbol(sum.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
@endif
{% if loop.index != group.sums|length %},@endif
</span>
@else
{{ format_amount_by_symbol(sum.amount, sum.currency_symbol, sum.currency_decimal_places) }}
{% if convertToPrimary and 0 != sum.pc_amount %}
- (~ {{ format_amount_by_symbol(sum.pc_amount*-1, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+ (~ {{ format_amount_by_symbol(sum.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
@endif
{% if loop.index != group.sums|length %},@endif
@endif
@@ -174,7 +174,7 @@
@endif
{{-- primary currency amount of deposit --}}
{% if convertToPrimary and 0 != transaction.pc_amount %}
- (~ {{ format_amount_by_symbol(transaction.pc_amount*-1, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+ (~ {{ format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
@endif
{{-- transfer --}}
{% elseif transaction.transaction_type_type == 'Transfer' %}
@@ -197,7 +197,7 @@
{{-- primary currency amount of transfer --}}
{% if convertToPrimary and 0 != transaction.pc_amount %}
- (~ {{ format_amount_by_symbol(transaction.pc_amount*-1, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+ (~ {{ format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
@endif
</span>
{{-- opening balance --}}
@@ -208,7 +208,7 @@
({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
@endif
{% if convertToPrimary and 0 != transaction.pc_amount %}
- (~ {{ format_amount_by_symbol(transaction.pc_amount*-1, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+ (~ {{ format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
@endif
@else
{{ format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
@@ -216,7 +216,7 @@
({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
@endif
{% if convertToPrimary and 0 != transaction.pc_amount %}
- (~ {{ format_amount_by_symbol(transaction.pc_amount, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+ (~ {{ format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
@endif
@endif
{{-- reconciliation --}}
@@ -227,7 +227,7 @@
({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
@endif
{% if convertToPrimary and 0 != transaction.pc_amount %}
- (~ {{ format_amount_by_symbol(transaction.pc_amount*-1, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+ (~ {{ format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
@endif
@else
{{ format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
@@ -235,7 +235,7 @@
({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
@endif
{% if convertToPrimary and 0 != transaction.pc_amount %}
- (~ {{ format_amount_by_symbol(transaction.pc_amount, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+ (~ {{ format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
@endif
@endif
{{-- liability credit --}}
@@ -246,7 +246,7 @@
({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
@endif
{% if convertToPrimary and 0 != transaction.pc_amount %}
- (~ {{ format_amount_by_symbol(transaction.pc_amount, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+ (~ {{ format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
@endif
@else
{{ format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
@@ -254,7 +254,7 @@
({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
@endif
{% if convertToPrimary and 0 != transaction.pc_amount %}
- (~ {{ format_amount_by_symbol(transaction.pc_amount*-1, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+ (~ {{ format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
@endif
@endif
@@ -269,8 +269,8 @@
({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
@endif
{{-- primary currency amount of withdrawal, if not in foreign currency --}}
- {% if convertToPrimary and 0 != transaction.pc_amount and primaryCurrency.id != transaction.foreign_currency_id %}
- (~ {{ format_amount_by_symbol(transaction.pc_amount, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+ {% if convertToPrimary and 0 != transaction.pc_amount and $primaryCurrency->id != transaction.foreign_currency_id %}
+ (~ {{ format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
@endif
@endif
</td>
diff --git a/resources/views/list/piggy-banks.twig b/resources/views/list/piggy-banks.twig
index ce0ceeafe2..0b6604eff6 100644
--- a/resources/views/list/piggy-banks.twig
+++ b/resources/views/list/piggy-banks.twig
@@ -48,8 +48,8 @@
<td class="text-right piggySaved">
<span title="Saved so far" class="text-right">
{{ format_amount_by_symbol(piggy.current_amount,piggy.currency_symbol,piggy.currency_decimal_places) }}
- {% if convertToPrimary and piggy.currency_id != primaryCurrency.id and null != piggy.pc_current_amount %}
- ({{ format_amount_by_symbol(piggy.pc_current_amount,primaryCurrency.symbol,primaryCurrency.decimal_places) }})
+ {% if convertToPrimary and piggy.currency_id != $primaryCurrency->id and null != piggy.pc_current_amount %}
+ ({{ format_amount_by_symbol(piggy.pc_current_amount,$primaryCurrency->symbol,$primaryCurrency->decimal_places) }})
@endif
</span>
</td>
@@ -89,24 +89,24 @@
<td class="hidden-sm hidden-xs text-right">
{% if null != piggy.target_amount and 0 != piggy.target_amount %}
<span title="{{ 'target_amount'|_ }}">{{ format_amount_by_symbol(piggy.target_amount,piggy.currency_symbol,piggy.currency_decimal_places) }}</span>
- {% if convertToPrimary and piggy.currency_id != primaryCurrency.id and null != piggy.pc_target_amount %}
- (<span title="{{ 'target_amount'|_ }}">{{ format_amount_by_symbol(piggy.pc_target_amount,primaryCurrency.symbol, primaryCurrency.decimal_places) }}</span>)
+ {% if convertToPrimary and piggy.currency_id != $primaryCurrency->id and null != piggy.pc_target_amount %}
+ (<span title="{{ 'target_amount'|_ }}">{{ format_amount_by_symbol(piggy.pc_target_amount,$primaryCurrency->symbol, $primaryCurrency->decimal_places) }}</span>)
@endif
@endif
</td>
<td class="hidden-sm hidden-xs text-right">
{% if piggy.left_to_save > 0 %}
<span title="{{ 'left_to_save'|_ }}">{{ format_amount_by_symbol(piggy.left_to_save,piggy.currency_symbol,piggy.currency_decimal_places) }}</span>
- {% if convertToPrimary and piggy.currency_id != primaryCurrency.id and null != piggy.pc_left_to_save %}
- (<span title="{{ 'left_to_save'|_ }}">{{ format_amount_by_symbol(piggy.pc_left_to_save, primaryCurrency.symbol,primaryCurrency.decimal_places) }}</span>)
+ {% if convertToPrimary and piggy.currency_id != $primaryCurrency->id and null != piggy.pc_left_to_save %}
+ (<span title="{{ 'left_to_save'|_ }}">{{ format_amount_by_symbol(piggy.pc_left_to_save, $primaryCurrency->symbol,$primaryCurrency->decimal_places) }}</span>)
@endif
@endif
</td>
<td class="hidden-sm hidden-xs text-right">
{% if piggy.target_date and piggy.save_per_month %}
{{ format_amount_by_symbol(piggy.save_per_month, piggy.currency_symbol, piggy.currency_decimal_places) }}
- {% if convertToPrimary and piggy.currency_id != primaryCurrency.id and null != piggy.pc_save_per_month %}
- ({{ format_amount_by_symbol(piggy.pc_save_per_month, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+ {% if convertToPrimary and piggy.currency_id != $primaryCurrency->id and null != piggy.pc_save_per_month %}
+ ({{ format_amount_by_symbol(piggy.pc_save_per_month, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
@endif
@endif
</td>
diff --git a/resources/views/new-user/index.twig b/resources/views/new-user/index.twig
index f0f83b2682..935e7e27ff 100644
--- a/resources/views/new-user/index.twig
+++ b/resources/views/new-user/index.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
@@ -23,8 +23,8 @@
<p>
{{ 'to_get_started'|_ }}
</p>
- {{ ExpandedForm::text('bank_name') }}
- {{ CurrencyForm.balanceAll('bank_balance') }}
+ {!! ExpandedForm::text('bank_name') }}
+ {!! CurrencyForm.balanceAll('bank_balance') }}
<p class="text-success">
{{ 'currency_not_present'|_ }}
@@ -34,7 +34,7 @@
{{ 'savings_balance_text'|_ }}
</p>
- {{ ExpandedForm.integer('savings_balance',0, {"step": "any"}) }}
+ {!! ExpandedForm::integer('savings_balance',0, {"step": "any"}) }}
<p>
{{ 'set_preferred_language'|_ }}
diff --git a/resources/views/object-groups/delete.twig b/resources/views/object-groups/delete.twig
index ea061c4054..e9d6213f8d 100644
--- a/resources/views/object-groups/delete.twig
+++ b/resources/views/object-groups/delete.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, objectGroup) }}
@endsection
@@ -10,7 +10,7 @@
<input name="_token" type="hidden" value="{{ csrf_token() }}">
<div class="row">
<div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12">
- <div class="box box-danger">
+ <div class="card card-danger card-outline">
<div class="card-header">
<h3 class="card-title">{{ trans('form.delete_object_group', {'title': objectGroup.title}) }}</h3>
</div>
@@ -25,7 +25,7 @@
{% if piggyBanks > 0 %}
<p>
- {{ Lang.choice('form.not_delete_piggy_banks', piggyBanks, {count: piggyBanks}) }}
+ {{ Lang::choice('form.not_delete_piggy_banks', piggyBanks, {count: piggyBanks}) }}
</p>
@endif
diff --git a/resources/views/object-groups/edit.twig b/resources/views/object-groups/edit.twig
index e141d38cc9..898fad973c 100644
--- a/resources/views/object-groups/edit.twig
+++ b/resources/views/object-groups/edit.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, objectGroup) }}
@endsection
@@ -19,7 +19,7 @@
<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::text('title', objectGroup.title) }}
+ {!! ExpandedForm::text('title', objectGroup.title) }}
</div>
</div>
@@ -33,7 +33,7 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::optionsList('update','object group') }}
+ {!! ExpandedForm::optionsList('update','object group') }}
</div>
<div class="card-footer">
<button type="submit" class="btn btn-success text-end">
diff --git a/resources/views/partials/flashes.twig b/resources/views/partials/flashes.twig
index 06e6a6357d..2ef891ef26 100644
--- a/resources/views/partials/flashes.twig
+++ b/resources/views/partials/flashes.twig
@@ -43,7 +43,7 @@
{{-- MULTIPLE INFO MESSAGE --}}
{% if session('info') is iterable and session('info')|length > 1 %}
<strong>
- {{ Lang.choice('firefly.flash_info_multiple', session('info')|length, {count: session('info')|length}) }}:</strong>
+ {{ Lang::choice('firefly.flash_info_multiple', session('info')|length, {count: session('info')|length}) }}:</strong>
<ul class="list-unstyled">
{% for inf in session('info') %}
<li>{{ inf|raw }}</li>
@@ -89,7 +89,7 @@
{{-- MULTIPLE ERRORS (BAD) --}}
{% if session('error') is iterable and session('error')|length > 1 %}
<strong>
- {{ Lang.choice('firefly.flash_error_multiple', session('error')|length, {count: session('error')|length}) }}:
+ {{ Lang::choice('firefly.flash_error_multiple', session('error')|length, {count: session('error')|length}) }}:
</strong>
<ul class="list-unstyled">
{% for err in session('error') %}
diff --git a/resources/views/partials/form/transaction/amount.blade.php b/resources/views/partials/form/transaction/amount.blade.php
index d6a30f73e4..ebdf259150 100644
--- a/resources/views/partials/form/transaction/amount.blade.php
+++ b/resources/views/partials/form/transaction/amount.blade.php
@@ -11,7 +11,7 @@
<template x-if="!formStates.loadingCurrencies">
<select class="form-control" :id="'currency_code_' + index" x-model="transaction.currency_code">
<template x-for="currency in formData.primaryCurrencies">
- <option :selected="currency.id == formData.primaryCurrency.id"
+ <option :selected="currency.id == formData.$primaryCurrency->id"
:label="currency.name" :value="currency.code"
x-text="currency.name"></option>
</template>
diff --git a/resources/views/piggy-banks/add-mobile.twig b/resources/views/piggy-banks/add-mobile.twig
index 4026078ad0..818be20a70 100644
--- a/resources/views/piggy-banks/add-mobile.twig
+++ b/resources/views/piggy-banks/add-mobile.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}
@endsection
diff --git a/resources/views/piggy-banks/create.twig b/resources/views/piggy-banks/create.twig
index 10a684d68d..0c505ef377 100644
--- a/resources/views/piggy-banks/create.twig
+++ b/resources/views/piggy-banks/create.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
@@ -15,9 +15,9 @@
<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::text('name') }}
- {{ ExpandedForm::amountNoCurrency('target_amount') }}
- {{ CurrencyForm::currencyList('transaction_currency_id', preFilled.transaction_currency_id, {helpText:'piggy_default_currency'|_}) }}
+ {!! ExpandedForm::text('name') }}
+ {!! ExpandedForm::amountNoCurrency('target_amount') }}
+ {!! CurrencyForm::currencyList('transaction_currency_id', preFilled.transaction_currency_id, {helpText:'piggy_default_currency'|_}) }}
{{ AccountForm.assetLiabilityMultiAccountList('accounts', preFilled.accounts, {label: 'saveOnAccounts'|_, helpText: 'piggy_account_currency_match'|_ }) }}
</div>
@@ -29,10 +29,10 @@
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::date('target_date') }}
- {{ ExpandedForm::textarea('notes', null, {helpText: trans('firefly.field_supports_markdown')} ) }}
- {{ ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
- {{ ExpandedForm.objectGroup() }}
+ {!! ExpandedForm::date('target_date') }}
+ {!! ExpandedForm::textarea('notes', null, {helpText: trans('firefly.field_supports_markdown')} ) }}
+ {!! ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
+ {!! ExpandedForm::objectGroup() }}
</div>
</div>
</div>
@@ -45,7 +45,7 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::optionsList('create','piggy bank') }}
+ {!! ExpandedForm::optionsList('create','piggy bank') }}
</div>
<div class="card-footer">
<button type="submit" class="btn btn-success text-end">
diff --git a/resources/views/piggy-banks/delete.twig b/resources/views/piggy-banks/delete.twig
index d58b8b4581..ecd8b3936f 100644
--- a/resources/views/piggy-banks/delete.twig
+++ b/resources/views/piggy-banks/delete.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}
@endsection
@@ -10,7 +10,7 @@
<input name="_token" type="hidden" value="{{ csrf_token() }}">
<div class="row">
<div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12">
- <div class="box box-danger">
+ <div class="card card-danger card-outline">
<div class="card-header">
<h3 class="card-title">{{ trans('firefly.delete_piggy_bank', {'name': piggyBank.name}) }}</h3>
</div>
diff --git a/resources/views/piggy-banks/edit.twig b/resources/views/piggy-banks/edit.twig
index b43d6494d3..541e97d343 100644
--- a/resources/views/piggy-banks/edit.twig
+++ b/resources/views/piggy-banks/edit.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}
@endsection
@@ -21,9 +21,9 @@
</div>
<div class="card-body">
- {{ ExpandedForm::text('name') }}
- {{ ExpandedForm::amountNoCurrency('target_amount') }}
- {{ CurrencyForm::currencyList('transaction_currency_id', preFilled.transaction_currency_id, {helpText:'piggy_default_currency'|_}) }}
+ {!! ExpandedForm::text('name') }}
+ {!! ExpandedForm::amountNoCurrency('target_amount') }}
+ {!! CurrencyForm::currencyList('transaction_currency_id', preFilled.transaction_currency_id, {helpText:'piggy_default_currency'|_}) }}
{{ AccountForm.assetLiabilityMultiAccountList('accounts', preFilled.accounts, {label: 'saveOnAccounts'|_, helpText: 'piggy_account_currency_match'|_ }) }}
</div>
@@ -36,11 +36,11 @@
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::date('start_date') }}
- {{ ExpandedForm::date('target_date') }}
- {{ ExpandedForm::textarea('notes', null, {helpText: trans('firefly.field_supports_markdown')}) }}
- {{ ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
- {{ ExpandedForm.objectGroup() }}
+ {!! ExpandedForm::date('start_date') }}
+ {!! ExpandedForm::date('target_date') }}
+ {!! ExpandedForm::textarea('notes', null, {helpText: trans('firefly.field_supports_markdown')}) }}
+ {!! ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
+ {!! ExpandedForm::objectGroup() }}
</div>
</div>
</div>
@@ -53,7 +53,7 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::optionsList('update','piggy bank') }}
+ {!! ExpandedForm::optionsList('update','piggy bank') }}
</div>
<div class="card-footer">
<button type="submit" class="btn btn-success text-end">
diff --git a/resources/views/piggy-banks/remove-mobile.twig b/resources/views/piggy-banks/remove-mobile.twig
index be6200eb71..aafa045763 100644
--- a/resources/views/piggy-banks/remove-mobile.twig
+++ b/resources/views/piggy-banks/remove-mobile.twig
@@ -1,5 +1,5 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}
@endsection
diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twig
index 0691ceceae..fbab8ba8e7 100644
--- a/resources/views/piggy-banks/show.twig
+++ b/resources/views/piggy-banks/show.twig
@@ -1,13 +1,13 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}
@endsection
@section('content')
<div class="row">
<div class="col-lg-8 col-md-8 col-sm-6">
- <div class="box" id="piggyChart">
+ <div class="card" id="piggyChart">
<div class="card-header">
<h3 class="card-title">{{ 'events'|_ }}</h3>
</div>
diff --git a/resources/views/preferences/index.twig b/resources/views/preferences/index.twig
index 54ec90eb08..630fa52408 100644
--- a/resources/views/preferences/index.twig
+++ b/resources/views/preferences/index.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
@@ -109,8 +109,8 @@
{{ 'pref_custom_fiscal_year_help'|_ }}
</p>
{% set isCustomFiscalYear = customFiscalYear == 1 ? true : false %}
- {{ ExpandedForm::checkbox('customFiscalYear','1',isCustomFiscalYear,{ 'label' : 'pref_custom_fiscal_year_label'|_ }) }}
- {{ ExpandedForm::date('fiscalYearStart',fiscalYearStart,{ 'label' : 'pref_fiscal_year_start_label'|_ }) }}
+ {!! ExpandedForm::checkbox('customFiscalYear','1',isCustomFiscalYear,{ 'label' : 'pref_custom_fiscal_year_label'|_ }) }}
+ {!! ExpandedForm::date('fiscalYearStart',fiscalYearStart,{ 'label' : 'pref_fiscal_year_start_label'|_ }) }}
</div>
{{-- conversion back to primary currency --}}
@@ -120,7 +120,7 @@
<p>
{{ 'pref_convert_to_primary_help'|_ }}
</p>
- {{ ExpandedForm::checkbox('convertToPrimary','1',convertToPrimary,{ 'label' : 'pref_convert_primary_help'|_ }) }}
+ {!! ExpandedForm::checkbox('convertToPrimary','1',convertToPrimary,{ 'label' : 'pref_convert_primary_help'|_ }) }}
</div>
@endif
{{-- conversion back to primary currency --}}
@@ -129,7 +129,7 @@
<p>
{{ 'pref_anonymous_help'|_ }}
</p>
- {{ ExpandedForm::checkbox('anonymous','1',anonymous,{ 'label' : 'pref_anonymous_label'|_ }) }}
+ {!! ExpandedForm::checkbox('anonymous','1',anonymous,{ 'label' : 'pref_anonymous_label'|_ }) }}
</div>
</div>
@@ -143,22 +143,22 @@
{{ 'pref_optional_fields_transaction_help'|_ }}
</p>
<h4>{{ 'optional_tj_date_fields'|_ }}</h4>
- {{ ExpandedForm::checkbox('tj[interest_date]','1', tjOptionalFields.interest_date,{ 'label' : 'pref_optional_tj_interest_date'|_ }) }}
- {{ ExpandedForm::checkbox('tj[book_date]','1', tjOptionalFields.book_date,{ 'label' : 'pref_optional_tj_book_date'|_ }) }}
- {{ ExpandedForm::checkbox('tj[process_date]','1', tjOptionalFields.process_date,{ 'label' : 'pref_optional_tj_process_date'|_ }) }}
- {{ ExpandedForm::checkbox('tj[due_date]','1', tjOptionalFields.due_date,{ 'label' : 'pref_optional_tj_due_date'|_ }) }}
- {{ ExpandedForm::checkbox('tj[payment_date]','1', tjOptionalFields.payment_date,{ 'label' : 'pref_optional_tj_payment_date'|_ }) }}
- {{ ExpandedForm::checkbox('tj[invoice_date]','1', tjOptionalFields.invoice_date,{ 'label' : 'pref_optional_tj_invoice_date'|_ }) }}
+ {!! ExpandedForm::checkbox('tj[interest_date]','1', tjOptionalFields.interest_date,{ 'label' : 'pref_optional_tj_interest_date'|_ }) }}
+ {!! ExpandedForm::checkbox('tj[book_date]','1', tjOptionalFields.book_date,{ 'label' : 'pref_optional_tj_book_date'|_ }) }}
+ {!! ExpandedForm::checkbox('tj[process_date]','1', tjOptionalFields.process_date,{ 'label' : 'pref_optional_tj_process_date'|_ }) }}
+ {!! ExpandedForm::checkbox('tj[due_date]','1', tjOptionalFields.due_date,{ 'label' : 'pref_optional_tj_due_date'|_ }) }}
+ {!! ExpandedForm::checkbox('tj[payment_date]','1', tjOptionalFields.payment_date,{ 'label' : 'pref_optional_tj_payment_date'|_ }) }}
+ {!! ExpandedForm::checkbox('tj[invoice_date]','1', tjOptionalFields.invoice_date,{ 'label' : 'pref_optional_tj_invoice_date'|_ }) }}
<h4>{{ 'optional_tj_other_fields'|_ }}</h4>
- {{ ExpandedForm::checkbox('tj[internal_reference]','1', tjOptionalFields.internal_reference,{ 'label' : 'pref_optional_tj_internal_reference'|_ }) }}
- {{ ExpandedForm::checkbox('tj[external_url]','1', tjOptionalFields.external_url,{ 'label' : 'pref_optional_tj_external_url'|_ }) }}
- {{ ExpandedForm::checkbox('tj[notes]','1', tjOptionalFields.notes,{ 'label' : 'pref_optional_tj_notes'|_ }) }}
- {{ ExpandedForm::checkbox('tj[location]','1', tjOptionalFields.location,{ 'label' : 'pref_optional_tj_location'|_ }) }}
- {{ ExpandedForm::checkbox('tj[links]','1', tjOptionalFields.links,{ 'label' : 'pref_optional_tj_links'|_ }) }}
+ {!! ExpandedForm::checkbox('tj[internal_reference]','1', tjOptionalFields.internal_reference,{ 'label' : 'pref_optional_tj_internal_reference'|_ }) }}
+ {!! ExpandedForm::checkbox('tj[external_url]','1', tjOptionalFields.external_url,{ 'label' : 'pref_optional_tj_external_url'|_ }) }}
+ {!! ExpandedForm::checkbox('tj[notes]','1', tjOptionalFields.notes,{ 'label' : 'pref_optional_tj_notes'|_ }) }}
+ {!! ExpandedForm::checkbox('tj[location]','1', tjOptionalFields.location,{ 'label' : 'pref_optional_tj_location'|_ }) }}
+ {!! ExpandedForm::checkbox('tj[links]','1', tjOptionalFields.links,{ 'label' : 'pref_optional_tj_links'|_ }) }}
<h4>{{ 'optional_tj_attachment_fields'|_ }}</h4>
- {{ ExpandedForm::checkbox('tj[attachments]','1', tjOptionalFields.attachments,{ 'label' : 'pref_optional_tj_attachments'|_ }) }}
+ {!! ExpandedForm::checkbox('tj[attachments]','1', tjOptionalFields.attachments,{ 'label' : 'pref_optional_tj_attachments'|_ }) }}
</div>
</div>
</div>
@@ -313,7 +313,7 @@
<div class="preferences-box">
<h3>{{ 'list_page_size_title'|_ }}</h3>
<p>{{ 'list_page_size_help'|_ }}</p>
- {{ ExpandedForm.integer('listPageSize',listPageSize,{'label' : 'list_page_size_label'|_}) }}
+ {!! ExpandedForm::integer('listPageSize',listPageSize,{'label' : 'list_page_size_label'|_}) }}
</div>
<div class="preferences-box">
<h3>{{ 'dark_mode_preference'|_ }}</h3>
@@ -378,10 +378,10 @@
<div class="preferences-box">
<h3>{{ 'pref_notifications_settings'|_ }}</h3>
<p>{{ 'pref_notifications_settings_help'|_ }}</p>
- {{ ExpandedForm::text('slack_webhook_url',slackUrl,{'label' : 'slack_url_label'|_, helpText: 'slack_discord_double'|_}) }}
+ {!! ExpandedForm::text('slack_webhook_url',slackUrl,{'label' : 'slack_url_label'|_, helpText: 'slack_discord_double'|_}) }}
- {{ ExpandedForm::text('pushover_app_token', pushoverAppToken, {}) }}
- {{ ExpandedForm::text('pushover_user_token', pushoverUserToken, {}) }}
+ {!! ExpandedForm::text('pushover_app_token', pushoverAppToken, {}) }}
+ {!! ExpandedForm::text('pushover_user_token', pushoverUserToken, {}) }}
{{ Form.hidden('ntfy_server', ntfyServer, {}) }}
diff --git a/resources/views/profile/change-email.twig b/resources/views/profile/change-email.twig
index d4e0c91f5e..3749cbdb68 100644
--- a/resources/views/profile/change-email.twig
+++ b/resources/views/profile/change-email.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
@@ -34,7 +34,7 @@
name="email">
</div>
</div>
- {{ ExpandedForm::staticText('verification',trans('firefly.email_verification')) }}
+ {!! ExpandedForm::staticText('verification',trans('firefly.email_verification')) }}
</div>
<div class="card-footer">
diff --git a/resources/views/profile/change-password.twig b/resources/views/profile/change-password.twig
index 1c62518599..5041a01c1b 100644
--- a/resources/views/profile/change-password.twig
+++ b/resources/views/profile/change-password.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
@@ -52,7 +52,7 @@
</div>
</div>
- {{ ExpandedForm::checkbox('verify_password','1', true) }}
+ {!! ExpandedForm::checkbox('verify_password','1', true) }}
<p>
<a data-toggle="modal" data-target="#passwordModal" href="#passwordModal">{{ 'what_is_pw_security'|_ }}</a>
</p>
diff --git a/resources/views/profile/delete-account.twig b/resources/views/profile/delete-account.twig
index 3bc7b6f7ed..550605285f 100644
--- a/resources/views/profile/delete-account.twig
+++ b/resources/views/profile/delete-account.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
@@ -10,7 +10,7 @@
<div class="row">
<div class="col-lg-6 col-md-12 col-sm-12">
- <div class="box box-danger">
+ <div class="card card-danger card-outline">
<div class="card-header">
<h3 class="card-title">{{ 'delete_your_account'|_ }}</h3>
</div>
diff --git a/resources/views/profile/index.twig b/resources/views/profile/index.twig
index 416459b8ff..2a5cb5d387 100644
--- a/resources/views/profile/index.twig
+++ b/resources/views/profile/index.twig
@@ -1,7 +1,7 @@
{% set VUE_SCRIPT_NAME = 'profile' %}
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
diff --git a/resources/views/profile/logout-other-sessions.twig b/resources/views/profile/logout-other-sessions.twig
index 4e1edfa22e..979a1ddb5d 100644
--- a/resources/views/profile/logout-other-sessions.twig
+++ b/resources/views/profile/logout-other-sessions.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
diff --git a/resources/views/profile/mfa/backup-codes-intro.twig b/resources/views/profile/mfa/backup-codes-intro.twig
index 967e89934e..99db2b3dcc 100644
--- a/resources/views/profile/mfa/backup-codes-intro.twig
+++ b/resources/views/profile/mfa/backup-codes-intro.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
@@ -31,8 +31,8 @@
<div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12 col-xs-12">
<div class="card">
<div class="card-body">
- {{ ExpandedForm.password('password', {helpText: 'current_password_confirm_mfa'|_}) }}
- {{ ExpandedForm::text('code', code) }}
+ {!! ExpandedForm.password('password', {helpText: 'current_password_confirm_mfa'|_}) }}
+ {!! ExpandedForm::text('code', code) }}
</div>
<div class="card-footer">
<button type="submit" class="btn btn-success">{{ 'pref_save_settings'|_ }}</button>
diff --git a/resources/views/profile/mfa/backup-codes-post.twig b/resources/views/profile/mfa/backup-codes-post.twig
index a02b6b2afb..a1898e57e9 100644
--- a/resources/views/profile/mfa/backup-codes-post.twig
+++ b/resources/views/profile/mfa/backup-codes-post.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
diff --git a/resources/views/profile/mfa/disable-mfa.twig b/resources/views/profile/mfa/disable-mfa.twig
index fbfa7abf94..057e227f33 100644
--- a/resources/views/profile/mfa/disable-mfa.twig
+++ b/resources/views/profile/mfa/disable-mfa.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
@@ -25,8 +25,8 @@
<div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12 col-xs-12">
<div class="card">
<div class="card-body">
- {{ ExpandedForm.password('password', {helpText: 'current_password_confirm_mfa'|_}) }}
- {{ ExpandedForm::text('code', code) }}
+ {!! ExpandedForm.password('password', {helpText: 'current_password_confirm_mfa'|_}) }}
+ {!! ExpandedForm::text('code', code) }}
</div>
<div class="card-footer">
<button type="submit" class="btn btn-danger">{{ 'pref_disable_mfa'|_ }}</button>
diff --git a/resources/views/profile/mfa/enable-mfa.twig b/resources/views/profile/mfa/enable-mfa.twig
index d9a1b7f428..0689b10392 100644
--- a/resources/views/profile/mfa/enable-mfa.twig
+++ b/resources/views/profile/mfa/enable-mfa.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
@@ -36,8 +36,8 @@
<div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12 col-xs-12">
<div class="card">
<div class="card-body">
- {{ ExpandedForm.password('password', {helpText: 'current_password_confirm_mfa'|_}) }}
- {{ ExpandedForm::text('code', code) }}
+ {!! ExpandedForm.password('password', {helpText: 'current_password_confirm_mfa'|_}) }}
+ {!! ExpandedForm::text('code', code) }}
</div>
<div class="card-footer">
<button type="submit" class="btn btn-success btn-lg">{{ 'pref_save_settings'|_ }}</button>
diff --git a/resources/views/profile/mfa/index.twig b/resources/views/profile/mfa/index.twig
index f4ff6ee1fa..10a4a59470 100644
--- a/resources/views/profile/mfa/index.twig
+++ b/resources/views/profile/mfa/index.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
diff --git a/resources/views/profile/new-backup-codes.twig b/resources/views/profile/new-backup-codes.twig
index 717d1798b6..584ef9e1bc 100644
--- a/resources/views/profile/new-backup-codes.twig
+++ b/resources/views/profile/new-backup-codes.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
diff --git a/resources/views/profile/oauth/index.twig b/resources/views/profile/oauth/index.twig
index fc44c9ca14..c11cb7ceea 100644
--- a/resources/views/profile/oauth/index.twig
+++ b/resources/views/profile/oauth/index.twig
@@ -1,7 +1,7 @@
{% set VUE_SCRIPT_NAME = 'profile' %}
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
diff --git a/resources/views/recurring/create.twig b/resources/views/recurring/create.twig
index b18bef3030..e80d53b051 100644
--- a/resources/views/recurring/create.twig
+++ b/resources/views/recurring/create.twig
@@ -1,5 +1,5 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
@section('content')
@@ -17,15 +17,15 @@
<h3 class="card-title">{{ 'mandatory_for_recurring'|_ }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::text('title') }}
+ {!! ExpandedForm::text('title') }}
{{ preFilled.first_date.format('Y-m-d') }}
- {{ ExpandedForm::date('first_date',null, {helpText: trans('firefly.help_first_date'), min: preFilled.first_date}) }}
- {{ ExpandedForm::select('repetition_type', [], null, {helpText: trans('firefly.change_date_other_options')}) }}
- {{ ExpandedForm.integer('skip',0, {'helpText': trans('firefly.skip_help_text')}) }}
- {{ ExpandedForm::select('weekend', weekendResponses, null, {helpText: trans('firefly.help_weekend')}) }}
- {{ ExpandedForm::select('repetition_end', repetitionEnds) }}
- {{ ExpandedForm::date('repeat_until',null) }}
- {{ ExpandedForm.integer('repetitions',null) }}
+ {!! ExpandedForm::date('first_date',null, {helpText: trans('firefly.help_first_date'), min: preFilled.first_date}) }}
+ {!! ExpandedForm::select('repetition_type', [], null, {helpText: trans('firefly.change_date_other_options')}) }}
+ {!! ExpandedForm::integer('skip',0, {'helpText': trans('firefly.skip_help_text')}) }}
+ {!! ExpandedForm::select('weekend', weekendResponses, null, {helpText: trans('firefly.help_weekend')}) }}
+ {!! ExpandedForm::select('repetition_end', repetitionEnds) }}
+ {!! ExpandedForm::date('repeat_until',null) }}
+ {!! ExpandedForm::integer('repetitions',null) }}
{# calendar in popup --}}
<div class="form-group" id="calendar_holder">
@@ -49,12 +49,12 @@
<h3 class="card-title">{{ 'optional_for_recurring'|_ }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::textarea('recurring_description') }}
+ {!! ExpandedForm::textarea('recurring_description') }}
{# only correct way to do active checkbox --}}
- {{ ExpandedForm::checkbox('active', 1) }}
- {{ ExpandedForm::checkbox('apply_rules',1) }}
- {{ ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
+ {!! ExpandedForm::checkbox('active', 1) }}
+ {!! ExpandedForm::checkbox('apply_rules',1) }}
+ {!! ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
</div>
</div>
</div>
@@ -89,10 +89,10 @@
<input type="hidden" name="transaction_type" value="">
{# end of three buttons --}}
- {{ ExpandedForm::text('transaction_description') }}
+ {!! ExpandedForm::text('transaction_description') }}
{# transaction information (mandatory) --}}
- {{ CurrencyForm::currencyList('transaction_currency_id', primaryCurrency.id) }}
- {{ ExpandedForm::amountNoCurrency('amount') }}
+ {!! CurrencyForm::currencyList('transaction_currency_id', $primaryCurrency->id) }}
+ {!! ExpandedForm::amountNoCurrency('amount') }}
{# source account if withdrawal, or if transfer: --}}
{{ AccountForm.longAccountList('source_id', null, {label: trans('form.asset_source_account')}) }}
@@ -104,7 +104,7 @@
{{ AccountForm.longAccountList('destination_id', null, {label: trans('form.asset_destination_account')} ) }}
{# destination account name for withdrawals --}}
- {# {{ ExpandedForm::text('destination_name', null, {label: trans('form.expense_account')}) }} --}}
+ {# {!! ExpandedForm::text('destination_name', null, {label: trans('form.expense_account')}) }} --}}
{# NEW for withdrawals, also a drop down with expense accounts, loans, debts, mortgages or (cash). --}}
{{ AccountForm.activeWithdrawalDestinations('withdrawal_destination_id', null, {label: trans('form.withdrawal_destination_id')}) }}
@@ -120,28 +120,28 @@
</div>
<div class="card-body">
{# transaction information (optional) --}}
- {{ CurrencyForm::currencyListEmpty('foreign_currency_id') }}
- {{ ExpandedForm::amountNoCurrency('foreign_amount') }}
+ {!! CurrencyForm::currencyListEmpty('foreign_currency_id') }}
+ {!! ExpandedForm::amountNoCurrency('foreign_amount') }}
{# BUDGET ONLY WHEN CREATING A WITHDRAWAL --}}
{% if budgets|length > 1 %}
- {{ ExpandedForm::select('budget_id', budgets, null) }}
+ {!! ExpandedForm::select('budget_id', budgets, null) }}
@else
- {{ ExpandedForm::select('budget_id', budgets, null, {helpText: trans('firefly.no_budget_pointer', {link: route('budgets.index')})}) }}
+ {!! ExpandedForm::select('budget_id', budgets, null, {helpText: trans('firefly.no_budget_pointer', {link: route('budgets.index')})}) }}
@endif
{# CATEGORY ALWAYS --}}
- {{ ExpandedForm::text('category') }}
+ {!! ExpandedForm::text('category') }}
{# BILL / SUBSCRIPTION ONLY FOR WITHDRAWALS --}}
{% if bills|length > 1 %}
- {{ ExpandedForm::select('bill_id', bills, null) }}
+ {!! ExpandedForm::select('bill_id', bills, null) }}
@else
- {{ ExpandedForm::select('bill_id', bills, null, {helpText: trans('firefly.no_bill_pointer', {link: route('subscriptions.index')})}) }}
+ {!! ExpandedForm::select('bill_id', bills, null, {helpText: trans('firefly.no_bill_pointer', {link: route('subscriptions.index')})}) }}
@endif
{# TAGS --}}
- {{ ExpandedForm::text('tags') }}
+ {!! ExpandedForm::text('tags') }}
{# RELATE THIS TRANSFER TO A PIGGY BANK --}}
{{ PiggyBankForm.piggyBankList('piggy_bank_id') }}
@@ -158,7 +158,7 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::optionsList('create','recurrence') }}
+ {!! ExpandedForm::optionsList('create','recurrence') }}
</div>
<div class="card-footer">
<button type="submit" class="btn text-end btn-success">
diff --git a/resources/views/recurring/delete.twig b/resources/views/recurring/delete.twig
index 3dbb3e21be..a4ef4bf3e8 100644
--- a/resources/views/recurring/delete.twig
+++ b/resources/views/recurring/delete.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, recurrence) }}
@endsection
@@ -10,7 +10,7 @@
<input name="_token" type="hidden" value="{{ csrf_token() }}">
<div class="row">
<div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12">
- <div class="box box-danger">
+ <div class="card card-danger card-outline">
<div class="card-header">
<h3 class="card-title">{{ trans('form.delete_recurring', {'title': recurrence.title}) }}</h3>
</div>
@@ -25,7 +25,7 @@
<p>
{% if journalsCreated > 0 %}
- {{ Lang.choice('form.recurring_keep_transactions', journalsCreated, {count: journalsCreated }) }}
+ {{ Lang::choice('form.recurring_keep_transactions', journalsCreated, {count: journalsCreated }) }}
@endif
</p>
</div>
diff --git a/resources/views/recurring/edit.twig b/resources/views/recurring/edit.twig
index 5c03e0b540..07183dcbd4 100644
--- a/resources/views/recurring/edit.twig
+++ b/resources/views/recurring/edit.twig
@@ -1,5 +1,5 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, recurrence) }}
@endsection
@section('content')
@@ -20,14 +20,14 @@
</div>
<div class="card-body">
<input type="hidden" name="id" value="{{ array.id }}"/>
- {{ ExpandedForm::text('title', array.title) }}
- {{ ExpandedForm::date('first_date',array.first_date, {helpText: trans('firefly.help_first_date_no_past')}) }}
- {{ ExpandedForm::select('repetition_type', [], null, {helpText: trans('firefly.change_date_other_options')}) }}
- {{ ExpandedForm.integer('skip', array.repetitions[0].skip, {'helpText': trans('firefly.skip_help_text')}) }}
- {{ ExpandedForm::select('weekend', weekendResponses, array.repetitions[0].weekend, {helpText: trans('firefly.help_weekend')}) }}
- {{ ExpandedForm::select('repetition_end', repetitionEnds, repetitionEnd) }}
- {{ ExpandedForm::date('repeat_until',array.repeat_until) }}
- {{ ExpandedForm.integer('repetitions', array.nr_of_repetitions) }}
+ {!! ExpandedForm::text('title', array.title) }}
+ {!! ExpandedForm::date('first_date',array.first_date, {helpText: trans('firefly.help_first_date_no_past')}) }}
+ {!! ExpandedForm::select('repetition_type', [], null, {helpText: trans('firefly.change_date_other_options')}) }}
+ {!! ExpandedForm::integer('skip', array.repetitions[0].skip, {'helpText': trans('firefly.skip_help_text')}) }}
+ {!! ExpandedForm::select('weekend', weekendResponses, array.repetitions[0].weekend, {helpText: trans('firefly.help_weekend')}) }}
+ {!! ExpandedForm::select('repetition_end', repetitionEnds, repetitionEnd) }}
+ {!! ExpandedForm::date('repeat_until',array.repeat_until) }}
+ {!! ExpandedForm::integer('repetitions', array.nr_of_repetitions) }}
{{-- calendar in popup --}}
<div class="form-group" id="calendar_holder">
@@ -51,12 +51,12 @@
<h3 class="card-title">{{ 'optional_for_recurring'|_ }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::textarea('recurring_description',array.description) }}
+ {!! ExpandedForm::textarea('recurring_description',array.description) }}
{{-- only correct way to do active checkbox --}}
- {{ ExpandedForm::checkbox('active', 1, preFilled.active) }}
- {{ ExpandedForm::checkbox('apply_rules', 1, preFilled.apply_rules) }}
- {{ ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
+ {!! ExpandedForm::checkbox('active', 1, preFilled.active) }}
+ {!! ExpandedForm::checkbox('apply_rules', 1, preFilled.apply_rules) }}
+ {!! ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
</div>
</div>
</div>
@@ -90,10 +90,10 @@
</div>
<input type="hidden" name="transaction_type" value="">
{{-- end of three buttons --}}
- {{ ExpandedForm::text('transaction_description', array.transactions[0].description) }}
+ {!! ExpandedForm::text('transaction_description', array.transactions[0].description) }}
{{-- transaction information (mandatory) --}}
- {{ CurrencyForm::currencyList('transaction_currency_id', array.transactions[0].currency_id) }}
- {{ ExpandedForm::amountNoCurrency('amount', array.transactions[0].amount) }}
+ {!! CurrencyForm::currencyList('transaction_currency_id', array.transactions[0].currency_id) }}
+ {!! ExpandedForm::amountNoCurrency('amount', array.transactions[0].amount) }}
{{-- source account if withdrawal, or if transfer: --}}
{{ AccountForm.longAccountList('source_id', array.transactions[0].source_id, {label: trans('form.asset_source_account')}) }}
@@ -118,29 +118,29 @@
</div>
<div class="card-body">
{{-- transaction information (optional) --}}
- {{ CurrencyForm::currencyListEmpty('foreign_currency_id', array.transactions[0].foreign_currency_id) }}
- {{ ExpandedForm::amountNoCurrency('foreign_amount', array.transactions[0].foreign_amount) }}
+ {!! CurrencyForm::currencyListEmpty('foreign_currency_id', array.transactions[0].foreign_currency_id) }}
+ {!! ExpandedForm::amountNoCurrency('foreign_amount', array.transactions[0].foreign_amount) }}
{{-- BUDGET ONLY WHEN CREATING A WITHDRAWAL --}}
{% if budgets|length > 1 %}
- {{ ExpandedForm::select('budget_id', budgets, array.transactions[0].budget_id) }}
+ {!! ExpandedForm::select('budget_id', budgets, array.transactions[0].budget_id) }}
@else
- {{ ExpandedForm::select('budget_id', budgets, array.transactions[0].budget_id, {helpText: trans('firefly.no_budget_pointer', {link: route('budgets.index')})}) }}
+ {!! ExpandedForm::select('budget_id', budgets, array.transactions[0].budget_id, {helpText: trans('firefly.no_budget_pointer', {link: route('budgets.index')})}) }}
{{-- budgets --}}
@endif
{# CATEGORY ALWAYS --}}
- {{ ExpandedForm::text('category',array.transactions[0].category_name) }}
+ {!! ExpandedForm::text('category',array.transactions[0].category_name) }}
{# BILL ONLY WHEN CREATING A WITHDRAWAL --}}
{% if bills|length > 1 %}
- {{ ExpandedForm::select('bill_id', bills, array.transactions[0].subscription_id) }}
+ {!! ExpandedForm::select('bill_id', bills, array.transactions[0].subscription_id) }}
@else
- {{ ExpandedForm::select('bill_id', bills, array.transactions[0].subscription_id, {helpText: trans('firefly.no_bill_pointer', {link: route('subscriptions.index')})}) }}
+ {!! ExpandedForm::select('bill_id', bills, array.transactions[0].subscription_id, {helpText: trans('firefly.no_bill_pointer', {link: route('subscriptions.index')})}) }}
@endif
{# TAGS --}}
- {{ ExpandedForm::text('tags', array.transactions[0].tags) }}
+ {!! ExpandedForm::text('tags', array.transactions[0].tags) }}
{# RELATE THIS TRANSFER TO A PIGGY BANK --}}
{{ PiggyBankForm.piggyBankList('piggy_bank_id',array.transactions[0].piggy_bank_id) }}
@@ -157,7 +157,7 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::optionsList('update','recurrence') }}
+ {!! ExpandedForm::optionsList('update','recurrence') }}
</div>
<div class="card-footer">
<button type="submit" class="btn text-end btn-success">
diff --git a/resources/views/recurring/old-index.twig b/resources/views/recurring/old-index.twig
index 26b0b7f75d..9f274dbc8a 100644
--- a/resources/views/recurring/old-index.twig
+++ b/resources/views/recurring/old-index.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
diff --git a/resources/views/recurring/show.twig b/resources/views/recurring/show.twig
index 351365794a..49fa493b38 100644
--- a/resources/views/recurring/show.twig
+++ b/resources/views/recurring/show.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, recurrence) }}
@endsection
diff --git a/resources/views/reports/audit/report.twig b/resources/views/reports/audit/report.twig
index 17bc1fe7c6..13da0533a4 100644
--- a/resources/views/reports/audit/report.twig
+++ b/resources/views/reports/audit/report.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, start, end) }}
@endsection
@@ -8,7 +8,7 @@
<div class="row no-print">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
- <div class="box" id="optionsBox">
+ <div class="card" id="optionsBox">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
diff --git a/resources/views/reports/budget/month.twig b/resources/views/reports/budget/month.twig
index ec03647047..d82ca78c47 100644
--- a/resources/views/reports/budget/month.twig
+++ b/resources/views/reports/budget/month.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, budgetIds, start, end) }}
@endsection
diff --git a/resources/views/reports/category/month.twig b/resources/views/reports/category/month.twig
index acd7e248b0..37a62113bf 100644
--- a/resources/views/reports/category/month.twig
+++ b/resources/views/reports/category/month.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, categoryIds, start, end) }}
@endsection
diff --git a/resources/views/reports/default/month.twig b/resources/views/reports/default/month.twig
index 8c7f92d1b2..fec12ef7bd 100644
--- a/resources/views/reports/default/month.twig
+++ b/resources/views/reports/default/month.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, start, end) }}
@endsection
diff --git a/resources/views/reports/default/multi-year.twig b/resources/views/reports/default/multi-year.twig
index 539ccd0a29..cef2ba80c6 100644
--- a/resources/views/reports/default/multi-year.twig
+++ b/resources/views/reports/default/multi-year.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, start, end) }}
@endsection
@@ -9,7 +9,7 @@
{{-- charts --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
- <div class="box" id="year-inc-exp">
+ <div class="card" id="year-inc-exp">
<div class="card-header">
<h3 class="card-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
diff --git a/resources/views/reports/default/year.twig b/resources/views/reports/default/year.twig
index e9cca509fa..38ec774626 100644
--- a/resources/views/reports/default/year.twig
+++ b/resources/views/reports/default/year.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, start, end) }}
@endsection
@@ -9,7 +9,7 @@
{{-- charts --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
- <div class="box" id="year-inc-exp">
+ <div class="card" id="year-inc-exp">
<div class="card-header">
<h3 class="card-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
diff --git a/resources/views/reports/double/report.twig b/resources/views/reports/double/report.twig
index c052f02be1..4c714d1565 100644
--- a/resources/views/reports/double/report.twig
+++ b/resources/views/reports/double/report.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, doubleIds, start, end) }}
@endsection
@@ -120,7 +120,7 @@
{% for account in doubles %}
<div class="row">
<div class="col-lg-12">
- <div class="box" id="incomeAndExpensesChart">
+ <div class="card" id="incomeAndExpensesChart">
<div class="card-header">
<h3 class="card-title">{{ 'income_and_expenses'|_ }} ({{ account.name }}) {% if account.iban %}({{ account.iban }})@endif</h3>
</div>
diff --git a/resources/views/reports/tag/month.twig b/resources/views/reports/tag/month.twig
index 49a9bd2ec6..245b6ea152 100644
--- a/resources/views/reports/tag/month.twig
+++ b/resources/views/reports/tag/month.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, tagIds, start, end) }}
@endsection
diff --git a/resources/views/rules/old-index.twig b/resources/views/rules/old-index.twig
index 2ebdf08496..75281b8d28 100644
--- a/resources/views/rules/old-index.twig
+++ b/resources/views/rules/old-index.twig
@@ -1,5 +1,5 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
@section('content')
@@ -17,7 +17,7 @@
{% if ruleGroups|length == 1 and ruleGroups[0].rules.count() == 0 %}
{% include 'partials.empty' with {objectType: 'default', type: 'rules',route: route('rules.create')} %}
- {{-- make FF ignore demo for now. #}
+ {{-- make FF ignore demo for now. --}}
{% set shownDemo = true %}
@endif
@@ -103,14 +103,14 @@
</td>
<td>
<div class="btn-group btn-group-sm test_buttons">
- {{-- show which transactions would match #}
+ {{-- show which transactions would match --}}
<a href="{{ route('rules.search',rule.id) }}" class="btn btn-outline-secondary {% if false == rule.strict %}test_rule_triggers@endif" data-id="{{ rule.id }}" title="{{ 'test_rule_triggers'|_ }}"><span data-id="{{ rule.id }}" class="fa fa-flask"></span></a>
{% if rule.active %}
- {{-- actually execute rule #}
+ {{-- actually execute rule --}}
<a href="{{ route('rules.select-transactions',rule.id) }}" class="btn btn-outline-secondary" title=" {{ trans('firefly.apply_rule_selection', {title: rule.title}) }}"><span class="fa fa-power-off "></span></a>
@endif
- {{-- duplicate rule #}
+ {{-- duplicate rule --}}
<a href="#" class="btn btn-outline-secondary duplicate-rule" data-id="{{ rule.id }}" title=" {{ trans('firefly.duplicate_rule', {title: rule.title}) }}"><span class="bi bi-copy"></span></a>
</div>
</td>
diff --git a/resources/views/rules/rule-group/create.twig b/resources/views/rules/rule-group/create.twig
index 2dc9846aab..8d48c0e005 100644
--- a/resources/views/rules/rule-group/create.twig
+++ b/resources/views/rules/rule-group/create.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
@@ -14,7 +14,7 @@
<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::text('title') }}
+ {!! ExpandedForm::text('title') }}
</div>
</div>
</div>
@@ -26,7 +26,7 @@
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::textarea('description') }}
+ {!! ExpandedForm::textarea('description') }}
</div>
</div>
</div>
@@ -39,7 +39,7 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::optionsList('create','rule-group') }}
+ {!! ExpandedForm::optionsList('create','rule-group') }}
</div>
<div class="card-footer">
<button type="submit" class="btn text-end btn-success">{{ 'store_new_rule_group'|_ }}</button>
diff --git a/resources/views/rules/rule-group/delete.twig b/resources/views/rules/rule-group/delete.twig
index 99efd64a30..4332049121 100644
--- a/resources/views/rules/rule-group/delete.twig
+++ b/resources/views/rules/rule-group/delete.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, ruleGroup) }}
@endsection
@@ -10,7 +10,7 @@
<input name="_token" type="hidden" value="{{ csrf_token() }}">
<div class="row">
<div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12">
- <div class="box box-danger">
+ <div class="card card-danger card-outline">
<div class="card-header">
<h3 class="card-title">{{ trans('form.delete_rule_group', {'title': ruleGroup.title}) }}</h3>
</div>
diff --git a/resources/views/rules/rule-group/edit.twig b/resources/views/rules/rule-group/edit.twig
index 2e8feff0ab..a69454b0a4 100644
--- a/resources/views/rules/rule-group/edit.twig
+++ b/resources/views/rules/rule-group/edit.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, ruleGroup) }}
@endsection
@@ -19,9 +19,9 @@
</div>
<div class="card-body">
{{-- only correct way to do active checkbox --}}
- {{ ExpandedForm::checkbox('active', 1) }}
+ {!! ExpandedForm::checkbox('active', 1) }}
- {{ ExpandedForm::text('title', ruleGroup.title) }}
+ {!! ExpandedForm::text('title', ruleGroup.title) }}
</div>
</div>
@@ -34,7 +34,7 @@
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::textarea('description', ruleGroup.description) }}
+ {!! ExpandedForm::textarea('description', ruleGroup.description) }}
</div>
</div>
</div>
@@ -47,7 +47,7 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::optionsList('update','rule-group') }}
+ {!! ExpandedForm::optionsList('update','rule-group') }}
</div>
<div class="card-footer">
<button type="submit" class="btn text-end btn-success">{{ 'update_rule_group'|_ }}</button>
diff --git a/resources/views/rules/rule-group/select-transactions.twig b/resources/views/rules/rule-group/select-transactions.twig
index f9cb70092c..820d4f5691 100644
--- a/resources/views/rules/rule-group/select-transactions.twig
+++ b/resources/views/rules/rule-group/select-transactions.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, ruleGroup) }}
@endsection
@@ -24,8 +24,8 @@
</p>
<div class="row">
<div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
- {{ ExpandedForm::date('start') }}
- {{ ExpandedForm::date('end') }}
+ {!! ExpandedForm::date('start') }}
+ {!! ExpandedForm::date('end') }}
{{ AccountForm.assetAccountCheckList('accounts', {'select_all': true,'class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }}
</div>
</div>
diff --git a/resources/views/rules/rule/create.twig b/resources/views/rules/rule/create.twig
index c4819691ea..b23a9a0eff 100644
--- a/resources/views/rules/rule/create.twig
+++ b/resources/views/rules/rule/create.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, ruleGroup) }}
@endsection
@@ -36,11 +36,11 @@
<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::text('title') }}
- {{ ExpandedForm::select('trigger',allJournalTriggers()) }}
+ {!! ExpandedForm::text('title') }}
+ {!! ExpandedForm::select('trigger',allJournalTriggers()) }}
{{ RuleForm.ruleGroupList('rule_group_id', ruleGroup.id) }}
- {{ ExpandedForm::checkbox('stop_processing',1,null, {helpText: trans('firefly.rule_help_stop_processing')}) }}
- {{ ExpandedForm::checkbox('strict',1, null,{helpText: trans('firefly.rule_help_strict')}) }}
+ {!! ExpandedForm::checkbox('stop_processing',1,null, {helpText: trans('firefly.rule_help_stop_processing')}) }}
+ {!! ExpandedForm::checkbox('strict',1, null,{helpText: trans('firefly.rule_help_strict')}) }}
</div>
</div>
</div>
@@ -52,7 +52,7 @@
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::textarea('description', null, {helpText: trans('firefly.field_supports_markdown')}) }}
+ {!! ExpandedForm::textarea('description', null, {helpText: trans('firefly.field_supports_markdown')}) }}
</div>
</div>
</div>
@@ -132,8 +132,8 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::checkbox('run_after_form',1,null, {helpText: trans('firefly.rule_run_after_creation')}) }}
- {{ ExpandedForm::optionsList('create','rule') }}
+ {!! ExpandedForm::checkbox('run_after_form',1,null, {helpText: trans('firefly.rule_run_after_creation')}) }}
+ {!! ExpandedForm::optionsList('create','rule') }}
</div>
<div class="card-footer">
<button type="submit" class="btn text-end btn-success">{{ 'store_new_rule'|_ }}</button>
diff --git a/resources/views/rules/rule/delete.twig b/resources/views/rules/rule/delete.twig
index 71c42da040..dfb7d07fc7 100644
--- a/resources/views/rules/rule/delete.twig
+++ b/resources/views/rules/rule/delete.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, rule) }}
@endsection
@@ -10,7 +10,7 @@
<input name="_token" type="hidden" value="{{ csrf_token() }}">
<div class="row">
<div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12">
- <div class="box box-danger">
+ <div class="card card-danger card-outline">
<div class="card-header">
<h3 class="card-title">{{ trans('form.delete_rule', {'title': rule.title}) }}</h3>
</div>
diff --git a/resources/views/rules/rule/edit.twig b/resources/views/rules/rule/edit.twig
index 6b7d6aae72..dc09c36b88 100644
--- a/resources/views/rules/rule/edit.twig
+++ b/resources/views/rules/rule/edit.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, rule) }}
@endsection
@@ -17,15 +17,15 @@
<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::text('title', rule.title) }}
+ {!! ExpandedForm::text('title', rule.title) }}
{{ RuleForm.ruleGroupList('rule_group_id', rule.rule_group_id) }}
- {{ ExpandedForm::select('trigger',allJournalTriggers(), primaryTrigger) }}
+ {!! ExpandedForm::select('trigger',allJournalTriggers(), primaryTrigger) }}
{{-- only correct way to do active checkbox --}}
- {{ ExpandedForm::checkbox('active', 1, null, {helpText: trans('firefly.rule_help_active')}) }}
+ {!! ExpandedForm::checkbox('active', 1, null, {helpText: trans('firefly.rule_help_active')}) }}
- {{ ExpandedForm::checkbox('stop_processing',1,rule.stop_processing, {helpText: trans('firefly.rule_help_stop_processing')}) }}
- {{ ExpandedForm::checkbox('strict',1,rule.strict, {helpText: trans('firefly.rule_help_strict')}) }}
+ {!! ExpandedForm::checkbox('stop_processing',1,rule.stop_processing, {helpText: trans('firefly.rule_help_stop_processing')}) }}
+ {!! ExpandedForm::checkbox('strict',1,rule.strict, {helpText: trans('firefly.rule_help_strict')}) }}
</div>
</div>
</div>
@@ -37,7 +37,7 @@
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::textarea('description', rule.description, {helpText: trans('firefly.field_supports_markdown')}) }}
+ {!! ExpandedForm::textarea('description', rule.description, {helpText: trans('firefly.field_supports_markdown')}) }}
</div>
</div>
</div>
@@ -118,8 +118,8 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::checkbox('run_after_form',1,null, {helpText: trans('firefly.rule_run_after_edit')}) }}
- {{ ExpandedForm::optionsList('update','rule') }}
+ {!! ExpandedForm::checkbox('run_after_form',1,null, {helpText: trans('firefly.rule_run_after_edit')}) }}
+ {!! ExpandedForm::optionsList('update','rule') }}
</div>
<div class="card-footer">
<button type="submit" class="btn text-end btn-success">{{ 'update_rule'|_ }}</button>
diff --git a/resources/views/rules/rule/select-transactions.twig b/resources/views/rules/rule/select-transactions.twig
index c0c57136fe..c86d2e2918 100644
--- a/resources/views/rules/rule/select-transactions.twig
+++ b/resources/views/rules/rule/select-transactions.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, rule) }}
@endsection
@@ -23,8 +23,8 @@
</p>
<div class="row">
<div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
- {{ ExpandedForm::date('start') }}
- {{ ExpandedForm::date('end') }}
+ {!! ExpandedForm::date('start') }}
+ {!! ExpandedForm::date('end') }}
{{ AccountForm.assetAccountCheckList('accounts', {'select_all': true, 'class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }}
</div>
</div>
diff --git a/resources/views/search/index.twig b/resources/views/search/index.twig
index 45c9686a2c..d443e1add0 100644
--- a/resources/views/search/index.twig
+++ b/resources/views/search/index.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, fullQuery) }}
@endsection
@@ -127,7 +127,7 @@
</div>
<div class="row error_row hidden">
<div class="col-lg-12 col-md-12 col-sm-12">
- <div class="box box-danger">
+ <div class="card card-danger card-outline">
<div class="card-header">
<h3 class="card-title">{{ 'search_error'|_ }}</h3>
</div>
diff --git a/resources/views/settings/link/create.twig b/resources/views/settings/link/create.twig
index de475384f4..64a47edd98 100644
--- a/resources/views/settings/link/create.twig
+++ b/resources/views/settings/link/create.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
@@ -15,9 +15,9 @@
<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::text('name', null, {helpText: trans('firefly.link_type_help_name')}) }}
- {{ ExpandedForm::text('inward', null, {helpText: trans('firefly.link_type_help_inward')}) }}
- {{ ExpandedForm::text('outward', null, {helpText: trans('firefly.link_type_help_outward')}) }}
+ {!! ExpandedForm::text('name', null, {helpText: trans('firefly.link_type_help_name')}) }}
+ {!! ExpandedForm::text('inward', null, {helpText: trans('firefly.link_type_help_inward')}) }}
+ {!! ExpandedForm::text('outward', null, {helpText: trans('firefly.link_type_help_outward')}) }}
</div>
</div>
</div>
@@ -30,7 +30,7 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::optionsList('create','link_type') }}
+ {!! ExpandedForm::optionsList('create','link_type') }}
</div>
<div class="card-footer">
<button type="submit" class="btn text-end btn-success">{{ 'store_new_link_type'|_ }}</button>
diff --git a/resources/views/settings/link/delete.twig b/resources/views/settings/link/delete.twig
index b1c2668b07..f2f6ee8982 100644
--- a/resources/views/settings/link/delete.twig
+++ b/resources/views/settings/link/delete.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, linkType) }}
@endsection
@@ -11,7 +11,7 @@
<input name="_token" type="hidden" value="{{ csrf_token() }}">
<div class="row">
<div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12">
- <div class="box box-danger">
+ <div class="card card-danger card-outline">
<div class="card-header">
<h3 class="card-title">{{ trans('form.delete_link_type', {'name': linkType.name}) }}</h3>
</div>
@@ -26,7 +26,7 @@
{% if count > 0 %}
<p>
- {{ Lang.choice('form.also_delete_connections', count, {count: count}) }}
+ {{ Lang::choice('form.also_delete_connections', count, {count: count}) }}
</p>
@endif
{% if count > 0 %}
diff --git a/resources/views/settings/link/edit.twig b/resources/views/settings/link/edit.twig
index 25c6965c9d..eabe633d45 100644
--- a/resources/views/settings/link/edit.twig
+++ b/resources/views/settings/link/edit.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, linkType) }}
@endsection
@@ -18,9 +18,9 @@
<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::text('name', linkType.name, {helpText: trans('firefly.link_type_help_name')}) }}
- {{ ExpandedForm::text('inward', linkType.inward, {helpText: trans('firefly.link_type_help_inward')}) }}
- {{ ExpandedForm::text('outward', linkType.outward, {helpText: trans('firefly.link_type_help_outward')}) }}
+ {!! ExpandedForm::text('name', linkType.name, {helpText: trans('firefly.link_type_help_name')}) }}
+ {!! ExpandedForm::text('inward', linkType.inward, {helpText: trans('firefly.link_type_help_inward')}) }}
+ {!! ExpandedForm::text('outward', linkType.outward, {helpText: trans('firefly.link_type_help_outward')}) }}
</div>
</div>
</div>
@@ -34,7 +34,7 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::optionsList('update','link_type') }}
+ {!! ExpandedForm::optionsList('update','link_type') }}
</div>
<div class="card-footer">
<button type="submit" class="btn text-end btn-success">
diff --git a/resources/views/settings/link/index.twig b/resources/views/settings/link/index.twig
index 5ba3ff8274..ea469e262f 100644
--- a/resources/views/settings/link/index.twig
+++ b/resources/views/settings/link/index.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render }}
@endsection
@section('content')
diff --git a/resources/views/settings/link/show.twig b/resources/views/settings/link/show.twig
index e75a984659..d212491820 100644
--- a/resources/views/settings/link/show.twig
+++ b/resources/views/settings/link/show.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, linkType) }}
@endsection
@section('content')
diff --git a/resources/views/settings/notifications/index.twig b/resources/views/settings/notifications/index.twig
index a5ec9d9b0a..6beeec9abc 100644
--- a/resources/views/settings/notifications/index.twig
+++ b/resources/views/settings/notifications/index.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render }}
@endsection
@section('content')
@@ -24,16 +24,16 @@
</div>
@endforeach
<p class="mt-5">{{ 'channel_settings'|_ }}</p>
- {{ ExpandedForm::text('slack_webhook_url', slackUrl, {'label' : 'slack_url_label'|_, helpText: trans('firefly.slack_discord_double')}) }}
+ {!! ExpandedForm::text('slack_webhook_url', slackUrl, {'label' : 'slack_url_label'|_, helpText: trans('firefly.slack_discord_double')}) }}
- {{ ExpandedForm::text('pushover_app_token', pushoverAppToken, {}) }}
- {{ ExpandedForm::text('pushover_user_token', pushoverUserToken, {}) }}
+ {!! ExpandedForm::text('pushover_app_token', pushoverAppToken, {}) }}
+ {!! ExpandedForm::text('pushover_user_token', pushoverUserToken, {}) }}
- {{ ExpandedForm::text('ntfy_server', ntfyServer, {}) }}
- {{ ExpandedForm::text('ntfy_topic', ntfyTopic, {}) }}
- {{ ExpandedForm::checkbox('ntfy_auth','1', ntfyAuth, {}) }}
- {{ ExpandedForm::text('ntfy_user', ntfyUser, {}) }}
- {{ ExpandedForm.passwordWithValue('ntfy_pass', ntfyPass, {}) }}
+ {!! ExpandedForm::text('ntfy_server', ntfyServer, {}) }}
+ {!! ExpandedForm::text('ntfy_topic', ntfyTopic, {}) }}
+ {!! ExpandedForm::checkbox('ntfy_auth','1', ntfyAuth, {}) }}
+ {!! ExpandedForm::text('ntfy_user', ntfyUser, {}) }}
+ {!! ExpandedForm.passwordWithValue('ntfy_pass', ntfyPass, {}) }}
</div>
<div class="card-footer">
<button type="submit" class="btn btn-success">
diff --git a/resources/views/settings/update/index.twig b/resources/views/settings/update/index.twig
index 3603dc0fad..b15b54d4c4 100644
--- a/resources/views/settings/update/index.twig
+++ b/resources/views/settings/update/index.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render }}
@endsection
@section('content')
@@ -19,7 +19,7 @@
<p class="text-info">
{{ 'admin_update_channel_explain'|_ }}
</p>
- {{ ExpandedForm::select('update_channel', channelOptions, channelSelected) }}
+ {!! ExpandedForm::select('update_channel', channelOptions, channelSelected) }}
</div>
</div>
</div>
@@ -34,7 +34,7 @@
<p class="text-info">
{{ 'admin_update_check_explain'|_ }}
</p>
- {{ ExpandedForm::select('check_for_updates',options, selected) }}
+ {!! ExpandedForm::select('check_for_updates',options, selected) }}
</div>
</div>
</div>
diff --git a/resources/views/settings/users/delete.twig b/resources/views/settings/users/delete.twig
index 7fc2944081..374051bbf0 100644
--- a/resources/views/settings/users/delete.twig
+++ b/resources/views/settings/users/delete.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, user) }}
@endsection
@@ -11,7 +11,7 @@
<div class="row">
<div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12">
- <div class="box box-danger">
+ <div class="card card-danger card-outline">
<div class="card-header">
<h3 class="card-title">{{ trans('form.delete_user', {'email': user.email}) }}</h3>
</div>
diff --git a/resources/views/settings/users/edit.twig b/resources/views/settings/users/edit.twig
index 54c98d28b1..fd79565d16 100644
--- a/resources/views/settings/users/edit.twig
+++ b/resources/views/settings/users/edit.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, user) }}
@endsection
@section('content')
@@ -20,18 +20,18 @@
</div>
<div class="card-body">
{% if canEditDetails %}
- {{ ExpandedForm::text('email',user.email,{'helpText': trans('firefly.admin_update_email')}) }}
- {{ ExpandedForm.password('password') }}
- {{ ExpandedForm.password('password_confirmation') }}
+ {!! ExpandedForm::text('email',user.email,{'helpText': trans('firefly.admin_update_email')}) }}
+ {!! ExpandedForm.password('password') }}
+ {!! ExpandedForm.password('password_confirmation') }}
@else
<input type="hidden" name="email" value="{{ user.email }}"/>
<input type="hidden" name="password" value=""/>
<input type="hidden" name="password_confirmation" value=""/>
@endif
- {{ ExpandedForm::checkbox('blocked') }}
- {{ ExpandedForm::select('blocked_code', codes, user.blocked_code) }}
+ {!! ExpandedForm::checkbox('blocked') }}
+ {!! ExpandedForm::select('blocked_code', codes, user.blocked_code) }}
{% if user.id != currentUser.id %}
- {{ ExpandedForm::checkbox('is_owner',1,isAdmin) }}
+ {!! ExpandedForm::checkbox('is_owner',1,isAdmin) }}
@endif
</div>
</div>
@@ -45,7 +45,7 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::optionsList('update','account') }}
+ {!! ExpandedForm::optionsList('update','account') }}
</div>
<div class="card-footer">
<button type="submit" class="btn text-end btn-success">
diff --git a/resources/views/settings/users/index.twig b/resources/views/settings/users/index.twig
index 0b9824c3bf..1e922f5ca5 100644
--- a/resources/views/settings/users/index.twig
+++ b/resources/views/settings/users/index.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render }}
@endsection
@section('content')
@@ -17,7 +17,7 @@
<p>
{{ 'invite_new_user_text'|_ }}
</p>
- {{ ExpandedForm::text('invited_user',null, {'type': 'email', 'label' : 'invited_user_mail'|_}) }}
+ {!! ExpandedForm::text('invited_user',null, {'type': 'email', 'label' : 'invited_user_mail'|_}) }}
</div>
<div class="card-footer">
<button type="submit" class="btn text-end btn-success">
diff --git a/resources/views/settings/users/show.twig b/resources/views/settings/users/show.twig
index e55f5d63e8..ab1295afd5 100644
--- a/resources/views/settings/users/show.twig
+++ b/resources/views/settings/users/show.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, user) }}
@endsection
@section('content')
diff --git a/resources/views/tags/create.twig b/resources/views/tags/create.twig
index 9c8847317a..cee1a088e7 100644
--- a/resources/views/tags/create.twig
+++ b/resources/views/tags/create.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
@@ -20,7 +20,7 @@
<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::text('tag') }}
+ {!! ExpandedForm::text('tag') }}
</div>
</div>
</div>
@@ -32,9 +32,9 @@
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::date('date') }}
- {{ ExpandedForm::textarea('description') }}
- {{ ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
+ {!! ExpandedForm::date('date') }}
+ {!! ExpandedForm::textarea('description') }}
+ {!! ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
</div>
</div>
</div>
@@ -47,7 +47,7 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::optionsList('create','tag') }}
+ {!! ExpandedForm::optionsList('create','tag') }}
</div>
<div class="card-footer">
<button type="submit" class="btn btn-success text-end">
diff --git a/resources/views/tags/delete.twig b/resources/views/tags/delete.twig
index 61b01cfc28..54a399e1f4 100644
--- a/resources/views/tags/delete.twig
+++ b/resources/views/tags/delete.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, tag) }}
@endsection
@@ -10,7 +10,7 @@
<input name="_token" type="hidden" value="{{ csrf_token() }}">
<div class="row">
<div class="col-lg-6 offset-lg-3 col-md-6 col-sm-12">
- <div class="box box-danger">
+ <div class="card card-danger card-outline">
<div class="card-header">
<h3 class="card-title">{{ trans('firefly.delete_tag',{tag: tag.tag}) }}</h3>
</div>
@@ -25,7 +25,7 @@
<p>
{% if tag.transactionjournals.count() > 0 %}
- {{ Lang.choice('form.tag_keep_transactions', tag.transactionjournals.count(), {count: tag.transactionjournals.count()}) }}
+ {{ Lang::choice('form.tag_keep_transactions', tag.transactionjournals.count(), {count: tag.transactionjournals.count()}) }}
@endif
</p>
</div>
diff --git a/resources/views/tags/edit.twig b/resources/views/tags/edit.twig
index ef883a1bf5..d7875df93f 100644
--- a/resources/views/tags/edit.twig
+++ b/resources/views/tags/edit.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, tag) }}
@endsection
@@ -24,7 +24,7 @@
<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::text('tag', tag.tag) }}
+ {!! ExpandedForm::text('tag', tag.tag) }}
</div>
</div>
</div>
@@ -36,9 +36,9 @@
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::date('date', tag.date.format('Y-m-d')) }}
- {{ ExpandedForm::textarea('description', tag.description) }}
- {{ ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
+ {!! ExpandedForm::date('date', tag.date.format('Y-m-d')) }}
+ {!! ExpandedForm::textarea('description', tag.description) }}
+ {!! ExpandedForm::file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
</div>
</div>
</div>
@@ -51,7 +51,7 @@
<h3 class="card-title">{{ __('firefly.options') }}</h3>
</div>
<div class="card-body">
- {{ ExpandedForm::optionsList('update','tag') }}
+ {!! ExpandedForm::optionsList('update','tag') }}
</div>
<div class="card-footer">
<button type="submit" class="btn text-end btn-success">
diff --git a/resources/views/tags/show.twig b/resources/views/tags/show.twig
index 631e069a6e..195b8edd32 100644
--- a/resources/views/tags/show.twig
+++ b/resources/views/tags/show.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, tag, start, end) }}
@endsection
@@ -158,7 +158,7 @@
<td> {{ sums.Reconciliation|formatAmount }}</td>
</tr>
@endif
- #}
+ --}}
</table>
</div>
<div class="card-footer">
diff --git a/resources/views/transactions/bulk/edit.twig b/resources/views/transactions/bulk/edit.twig
index 8c15210711..f1c0b384d0 100644
--- a/resources/views/transactions/bulk/edit.twig
+++ b/resources/views/transactions/bulk/edit.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, journals) }}
@endsection
diff --git a/resources/views/transactions/convert.twig b/resources/views/transactions/convert.twig
index 2b88e6c377..d658028bec 100644
--- a/resources/views/transactions/convert.twig
+++ b/resources/views/transactions/convert.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, group, groupTitle) }}
@endsection
diff --git a/resources/views/transactions/delete.twig b/resources/views/transactions/delete.twig
index 4eab747945..8f5165630a 100644
--- a/resources/views/transactions/delete.twig
+++ b/resources/views/transactions/delete.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, group) }}
@endsection
@@ -10,7 +10,7 @@
<div class="row">
<div class="col-lg-6 offset-lg-3 col-md-6 col-sm-12">
- <div class="box box-danger">
+ <div class="card card-danger card-outline">
<div class="card-header">
<h3 class="card-title">{{ trans('form.delete_journal', {'description': group.title|default(journal.description)}) }}</h3>
</div>
diff --git a/resources/views/transactions/links/delete.twig b/resources/views/transactions/links/delete.twig
index 9a890f1ef6..a3ff926cc4 100644
--- a/resources/views/transactions/links/delete.twig
+++ b/resources/views/transactions/links/delete.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, link) }}
@endsection
@@ -10,7 +10,7 @@
<input name="_token" type="hidden" value="{{ csrf_token() }}">
<div class="row">
<div class="col-lg-6 offset-lg-3 col-md-6 col-sm-12">
- <div class="box box-danger">
+ <div class="card card-danger card-outline">
<div class="card-header">
<h3 class="card-title">{{ trans('firefly.delete_journal_link', {source: link.source.description|escape, destination: link.destination.description|escape, source_link: route('transactions.show', [link.source_id]) , destination_link: route('transactions.show',link.destination_id)})|raw }}</h3>
</div>
diff --git a/resources/views/transactions/mass/delete.twig b/resources/views/transactions/mass/delete.twig
index ccdf2d1b8c..dda88e501b 100644
--- a/resources/views/transactions/mass/delete.twig
+++ b/resources/views/transactions/mass/delete.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, journals) }}
@endsection
@@ -10,7 +10,7 @@
<div class="row">
<div class="col-lg-8 offset-lg-2 col-md-8 coll-offset-md-2 col-sm-12">
- <div class="box box-danger">
+ <div class="card card-danger card-outline">
<div class="card-header">
<h3 class="card-title">{{ 'mass_delete_journals'|_ }}</h3>
</div>
diff --git a/resources/views/transactions/mass/edit.twig b/resources/views/transactions/mass/edit.twig
index 4780ef038b..b1ed8a36ad 100644
--- a/resources/views/transactions/mass/edit.twig
+++ b/resources/views/transactions/mass/edit.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, journals) }}
@endsection
diff --git a/resources/views/transactions/old-create.twig b/resources/views/transactions/old-create.twig
index aff03d1c9e..a9a308838d 100644
--- a/resources/views/transactions/old-create.twig
+++ b/resources/views/transactions/old-create.twig
@@ -1,6 +1,6 @@
{% set VUE_SCRIPT_NAME = 'create_transaction' %}
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, objectType) }}
@endsection
diff --git a/resources/views/transactions/old-edit.twig b/resources/views/transactions/old-edit.twig
index 7f98d595e4..9931b18dde 100644
--- a/resources/views/transactions/old-edit.twig
+++ b/resources/views/transactions/old-edit.twig
@@ -1,6 +1,6 @@
{% set VUE_SCRIPT_NAME = 'edit_transaction' %}
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, transactionGroup) }}
@endsection
diff --git a/resources/views/transactions/old-index.twig b/resources/views/transactions/old-index.twig
index 9863c4aeb2..c32a2f35a0 100644
--- a/resources/views/transactions/old-index.twig
+++ b/resources/views/transactions/old-index.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, objectType, start, end) }}
@endsection
diff --git a/resources/views/transactions/single/delete.twig b/resources/views/transactions/single/delete.twig
index f4b961e8e9..64fc01947e 100644
--- a/resources/views/transactions/single/delete.twig
+++ b/resources/views/transactions/single/delete.twig
@@ -1,6 +1,6 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, journal) }}
@endsection
@@ -10,7 +10,7 @@
<div class="row">
<div class="col-lg-6 offset-lg-3 col-md-6 col-sm-12">
- <div class="box box-danger">
+ <div class="card card-danger card-outline">
<div class="card-header">
<h3 class="card-title">{{ trans('form.delete_journal', {'description': journal.description}) }}</h3>
</div>
diff --git a/resources/views/webhooks/create.twig b/resources/views/webhooks/create.twig
index f2c2046706..c18cf313e8 100644
--- a/resources/views/webhooks/create.twig
+++ b/resources/views/webhooks/create.twig
@@ -1,6 +1,6 @@
{% set VUE_SCRIPT_NAME = 'webhooks/create' %}
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@endsection
diff --git a/resources/views/webhooks/delete.twig b/resources/views/webhooks/delete.twig
index f177a9b435..be4dcda219 100644
--- a/resources/views/webhooks/delete.twig
+++ b/resources/views/webhooks/delete.twig
@@ -1,13 +1,13 @@
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, webhook) }}
@endsection
@section('content')
<div class="row">
<div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12">
- <div class="box box-danger">
+ <div class="card card-danger card-outline">
<div class="card-header">
<h3 class="card-title">{{ trans('form.delete_webhook', {'title': webhook.title}) }}</h3>
</div>
diff --git a/resources/views/webhooks/edit.twig b/resources/views/webhooks/edit.twig
index 38ad4c3739..6fcf94d9d1 100644
--- a/resources/views/webhooks/edit.twig
+++ b/resources/views/webhooks/edit.twig
@@ -1,6 +1,6 @@
{% set VUE_SCRIPT_NAME = 'webhooks/edit' %}
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, webhook) }}
@endsection
diff --git a/resources/views/webhooks/show.twig b/resources/views/webhooks/show.twig
index c40f629c1e..d69661e556 100644
--- a/resources/views/webhooks/show.twig
+++ b/resources/views/webhooks/show.twig
@@ -1,6 +1,6 @@
{% set VUE_SCRIPT_NAME = 'webhooks/show' %}
@extends('layout.v3.session')
-{% block breadcrumbs %}
+
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, webhook) }}
@endsection