Skip to content

Firefly III: a personal finances manager

new view stuff

Sander Dorigo59613d0edcd0
diff --git a/app/Helpers/Functions/helpers.php b/app/Helpers/Functions/helpers.php
index adf427e22c..5c31c21944 100644
--- a/app/Helpers/Functions/helpers.php
+++ b/app/Helpers/Functions/helpers.php
@@ -23,18 +23,22 @@
declare(strict_types=1);
use Carbon\Carbon;
+use Carbon\CarbonInterface;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Account;
+use FireflyIII\Models\TransactionJournalMeta;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Support\Facades\Amount;
use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Facades\Steam;
use FireflyIII\Support\Search\OperatorQuerySearch;
use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Route;
use League\CommonMark\GithubFlavoredMarkdownConverter;
+use function Safe\json_decode;
use function Safe\mb_ord;
use function Safe\preg_match;
use function Safe\preg_replace_callback;
@@ -201,6 +205,36 @@ if (!function_exists('string_is_equal')) {
}
}
+if(!function_exists('journal_has_meta')) {
+ function journal_has_meta(int $journalId, string $metaField): bool {
+ $count = DB::table('journal_meta')->where('name', $metaField)->where('transaction_journal_id', $journalId)->whereNull('deleted_at')->count();
+
+ return 1 === $count;
+ }
+}
+if(!function_exists('journal_get_meta_field')) {
+ function journal_get_meta_field (int $journalId, string $metaField) {
+ /** @var null|TransactionJournalMeta $entry */
+ $entry = DB::table('journal_meta')->where('name', $metaField)->where('transaction_journal_id', $journalId)->whereNull('deleted_at')->first();
+ if (null === $entry) {
+ return '';
+ }
+
+ return json_decode((string) $entry->data, true);
+ }
+}
+if(!function_exists('journal_get_meta_date')) {
+ function journal_get_meta_date (int $journalId, string $metaField): Carbon|CarbonInterface {
+ /** @var null|TransactionJournalMeta $entry */
+ $entry = DB::table('journal_meta')->where('name', $metaField)->where('transaction_journal_id', $journalId)->whereNull('deleted_at')->first();
+ if (null === $entry) {
+ return today(config('app.timezone'));
+ }
+
+ return new Carbon(json_decode((string) $entry->data, false));
+ }
+}
+
if(!function_exists('format_amount_by_account')) {
function format_amount_by_account (Account $account, string $amount, ?bool $coloured = null): string {
$coloured ??= true;
diff --git a/resources/assets/v3/js/pages/transactions/show.js b/resources/assets/v3/js/pages/transactions/show.js
new file mode 100644
index 0000000000..afa0c9463d
--- /dev/null
+++ b/resources/assets/v3/js/pages/transactions/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 show');
+ }
+ }
+};
+
+
+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/sass/app.scss b/resources/assets/v3/sass/app.scss
index 7e28a62a4f..8b0980a5a0 100644
--- a/resources/assets/v3/sass/app.scss
+++ b/resources/assets/v3/sass/app.scss
@@ -77,6 +77,18 @@ body.waiting * {
/* some info for tables */
td.quarter th.quarter {width:25%;}
+td.forty th.forty {width:40%;}
+td.thirty th.thirty {width:30%;}
+
+/* markdown stuff*/
+.markdown blockquote p {
+ font-size: 14px;
+}
+
+.markdown h1 {
+ font-size: 24px;
+}
+
// @import "admin-lte/dist/css/adminlte.min.css";
diff --git a/resources/assets/v3/vite.config.js b/resources/assets/v3/vite.config.js
index 098bb54e4b..6c05aff4d1 100644
--- a/resources/assets/v3/vite.config.js
+++ b/resources/assets/v3/vite.config.js
@@ -83,6 +83,7 @@ export default defineConfig(({command, mode, isSsrBuild, isPreview}) => {
'js/pages/transactions/index.js',
'js/pages/transactions/create.js',
'js/pages/transactions/edit.js',
+ 'js/pages/transactions/show.js',
// tags
'js/pages/tags/index.js',
diff --git a/resources/views/accounts/reconcile/edit.twig b/resources/views/accounts/reconcile/unused-edit.blade.php
similarity index 100%
rename from resources/views/accounts/reconcile/edit.twig
rename to resources/views/accounts/reconcile/unused-edit.blade.php
diff --git a/resources/views/accounts/reconcile/show.blade.php b/resources/views/accounts/reconcile/unused-show.blade.php
similarity index 100%
rename from resources/views/accounts/reconcile/show.blade.php
rename to resources/views/accounts/reconcile/unused-show.blade.php
diff --git a/resources/views/attachments/edit.twig b/resources/views/attachments/edit.twig
index 1ad459b395..280fafa617 100644
--- a/resources/views/attachments/edit.twig
+++ b/resources/views/attachments/edit.twig
@@ -41,7 +41,7 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for options #}
+ {{-- panel for options --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.options') }}</h3>
diff --git a/resources/views/bills/create.twig b/resources/views/bills/create.twig
index d34f5874fd..ff3400599c 100644
--- a/resources/views/bills/create.twig
+++ b/resources/views/bills/create.twig
@@ -46,7 +46,7 @@
</div>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for options #}
+ {{-- panel for options --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.options') }}</h3>
@@ -78,7 +78,7 @@
<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/edit.twig b/resources/views/bills/edit.twig
index 89473c1f32..09130c80e1 100644
--- a/resources/views/bills/edit.twig
+++ b/resources/views/bills/edit.twig
@@ -46,7 +46,7 @@
{{ 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 #}
+ {{-- only correct way to do active checkbox --}}
{{ ExpandedForm::checkbox('active', 1) }}
</div>
@@ -89,7 +89,7 @@
<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/accounts/edit.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 }}"
diff --git a/resources/views/bills/show.twig b/resources/views/bills/show.twig
index 15db714210..1859ddc476 100644
--- a/resources/views/bills/show.twig
+++ b/resources/views/bills/show.twig
@@ -145,7 +145,7 @@
{% if attachments.count() > 0 %}
<div class="card">
<div class="card-header">
- <h3 class="card-title">{{ 'attachments'|_ }}</h3>
+ <h3 class="card-title">{{ __('firefly.attachments') }}</h3>
</div>
<div class="card-body p-0">
{% include 'list.attachments' %}
@@ -192,6 +192,6 @@
<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 #}
+ {{-- 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 003cad4d9e..8372e79ac0 100644
--- a/resources/views/budgets/create.twig
+++ b/resources/views/budgets/create.twig
@@ -22,7 +22,7 @@
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for auto-budget #}
+ {{-- panel for auto-budget --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
@@ -39,7 +39,7 @@
</div>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for options #}
+ {{-- panel for options --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.options') }}</h3>
diff --git a/resources/views/budgets/edit.twig b/resources/views/budgets/edit.twig
index ec3db6a3d9..25026ad6cb 100644
--- a/resources/views/budgets/edit.twig
+++ b/resources/views/budgets/edit.twig
@@ -16,7 +16,7 @@
<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3>
</div>
<div class="card-body">
- {# only correct way to do active checkbox #}
+ {{-- only correct way to do active checkbox --}}
{{ ExpandedForm::checkbox('active', 1) }}
{{ ExpandedForm::text('name', budget.name) }}
</div>
@@ -24,7 +24,7 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for auto-budget #}
+ {{-- panel for auto-budget --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
@@ -42,7 +42,7 @@
</div>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for options #}
+ {{-- panel for options --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.options') }}</h3>
diff --git a/resources/views/budgets/index.blade.php b/resources/views/budgets/index.blade.php
index 10dabc57a0..5a53726c96 100644
--- a/resources/views/budgets/index.blade.php
+++ b/resources/views/budgets/index.blade.php
@@ -201,7 +201,7 @@
</tr>
</thead>
<tbody>
- {{-- {# START OF BUDGET ROW #} --}}
+ {{-- {{-- START OF BUDGET ROW --}} --}}
@foreach($budgets as $budget)
<tr data-id="{{ $budget['id'] }}">
diff --git a/resources/views/budgets/no-budget.twig b/resources/views/budgets/no-budget.twig
index 385ecd08ee..2c91a109ee 100644
--- a/resources/views/budgets/no-budget.twig
+++ b/resources/views/budgets/no-budget.twig
@@ -6,7 +6,7 @@
@section('content')
- {# upper show-all instruction #}
+ {{-- upper show-all instruction --}}
@if(count($periods) > 0)
<div class="row">
<div class="col-lg-offset-9 col-lg-3 col-md-offset-9 col-md-3 col-sm-12 col-xs-12">
@@ -48,7 +48,7 @@
</div>
- {# lower show-all instruction #}
+ {{-- lower show-all instruction --}}
@if(count($periods) > 0)
<div class="row">
<div class="col-lg-offset-9 col-lg-3 col-md-offset-9 col-md-3 col-sm-12 col-xs-12">
@@ -59,6 +59,6 @@
@endsection
@section('scripts')
- {# required for groups.twig #}
+ {{-- 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/partials/amount-left.twig b/resources/views/budgets/partials/amount-left.twig
index c436a18d80..59a8d8914f 100644
--- a/resources/views/budgets/partials/amount-left.twig
+++ b/resources/views/budgets/partials/amount-left.twig
@@ -1,11 +1,11 @@
-{# The amount left can only be shown for actual budget limits. #}
+{{-- The amount left can only be shown for actual budget limits. --}}
{% for budgetLimit in budget.budgeted %}
<span class="left_span" data-currency="{{ budgetLimit.currency_id }}" data-limit="{{ budgetLimit.id }}" data-value="{{ budgetLimit.left }}" class="amount_left">
- {# the amount left #}
+ {{-- the amount left --}}
<span title="{{ 'left_in_budget_limit_overview'|_ }}">{{ format_amount_by_symbol(budgetLimit.left, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }}</span>
- {# if the budget limit is in the past, this is not interesting. #}
- {# if there is nothing left, this is not interesting. #}
+ {{-- if the budget limit is in the past, this is not interesting. --}}
+ {{-- if there is nothing left, this is not interesting. --}}
{% if not budgetLimit.in_past and -1 == bccomp('0',budgetLimit.left) %}
{% if 0 == budgetLimit.active_days_left %}
<span title="{{ trans('firefly.left_in_budget_limit_per_day', {days: 0}) }}">({{ format_amount_by_symbol(budgetLimit.left, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
@@ -14,7 +14,7 @@
@endif
@endif
- {# if there is nothing left, just format 0.00 #}
+ {{-- if there is nothing left, just format 0.00 --}}
{% if not budgetLimit.in_past and -1 != bccomp('0',budgetLimit.left) %}
<span title="{{ 'nothing_left_in_budget'|_ }}">({{ format_amount_by_symbol('0', budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})</span>
@endif
@@ -22,7 +22,7 @@
@endforeach
-{#
+{{--
{% for spentInfo in budget.spent %}
{% set countLimit = 0 %}
<!-- loop each budget limit collected for this budget in this period. -->
@@ -93,4 +93,4 @@
@endif
@endforeach
-#}
+--}}
diff --git a/resources/views/budgets/partials/amount-spent.twig b/resources/views/budgets/partials/amount-spent.twig
index d8a07aae2c..8fdf735927 100644
--- a/resources/views/budgets/partials/amount-spent.twig
+++ b/resources/views/budgets/partials/amount-spent.twig
@@ -1,4 +1,4 @@
-{# this is spent in budget limits: #}
+{{-- this is spent in budget limits: --}}
{% for budgetLimit in budget.budgeted %}
<span title="{{ 'spent_this_period'|_ }}">{{ format_amount_by_symbol(budgetLimit.spent, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }}</span>
{% if 0 == budgetLimit.active_days_passed %}
@@ -9,7 +9,7 @@
<br />
@endforeach
-{# this is spent NOT in budget limits: #}
+{{-- this is spent NOT in budget limits: --}}
{% for spent in budget.spent %}
{% if 0 != bccomp('0', spent.spent_outside) %}
<span title="{{ 'spent_in_budget_limit_outside_period'|_ }}">{{ format_amount_by_symbol(spent.spent_outside, spent.currency_symbol, spent.currency_decimal_places) }}</span>
@@ -22,7 +22,7 @@
@endif
@endforeach
-{#
+{{--
{% for spentInfo in budget.spent %}
@@ -39,4 +39,4 @@
{{ format_amount_by_symbol(0, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }}<br/>
@endif
@endforeach
-#}
+--}}
diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twig
index 83e664e8d2..039cc53b4d 100644
--- a/resources/views/budgets/show.twig
+++ b/resources/views/budgets/show.twig
@@ -43,7 +43,7 @@
<div class="card">
<div class="card-header">
<h3 class="card-title">
- {{ 'attachments'|_ }}
+ {{ __('firefly.attachments') }}
</h3>
</div>
<div class="card-body p-0">
@@ -182,7 +182,7 @@
{% set overspent = limit.amount + limit.spent < 0 %}
{% if overspent %}
- {% set pct = (limit.spent != 0 ? (limit.amount / (limit.spent*-1))*100 : 0) %} {# must have -1 here #}
+ {% set pct = (limit.spent != 0 ? (limit.amount / (limit.spent*-1))*100 : 0) %} {{-- must have -1 here --}}
<div class="progress progress-striped">
<div class="progress-bar progress-bar-warning width-{{ pct|round }}" role="progressbar" aria-valuenow="{{ pct|round }}"
aria-valuemin="0"
@@ -191,7 +191,7 @@
aria-valuemin="0" aria-valuemax="100"></div>
</div>
@else
- {% set pct = (limit.amount != 0 ? (((limit.spent*-1) / limit.amount)*100) : 0) %} {# must have -1 here #}
+ {% set pct = (limit.amount != 0 ? (((limit.spent*-1) / limit.amount)*100) : 0) %} {{-- must have -1 here --}}
<div class="progress progress-striped">
<div class="progress-bar progress-bar-success width-{{ pct|round }}" role="progressbar" aria-valuenow="{{ pct|round }}"
aria-valuemin="0"
@@ -234,6 +234,6 @@
<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/budgets/show.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
- {# required for groups.twig #}
+ {{-- 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/categories/create.twig b/resources/views/categories/create.twig
index bc757e134f..bd5187460d 100644
--- a/resources/views/categories/create.twig
+++ b/resources/views/categories/create.twig
@@ -20,7 +20,7 @@
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for optional fields #}
+ {{-- panel for optional fields --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
@@ -34,7 +34,7 @@
</div>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for options #}
+ {{-- panel for options --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.options') }}</h3>
diff --git a/resources/views/categories/edit.twig b/resources/views/categories/edit.twig
index b6a49b6ce3..c31500883d 100644
--- a/resources/views/categories/edit.twig
+++ b/resources/views/categories/edit.twig
@@ -24,7 +24,7 @@
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for optional fields #}
+ {{-- panel for optional fields --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
@@ -40,7 +40,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
- {# panel for options #}
+ {{-- panel for options --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.options') }}</h3>
diff --git a/resources/views/categories/no-category.twig b/resources/views/categories/no-category.twig
index b994d07602..123a68ffe2 100644
--- a/resources/views/categories/no-category.twig
+++ b/resources/views/categories/no-category.twig
@@ -6,7 +6,7 @@
@section('content')
- {# upper show-all instruction #}
+ {{-- upper show-all instruction --}}
@if(count($periods) > 0)
<div class="row">
<div class="col-lg-offset-10 col-lg-2 col-md-offset-9 col-md-3 col-sm-12 col-xs-12">
@@ -48,7 +48,7 @@
</div>
- {# lower show-all instruction #}
+ {{-- lower show-all instruction --}}
@if(count($periods) > 0)
<div class="row">
<div class="col-lg-offset-10 col-lg-2 col-md-offset-9 col-md-3 col-sm-12 col-xs-12">
@@ -59,6 +59,6 @@
@endsection
@section('scripts')
- {# required for groups.twig #}
+ {{-- 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/categories/show.twig b/resources/views/categories/show.twig
index a8f1c3005d..323abf0318 100644
--- a/resources/views/categories/show.twig
+++ b/resources/views/categories/show.twig
@@ -7,7 +7,7 @@
@section('content')
<div class="row">
{% if Route.getCurrentRoute.getName == 'categories.show' %}
- {# both charts #}
+ {{-- both charts --}}
<div class="{% if attachments.count() == 0 %}col-lg-6 col-md-12 col-sm-12 col-xs-12@elsecol-lg-4 col-md-12 col-sm-12 col-xs-12@endif">
<div class="card">
<div class="card-header">
@@ -34,7 +34,7 @@
</div>
@endif
{% if Route.getCurrentRoute.getName == 'categories.show.all' %}
- {# all chart #}
+ {{-- all chart --}}
<div class="{% if attachments.count() == 0 %}col-lg-12 col-md-12 col-sm-12 col-xs-12@elsecol-lg-8 col-md-12 col-sm-12 col-xs-12@endif">
<div class="card">
<div class="card-header">
@@ -53,7 +53,7 @@
<div class="card">
<div class="card-header">
<h3 class="card-title">
- {{ 'attachments'|_ }}
+ {{ __('firefly.attachments') }}
</h3>
</div>
<div class="card-body p-0">
@@ -117,6 +117,6 @@
<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/categories/show.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
- {# required for groups.twig #}
+ {{-- 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/currencies/create.twig b/resources/views/currencies/create.twig
index 2fb742882c..a15b731525 100644
--- a/resources/views/currencies/create.twig
+++ b/resources/views/currencies/create.twig
@@ -26,7 +26,7 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for options #}
+ {{-- panel for options --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.options') }}</h3>
diff --git a/resources/views/currencies/edit.twig b/resources/views/currencies/edit.twig
index bed3569912..0f7e7e6285 100644
--- a/resources/views/currencies/edit.twig
+++ b/resources/views/currencies/edit.twig
@@ -30,7 +30,7 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for options #}
+ {{-- panel for options --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.options') }}</h3>
diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig
index 1f25a6448a..3c1f71e6f4 100644
--- a/resources/views/layout/default.twig
+++ b/resources/views/layout/default.twig
@@ -27,14 +27,14 @@
</title>
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
- {# CSS things #}
+ {{-- CSS things --}}
<link href="v1/lib/bs/css/bootstrap.min.css?v={{ $FF_BUILD_TIME }}" rel="stylesheet" type="text/css"
nonce="{{ $JS_NONCE }}">
<link href="v1/lib/fa/css/font-awesome.min.css?v={{ $FF_BUILD_TIME }}" rel="stylesheet" type="text/css"
nonce="{{ $JS_NONCE }}">
- {# the theme #}
+ {{-- the theme --}}
<link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ $FF_BUILD_TIME }}" rel="stylesheet" type="text/css"
nonce="{{ $JS_NONCE }}">
{% if 'browser' == darkMode %}
@@ -71,28 +71,28 @@
<link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ $FF_BUILD_TIME }}" rel="stylesheet" type="text/css"
nonce="{{ $JS_NONCE }}">
@endif
- {# Firefly III customisations #}
+ {{-- Firefly III customisations --}}
<link href="v1/css/firefly.css?v={{ $FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ $JS_NONCE }}">
- {# Extra CSS for the demo: #}
+ {{-- Extra CSS for the demo: --}}
{% if not shownDemo %}
<link href="v1/lib/intro/introjs.min.css?v={{ $FF_BUILD_TIME }}" rel="stylesheet" type="text/css"
nonce="{{ $JS_NONCE }}">
@endif
- {# Any local custom CSS. #}
+ {{-- Any local custom CSS. --}}
@section('styles')@endsection
<!--[if lt IE 9]>
<script src="v1/js/lib/html5shiv.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
<script src="v1/js/lib/respond.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
<![endif]-->
- {# favicons #}
+ {{-- favicons --}}
{% include 'partials.favicons' %}
</head>
<body class="skin-firefly-iii sidebar-mini hold-transition">
-{# this entry is in the header so it's loaded early #}
+{{-- this entry is in the header so it's loaded early --}}
<script type="text/javascript" nonce="{{ $JS_NONCE }}">
var forceDemoOff = false;
if ('true' === localStorage.getItem('ff3_sidebar_collapsed')) {
@@ -103,11 +103,11 @@
<header class="main-header">
- {# Logo #}
+ {{-- Logo --}}
<a href="{{ route('index') }}" class="logo">
- {# mini logo for sidebar mini 50x50 pixels #}
+ {{-- mini logo for sidebar mini 50x50 pixels --}}
<span class="logo-mini">FF</span>
- {# logo for regular state and mobile devices #}
+ {{-- logo for regular state and mobile devices --}}
<span class="logo-lg"><strong>Firefly</strong>III</span>
</a>
@@ -229,37 +229,37 @@
</div>
</div>
-{# Java libraries and stuff: #}
+{{-- Java libraries and stuff: --}}
{% block definitions %}@endsection
-{# Moment JS #}
+{{-- Moment JS --}}
<script src="v1/js/lib/moment.min.js?v={{ $FF_BUILD_TIME }}" type="text/javascript" nonce="{{ $JS_NONCE }}"></script>
<script src="v1/js/lib/moment/{{ language|replace({'-':'_'}) }}.js?v={{ $FF_BUILD_TIME }}" type="text/javascript"
nonce="{{ $JS_NONCE }}"></script>
-{# All kinds of variables. #}
+{{-- All kinds of variables. --}}
<script
src="{{ route('javascript.variables') }}?ext=.js&amp;v={{ FF_VERSION }}{% if account %}&amp;account={{ account.id }}@endif"
type="text/javascript" nonce="{{ $JS_NONCE }}"></script>
-{# Base script: jquery and bootstrap #}
+{{-- Base script: jquery and bootstrap --}}
<script src="v1/js/app.js?v={{ $FF_BUILD_TIME }}" type="text/javascript" nonce="{{ $JS_NONCE }}"></script>
-{# Vue scripts and components. Only loaded when needed #}
+{{-- Vue scripts and components. Only loaded when needed --}}
{% if VUE_SCRIPT_NAME %}
<script src="v1/js/app_vue.js?v={{ $FF_BUILD_TIME }}" type="text/javascript" nonce="{{ $JS_NONCE }}"></script>
<script src="v1/js/{{ VUE_SCRIPT_NAME }}.js?v={{ $FF_BUILD_TIME }}" type="text/javascript"
nonce="{{ $JS_NONCE }}"></script>
@endif
-{# date range picker, current template, etc. #}
+{{-- date range picker, current template, etc. --}}
<script src="v1/js/lib/daterangepicker.js?v={{ $FF_BUILD_TIME }}" type="text/javascript" nonce="{{ $JS_NONCE }}"></script>
<script src="v1/lib/adminlte/js/adminlte.min.js?v={{ $FF_BUILD_TIME }}" type="text/javascript"
nonce="{{ $JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/lib/accounting.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
-{# Firefly III code #}
+{{-- Firefly III code --}}
<script type="text/javascript" src="v1/js/ff/firefly.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/ff/help.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
{% if not shownDemo %}
diff --git a/resources/views/layout/empty.twig b/resources/views/layout/empty.twig
index a30a254e0b..4ce34c05a8 100644
--- a/resources/views/layout/empty.twig
+++ b/resources/views/layout/empty.twig
@@ -11,13 +11,13 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-capable" content="yes">
- {# CSS things #}
+ {{-- CSS things --}}
- {# libraries #}
+ {{-- libraries --}}
<link href="v1/lib/bs/css/bootstrap.min.css?v={{ $FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ $JS_NONCE }}">
<link href="v1/lib/fa/css/font-awesome.min.css?v={{ $FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ $JS_NONCE }}">
- {# the theme #}
+ {{-- the theme --}}
<link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ $FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ $JS_NONCE }}">
{% if 'browser' == darkMode %}
<meta name="color-scheme" content="light dark">
@@ -44,7 +44,7 @@
<link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ $FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ $JS_NONCE }}">
@endif
- {# Firefly III customisations #}
+ {{-- Firefly III customisations --}}
<link href="v1/css/firefly.css?v={{ $FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ $JS_NONCE }}">
<!--[if lt IE 9]>
@@ -52,7 +52,7 @@
<script src="v1/js/lib/respond.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
<![endif]-->
- {# favicons #}
+ {{-- favicons --}}
{% include('partials.favicons') %}
</head>
diff --git a/resources/views/layout/guest.twig b/resources/views/layout/guest.twig
index dd2b294e4e..504064bb81 100644
--- a/resources/views/layout/guest.twig
+++ b/resources/views/layout/guest.twig
@@ -20,13 +20,13 @@
<meta name="csrf-token" content="{{ csrf_token() }}">
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
- {# CSS things #}
+ {{-- CSS things --}}
- {# libraries #}
+ {{-- libraries --}}
<link href="v1/lib/bs/css/bootstrap.min.css?v={{ $FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ $JS_NONCE }}">
<link href="v1/lib/fa/css/font-awesome.min.css?v={{ $FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ $JS_NONCE }}">
- {# the theme #}
+ {{-- the theme --}}
<link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ $FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ $JS_NONCE }}">
{% if 'browser' == darkMode %}
<meta name="color-scheme" content="light dark">
@@ -53,7 +53,7 @@
<link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ $FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ $JS_NONCE }}">
@endif
- {# Firefly III customisations #}
+ {{-- Firefly III customisations --}}
<link href="v1/css/firefly.css?v={{ $FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ $JS_NONCE }}">
<!--[if lt IE 9]>
@@ -61,7 +61,7 @@
<script src="v1/js/lib/respond.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
<![endif]-->
- {# favicons #}
+ {{-- favicons --}}
{% include('partials.favicons') %}
</head>
diff --git a/resources/views/layout/install.twig b/resources/views/layout/install.twig
index d74253ea5c..63b9f12914 100644
--- a/resources/views/layout/install.twig
+++ b/resources/views/layout/install.twig
@@ -12,7 +12,7 @@
<meta name="csrf-token" content="{{ csrf_token() }}">
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
- {# CSS things #}
+ {{-- CSS things --}}
<!-- fonts and styles -->
<link rel="stylesheet" href="v3-local/css/fonts.css?v=6.0.7">
@@ -20,7 +20,7 @@
<link rel="stylesheet" href="v3-local/lib/icheck-bootstrap/icheck-bootstrap.min.css?v=6.0.7">
<link rel="stylesheet" href="v3-local/dist/css/adminlte.min.css?v=6.0.7">
- {# favicons #}
+ {{-- favicons --}}
{% include('partials.favicons') %}
</head>
<body class="hold-transition login-page dark-mode">
diff --git a/resources/views/layout/v3/session.blade.php b/resources/views/layout/v3/session.blade.php
index aa13fa96bd..25f11cde7a 100644
--- a/resources/views/layout/v3/session.blade.php
+++ b/resources/views/layout/v3/session.blade.php
@@ -330,7 +330,7 @@
{{-- All kinds of variables. --}}
<script
- src="{{ route('javascript.variables') }}?ext=.js&amp;v={{ $FF_VERSION }}@if(isset($account))&amp;account={{ $account->id }}@endif"
+ src="{{ route('javascript.variables') }}?ext=.js&amp;v={{ $FF_VERSION }}@if(isset($account) && is_object($account))&amp;account={{ $account->id }}@elseif(isset($account) && is_array($account))&amp;account={{ $account['id'] }}@endif"
type="text/javascript" nonce="{{ $JS_NONCE }}"></script>
{{-- Base script: jquery and bootstrap --}}
diff --git a/resources/views/list/accounts.twig b/resources/views/list/accounts.twig
index b2f5da5bf5..d9081a3d6b 100644
--- a/resources/views/list/accounts.twig
+++ b/resources/views/list/accounts.twig
@@ -24,7 +24,7 @@
</th>
@endif
<th class="hidden-sm hidden-xs">{{ trans('list.active') }}</th>
- {# hide last activity to make room for other stuff #}
+ {{-- hide last activity to make room for other stuff --}}
{% if objectType != 'liabilities' %}
<th class="hidden-sm hidden-xs hidden-md">{{ trans('list.lastActivity') }}</th>
@endif
@@ -100,7 +100,7 @@
<span class="fa fa-ban"></span>
@endif
</td>
- {# hide last activity to make room for other stuff #}
+ {{-- hide last activity to make room for other stuff --}}
{% if objectType != 'liabilities' %}
{% if account.lastActivityDate %}
<td class="hidden-sm hidden-xs hidden-md">
@@ -135,7 +135,7 @@
<td class="hidden-sm hidden-xs">
<div class="btn-group btn-group-sm pull-right">
<button type="button" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
- {{ 'actions'|_ }} <span class="caret"></span></button>
+ {{ __('firefly.actions') }} <span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
<li><a href="{{ route('accounts.edit',account.id) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>
<li><a href="{{ route('accounts.delete',account.id) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>
diff --git a/resources/views/list/ale.twig b/resources/views/list/ale.twig
index 3e91bcdc53..8bf8914cd4 100644
--- a/resources/views/list/ale.twig
+++ b/resources/views/list/ale.twig
@@ -8,7 +8,7 @@
{% for logEntry in logEntries %}
<tr>
<th class="twenty" scope="row">
- {# link to object: #}
+ {{-- link to object: --}}
{% if 'FireflyIII\\Models\\Rule' == logEntry.changer_type %}
<a href="{{ route('rules.edit', [logEntry.changer_id] ) }}">
@endif
@@ -18,11 +18,11 @@
{{ logEntry.changer_type|replace({"FireflyIII\\Models\\": ""})|replace({"FireflyIII\\": ""}) }} #{{ logEntry.changer_id }}
</a>
</th>
- <td class="thirty" title="{{ logEntry.created_at.isoFormat(dateTimeFormat) }}">
+ <td class="thirty" title="{{ logEntry.created_at.isoFormat($dateTimeFormat) }}">
{{ trans('firefly.ale_action_'~logEntry.action) }}
</td>
<td>
- {# display depends on action #}
+ {{-- display depends on action --}}
{% if 'add_tag' == logEntry.action %}
<code>{{ logEntry.after }}</code>
@endif
@@ -75,9 +75,9 @@
<code>{{ logEntry.after }}</code>
@endif
{% if 'update_date' == logEntry.action %}
- <code><s>{{ carbonize(logEntry.before).isoFormat(dateTimeFormat) }}</s></code>
+ <code><s>{{ carbonize(logEntry.before).isoFormat($dateTimeFormat) }}</s></code>
&rarr;
- <code>{{ carbonize(logEntry.after).isoFormat(dateTimeFormat) }}</code>
+ <code>{{ carbonize(logEntry.after).isoFormat($dateTimeFormat) }}</code>
@endif
{% if 'update_transaction_type' == logEntry.action %}
{{ trans('firefly.'~logEntry.before) }} &rarr; {{ trans('firefly.'~logEntry.after) }}
diff --git a/resources/views/list/bills.twig b/resources/views/list/bills.twig
index aa93a4b67b..650ca25ed4 100644
--- a/resources/views/list/bills.twig
+++ b/resources/views/list/bills.twig
@@ -42,7 +42,7 @@
<span class="bi bi-ban"></span>
@endif
<a href="{{ route('subscriptions.show',entry.id) }}" title="{{ entry.name }}">{{ entry.name }}</a>
- {# count attachments #}
+ {{-- count attachments --}}
{% if entry.attachments.count() > 0 %}
<span class="bi bi-paperclip"></span>
@endif
@@ -72,11 +72,11 @@
</span>
</td>
- {#
+ {{--
paidDates = 0 (bill not paid in period)
pay_dates = 0 (bill not expected to be paid in this period)
bill is active.
- #}
+ --}}
{% if entry.paid_dates|length == 0 and entry.pay_dates|length == 0 and entry.active %}
<td class="paid_in_period text-muted">
{{ trans('firefly.not_expected_period') }}
@@ -88,14 +88,14 @@
</td>
@endif
- {#
+ {{--
paid_dates = 0 (bill not paid in period)
pay_dates > 0 (bill IS expected to be paid in this period)
bill is active
first pay date is in the past.
- #}
+ --}}
{% if entry.paid_dates|length == 0 and entry.pay_dates|length > 0 and entry.active %}
- {% if entry.next_expected_match_diff == trans('firefly.not_expected_period') %} {# terrible code, you should sue me for this. #}
+ {% if entry.next_expected_match_diff == trans('firefly.not_expected_period') %} {{-- terrible code, you should sue me for this. --}}
<td class="paid_in_period text-muted">
{{ entry.next_expected_match_diff }}
</td>
@@ -114,10 +114,10 @@
</td>
@endif
- {#
+ {{--
paid_dates >= 0 (bill is paid X times).
Don't care about pay_dates.
- #}
+ --}}
{% if entry.paid_dates|length > 0 and entry.active %}
<td class="paid_in_period text-success">
@@ -136,7 +136,7 @@
@endif
</td>
@endif
- {# bill is not active #}
+ {{-- bill is not active --}}
{% if not entry.active %}
<td class="paid_in_period text-muted">
~
diff --git a/resources/views/list/groups-tiny.twig b/resources/views/list/groups-tiny.twig
index 733a7cdaec..dfc867f605 100644
--- a/resources/views/list/groups-tiny.twig
+++ b/resources/views/list/groups-tiny.twig
@@ -18,7 +18,7 @@
{% elseif transaction.transaction_type_type == 'Transfer' %}
<span class="text-info money-transfer">
- {# transfer away: #}
+ {{-- transfer away: --}}
{% if transaction.source_account_id == account.id %}
{{ format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
{% if null != transaction.foreign_amount %}
@@ -36,7 +36,7 @@
({{ format_amount_by_symbol(transaction.pc_amount*-1, primaryCurrency.symbol, foreign_currency_.decimal_places) }})
@endif
@endif
- {# transfer to #}
+ {{-- transfer to --}}
</span>
{% elseif transaction.transaction_type_type == 'Opening balance' %}
{% if transaction.source_account_type == 'Initial balance account' %}
diff --git a/resources/views/list/groups.twig b/resources/views/list/groups.twig
index 5a421d062a..34f0168456 100644
--- a/resources/views/list/groups.twig
+++ b/resources/views/list/groups.twig
@@ -11,7 +11,7 @@
<div class="btn-group btn-group-sm action-menu pull-right hidden">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
- {{ 'actions'|_ }}<span class="caret"></span>
+ {{ __('firefly.actions') }}<span class="caret"></span>
</button>
<ul class="dropdown-menu dropdown-menu-right">
<li><a href="#" class="mass-edit"><span class="bi bi-pencil"></span>
@@ -95,16 +95,16 @@
<div class="btn-group btn-group-sm pull-right">
<button type="button" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
- {{ 'actions'|_ }} <span class="caret"></span></button>
+ {{ __('firefly.actions') }} <span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
<li><a href="{{ route('transactions.edit', [group.id]) }}"><span
class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>
<li><a href="{{ route('transactions.delete', [group.id]) }}"><span
class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>
<li><a href="#" data-id="{{ group.id }}" class="clone-transaction"><span
- class="bi bi-copy"></span> {{ 'clone'|_ }}</a></li>
+ class="bi bi-copy"></span> {{ __('firefly.clone') }}</a></li>
<li><a href="#" data-id="{{ group.id }}" class="clone-transaction-and-edit"><span
- class="bi bi-copy"></span> {{ 'clone_and_edit'|_ }}</a></li>
+ class="bi bi-copy"></span> {{ __('firefly.clone_and_edit') }}</a></li>
</ul>
</div>
</td>
@@ -164,22 +164,22 @@
</td>
<td class="{{ className }} text-right">
- {# deposit #}
+ {{-- deposit --}}
{% if transaction.transaction_type_type == 'Deposit' %}
- {# amount of deposit #}
+ {{-- amount of deposit --}}
{{ format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
- {# foreign amount of deposit #}
+ {{-- foreign amount of deposit --}}
{% if null != transaction.foreign_amount %}
({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
@endif
- {# primary currency amount of deposit #}
+ {{-- 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) }})
@endif
- {# transfer #}
+ {{-- transfer --}}
{% elseif transaction.transaction_type_type == 'Transfer' %}
<span class="text-info money-transfer">
- {# amount of transfer #}
+ {{-- amount of transfer --}}
{% if transaction.source_account_id == account.id %}
{{ format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
@endif
@@ -187,7 +187,7 @@
{{ format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
@endif
- {# foreign amount of transfer #}
+ {{-- foreign amount of transfer --}}
{% if null != transaction.foreign_amount and transaction.source_account_id == account.id %}
({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
@endif
@@ -195,12 +195,12 @@
({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
@endif
- {# primary currency amount of transfer #}
+ {{-- 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) }})
@endif
</span>
- {# opening balance #}
+ {{-- opening balance --}}
{% elseif transaction.transaction_type_type == 'Opening balance' %}
{% if transaction.source_account_type == 'Initial balance account' %}
{{ format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
@@ -219,7 +219,7 @@
(~ {{ format_amount_by_symbol(transaction.pc_amount, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
@endif
@endif
- {# reconciliation #}
+ {{-- reconciliation --}}
{% elseif transaction.transaction_type_type == 'Reconciliation' %}
{% if transaction.source_account_type == 'Reconciliation account' %}
{{ format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
@@ -238,7 +238,7 @@
(~ {{ format_amount_by_symbol(transaction.pc_amount, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
@endif
@endif
- {# liability credit #}
+ {{-- liability credit --}}
{% elseif transaction.transaction_type_type == 'Liability credit' %}
{% if transaction.source_account_type == 'Liability credit' %}
{{ format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
@@ -259,16 +259,16 @@
@endif
- {# THE REST #}
+ {{-- THE REST --}}
@else
- {# amount of withdrawal #}
+ {{-- amount of withdrawal --}}
{{ format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
- {# foreign amount of withdrawal #}
+ {{-- foreign amount of withdrawal --}}
{% if null != transaction.foreign_amount %}
({{ 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 #}
+ {{-- 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) }})
@endif
@@ -276,7 +276,7 @@
</td>
{% if (fireflyiiiconfig('use_running_balance', true)) %}
<td class=" {{ className }} text-right">
- {# RUNNING BALANCE #}
+ {{-- RUNNING BALANCE --}}
{% if (null == transaction.balance_dirty or false == transaction.balance_dirty) and null != transaction.destination_balance_after and null != transaction.source_balance_after %}
{% if transaction.transaction_type_type == 'Deposit' %}
{% if transaction.source_account_id == account.id %}
@@ -287,14 +287,14 @@
@else
<span title="Deposit from liab">{{ format_amount_by_symbol(transaction.destination_balance_after, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }}</span>
@endif
- {# if this is a deposit from revenue account, use the destination account currency? For #12043 and #12169 #}
- {# otherwise, keep at source account #}
- {# changed from normal currency_symbol to foreign_currency_symbol for #12043 #}
+ {{-- if this is a deposit from revenue account, use the destination account currency? For #12043 and #12169 --}}
+ {{-- otherwise, keep at source account --}}
+ {{-- changed from normal currency_symbol to foreign_currency_symbol for #12043 --}}
{% endif %}
{% elseif transaction.transaction_type_type == 'Withdrawal' %}
- {# withdrawal into a liability #}
+ {{-- withdrawal into a liability --}}
{% if 'Loan' == transaction.destination_account_type or 'Mortgage' == transaction.destination_account_type or 'Debt' == transaction.destination_account_type %}
{% if currency.id == transaction.currency_id %}
{% if account.id == transaction.source_account_id %}
@@ -308,7 +308,7 @@
{% if currency.id == transaction.foreign_currency_id and null != transaction.destination_balance_after and null != transaction.destination_balance_after %}
<span title="Withdrawal, liab, dest 2">{{ format_amount_by_symbol(transaction.destination_balance_after, transaction.foreign_currency_symbol ?? transaction.currency_symbol, transaction.foreign_currency_decimal_places ?? transaction.currency_decimal_places) }}</span>
@endif
- {# withdrawal into an expense account #}
+ {{-- withdrawal into an expense account --}}
@else
{% if account.id == transaction.source_account_id %}
<span title="Withdrawal, source">{{ format_amount_by_symbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
@@ -348,7 +348,7 @@
</td>
<td class="{{ className }}">
{% if 'Cash account' == transaction.source_account_type %}
- <span class="text-success">({{ 'cash'|_ }})</span>
+ <span class="text-success">({{ __('firefly.cash') }})</span>
@else
<a href="{{ route('accounts.show', [transaction.source_account_id|default(1)]) }}"
title="{{ transaction.source_account_iban|default(transaction.source_account_name) }}">{{ transaction.source_account_name }}</a>
@@ -356,7 +356,7 @@
</td>
<td class="{{ className }}">
{% if 'Cash account' == transaction.destination_account_type %}
- <span class="text-success">({{ 'cash'|_ }})</span>
+ <span class="text-success">({{ __('firefly.cash') }})</span>
@else
<a href="{{ route('accounts.show', [transaction.destination_account_id|default(1)]) }}"
title="{{ transaction.destination_account_iban|default(transaction.destination_account_name) }}">{{ transaction.destination_account_name }}</a>
@@ -384,7 +384,7 @@
<div class="btn-group btn-group-sm pull-right">
<button type="button" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
- {{ 'actions'|_ }} <span class="caret"></span></button>
+ {{ __('firefly.actions') }} <span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
<li><a href="{{ route('transactions.edit', [group.id]) }}"><span
class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>
@@ -394,9 +394,9 @@
@endif
{% if transaction.transaction_type_type != 'Reconciliation' and transaction.transaction_type_type != 'Opening balance' and transaction.transaction_type_type != 'Liability credit' %}
<li><a href="#" data-id="{{ group.id }}" class="clone-transaction"><span
- class="bi bi-copy"></span> {{ 'clone'|_ }}</a></li>
+ class="bi bi-copy"></span> {{ __('firefly.clone') }}</a></li>
<li><a href="#" data-id="{{ group.id }}" class="clone-transaction-and-edit"><span
- class="bi bi-copy"></span> {{ 'clone_and_edit'|_ }}</a></li>
+ class="bi bi-copy"></span> {{ __('firefly.clone_and_edit') }}</a></li>
<li>
<a href="{{ route('rules.create-from-journal', [transaction.transaction_journal_id]) }}"><span
class="bi bi-shuffle"></span> {{ 'create_rule_from_transaction'|_ }}
@@ -435,7 +435,7 @@
<div class="btn-group action-menu btn-group-sm pull-right hidden">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
- {{ 'actions'|_ }} <span class="caret"></span>
+ {{ __('firefly.actions') }} <span class="caret"></span>
</button>
<ul class="dropdown-menu btn-group-sm dropdown-menu-right">
<li><a href="#" class="mass-edit"><span class="bi bi-pencil"></span>
diff --git a/resources/views/list/piggy-banks.twig b/resources/views/list/piggy-banks.twig
index b7ef329f94..ce0ceeafe2 100644
--- a/resources/views/list/piggy-banks.twig
+++ b/resources/views/list/piggy-banks.twig
@@ -115,17 +115,17 @@
<tr>
<td class="visible-xs visible-sm hidden-md hidden-lg">&nbsp;</td>
<td class="visible-xs visible-sm hidden-md hidden-lg">&nbsp;</td>
- <td class="hidden-sm hidden-xs">&nbsp;</td> {# handle #}
- <td class="hidden-sm hidden-xs">&nbsp;</td> {# buttons #}
+ <td class="hidden-sm hidden-xs">&nbsp;</td> {{-- handle --}}
+ <td class="hidden-sm hidden-xs">&nbsp;</td> {{-- buttons --}}
<td>&nbsp;</td>
<td class="text-right">
{% for sum in objectGroup.sums %}
{{ format_amount_by_symbol(sum.saved, sum.currency_symbol, sum.currency_decimal_places) }}<br />
@endforeach
</td>
- <td class="hidden-sm hidden-xs">&nbsp;</td> {# remove money #}
- <td class="hidden-sm hidden-xs">&nbsp;</td> {# progress#}
- <td class="hidden-sm hidden-xs">&nbsp;</td> {# add money #}
+ <td class="hidden-sm hidden-xs">&nbsp;</td> {{-- remove money --}}
+ <td class="hidden-sm hidden-xs">&nbsp;</td> {{-- progress--}}
+ <td class="hidden-sm hidden-xs">&nbsp;</td> {{-- add money --}}
<td class="text-right hidden-sm hidden-xs">
{% for sum in objectGroup.sums %}
{{ format_amount_by_symbol(sum.target, sum.currency_symbol, sum.currency_decimal_places) }}<br />
diff --git a/resources/views/object-groups/edit.twig b/resources/views/object-groups/edit.twig
index 1dd453e53d..abf0479ce0 100644
--- a/resources/views/object-groups/edit.twig
+++ b/resources/views/object-groups/edit.twig
@@ -27,7 +27,7 @@
</div>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for options #}
+ {{-- panel for options --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.options') }}</h3>
@@ -52,7 +52,7 @@
<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/piggy-banks/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 }}"
diff --git a/resources/views/partials/boxes.twig b/resources/views/partials/boxes.twig
index b3a83bff38..4ff496d28b 100644
--- a/resources/views/partials/boxes.twig
+++ b/resources/views/partials/boxes.twig
@@ -1,5 +1,5 @@
<div class="row hidden-xs">
- {# box for in and out (balance) #}
+ {{-- box for in and out (balance) --}}
<div class="col-lg-3 col-md-6 col-sm-6 col-xs-12">
<div class="info-box bg-aqua-gradient" id="box_out_holder">
<span class="info-box-icon"><span class="fa fa-balance-scale"></span></span>
@@ -19,7 +19,7 @@
</div>
</div>
- {# box for bills #}
+ {{-- box for bills --}}
<div class="col-lg-3 col-md-6 col-sm-6 col-xs-12">
<div class="info-box bg-teal-gradient">
<span class="info-box-icon"><span class="bi bi-calendar-o"></span></span>
@@ -39,7 +39,7 @@
</div>
</div>
- {# available to spend total / per day #}
+ {{-- available to spend total / per day --}}
<div class="col-lg-3 col-md-6 col-sm-6 col-xs-12">
<div class="info-box bg-green-gradient" id="box-left-to-spend-box">
<span class="info-box-icon"><span class="bi bi-cash"></span></span>
@@ -58,7 +58,7 @@
</div>
</div>
- {# net worth #}
+ {{-- net worth --}}
<div class="col-lg-3 col-md-6 col-sm-6 col-xs-12">
<div class="info-box bg-blue-gradient">
<span class="info-box-icon"><span class="fa fa-line-chart"></span></span>
diff --git a/resources/views/partials/debug-table.twig b/resources/views/partials/debug-table.twig
index c08ecc97d6..2ad05e60ae 100644
--- a/resources/views/partials/debug-table.twig
+++ b/resources/views/partials/debug-table.twig
@@ -9,7 +9,7 @@
</tr>
</thead>
<tbody>
- {# Firefly III version #}
+ {{-- Firefly III version --}}
<tr>
<td>Firefly III</td>
<td>{% if FF_IS_DEVELOP %}<!-- .Z9JBCmw64Zkx1pQw -->@endif{% if not FF_IS_DEVELOP %}v@endif{{ FF_VERSION }}</td>
@@ -18,7 +18,7 @@
<td>Build time</td>
<td>{{ system.build_time_nice }} ({{ system.build_time }})</td>
</tr>
- {# PHP version + settings #}
+ {{-- PHP version + settings --}}
<tr>
<td>PHP version</td>
<td>{{ system.php_version|escape }} ({{ system.bits }}bits) / {{ system.interface }} / {{ system.php_os }} {{ system.uname }}</td>
@@ -41,7 +41,7 @@
{% for driver in system.all_drivers %}{% if system.current_driver == driver %}<strong>*{{ driver }}*</strong>@else{{ driver }}@endif, @endforeach
</td>
</tr>
- {# Docker information #}
+ {{-- Docker information --}}
{% if docker.is_docker %}
<tr>
<td>
diff --git a/resources/views/partials/flashes.twig b/resources/views/partials/flashes.twig
index da1b3bb8db..06e6a6357d 100644
--- a/resources/views/partials/flashes.twig
+++ b/resources/views/partials/flashes.twig
@@ -1,4 +1,4 @@
-{# LOCALE ERROR MESSAGE #}
+{{-- LOCALE ERROR MESSAGE --}}
{% if invalidMonetaryLocale %}
<div class="alert alert-info alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert">
@@ -8,14 +8,14 @@
</div>
@endif
-{# MANDATORY UPDATE MESSAGE #}
+{{-- MANDATORY UPDATE MESSAGE --}}
{% if upgrade_security_message and upgrade_security_level %}
<div class="alert alert-{{ upgrade_security_level }} alert-dismissible" role="alert">
<strong>{{ ('flash_'~upgrade_security_level)|_ }}</strong> <span class="fa fa-exclamation-triangle"></span> {{ upgrade_security_message }}
</div>
@endif
-{# SUCCESS MESSAGE (ALWAYS SINGULAR) #}
+{{-- SUCCESS MESSAGE (ALWAYS SINGULAR) --}}
{% if session_has('success') %}
<div class="alert alert-success alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert">
@@ -33,14 +33,14 @@
</div>
@endif
-{# INFO MESSAGE (CAN BE MULTIPLE) #}
+{{-- INFO MESSAGE (CAN BE MULTIPLE) --}}
{% if session_has('info') %}
<div class="alert alert-info alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert">
<span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
</button>
- {# MULTIPLE INFO MESSAGE #}
+ {{-- 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>
@@ -50,11 +50,11 @@
@endforeach
</ul>
@endif
- {# SET OF MULTIPLE INFO MESSAGES, BUT THERE IS JUST ONE #}
+ {{-- SET OF MULTIPLE INFO MESSAGES, BUT THERE IS JUST ONE --}}
{% if session('info') is iterable and session('info')|length == 1 %}
<strong>{{ 'flash_info'|_ }}:</strong> {{ session('info')[0]|raw }}
@endif
- {# SINGLE INFO MESSAGE #}
+ {{-- SINGLE INFO MESSAGE --}}
{% if session('info') is not iterable %}
{% if session_has('info_url') %}
<a href="{{ session('info_url') }}">
@@ -69,7 +69,7 @@
@endif
-{# WARNING MESSAGE (ALWAYS SINGULAR) #}
+{{-- WARNING MESSAGE (ALWAYS SINGULAR) --}}
{% if session_has('warning') %}
<div class="alert alert-warning alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert">
@@ -79,14 +79,14 @@
</div>
@endif
-{# ERROR MESSAGE (CAN BE MULTIPLE) #}
+{{-- ERROR MESSAGE (CAN BE MULTIPLE) --}}
{% if session_has('error') %}
<div class="alert alert-danger alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert">
<span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
</button>
- {# MULTIPLE ERRORS (BAD) #}
+ {{-- 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}) }}:
@@ -98,13 +98,13 @@
</ul>
@endif
- {# SET OF MULTIPLE ERRORS, BUT THERE IS JUST ONE #}
+ {{-- SET OF MULTIPLE ERRORS, BUT THERE IS JUST ONE --}}
{% if session('error') is iterable and session('error')|length == 1 %}
<strong>{{ 'flash_error'|_ }}</strong>
{{ session('error')[0]|raw }}
@endif
- {# SINGLE ERROR #}
+ {{-- SINGLE ERROR --}}
{% if session('error') is not iterable %}
<strong>{{ 'flash_error'|_ }}</strong> {{ session('error')|raw }}
@endif
diff --git a/resources/views/partials/menu-sidebar.twig b/resources/views/partials/menu-sidebar.twig
index bada20f93f..2603ac5b25 100644
--- a/resources/views/partials/menu-sidebar.twig
+++ b/resources/views/partials/menu-sidebar.twig
@@ -180,7 +180,7 @@
</li>
<li class="{{ activeRoutePartial('reports') }}" id="report-menu">
- <a href="{{ route('reports.index') }}"> {# relative route! #}
+ <a href="{{ route('reports.index') }}"> {{-- relative route! --}}
<em class="fa fa-bar-chart"></em>
<span>{{ 'reports'|_ }}</span>
</a>
diff --git a/resources/views/piggy-banks/create.twig b/resources/views/piggy-banks/create.twig
index c591558281..5fbe32fc01 100644
--- a/resources/views/piggy-banks/create.twig
+++ b/resources/views/piggy-banks/create.twig
@@ -39,7 +39,7 @@
</div>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for options #}
+ {{-- panel for options --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.options') }}</h3>
@@ -63,7 +63,7 @@
<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/piggy-banks/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/piggy-banks/edit.twig b/resources/views/piggy-banks/edit.twig
index cb4fc6e645..86af3a387d 100644
--- a/resources/views/piggy-banks/edit.twig
+++ b/resources/views/piggy-banks/edit.twig
@@ -47,7 +47,7 @@
</div>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for options #}
+ {{-- panel for options --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.options') }}</h3>
@@ -72,7 +72,7 @@
<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/piggy-banks/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 }}"
diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twig
index d2db79d3e2..9f7eaefa54 100644
--- a/resources/views/piggy-banks/show.twig
+++ b/resources/views/piggy-banks/show.twig
@@ -142,7 +142,7 @@
<div class="card">
<div class="card-header">
<h3 class="card-title">
- {{ 'attachments'|_ }}
+ {{ __('firefly.attachments') }}
</h3>
</div>
<div class="card-body p-0">
diff --git a/resources/views/popup/list/journals.twig b/resources/views/popup/list/journals.twig
index 973fda7d8d..082b77105b 100644
--- a/resources/views/popup/list/journals.twig
+++ b/resources/views/popup/list/journals.twig
@@ -12,14 +12,14 @@
<th class="hidden-xs">{{ trans('list.to') }}</th>
@endif
- {# Hide budgets? #}
+ {{-- Hide budgets? --}}
{% if not hideBudget %}
<th class="hidden-xs">
<span class="bi bi-pie-chart" title="{{ trans('list.budget') }}"></span>
</th>
@endif
- {# Hide categories? #}
+ {{-- Hide categories? --}}
{% if not hideCategory %}
<th class="hidden-xs">
<span class="bi bi-bookmark" title="{{ trans('list.category') }}"></span>
@@ -28,12 +28,12 @@
</tr>
</thead>
<tbody>
- {# Make sum: #}
+ {{-- Make sum: --}}
{% set sum = 0 %}
{% set symbol = '' %}
{% set decimal_places =2 %}
{% for transaction in journals %}
- {# add to sum #}
+ {{-- add to sum --}}
{% set symbol = transaction.currency_symbol %}
{% set decimal_places = transaction.currency_decimal_places %}
<tr class="drag" data-date="{{ transaction.date.format('Y-m-d') }}" data-id="{{ transaction.journal_id }}">
diff --git a/resources/views/preferences/index.twig b/resources/views/preferences/index.twig
index 9470996201..54ec90eb08 100644
--- a/resources/views/preferences/index.twig
+++ b/resources/views/preferences/index.twig
@@ -11,7 +11,7 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
- {# start of preferences tabs #}
+ {{-- start of preferences tabs --}}
<div class="nav-tabs-custom">
<ul class="nav nav-tabs">
<li class="active"><a href="#general" data-toggle="tab"
@@ -37,11 +37,11 @@
@endif
<div class="tab-pane active" id="general">
- {# general settings here #}
+ {{-- general settings here --}}
<div class="row">
- {# general settings column A #}
+ {{-- general settings column A --}}
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# language #}
+ {{-- language --}}
<div class="preferences-box">
<h3>{{ 'pref_languages'|_ }}</h3>
<p>{{ 'pref_languages_help'|_ }}</p>
@@ -69,7 +69,7 @@
</p>
</div>
- {# locale #}
+ {{-- locale --}}
{% if not isDocker %}
<div class="preferences-box">
<h3>{{ 'pref_locale'|_ }}</h3>
@@ -102,7 +102,7 @@
<input type="hidden" name="locale" value="equal"/>
@endif
- {# fiscal year #}
+ {{-- fiscal year --}}
<div class="preferences-box">
<h3>{{ 'pref_custom_fiscal_year'|_ }}</h3>
<p>
@@ -113,7 +113,7 @@
{{ ExpandedForm::date('fiscalYearStart',fiscalYearStart,{ 'label' : 'pref_fiscal_year_start_label'|_ }) }}
</div>
- {# conversion back to primary currency #}
+ {{-- conversion back to primary currency --}}
{% if fireflyiiiconfig('enable_exchange_rates', true) %}
<div class="preferences-box">
<h3>{{ 'pref_convert_to_primary'|_ }}</h3>
@@ -123,7 +123,7 @@
{{ ExpandedForm::checkbox('convertToPrimary','1',convertToPrimary,{ 'label' : 'pref_convert_primary_help'|_ }) }}
</div>
@endif
- {# conversion back to primary currency #}
+ {{-- conversion back to primary currency --}}
<div class="preferences-box">
<h3>{{ 'pref_anonymous'|_ }}</h3>
<p>
@@ -133,10 +133,10 @@
</div>
</div>
- {# general settings column B #}
+ {{-- general settings column B --}}
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# transaction preferences #}
+ {{-- transaction preferences --}}
<div class="preferences-box">
<h3>{{ 'pref_optional_fields_transaction'|_ }}</h3>
<p>
@@ -164,9 +164,9 @@
</div>
</div>
<div class="tab-pane" id="frontpage">
- {# frontpage settings here #}
+ {{-- frontpage settings here --}}
<div class="row">
- {# frontpage settings column a #}
+ {{-- frontpage settings column a --}}
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="preferences-box">
<h3>{{ 'pref_home_screen_accounts'|_ }}</h3>
@@ -194,17 +194,17 @@
@endforeach
</div>
</div>
- {# frontpage settings column b #}
+ {{-- frontpage settings column b --}}
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
</div>
</div>
</div>
<div class="tab-pane" id="layout">
- {# layout settings here #}
+ {{-- layout settings here --}}
<div class="row">
- {# layout settings column A #}
+ {{-- layout settings column A --}}
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# view range #}
+ {{-- view range --}}
<div class="preferences-box">
<h3>{{ 'pref_view_range'|_ }}</h3>
<p>{{ 'pref_view_range_help'|_ }}</p>
@@ -308,7 +308,7 @@
</div>
</div>
- {# layout settings column B #}
+ {{-- layout settings column B --}}
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="preferences-box">
<h3>{{ 'list_page_size_title'|_ }}</h3>
@@ -332,11 +332,11 @@
</div>
</div>
<div class="tab-pane" id="notifications">
- {# layout settings here #}
+ {{-- layout settings here --}}
<div class="row">
- {# layout settings column A #}
+ {{-- layout settings column A --}}
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# view range #}
+ {{-- view range --}}
<div class="preferences-box">
<h3>{{ 'pref_notifications'|_ }}</h3>
<p>
diff --git a/resources/views/recurring/create.twig b/resources/views/recurring/create.twig
index ce0888b72f..e644aa4532 100644
--- a/resources/views/recurring/create.twig
+++ b/resources/views/recurring/create.twig
@@ -7,11 +7,11 @@
<form action="{{ route('recurring.store') }}" method="post" id="store" class="form-horizontal"
enctype="multipart/form-data">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
- {# row with recurrence information #}
+ {{-- row with recurrence information --}}
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
- {# mandatory recurrence stuff #}
+ {# mandatory recurrence stuff --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ 'mandatory_for_recurring'|_ }}</h3>
@@ -27,7 +27,7 @@
{{ ExpandedForm::date('repeat_until',null) }}
{{ ExpandedForm.integer('repetitions',null) }}
- {# calendar in popup #}
+ {# calendar in popup --}}
<div class="form-group" id="calendar_holder">
<label for="ffInput_calendar"
class="col-sm-4 control-label">{{ trans('form.calendar') }}</label>
@@ -43,7 +43,7 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12">
- {# optional recurrence stuff #}
+ {# optional recurrence stuff --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ 'optional_for_recurring'|_ }}</h3>
@@ -51,7 +51,7 @@
<div class="card-body">
{{ ExpandedForm::textarea('recurring_description') }}
- {# only correct way to do active checkbox #}
+ {# 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}) }) }}
@@ -62,14 +62,14 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
- {# mandatory transaction information #}
+ {# mandatory transaction information --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ 'mandatory_for_transaction'|_ }}</h3>
</div>
<div class="card-body">
<p><em>{{ 'mandatory_fields_for_tranaction'|_ }}</em></p>
- {# three buttons to distinguish type of transaction #}
+ {# three buttons to distinguish type of transaction --}}
<div class="form-group" id="name_holder">
<label for="ffInput_type" class="col-sm-4 control-label">
{{ trans('form.transaction_type') }}
@@ -87,70 +87,70 @@
</div>
</div>
<input type="hidden" name="transaction_type" value="">
- {# end of three buttons #}
+ {# end of three buttons --}}
{{ ExpandedForm::text('transaction_description') }}
- {# transaction information (mandatory) #}
+ {# transaction information (mandatory) --}}
{{ CurrencyForm::currencyList('transaction_currency_id', primaryCurrency.id) }}
{{ ExpandedForm::amountNoCurrency('amount') }}
- {# source account if withdrawal, or if transfer: #}
+ {# source account if withdrawal, or if transfer: --}}
{{ AccountForm.longAccountList('source_id', null, {label: trans('form.asset_source_account')}) }}
- {# for deposits, a drop down with revenue accounts, loan debt cash and mortgage #}
+ {# for deposits, a drop down with revenue accounts, loan debt cash and mortgage --}}
{{ AccountForm.activeDepositDestinations('deposit_source_id', null, {label: trans('form.deposit_source_id')}) }}
- {# destination if deposit or transfer: #}
+ {# destination if deposit or transfer: --}}
{{ 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')}) }} #}
+ {# destination account name for withdrawals --}}
+ {# {{ 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). #}
+ {# 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')}) }}
</div>
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-12">
- {# optional transaction information #}
+ {# optional transaction information --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ 'optional_for_transaction'|_ }}</h3>
</div>
<div class="card-body">
- {# transaction information (optional) #}
+ {# transaction information (optional) --}}
{{ CurrencyForm::currencyListEmpty('foreign_currency_id') }}
{{ ExpandedForm::amountNoCurrency('foreign_amount') }}
- {# BUDGET ONLY WHEN CREATING A WITHDRAWAL #}
+ {# BUDGET ONLY WHEN CREATING A WITHDRAWAL --}}
{% if budgets|length > 1 %}
{{ ExpandedForm::select('budget_id', budgets, null) }}
@else
{{ ExpandedForm::select('budget_id', budgets, null, {helpText: trans('firefly.no_budget_pointer', {link: route('budgets.index')})}) }}
@endif
- {# CATEGORY ALWAYS #}
+ {# CATEGORY ALWAYS --}}
{{ ExpandedForm::text('category') }}
- {# BILL / SUBSCRIPTION ONLY FOR WITHDRAWALS #}
+ {# BILL / SUBSCRIPTION ONLY FOR WITHDRAWALS --}}
{% if bills|length > 1 %}
{{ ExpandedForm::select('bill_id', bills, null) }}
@else
{{ ExpandedForm::select('bill_id', bills, null, {helpText: trans('firefly.no_bill_pointer', {link: route('subscriptions.index')})}) }}
@endif
- {# TAGS #}
+ {# TAGS --}}
{{ ExpandedForm::text('tags') }}
- {# RELATE THIS TRANSFER TO A PIGGY BANK #}
+ {# RELATE THIS TRANSFER TO A PIGGY BANK --}}
{{ PiggyBankForm.piggyBankList('piggy_bank_id') }}
</div>
</div>
</div>
</div>
- {# row with submit stuff. #}
+ {# row with submit stuff. --}}
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
@@ -181,10 +181,10 @@
</div>
</div>
</div>
- #}
+ --}}
</form>
- {# calendar modal #}
+ {# calendar modal --}}
<div class="modal fade" id="calendarModal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-lg">
<div class="modal-content">
diff --git a/resources/views/recurring/edit.twig b/resources/views/recurring/edit.twig
index bbcbf047b9..223678a4f4 100644
--- a/resources/views/recurring/edit.twig
+++ b/resources/views/recurring/edit.twig
@@ -9,11 +9,11 @@
enctype="multipart/form-data">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
- {# row with recurrence information #}
+ {{-- row with recurrence information --}}
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
- {# mandatory recurrence stuff #}
+ {{-- mandatory recurrence stuff --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ 'mandatory_for_recurring'|_ }}</h3>
@@ -29,7 +29,7 @@
{{ ExpandedForm::date('repeat_until',array.repeat_until) }}
{{ ExpandedForm.integer('repetitions', array.nr_of_repetitions) }}
- {# calendar in popup #}
+ {{-- calendar in popup --}}
<div class="form-group" id="calendar_holder">
<label for="ffInput_calendar"
class="col-sm-4 control-label">{{ trans('form.calendar') }}</label>
@@ -45,7 +45,7 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12">
- {# optional recurrence stuff #}
+ {{-- optional recurrence stuff --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ 'optional_for_recurring'|_ }}</h3>
@@ -53,7 +53,7 @@
<div class="card-body">
{{ ExpandedForm::textarea('recurring_description',array.description) }}
- {# only correct way to do active checkbox #}
+ {{-- 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}) }) }}
@@ -64,14 +64,14 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
- {# mandatory transaction information #}
+ {{-- mandatory transaction information --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ 'mandatory_for_transaction'|_ }}</h3>
</div>
<div class="card-body">
<p><em>{{ 'mandatory_fields_for_tranaction'|_ }}</em></p>
- {# three buttons to distinguish type of transaction #}
+ {{-- three buttons to distinguish type of transaction --}}
<div class="form-group" id="name_holder">
<label for="ffInput_type" class="col-sm-4 control-label">
{{ trans('form.transaction_type') }}
@@ -89,67 +89,67 @@
</div>
</div>
<input type="hidden" name="transaction_type" value="">
- {# end of three buttons #}
+ {{-- end of three buttons --}}
{{ ExpandedForm::text('transaction_description', array.transactions[0].description) }}
- {# transaction information (mandatory) #}
+ {{-- transaction information (mandatory) --}}
{{ CurrencyForm::currencyList('transaction_currency_id', array.transactions[0].currency_id) }}
{{ ExpandedForm::amountNoCurrency('amount', array.transactions[0].amount) }}
- {# source account if withdrawal, or if transfer: #}
+ {{-- source account if withdrawal, or if transfer: --}}
{{ AccountForm.longAccountList('source_id', array.transactions[0].source_id, {label: trans('form.asset_source_account')}) }}
- {# NEW for deposits, a drop down with revenue accounts, loan debt cash and mortgage #}
+ {{-- NEW for deposits, a drop down with revenue accounts, loan debt cash and mortgage --}}
{{ AccountForm.activeDepositDestinations('deposit_source_id', preFilled.deposit_source_id, {label: trans('form.deposit_source_id')}) }}
- {# destination if deposit or transfer: #}
+ {{-- destination if deposit or transfer: --}}
{{ AccountForm.longAccountList('destination_id', array.transactions[0].destination_id, {label: trans('form.asset_destination_account')} ) }}
- {# NEW for withdrawals, also a drop down with expense accounts, loans, debts, mortgages or (cash). #}
+ {{-- NEW for withdrawals, also a drop down with expense accounts, loans, debts, mortgages or (cash). --}}
{{ AccountForm.activeWithdrawalDestinations('withdrawal_destination_id', preFilled.withdrawal_destination_id, {label: trans('form.withdrawal_destination_id')}) }}
</div>
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-12">
- {# optional transaction information #}
+ {{-- optional transaction information --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ 'optional_for_transaction'|_ }}</h3>
</div>
<div class="card-body">
- {# transaction information (optional) #}
+ {{-- transaction information (optional) --}}
{{ 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 #}
+ {{-- BUDGET ONLY WHEN CREATING A WITHDRAWAL --}}
{% if budgets|length > 1 %}
{{ 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')})}) }}
- {# budgets #}
+ {{-- budgets --}}
@endif
- {# CATEGORY ALWAYS #}
+ {# CATEGORY ALWAYS --}}
{{ ExpandedForm::text('category',array.transactions[0].category_name) }}
- {# BILL ONLY WHEN CREATING A WITHDRAWAL #}
+ {# BILL ONLY WHEN CREATING A WITHDRAWAL --}}
{% if bills|length > 1 %}
{{ 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')})}) }}
@endif
- {# TAGS #}
+ {# TAGS --}}
{{ ExpandedForm::text('tags', array.transactions[0].tags) }}
- {# RELATE THIS TRANSFER TO A PIGGY BANK #}
+ {# RELATE THIS TRANSFER TO A PIGGY BANK --}}
{{ PiggyBankForm.piggyBankList('piggy_bank_id',array.transactions[0].piggy_bank_id) }}
</div>
</div>
</div>
</div>
- {# row with submit stuff. #}
+ {# row with submit stuff. --}}
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
@@ -180,10 +180,10 @@
</div>
</div>
</div>
- #}
+ --}}
</form>
- {# calendar modal #}
+ {# calendar modal --}}
<div class="modal fade" id="calendarModal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-lg">
<div class="modal-content">
diff --git a/resources/views/recurring/old-index.twig b/resources/views/recurring/old-index.twig
index 6c1090cfc7..664477db6b 100644
--- a/resources/views/recurring/old-index.twig
+++ b/resources/views/recurring/old-index.twig
@@ -73,10 +73,10 @@
<ol>
{% for rtt in rt.transactions %}
<li>
- {# normal amount + comma #}
+ {{-- normal amount + comma --}}
{{ format_amount_by_symbol(rtt['amount'],rtt['currency_symbol'],rtt['currency_decimal_places']) }}{% if rtt['foreign_amount'] == null %},@endif
- {# foreign amount + comma #}
+ {{-- foreign amount + comma --}}
{% if null != rtt['foreign_amount'] %}
({{ format_amount_by_symbol(rtt['foreign_amount'],rtt['foreign_currency_symbol'],rtt['foreign_currency_decimal_places']) }}),
@endif
diff --git a/resources/views/recurring/show.twig b/resources/views/recurring/show.twig
index 1cac5b26d6..351365794a 100644
--- a/resources/views/recurring/show.twig
+++ b/resources/views/recurring/show.twig
@@ -46,7 +46,7 @@
<li>{{ rep.description }}</li>
@endforeach
</ul>
- <h4>{{ 'attachments'|_ }}</h4>
+ <h4>{{ __('firefly.attachments') }}</h4>
{% include 'list.attachments' with {attachments: array.attachments} %}
</div>
<div class="card-footer">
@@ -220,6 +220,6 @@
@section('scripts')
<script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}"
nonce="{{ $JS_NONCE }}"></script>
- {# required for groups.twig #}
+ {{-- 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/reports/budget/month.twig b/resources/views/reports/budget/month.twig
index cdb680a287..ec03647047 100644
--- a/resources/views/reports/budget/month.twig
+++ b/resources/views/reports/budget/month.twig
@@ -14,7 +14,7 @@
</div>
<div class="box-body table-responsive no-padding" id="accountsHolder">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -29,7 +29,7 @@
</div>
<div class="box-body table-responsive no-padding" id="budgetsHolder">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -46,7 +46,7 @@
</div>
<div class="box-body table-responsive no-padding" id="accountPerbudgetHolder">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -130,7 +130,7 @@
</div>
<div class="box-body table-responsive no-padding" id="avgExpensesHolder">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -146,7 +146,7 @@
</div>
<div class="box-body table-responsive no-padding" id="topExpensesHolder">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
diff --git a/resources/views/reports/budget/partials/top-expenses.twig b/resources/views/reports/budget/partials/top-expenses.twig
index c36e51ef66..854b363556 100644
--- a/resources/views/reports/budget/partials/top-expenses.twig
+++ b/resources/views/reports/budget/partials/top-expenses.twig
@@ -4,7 +4,7 @@
<th data-defaultsort="disabled">{{ 'description'|_ }}</th>
<th data-defaultsign="month">{{ 'date'|_ }}</th>
<th data-defaultsign="az">{{ 'account'|_ }}</th>
- <th data-defaultsign="az">{{ 'budget'|_ }}</th>
+ <th data-defaultsign="az">{{ __('firefly.budget') }}</th>
<th data-defaultsign="_19" class="text-right">{{ 'amount'|_ }}</th>
</tr>
</thead>
diff --git a/resources/views/reports/category/month.twig b/resources/views/reports/category/month.twig
index a6e28dbeaa..acd7e248b0 100644
--- a/resources/views/reports/category/month.twig
+++ b/resources/views/reports/category/month.twig
@@ -14,7 +14,7 @@
</div>
<div class="box-body table-responsive no-padding" id="accountsHolder">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -29,7 +29,7 @@
</div>
<div class="box-body table-responsive no-padding" id="categoriesHolder">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -46,7 +46,7 @@
</div>
<div class="box-body table-responsive no-padding" id="accountPerCategoryHolder">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -168,7 +168,7 @@
</div>
<div class="box-body table-responsive no-padding" id="avgExpensesHolder">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -183,7 +183,7 @@
</div>
<div class="box-body table-responsive no-padding" id="avgIncomeHolder">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -200,7 +200,7 @@
</div>
<div class="box-body table-responsive no-padding" id="topExpensesHolder">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -215,7 +215,7 @@
</div>
<div class="box-body table-responsive no-padding" id="topIncomeHolder">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
diff --git a/resources/views/reports/category/partials/top-expenses.twig b/resources/views/reports/category/partials/top-expenses.twig
index d5552d91e1..7861ea2eaf 100644
--- a/resources/views/reports/category/partials/top-expenses.twig
+++ b/resources/views/reports/category/partials/top-expenses.twig
@@ -4,7 +4,7 @@
<th data-defaultsort="disabled">{{ 'description'|_ }}</th>
<th data-defaultsign="month">{{ 'date'|_ }}</th>
<th data-defaultsign="az">{{ 'account'|_ }}</th>
- <th data-defaultsign="az">{{ 'category'|_ }}</th>
+ <th data-defaultsign="az">{{ __('firefly.category') }}</th>
<th data-defaultsign="_19" class="text-right">{{ 'amount'|_ }}</th>
</tr>
</thead>
diff --git a/resources/views/reports/category/partials/top-income.twig b/resources/views/reports/category/partials/top-income.twig
index 23df09501a..132842b909 100644
--- a/resources/views/reports/category/partials/top-income.twig
+++ b/resources/views/reports/category/partials/top-income.twig
@@ -4,7 +4,7 @@
<th data-defaultsort="disabled">{{ 'description'|_ }}</th>
<th data-defaultsign="month">{{ 'date'|_ }}</th>
<th data-defaultsign="az">{{ 'account'|_ }}</th>
- <th data-defaultsign="az">{{ 'category'|_ }}</th>
+ <th data-defaultsign="az">{{ __('firefly.category') }}</th>
<th data-defaultsign="_19" class="text-right">{{ 'amount'|_ }}</th>
</tr>
</thead>
diff --git a/resources/views/reports/default/month.twig b/resources/views/reports/default/month.twig
index 969ddbc49f..8c7f92d1b2 100644
--- a/resources/views/reports/default/month.twig
+++ b/resources/views/reports/default/month.twig
@@ -6,7 +6,7 @@
@section('content')
- {# chart #}
+ {{-- chart --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
@@ -20,7 +20,7 @@
</div>
</div>
- {# account balances and income vs. expense #}
+ {{-- account balances and income vs. expense --}}
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-6">
<div class="card">
@@ -29,7 +29,7 @@
</div>
<div class="box-body table-responsive no-padding" id="accountReport">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -44,7 +44,7 @@
</div>
<div class="box-body table-responsive no-padding" id="incomeVsExpenseReport">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -54,7 +54,7 @@
</div>
</div>
- {# in and out #}
+ {{-- in and out --}}
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
@@ -63,7 +63,7 @@
</div>
<div class="box-body table-responsive no-padding" id="incomeReport">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -78,7 +78,7 @@
</div>
<div class="box-body table-responsive no-padding" id="expenseReport">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -97,7 +97,7 @@
</div>
<div class="box-body table-responsive no-padding" id="budgetReport">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -113,7 +113,7 @@
<h3 class="card-title">{{ 'categories'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="categoryReport"></div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -130,7 +130,7 @@
</div>
<div class="box-body table-responsive no-padding" id="balanceReport">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -147,7 +147,7 @@
<h3 class="card-title">{{ 'bills'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="billReport"></div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
diff --git a/resources/views/reports/default/multi-year.twig b/resources/views/reports/default/multi-year.twig
index b008145570..539ccd0a29 100644
--- a/resources/views/reports/default/multi-year.twig
+++ b/resources/views/reports/default/multi-year.twig
@@ -6,7 +6,7 @@
@section('content')
- {# charts #}
+ {{-- charts --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box" id="year-inc-exp">
@@ -20,7 +20,7 @@
</div>
</div>
- {# balances and income vs. expense. #}
+ {{-- balances and income vs. expense. --}}
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
@@ -29,7 +29,7 @@
</div>
<div class="box-body table-responsive no-padding" id="accountReport">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -44,7 +44,7 @@
</div>
<div class="box-body table-responsive no-padding" id="incomeVsExpenseReport">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -54,7 +54,7 @@
</div>
</div>
- {# block with income #}
+ {{-- block with income --}}
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
@@ -63,7 +63,7 @@
</div>
<div class="box-body table-responsive no-padding" id="incomeReport">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -71,7 +71,7 @@
</div>
</div>
</div>
- {# block with expenses #}
+ {{-- block with expenses --}}
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
<div class="card-header">
@@ -79,7 +79,7 @@
</div>
<div class="box-body table-responsive no-padding" id="expenseReport">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -89,7 +89,7 @@
</div>
</div>
- {# net worth #}
+ {{-- net worth --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
@@ -109,7 +109,7 @@
</div>
- {# This is the budget overview generated by budget period report #}
+ {{-- This is the budget overview generated by budget period report --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
@@ -118,7 +118,7 @@
</div>
<div class="box-body no-padding table-responsive" id="budgetPeriodReport">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -129,7 +129,7 @@
</div>
- {# This is the chart that belongs to the above overview. #}
+ {{-- This is the chart that belongs to the above overview. --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
@@ -144,7 +144,7 @@
</div>
</div>
- {# same thing but for categories (expenses) #}
+ {{-- same thing but for categories (expenses) --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
@@ -153,7 +153,7 @@
</div>
<div class="box-body no-padding table-responsive" id="categoryExpense">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -163,7 +163,7 @@
</div>
</div>
- {# same thing but for categories (income) #}
+ {{-- same thing but for categories (income) --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
@@ -172,7 +172,7 @@
</div>
<div class="box-body no-padding table-responsive" id="categoryIncome">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -182,7 +182,7 @@
</div>
</div>
- {# and the same chart too! #}
+ {{-- and the same chart too! --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
diff --git a/resources/views/reports/default/year.twig b/resources/views/reports/default/year.twig
index e087ea7299..e9cca509fa 100644
--- a/resources/views/reports/default/year.twig
+++ b/resources/views/reports/default/year.twig
@@ -6,7 +6,7 @@
@section('content')
- {# charts #}
+ {{-- charts --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box" id="year-inc-exp">
@@ -20,7 +20,7 @@
</div>
</div>
- {# balances and inc vs exp #}
+ {{-- balances and inc vs exp --}}
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
@@ -29,7 +29,7 @@
</div>
<div class="box-body table-responsive no-padding" id="accountReport">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -44,7 +44,7 @@
</div>
<div class="box-body table-responsive no-padding" id="incomeVsExpenseReport">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -54,7 +54,7 @@
</div>
</div>
- {# income and expenses. #}
+ {{-- income and expenses. --}}
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
@@ -63,7 +63,7 @@
</div>
<div class="box-body table-responsive no-padding" id="incomeReport">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -78,7 +78,7 @@
</div>
<div class="box-body table-responsive no-padding" id="expenseReport">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -88,7 +88,7 @@
</div>
</div>
- {# net worth #}
+ {{-- net worth --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
@@ -107,7 +107,7 @@
</div>
</div>
- {# This is the budget overview generated by budget period report #}
+ {{-- This is the budget overview generated by budget period report --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
@@ -116,7 +116,7 @@
</div>
<div class="box-body no-padding table-responsive" id="budgetPeriodReport">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -127,7 +127,7 @@
</div>
- {# This is the chart that belongs to the above overview. #}
+ {{-- This is the chart that belongs to the above overview. --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
@@ -142,7 +142,7 @@
</div>
</div>
- {# same thing but for categories (expenses) #}
+ {{-- same thing but for categories (expenses) --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
@@ -151,7 +151,7 @@
</div>
<div class="box-body no-padding table-responsive" id="categoryExpense">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -161,7 +161,7 @@
</div>
</div>
- {# same thing but for categories (income) #}
+ {{-- same thing but for categories (income) --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
@@ -170,7 +170,7 @@
</div>
<div class="box-body no-padding table-responsive" id="categoryIncome">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -180,7 +180,7 @@
</div>
</div>
- {# and the same chart too! #}
+ {{-- and the same chart too! --}}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
diff --git a/resources/views/reports/double/report.twig b/resources/views/reports/double/report.twig
index e2570e8cf3..c052f02be1 100644
--- a/resources/views/reports/double/report.twig
+++ b/resources/views/reports/double/report.twig
@@ -13,7 +13,7 @@
<h3 class="card-title">{{ 'in_out_accounts'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="opsAccounts">
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -29,7 +29,7 @@
<h3 class="card-title">{{ 'in_out_accounts_per_asset'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="opsAccountsAsset">
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -141,7 +141,7 @@
<h3 class="card-title">{{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
</div>
<div class="box-body table-responsive no-padding" id="topExpensesHolder">
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -157,7 +157,7 @@
<h3 class="card-title">{{ 'income'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
</div>
<div class="box-body table-responsive no-padding" id="topIncomeHolder">
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -176,7 +176,7 @@
</div>
<div class="box-body table-responsive no-padding" id="avgExpensesHolder">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -191,7 +191,7 @@
</div>
<div class="box-body table-responsive no-padding" id="avgIncomeHolder">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
diff --git a/resources/views/reports/partials/bills.twig b/resources/views/reports/partials/bills.twig
index 1d052fe11a..2347a309d2 100644
--- a/resources/views/reports/partials/bills.twig
+++ b/resources/views/reports/partials/bills.twig
@@ -57,7 +57,7 @@
<td class="text-right hidden-xs" data-value="{{ line.getMin }}">{{ formatAmountByCurrency(line.getCurrency, line.getMin) }}</td>
<td class="text-right hidden-xs" data-value="{{ line.getMax }}">{{ formatAmountByCurrency(line.getCurrency, line.getMax) }}</td>
- {# if bill is hit, show hit amount #}
+ {{-- if bill is hit, show hit amount --}}
{% if line.isHit %}
<td data-value="{{ line.getAmount }}" class="text-right">
<a href="{{ route('transactions.show', line.getTransactionJournalId) }}">
@@ -65,7 +65,7 @@
</a>
</td>
@endif
- {# if not but is active, show "not yet charged #}
+ {{-- if not but is active, show "not yet charged --}}
{% if not line.isHit and line.isActive %}
<td data-value="0" class="bg-success">{{ 'notCharged'|_ }}</td>
@endif
diff --git a/resources/views/reports/partials/budget-period.twig b/resources/views/reports/partials/budget-period.twig
index ea1c42788f..63bef46d44 100644
--- a/resources/views/reports/partials/budget-period.twig
+++ b/resources/views/reports/partials/budget-period.twig
@@ -1,7 +1,7 @@
<table class="table table-hover sortable">
<thead>
<tr>
- <th data-defaultsign="az" colspan="2">{{ 'budget'|_ }}</th>
+ <th data-defaultsign="az" colspan="2">{{ __('firefly.budget') }}</th>
{% for period in periods %}
<th data-defaultsign="_19" class="text-right">{{ period }}</th>
@endforeach
diff --git a/resources/views/reports/partials/budgets.twig b/resources/views/reports/partials/budgets.twig
index e1f4a7c2b0..ea45a7718e 100644
--- a/resources/views/reports/partials/budgets.twig
+++ b/resources/views/reports/partials/budgets.twig
@@ -1,7 +1,7 @@
<table class="table table-hover sortable">
<thead>
<tr>
- <th data-defaultsign="az">{{ 'budget'|_ }}</th>
+ <th data-defaultsign="az">{{ __('firefly.budget') }}</th>
<th data-defaultsign="month" class="hidden-xs">{{ 'date'|_ }}</th>
<th data-defaultsign="_19" class="text-right hidden-xs">{{ 'budgeted'|_ }}</th>
<th data-defaultsign="_19" class="hidden-xs">{{ trans('list.percentage') }}</th>
diff --git a/resources/views/reports/partials/categories.twig b/resources/views/reports/partials/categories.twig
index e5d0306917..9981ca97c3 100644
--- a/resources/views/reports/partials/categories.twig
+++ b/resources/views/reports/partials/categories.twig
@@ -1,7 +1,7 @@
<table class="table table-hover sortable">
<thead>
<tr>
- <th data-defaultsign="az">{{ 'category'|_ }}</th>
+ <th data-defaultsign="az">{{ __('firefly.category') }}</th>
<th data-defaultsign="_19" class="text-right">{{ 'spent'|_ }}</th>
<th data-defaultsign="_19" class="text-right">{{ 'earned'|_ }}</th>
<th data-defaultsign="_19" class="text-right">{{ 'sum'|_ }}</th>
diff --git a/resources/views/reports/partials/category-period.twig b/resources/views/reports/partials/category-period.twig
index f9bab10d57..f0f219afd0 100644
--- a/resources/views/reports/partials/category-period.twig
+++ b/resources/views/reports/partials/category-period.twig
@@ -1,7 +1,7 @@
<table class="table table-hover sortable table-sm">
<thead>
<tr>
- <th data-defaultsign="az" colspan="2">{{ 'category'|_ }}</th>
+ <th data-defaultsign="az" colspan="2">{{ __('firefly.category') }}</th>
{% for period in periods %}
<th data-defaultsign="_19" class="text-right">{{ period }}</th>
@endforeach
@@ -22,7 +22,7 @@
<a title="{{ info.title }}" href="#" data-currency="{{ info.currency_id }}" data-category="{{ info.id }}" class="category-chart-activate">{{ info.title }}</a>
</td>
{% for key, period in periods %}
- {# income first #}
+ {{-- income first --}}
{% if(info.entries[key]) %}
<td data-value="{{ info.entries[key] }}" class="text-right">
{{ format_amount_by_symbol(info.entries[key], info.currency_symbol, info.currency_decimal_places) }}
@@ -34,7 +34,7 @@
@endif
@endforeach
- {# if sum of income, display: #}
+ {{-- if sum of income, display: --}}
{% if info.sum %}
<td data-value="{{ info.sum }}" class="text-right">
{{ format_amount_by_symbol(info.sum, info.currency_symbol, info.currency_decimal_places) }}
diff --git a/resources/views/reports/partials/exp-budgets.twig b/resources/views/reports/partials/exp-budgets.twig
index cc2bf6fa07..24814a52bb 100644
--- a/resources/views/reports/partials/exp-budgets.twig
+++ b/resources/views/reports/partials/exp-budgets.twig
@@ -1,7 +1,7 @@
<table class="table table-hover sortable">
<thead>
<tr>
- <th class="sixty-six" data-defaultsign="az" data-defaultsort="asc">{{ 'category'|_ }}</th>
+ <th class="sixty-six" data-defaultsign="az" data-defaultsort="asc">{{ __('firefly.category') }}</th>
<th class="third" data-defaultsign="_19">{{ 'spent'|_ }}</th>
</tr>
</thead>
diff --git a/resources/views/reports/partials/exp-categories.twig b/resources/views/reports/partials/exp-categories.twig
index 6f138792d7..1471453ab8 100644
--- a/resources/views/reports/partials/exp-categories.twig
+++ b/resources/views/reports/partials/exp-categories.twig
@@ -1,7 +1,7 @@
<table class="table table-hover sortable">
<thead>
<tr>
- <th class="half" data-defaultsign="az" data-defaultsort="asc">{{ 'category'|_ }}</th>
+ <th class="half" data-defaultsign="az" data-defaultsort="asc">{{ __('firefly.category') }}</th>
<th class="quarter" data-defaultsign="_19">{{ 'spent'|_ }}</th>
<th class="quarter" data-defaultsign="_19">{{ 'earned'|_ }}</th>
</tr>
diff --git a/resources/views/reports/partials/journals-audit.twig b/resources/views/reports/partials/journals-audit.twig
index 8bf7831649..39ede45723 100644
--- a/resources/views/reports/partials/journals-audit.twig
+++ b/resources/views/reports/partials/journals-audit.twig
@@ -10,7 +10,7 @@
<th class="text-right hide-balance_after">{{ trans('list.balance_after') }}</th>
<th class="hide-date">{{ trans('list.date') }}</th>
- {# new optional fields (3x) #}
+ {{-- new optional fields (3x) --}}
<th class="hide-from">{{ trans('list.from') }}</th>
<th class="hide-to">{{ trans('list.to') }}</th>
@@ -18,13 +18,13 @@
<th class="hide-category"><span class="bi bi-bookmark" title="{{ trans('list.category') }}"></span></th>
<th class="hide-bill">{{ trans('list.bill') }}</th>
- {# more optional fields (2x) #}
+ {{-- more optional fields (2x) --}}
<th class="hide-create_date">{{ trans('list.create_date') }}</th>
<th class="hide-update_date">{{ trans('list.update_date') }}</th>
<th class="hide-notes">{{ trans('list.notes') }}</th>
- {# even more optional fields #}
+ {{-- even more optional fields --}}
<th class="hide-interest_date">{{ trans('list.interest_date') }}</th>
<th class="hide-book_date">{{ trans('list.book_date') }}</th>
<th class="hide-process_date">{{ trans('list.process_date') }}</th>
@@ -129,7 +129,7 @@
</td>
<td class="hide-category">
{% if journal.category_id %}
- <a href="{{ route('categories.show', [journal.category_id]) }}" title="{{ journal.category_name }}">{{ journal.category_name }}</a>
+ <a href="{{ route('categories.show', [$journal['category_id']]) }}" title="{{ journal['category_name'] }}">{{ journal['category_name'] }}</a>
@endif
</td>
<td class="hide-bill">
@@ -140,11 +140,11 @@
<!-- new optional fields (2x) -->
<td class="hide-create_date">
- {{ journal.created_at.isoFormat(dateTimeFormat) }}
+ {{ journal.created_at.isoFormat($dateTimeFormat) }}
</td>
<td class="hide-update_date">
- {{ journal.updated_at.isoFormat(dateTimeFormat) }}
+ {{ journal.updated_at.isoFormat($dateTimeFormat) }}
</td>
<td class="hide-notes">
{{ journal.notes|default('')|markdown }}
diff --git a/resources/views/reports/tag/month.twig b/resources/views/reports/tag/month.twig
index 84c2ceb208..49a9bd2ec6 100644
--- a/resources/views/reports/tag/month.twig
+++ b/resources/views/reports/tag/month.twig
@@ -14,7 +14,7 @@
</div>
<div class="box-body table-responsive no-padding" id="accountsHolder">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -29,7 +29,7 @@
</div>
<div class="box-body table-responsive no-padding" id="tagsHolder">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -46,7 +46,7 @@
</div>
<div class="box-body table-responsive no-padding" id="accountPerTagHolder">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -199,7 +199,7 @@
</div>
<div class="box-body table-responsive no-padding" id="avgExpensesHolder">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -214,7 +214,7 @@
</div>
<div class="box-body table-responsive no-padding" id="avgIncomeHolder">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -231,7 +231,7 @@
</div>
<div class="box-body table-responsive no-padding" id="topExpensesHolder">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -246,7 +246,7 @@
</div>
<div class="box-body table-responsive no-padding" id="topIncomeHolder">
</div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
diff --git a/resources/views/rules/old-index.twig b/resources/views/rules/old-index.twig
index ba83598753..4738c8a3c0 100644
--- a/resources/views/rules/old-index.twig
+++ b/resources/views/rules/old-index.twig
@@ -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/partials/action.twig b/resources/views/rules/partials/action.twig
index aced339be8..3c416dabef 100644
--- a/resources/views/rules/partials/action.twig
+++ b/resources/views/rules/partials/action.twig
@@ -3,7 +3,7 @@
<a href="#" class="btn btn-danger btn-sm remove-action"><span class="bi bi-trash"></span></a>
</td>
<td class="thirty">
- {# TODO error when invalid name #}
+ {{-- TODO error when invalid name --}}
<select name="actions[{{ count }}][type]" class="form-control">
{% for key,type in allRuleActions() %}
<option value="{{ key }}" label="{{ type }}" {% if key == oldAction %} selected@endif>{{ type }}</option>
diff --git a/resources/views/rules/rule-group/create.twig b/resources/views/rules/rule-group/create.twig
index e5f7ed382b..48a120ea56 100644
--- a/resources/views/rules/rule-group/create.twig
+++ b/resources/views/rules/rule-group/create.twig
@@ -20,7 +20,7 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12">
- {# optional fields #}
+ {{-- optional fields --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
@@ -33,7 +33,7 @@
</div>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for options #}
+ {{-- panel for options --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.options') }}</h3>
diff --git a/resources/views/rules/rule-group/edit.twig b/resources/views/rules/rule-group/edit.twig
index 7f66c0e8df..5cce7ac638 100644
--- a/resources/views/rules/rule-group/edit.twig
+++ b/resources/views/rules/rule-group/edit.twig
@@ -18,7 +18,7 @@
<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3>
</div>
<div class="card-body">
- {# only correct way to do active checkbox #}
+ {{-- only correct way to do active checkbox --}}
{{ ExpandedForm::checkbox('active', 1) }}
{{ ExpandedForm::text('title', ruleGroup.title) }}
@@ -28,7 +28,7 @@
</div>
<div class="col-lg-6 col-md-12 col-sm-6">
- {# optional fields #}
+ {{-- optional fields --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
@@ -41,7 +41,7 @@
</div>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for options #}
+ {{-- panel for options --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.options') }}</h3>
diff --git a/resources/views/rules/rule/create.twig b/resources/views/rules/rule/create.twig
index 3ccf4feeaa..0afeb73f3a 100644
--- a/resources/views/rules/rule/create.twig
+++ b/resources/views/rules/rule/create.twig
@@ -46,7 +46,7 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12">
- {# optional fields #}
+ {{-- optional fields --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
@@ -126,7 +126,7 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for options #}
+ {{-- panel for options --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.options') }}</h3>
diff --git a/resources/views/rules/rule/edit.twig b/resources/views/rules/rule/edit.twig
index 330adb3541..90187acbfc 100644
--- a/resources/views/rules/rule/edit.twig
+++ b/resources/views/rules/rule/edit.twig
@@ -21,7 +21,7 @@
{{ RuleForm.ruleGroupList('rule_group_id', rule.rule_group_id) }}
{{ ExpandedForm::select('trigger',allJournalTriggers(), primaryTrigger) }}
- {# only correct way to do active checkbox #}
+ {{-- only correct way to do active checkbox --}}
{{ 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')}) }}
@@ -31,7 +31,7 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12">
- {# optional fields #}
+ {{-- optional fields --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
@@ -112,7 +112,7 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for options #}
+ {{-- panel for options --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.options') }}</h3>
diff --git a/resources/views/search/index.twig b/resources/views/search/index.twig
index 12844c2d6b..b4f1f4a9e0 100644
--- a/resources/views/search/index.twig
+++ b/resources/views/search/index.twig
@@ -15,7 +15,7 @@
<p>
{{ 'search_box_intro'|_ }}
</p>
- {# search form #}
+ {{-- search form --}}
<form class="form-horizontal" action="{{ route('search.index') }}" method="get">
<div class="form-group">
<label for="query" class="col-sm-1 control-label">{{ 'search_query'|_ }}</label>
@@ -95,7 +95,7 @@
{{ 'search_searching'|_ }}
</p>
<div class="search_results hidden"></div>
- {# loading indicator #}
+ {{-- loading indicator --}}
<div class="overlay">
<div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span>
@@ -168,7 +168,7 @@
var cloneGroupUrl = '{{ route('transactions.clone') }}';
var cloneAndEditUrl = '{{ route('transactions.clone') }}?redirect=edit';
</script>
- {# required for groups.twig #}
+ {{-- required for groups.twig --}}
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/ff/search/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
diff --git a/resources/views/settings/link/create.twig b/resources/views/settings/link/create.twig
index c785f558b2..ffb2d8fadc 100644
--- a/resources/views/settings/link/create.twig
+++ b/resources/views/settings/link/create.twig
@@ -24,7 +24,7 @@
</div>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for options #}
+ {{-- panel for options --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.options') }}</h3>
diff --git a/resources/views/settings/link/edit.twig b/resources/views/settings/link/edit.twig
index e011fc95d8..320c6cb032 100644
--- a/resources/views/settings/link/edit.twig
+++ b/resources/views/settings/link/edit.twig
@@ -28,7 +28,7 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for options #}
+ {{-- panel for options --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.options') }}</h3>
diff --git a/resources/views/settings/update/index.twig b/resources/views/settings/update/index.twig
index 7ed5c6931c..3603dc0fad 100644
--- a/resources/views/settings/update/index.twig
+++ b/resources/views/settings/update/index.twig
@@ -24,7 +24,7 @@
</div>
</div>
- {# do update check. #}
+ {{-- do update check. --}}
<div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
<div class="card">
<div class="card-header">
@@ -39,7 +39,7 @@
</div>
</div>
- {# check now button #}
+ {{-- check now button --}}
<div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
<div class="card">
<div class="card-header">
diff --git a/resources/views/settings/users/edit.twig b/resources/views/settings/users/edit.twig
index 507fb8e37a..d4a912db0a 100644
--- a/resources/views/settings/users/edit.twig
+++ b/resources/views/settings/users/edit.twig
@@ -39,7 +39,7 @@
</div>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for options #}
+ {{-- panel for options --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.options') }}</h3>
diff --git a/resources/views/tags/create.twig b/resources/views/tags/create.twig
index 2f06cdb738..b6a2793dcc 100644
--- a/resources/views/tags/create.twig
+++ b/resources/views/tags/create.twig
@@ -41,7 +41,7 @@
</div>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for options #}
+ {{-- panel for options --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.options') }}</h3>
diff --git a/resources/views/tags/edit.twig b/resources/views/tags/edit.twig
index 6358b9585f..891c5ba12c 100644
--- a/resources/views/tags/edit.twig
+++ b/resources/views/tags/edit.twig
@@ -45,7 +45,7 @@
</div>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- {# panel for options #}
+ {{-- panel for options --}}
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.options') }}</h3>
diff --git a/resources/views/tags/show.twig b/resources/views/tags/show.twig
index 95dca80f42..f7e3cb9b93 100644
--- a/resources/views/tags/show.twig
+++ b/resources/views/tags/show.twig
@@ -48,7 +48,7 @@
</tr>
@endif
- {# total amount #}
+ {{-- total amount --}}
{% set currentSum = 0 %}
{% for set in sums %}
{% set currentSum = currentSum + set.Withdrawal + set.Transfer + set.Deposit %}
@@ -65,7 +65,7 @@
</tr>
@endif
- {# total expense excl. transfer #}
+ {{-- total expense excl. transfer --}}
{% set currentSum = 0 %}
{% for set in sums %}
{% set currentSum = currentSum + set.Withdrawal + set.Deposit %}
@@ -81,7 +81,7 @@
</tr>
@endif
- {# withdrawals #}
+ {{-- withdrawals --}}
{% set currentSum = 0 %}
{% for set in sums %}
{% set currentSum = currentSum + set.Withdrawal %}
@@ -97,7 +97,7 @@
</tr>
@endif
- {# deposits #}
+ {{-- deposits --}}
{% set currentSum = 0 %}
{% for set in sums %}
{% set currentSum = currentSum + set.Deposit %}
@@ -113,7 +113,7 @@
</tr>
@endif
- {# transfers #}
+ {{-- transfers --}}
{% set currentSum = 0 %}
{% for set in sums %}
{% set currentSum = currentSum + set.Transfer %}
@@ -129,7 +129,7 @@
</tr>
@endif
- {# reconciliation #}
+ {{-- reconciliation --}}
{% set currentSum = 0 %}
{% for set in sums %}
{% set currentSum = currentSum + set.Reconciliation %}
@@ -145,7 +145,7 @@
</tr>
@endif
- {#
+ {{--
{% if sums.Transfer != 0 %}
<tr>
<td>{{ trans('list.sum_transfers') }}</td>
@@ -209,7 +209,7 @@
<div class="card">
<div class="card-header">
<h3 class="card-title">
- {{ 'attachments'|_ }}
+ {{ __('firefly.attachments') }}
</h3>
</div>
<div class="card-body p-0">
diff --git a/resources/views/transactions/bulk/edit.twig b/resources/views/transactions/bulk/edit.twig
index 891e570d09..254ae50642 100644
--- a/resources/views/transactions/bulk/edit.twig
+++ b/resources/views/transactions/bulk/edit.twig
@@ -66,7 +66,7 @@
<td>{{ journal.date.isoFormat($monthAndDayFormat) }}</td>
<td>
{% if journal.category_id != null %}
- <a href="{{ route('categories.show', [journal.category_id]) }}" title="{{ journal.category_name }}">{{ journal.category_name }}</a>
+ <a href="{{ route('categories.show', [$journal['category_id']]) }}" title="{{ journal['category_name'] }}">{{ journal['category_name'] }}</a>
@endif
</td>
<td>
diff --git a/resources/views/transactions/convert.twig b/resources/views/transactions/convert.twig
index a1064eb721..73c469491a 100644
--- a/resources/views/transactions/convert.twig
+++ b/resources/views/transactions/convert.twig
@@ -18,37 +18,37 @@
</div>
<div class="card-body">
<p>
- {# ONE: WITHDRAWAL TO DEPOSIT #}
+ {{-- ONE: WITHDRAWAL TO DEPOSIT --}}
{% if sourceType.type == 'Withdrawal' and destinationType.type == 'Deposit' %}
{{ trans_choice('firefly.convert_expl_w_d', groupArray.transactions|length) }}
{{ trans_choice('firefly.convert_select_sources', groupArray.transactions|length) }}
@endif
- {# TWO: WITHDRAWAL TO TRANSFER #}
+ {{-- TWO: WITHDRAWAL TO TRANSFER --}}
{% if sourceType.type == 'Withdrawal' and destinationType.type == 'Transfer' %}
{{ trans_choice('firefly.convert_expl_w_t', groupArray.transactions|length) }}
{{ trans_choice('firefly.convert_select_destinations', groupArray.transactions|length) }}
@endif
- {# THREE: DEPOSIT TO WITHDRAWAL #}
+ {{-- THREE: DEPOSIT TO WITHDRAWAL --}}
{% if sourceType.type == 'Deposit' and destinationType.type == 'Withdrawal' %}
{{ trans_choice('firefly.convert_expl_d_w', groupArray.transactions|length) }}
{{ trans_choice('firefly.convert_select_destinations', groupArray.transactions|length) }}
@endif
- {# FOUR: DEPOSIT TO TRANSFER #}
+ {{-- FOUR: DEPOSIT TO TRANSFER --}}
{% if sourceType.type == 'Deposit' and destinationType.type == 'Transfer' %}
{{ trans_choice('firefly.convert_expl_d_t', groupArray.transactions|length) }}
{{ trans_choice('firefly.convert_select_sources', groupArray.transactions|length) }}
@endif
- {# FIVE: TRANSFER TO WITHDRAWAL #}
+ {{-- FIVE: TRANSFER TO WITHDRAWAL --}}
{% if sourceType.type == 'Transfer' and destinationType.type == 'Withdrawal' %}
{{ trans_choice('firefly.convert_expl_t_w', groupArray.transactions|length) }}
{{ trans_choice('firefly.convert_select_destinations', groupArray.transactions|length) }}
@endif
- {# SIX: TRANSFER TO DEPOSIT #}
+ {{-- SIX: TRANSFER TO DEPOSIT --}}
{% if sourceType.type == 'Transfer' and destinationType.type == 'Deposit' %}
{{ trans_choice('firefly.convert_expl_t_d', groupArray.transactions|length) }}
{{ trans_choice('firefly.convert_select_sources', groupArray.transactions|length) }}
@@ -68,14 +68,14 @@
<td>#{{ transaction.transaction_journal_id }}</td>
<td>{{ transaction.description }}</td>
<td>
- {# ONE: WITHDRAWAL TO DEPOSIT #}
+ {{-- ONE: WITHDRAWAL TO DEPOSIT --}}
{% if sourceType.type == 'Withdrawal' and destinationType.type == 'Deposit' %}
- {# NEW DESTINATION = Asset, SOURCE MUST BE [Revenue, Cash, Loan, Debt, Mortgage] #}
+ {{-- NEW DESTINATION = Asset, SOURCE MUST BE [Revenue, Cash, Loan, Debt, Mortgage] --}}
{% if transaction.source_type == 'Asset account' %}
{{ Html::select('source_id['~transaction.transaction_journal_id~']', validDepositSources).class('form-control') }}
@endif
- {# NEW DESTINATION = [Loan, Debt, Mortgage], SOURCE MUST BE [Revenue] #}
+ {{-- NEW DESTINATION = [Loan, Debt, Mortgage], SOURCE MUST BE [Revenue] --}}
{% if
transaction.source_type == 'Loan' or
transaction.source_type == 'Debt' or
@@ -91,31 +91,31 @@
@endif
@endif
- {# TWO: WITHDRAWAL TO TRANSFER #}
+ {{-- TWO: WITHDRAWAL TO TRANSFER --}}
{% if sourceType.type == 'Withdrawal' and destinationType.type == 'Transfer' %}
<a href="{{ route('accounts.show', [transaction.source_id]) }}"
title="{{ transaction.source_iban|default(transaction.source_name) }}">{{ transaction.source_name }}</a>
- {# hide source in hidden input #}
+ {{-- hide source in hidden input --}}
<input type="hidden"
name="source_id[{{ transaction.transaction_journal_id }}]"
value="{{ transaction.source_id }}">
@endif
- {# THREE: DEPOSIT TO WITHDRAWAL #}
+ {{-- THREE: DEPOSIT TO WITHDRAWAL --}}
{% if sourceType.type == 'Deposit' and destinationType.type == 'Withdrawal' %}
<a href="{{ route('accounts.show', [transaction.destination_id]) }}"
title="{{ transaction.destination_iban|default(transaction.destination_name) }}">{{ transaction.destination_name }}</a>
- {# hide new source in hidden input #}
+ {{-- hide new source in hidden input --}}
<input type="hidden"
name="source_id[{{ transaction.transaction_journal_id }}]"
value="{{ transaction.destination_id }}">
@endif
- {# FOUR: DEPOSIT TO TRANSFER #}
+ {{-- FOUR: DEPOSIT TO TRANSFER --}}
{% if sourceType.type == 'Deposit' and destinationType.type == 'Transfer' %}
- {# if new destination is asset, then asset #}
+ {{-- if new destination is asset, then asset --}}
{% if transaction.destination_type == 'Asset account' %}
{{ Html::select('source_id['~transaction.transaction_journal_id~']', assets).class('form-control') }}
@endif
@@ -125,29 +125,29 @@
{{ Html::select('source_id['~transaction.transaction_journal_id~']', liabilities).class('form-control') }}
@endif
- {# if new destination liability, then liability. #}
+ {{-- if new destination liability, then liability. --}}
@endif
- {# FIVE: TRANSFER TO WITHDRAWAL #}
+ {{-- FIVE: TRANSFER TO WITHDRAWAL --}}
{% if sourceType.type == 'Transfer' and destinationType.type == 'Withdrawal' %}
<a href="{{ route('accounts.show', [transaction.source_id]) }}"
title="{{ transaction.source_iban|default(transaction.source_name) }}">{{ transaction.source_name }}</a>
- {# hide source in hidden input #}
+ {{-- hide source in hidden input --}}
<input type="hidden"
name="source_id[{{ transaction.transaction_journal_id }}]"
value="{{ transaction.source_id }}">
@endif
- {# SIX: TRANSFER TO DEPOSIT #}
+ {{-- SIX: TRANSFER TO DEPOSIT --}}
{% if sourceType.type == 'Transfer' and destinationType.type == 'Deposit' %}
- {# NEW DESTINATION = Asset, SOURCE MUST BE [Revenue, Cash, Loan, Debt, Mortgage] #}
+ {{-- NEW DESTINATION = Asset, SOURCE MUST BE [Revenue, Cash, Loan, Debt, Mortgage] --}}
{% if
transaction.source_type == 'Asset account' %}
{{ Html::select('source_id['~transaction.transaction_journal_id~']', validDepositSources).class('form-control') }}
@endif
- {# NEW DESTINATION = [Debt, Mortgage, Load], SOURCE MUST BE [Revenue] #}
+ {{-- NEW DESTINATION = [Debt, Mortgage, Load], SOURCE MUST BE [Revenue] --}}
{% if
transaction.source_type == 'Loan' or
transaction.source_type == 'Debt' or
@@ -166,20 +166,20 @@
</td>
<td>
- {# ONE: WITHDRAWAL TO DEPOSIT #}
+ {{-- ONE: WITHDRAWAL TO DEPOSIT --}}
{% if sourceType.type == 'Withdrawal' and destinationType.type == 'Deposit' %}
<a href="{{ route('accounts.show', [transaction.source_id]) }}"
title="{{ transaction.source_iban|default(transaction.source_name) }}">{{ transaction.source_name }}</a>
- {# hide destination in hidden input #}
+ {{-- hide destination in hidden input --}}
<input type="hidden"
name="destination_id[{{ transaction.transaction_journal_id }}]"
value="{{ transaction.source_id }}">
@endif
- {# TWO: WITHDRAWAL TO TRANSFER #}
+ {{-- TWO: WITHDRAWAL TO TRANSFER --}}
{% if sourceType.type == 'Withdrawal' and destinationType.type == 'Transfer' %}
- {# if the source is a liability, destination must also be a liability. #}
+ {{-- if the source is a liability, destination must also be a liability. --}}
{% if
transaction.source_type == 'Loan' or
transaction.source_type == 'Debt' or
@@ -187,23 +187,23 @@
{{ Html::select('destination_id['~transaction.transaction_journal_id~']', liabilities).class('form-control') }}
@endif
- {# if the source is an asset, destination can only be an asset. #}
+ {{-- if the source is an asset, destination can only be an asset. --}}
{% if transaction.source_type == 'Asset account' %}
{{ Html::select('destination_id['~transaction.transaction_journal_id~']', assets).class('form-control') }}
@endif
@endif
- {# THREE: DEPOSIT TO WITHDRAWAL #}
+ {{-- THREE: DEPOSIT TO WITHDRAWAL --}}
{% if sourceType.type == 'Deposit' and destinationType.type == 'Withdrawal' %}
- {# if new source is Asset, destination must be [Expense, Loan, Debt or Mortgage] #}
+ {{-- if new source is Asset, destination must be [Expense, Loan, Debt or Mortgage] --}}
{% if transaction.destination_type == 'Asset account' %}
{{ Html::select('destination_id['~transaction.transaction_journal_id~']', validWithdrawalDests).class('form-control') }}
@endif
{% if transaction.destination_type == 'Loan' or
transaction.destination_type == 'Debt' or
transaction.destination_type == 'Mortgage' %}
- {# if new source is Liability, destination must be expense account. #}
+ {{-- if new source is Liability, destination must be expense account. --}}
<input
autocomplete="off"
@@ -216,18 +216,18 @@
@endif
@endif
- {# FOUR: DEPOSIT TO TRANSFER #}
+ {{-- FOUR: DEPOSIT TO TRANSFER --}}
{% if sourceType.type == 'Deposit' and destinationType.type == 'Transfer' %}
<a href="{{ route('accounts.show', [transaction.destination_id]) }}"
title="{{ transaction.destination_iban|default(transaction.destination_name) }}">{{ transaction.destination_name }}</a>
- {# hide destination in hidden input #}
+ {{-- hide destination in hidden input --}}
<input type="hidden"
name="destination_id[{{ transaction.transaction_journal_id }}]"
value="{{ transaction.destination_id }}">
@endif
- {# FIVE: TRANSFER TO WITHDRAWAL #}
+ {{-- FIVE: TRANSFER TO WITHDRAWAL --}}
{% if sourceType.type == 'Transfer' and destinationType.type == 'Withdrawal' %}
{% if transaction.source_type == 'Asset account' %}
@@ -247,12 +247,12 @@
@endif
@endif
- {# SIX: TRANSFER TO DEPOSIT #}
+ {{-- SIX: TRANSFER TO DEPOSIT --}}
{% if sourceType.type == 'Transfer' and destinationType.type == 'Deposit' %}
<a href="{{ route('accounts.show', [transaction.destination_id]) }}"
title="{{ transaction.destination_iban|default(transaction.destination_name) }}">{{ transaction.destination_name }}</a>
- {# hide destination in hidden input #}
+ {{-- hide destination in hidden input --}}
<input type="hidden"
name="destination_id[{{ transaction.transaction_journal_id }}]"
value="{{ transaction.destination_id }}">
diff --git a/resources/views/transactions/mass/edit.twig b/resources/views/transactions/mass/edit.twig
index 3ebe075e4c..6bcdfb6bef 100644
--- a/resources/views/transactions/mass/edit.twig
+++ b/resources/views/transactions/mass/edit.twig
@@ -34,18 +34,18 @@
{% for journal in journals %}
<tr>
<td>
- {# LINK TO EDIT FORM #}
+ {{-- LINK TO EDIT FORM --}}
<a href="{{ route('transactions.edit', journal.transaction_group_id) }}" class="btn btn-xs btn-outline-secondary"><span
class="bi bi-pencil"></span></a>
<input type="hidden" name="journals[]" value="{{ journal.transaction_journal_id }}"/>
</td>
<td>
- {# DESCRIPTION #}
+ {{-- DESCRIPTION --}}
<input class="form-control input-sm" autocomplete="off"
placeholder="{{ journal.description }}" name="description[{{ journal.transaction_journal_id }}]"
type="text" value="{{ journal.description }}">
</td>
- {# AMOUNT #}
+ {{-- AMOUNT --}}
<td>
{% if journal.reconciled == false %}
<div class="input-group input-group-sm">
@@ -56,7 +56,7 @@
value="{{ journal.currency_id }}">
</div>
{% if journal.foreign_amount %}
- {# insert foreign data #}
+ {{-- insert foreign data --}}
<div class="input-group input-group-sm">
<span class="input-group-addon">{{ journal.foreign_currency_symbol }}</span>
<input name="foreign_amount[{{ journal.transaction_journal_id }}]" class="form-control" autocomplete="off"
@@ -90,7 +90,7 @@
</span>
</td>
<td>
- {# DATE #}
+ {{-- DATE --}}
<input class="form-control input-sm" autocomplete="off"
name="date[{{ journal.transaction_journal_id }}]" type="datetime-local" value="{{ journal.date }}">
</td>
@@ -102,7 +102,7 @@
<a href="{{ route('accounts.show', [journal.source_account_id]) }}">{{ journal.source_account_name }}</a>
@endif
{% if journal.reconciled == false %}
- {# SOURCE ACCOUNT ID FOR TRANSFER OR WITHDRAWAL #}
+ {{-- SOURCE ACCOUNT ID FOR TRANSFER OR WITHDRAWAL --}}
{% if journal.transaction_type_type == 'Transfer' or journal.transaction_type_type == 'Withdrawal' %}
<select class="form-control input-sm" name="source_id[{{ journal.transaction_journal_id }}]">
{% for account in withdrawalSources %}
@@ -112,7 +112,7 @@
</select>
@endif
- {# SOURCE ACCOUNT NAME FOR DEPOSIT #}
+ {{-- SOURCE ACCOUNT NAME FOR DEPOSIT --}}
{% if journal.transaction_type_type == 'Deposit' %}
<input class="form-control input-sm" spellcheck="false"
placeholder="{% if journal.source_type != 'Cash account' %}{{ journal.source_account_name }}@endif"
@@ -127,7 +127,7 @@
<a href="{{ route('accounts.show', [journal.destination_account_id]) }}">{{ journal.destination_account_name }}</a>
@endif
{% if journal.reconciled == false %}
- {# DESTINATION ACCOUNT NAME FOR TRANSFER AND DEPOSIT #}
+ {{-- DESTINATION ACCOUNT NAME FOR TRANSFER AND DEPOSIT --}}
{% if journal.transaction_type_type == 'Transfer' or journal.transaction_type_type == 'Deposit' %}
<select class="form-control input-sm" name="destination_id[{{ journal.transaction_journal_id }}]">
@@ -138,7 +138,7 @@
</select>
@endif
- {# DESTINATION ACCOUNT NAME FOR WITHDRAWAL #}
+ {{-- DESTINATION ACCOUNT NAME FOR WITHDRAWAL --}}
{% if journal.transaction_type_type == 'Withdrawal' %}
<input class="form-control input-sm" spellcheck="false"
placeholder="{% if journal.destination_type != 'Cash account' %}{{ journal.destination_account_name }}@endif"
@@ -147,12 +147,12 @@
@endif
@endif
</td>
- {# category #}
+ {{-- category --}}
<td class="position-relative">
- <input class="form-control input-sm" placeholder="{{ journal.category_name }}" autocomplete="off" spellcheck="false"
- name="category[{{ journal.transaction_journal_id }}]" type="text" value="{{ journal.category_name }}">
+ <input class="form-control input-sm" placeholder="{{ journal['category_name'] }}" autocomplete="off" spellcheck="false"
+ name="category[{{ journal.transaction_journal_id }}]" type="text" value="{{ journal['category_name'] }}">
</td>
- {# budget #}
+ {{-- budget --}}
<td>
{% if journal.transaction_type_type == 'Withdrawal' %}
<select class="form-control input-sm" name="budget_id[{{ journal.transaction_journal_id }}]">
diff --git a/resources/views/transactions/old-index.twig b/resources/views/transactions/old-index.twig
index fa1dfe2fd1..9863c4aeb2 100644
--- a/resources/views/transactions/old-index.twig
+++ b/resources/views/transactions/old-index.twig
@@ -6,7 +6,7 @@
@section('content')
- {# upper show-all instruction #}
+ {{-- upper show-all instruction --}}
@if(count($periods) > 0)
<div class="row">
<div class="col-lg-offset-10 col-lg-2 col-md-offset-10 col-md-2 col-sm-12 col-xs-12">
@@ -19,7 +19,7 @@
{% set boxSize = 'col-lg-4 col-md-6 col-sm-12 col-xs-12' %}
<div class="row">
- {# for withdrawals, deposits and transfers #}
+ {{-- for withdrawals, deposits and transfers --}}
<div class="{{ boxSize }}">
<div class="card">
<div class="card-header">
@@ -30,7 +30,7 @@
</div>
</div>
</div>
- {# only for withdrawals #}
+ {{-- only for withdrawals --}}
{% if objectType == 'withdrawal' %}
<div class="{{ boxSize }}">
<div class="card">
@@ -55,7 +55,7 @@
</div>
</div>
@endif
- {# for all #}
+ {{-- for all --}}
<div class="{{ boxSize }}">
<div class="card">
<div class="card-header">
@@ -69,7 +69,7 @@
</div>
@endif
- {# list with journals #}
+ {{-- list with journals --}}
<div class="row">
<div class="@if(count($periods) > 0)col-lg-10 col-md-10 col-sm-12@elsecol-lg-12 col-md-12 col-sm-12@endif">
<div class="card">
@@ -80,11 +80,11 @@
<div class="p-2">
<a href="{{ route('transactions.create', [objectType]) }}" class="btn btn-success"><span class="bi bi-plus-circle"></span> {{ 'create_new_transaction'|_ }}</a>
</div>
- {# actual list #}
+ {{-- actual list --}}
{% include 'list.groups' %}
</div>
<div class="card-footer">
- {# links for other views #}
+ {{-- links for other views --}}
@if(count($periods) > 0)
<p>
<span class="bi bi-calendar"></span>
@@ -100,7 +100,7 @@
</div>
</div>
- {# boxes with info #}
+ {{-- boxes with info --}}
@if(count($periods) > 0)
<div class="col-lg-2 col-md-2 col-sm-12 col-xs-12">
{% include 'list.periods' %}
@@ -109,7 +109,7 @@
</div>
- {# lower show-all instruction #}
+ {{-- lower show-all instruction --}}
@if(count($periods) > 0)
<div class="row">
<div class="col-lg-offset-10 col-lg-2 col-md-offset-10 col-md-2 col-sm-12 col-xs-12">
@@ -120,7 +120,7 @@
@endsection
@section('scripts')
- {# required for groups.twig #}
+ {{-- required for groups.twig --}}
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
<script type="text/javascript" nonce="{{ $JS_NONCE }}">
var showAll = @if(count($periods) > 0)false@elsetrue@endif;
diff --git a/resources/views/transactions/show.blade.php b/resources/views/transactions/show.blade.php
index 796e75dc89..7a695db62b 100644
--- a/resources/views/transactions/show.blade.php
+++ b/resources/views/transactions/show.blade.php
@@ -2,56 +2,57 @@
@section('content')
<div class="row">
<div class="col-lg-6">
- <div class="card">
+ <div class="card mb-2">
<div class="card-header">
- <h3 class="card-title">{{ __('firefly.transaction_journal_information') }}</h3>
- <div class="btn-group btn-group-sm pull-right">
- <button type="button" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown"
- aria-haspopup="true" aria-expanded="false">
- {{ 'actions'|_ }} <span class="caret"></span>
- </button>
- <ul class="dropdown-menu">
- {# edit + delete #}
- <li><a href="{{ route('transactions.edit', [$transactionGroup->id]) }}"><span
- class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>
- {% if groupArray.transactions[0].type != 'reconciliation' and groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'liability credit' %}
- <li><a href="{{ route('transactions.delete', [$transactionGroup->id]) }}"><span
- class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>
- @endif
- {% if groupArray.transactions[0].type != 'reconciliation' and groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'liability credit' %}
- <li role="separator" class="divider"></li>
-
- {# convert to different type #}
- {% if groupArray.transactions[0].type != 'withdrawal' %}
- <li>
- <a href="{{ route('transactions.convert.index', ['withdrawal', $transactionGroup->id]) }}"><span
- class="bi bi-arrow-left-right"></span> {{ 'convert_to_withdrawal'|_ }}</a></li>
- @endif
+ <div class="row">
+ <div class="col">
+ <h3 class="card-title">{{ __('firefly.transaction_journal_information') }}</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">{{ __('firefly.actions') }} <span class="caret"></span></button>
+ <ul class="dropdown-menu" aria-labelledby="card_header_menu">
+ {{-- edit + delete --}}
+ <li><a class="dropdown-item" href="{{ route('transactions.edit', [$transactionGroup->id]) }}"><span
+ class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>
+ @if($groupArray['transactions'][0]['type'] !== 'reconciliation' && $groupArray['transactions'][0]['type'] !== 'opening balance' && $groupArray['transactions'][0]['type'] !== 'liability credit')
+ <li><a class="dropdown-item" href="{{ route('transactions.delete', [$transactionGroup->id]) }}"><span
+ class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>
+ @endif
+ @if($groupArray['transactions'][0]['type'] !== 'reconciliation' && $groupArray['transactions'][0]['type'] !== 'opening balance' && $groupArray['transactions'][0]['type'] !== 'liability credit')
+ <li role="separator" class="divider"></li>
+
+ {{-- convert to different type --}}
+ @if($groupArray['transactions'][0]['type'] !== 'withdrawal')
+ <li>
+ <a class="dropdown-item" href="{{ route('transactions.convert.index', ['withdrawal', $transactionGroup->id]) }}"><span
+ class="bi bi-arrow-left-right"></span> {{ __('firefly.convert_to_withdrawal') }}</a></li>
+ @endif
- {% if groupArray.transactions[0].type != 'deposit' %}
- <li>
- <a href="{{ route('transactions.convert.index', ['deposit', $transactionGroup->id]) }}"><span
- class="bi bi-arrow-left-right"></span> {{ 'convert_to_deposit'|_ }}</a></li>
- @endif
+ @if($groupArray['transactions'][0]['type'] !== 'deposit')
+ <li>
+ <a class="dropdown-item" href="{{ route('transactions.convert.index', ['deposit', $transactionGroup->id]) }}"><span
+ class="bi bi-arrow-left-right"></span> {{ __('firefly.convert_to_deposit') }}</a></li>
+ @endif
- {% if groupArray.transactions[0].type != 'transfer' %}
- <li>
- <a href="{{ route('transactions.convert.index', ['transfer', $transactionGroup->id]) }}"><span
- class="bi bi-arrow-left-right"></span> {{ 'convert_to_transfer'|_ }}</a></li>
- @endif
+ @if($groupArray['transactions'][0]['type'] !== 'transfer')
+ <li>
+ <a class="dropdown-item" href="{{ route('transactions.convert.index', ['transfer', $transactionGroup->id]) }}"><span
+ class="bi bi-arrow-left-right"></span> {{ __('firefly.convert_to_transfer') }}</a></li>
+ @endif
- {# clone #}
- {% if groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'reconciliation' %}
- <li role="separator" class="divider"></li>
- <li><a href="#" class="clone-transaction" data-id="{{ transactionGroup.id }}"><span
- class="bi bi-copy"></span> {{ 'clone'|_ }}</a></li>
- <li><a href="#" class="clone-transaction-and-edit" data-id="{{ transactionGroup.id }}"><span
- class="bi bi-copy"></span> {{ 'clone_and_edit'|_ }}</a></li>
- @endif
- @endif
+ {{-- clone --}}
+ @if($groupArray['transactions'][0]['type'] !== 'opening balance' && $groupArray['transactions'][0]['type'] !== 'reconciliation')
+ <li role="separator" class="divider"></li>
+ <li><a class="dropdown-item" href="#" class="clone-transaction" data-id="{{ $transactionGroup->id }}"><span
+ class="bi bi-copy"></span> {{ __('firefly.clone') }}</a></li>
+ <li><a class="dropdown-item" href="#" class="clone-transaction-and-edit" data-id="{{ $transactionGroup->id }}"><span
+ class="bi bi-copy"></span> {{ __('firefly.clone_and_edit') }}</a></li>
+ @endif
+ @endif
- </ul>
+ </ul>
+ </div>
</div>
</div>
<div class="card-body p-0">
@@ -59,29 +60,29 @@
<tbody>
<tr>
<td class="forty">{{ trans('list.id') }}</td>
- <td>#{{ transactionGroup.id }}</td>
+ <td>#{{ $transactionGroup->id }}</td>
</tr>
<tr>
<td class="forty">{{ trans('list.type') }}</td>
- <td>{{ first.transaction_type_type|_ }}</td>
+ <td>{{ __($first['transaction_type_type']) }}</td>
</tr>
<tr>
<td>{{ trans('list.description') }}</td>
<td>
- {% if splits == 1 %}
- {{ first.description }}
+ @if(1 === $splits)
+ {{ $first['description'] }}
@else
- {{ transactionGroup.title }}
+ {{ $transactionGroup->title }}
@endif
</td>
</tr>
<tr>
<td class="thirty">{{ trans('list.date') }}</td>
<td>
- <span class="date-time" data-date="{{ first.date.toIso8601ZuluString() }}" title="{{ first.date.isoFormat(dateTimeFormat) }}{% if(first.date_tz != '') %} ({{ trans('firefly.stored_in_tz', {timezone: first.date_tz }) }}, {{ trans('firefly.displayed_in_tz', {timezone: config('app.timezone') }) }})@endif">
- {{ first.date.isoFormat(dateTimeFormat) }}
- {% if(first.date_tz != '') %}
- ({{ trans('firefly.stored_in_tz', {timezone: first.date_tz }) }})
+ <span class="date-time" data-date="{{ $first['date']->toIso8601ZuluString() }}" title="{{ $first['date']->isoFormat($dateTimeFormat) }}@if('' !== $first['date_tz']) ({{ trans('firefly.stored_in_tz', ['timezone' => $first['date_tz']]) }}, {{ trans('firefly.displayed_in_tz', ['timezone' => config('app.timezone')]) }})@endif">
+ {{ $first['date']->isoFormat($dateTimeFormat) }}
+ @if('' !== $first['date_tz'])
+ ({{ trans('firefly.stored_in_tz', ['timezone' => $first['date_tz']]) }})
@endif
</span>
</td>
@@ -90,11 +91,11 @@
</table>
</div>
</div>
- {% if groupLogEntries|length > 0 %}
- <div class="card">
+ @if(count($groupLogEntries) > 0)
+ <div class="card mb-2">
<div class="card-header">
<h3 class="card-title">
- {{ 'audit_log_entries'|_ }}
+ {{ __('firefly.audit_log_entries') }}
</h3>
</div>
<div class="card-body p-0">
@@ -105,73 +106,65 @@
</div>
<div class="col-lg-6">
- <div class="card">
+ <div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.transaction_journal_meta') }}</h3>
</div>
<div class="card-body p-0">
<table class="table table-hover">
<tbody>
- {% if first.transaction_type_type != 'Withdrawal' or splits == 1 %}
+ @if($first['transaction_type_type'] !== 'Withdrawal' || $splits === 1)
<tr>
<td class="forty">
- {{ trans_choice('firefly.source_accounts', accounts['source']|length ) }}
+ {{ trans_choice('firefly.source_accounts', count($accounts['source'])) }}
</td>
<td>
- {% for account in accounts['source'] %}
- {% if 'Cash account' == account.type %}
- <span class="text-success">({{ 'cash'|_ }})</span>
+ @foreach($accounts['source'] as $account)
+ @if('Cash account' === $account['type'])
+ <span class="text-success">({{ __('firefly.cash') }})</span>
@else
- <a href="{{ route('accounts.show',account.id) }}"
- title="{{ account.iban|default(account.name) }}">
- {{ account.name }}
- </a>
- @endif
- {% if loop.index0 != accounts['source']|length -1 %}, @endif
+ <a href="{{ route('accounts.show',$account['id']) }}"
+ title="{{ $account['iban'] ?? $account['name'] }}">
+ {{ $account['name'] }}
+ </a>&ZeroWidthSpace;@endif&ZeroWidthSpace;@if($loop->index !==count($accounts['source'])-1),@endif
@endforeach
</td>
</tr>
@endif
-
- {% if first.transaction_type_type != 'Deposit' or splits == 1 %}
+ @if('Deposit' === $first['transaction_type_type'] || 1 === $splits)
<tr>
<td>
- {{ trans_choice('firefly.destination_accounts', accounts['destination']|length ) }}
+ {{ trans_choice('firefly.destination_accounts', count($accounts['destination'] )) }}
</td>
<td>
- {% for account in accounts['destination'] %}
- {% if 'Cash account' == account.type %}
- <span class="text-success">({{ 'cash'|_ }})</span>
+ @foreach($accounts['destination'] as $account)
+ @if('Cash account' === $account['type'])
+ <span class="text-success">({{ __('firefly.cash') }})</span>
@else
- <a href="{{ route('accounts.show',account.id) }}"
- title="{{ account.iban|default(account.name) }}">
- {{ account.name }}
- </a>
- @endif
- {% if loop.index0 != accounts['destination']|length -1 %}, @endif
+ <a href="{{ route('accounts.show',$account['id']) }}" title="{{ $account['iban'] ?? $account['name'] }}">{{ $account['name'] }}</a>&ZeroWidthSpace;@endif&ZeroWidthSpace;@if($loop->index !==count($accounts['source'])-1),@endif
@endforeach
</td>
</tr>
@endif
<tr>
- <td class="thirty">{{ 'total_amount'|_ }}</td>
+ <td class="thirty">{{ __('firefly.total_amount') }}</td>
<td>
- {% for amount in amounts %}
- {% if first.transaction_type_type == 'Withdrawal' %}
- {% if amount.approximate %}~ @endif{{ format_amount_by_symbol(amount.amount,amount.symbol, amount.decimal_places) }}{% if loop.index0 != amounts|length -1 %}, @endif
- {% elseif first.transaction_type_type == 'Deposit' %}
- {% if amount.approximate %}~ @endif{{ format_amount_by_symbol(amount.amount*-1,amount.symbol, amount.decimal_places) }}{% if loop.index0 != amounts|length -1 %}, @endif
- {% elseif first.transaction_type_type == 'Transfer' %}
+ @foreach($amounts as $amount)
+ @if($first['transaction_type_type'] === 'Withdrawal')
+ @if($amount['approximate'])~ @endif{!! format_amount_by_symbol($amount['amount'],$amount['symbol'], $amount['decimal_places']) !!}@if($loop->index !== count($amounts)-1), @endif
+ @elseif($first['transaction_type_type'] === 'Deposit')
+ @if($amount['approximate'])~ @endif{!! format_amount_by_symbol($amount['amount']*-1,$amount['symbol'], $amount['decimal_places']) !!}@if($loop->index !== count($amounts)-1), @endif
+ @elseif($first['transaction_type_type'] === 'Transfer')
<span class="text-info money-transfer">
- {% if amount.approximate %}~ @endif{{ format_amount_by_symbol(amount.amount*-1, amount.symbol, amount.decimal_places, false) }}{% if loop.index0 != amounts|length -1 %}, @endif
+ @if($amount['approximate'])~ @endif{!! format_amount_by_symbol($amount['amount']*-1, $amount['symbol'], $amount['decimal_places'], false) !!}@if($loop->index !== count($amounts)-1), @endif
</span>
- {% elseif first.transaction_type_type == 'Opening balance' %}
- {# Opening balance stored amount is always negative: find out which way the money goes #}
- {% if groupArray.transactions[0].source_account_type == 'Initial balance account' %}
- {{ format_amount_by_symbol(amount.amount*-1,amount.symbol, amount.decimal_places) }}
+ @elseif($first['transaction_type_type'] === 'Opening balance')
+ {{-- Opening balance stored amount is always negative: find out which way the money goes --}}
+ @if($groupArray['transactions'][0]['source_account_type'] === 'Initial balance account')
+ {!! format_amount_by_symbol($amount['amount']*-1,$amount['symbol'], $amount['decimal_places']) !!}
@else
- {{ format_amount_by_symbol(amount.amount,amount.symbol, amount.decimal_places) }}
+ {!! format_amount_by_symbol($amount['amount'],$amount['symbol'], $amount['decimal_places']) !!}
@endif
@endif
@endforeach
@@ -186,260 +179,263 @@
<div class="row">
</div>
- {% if splits > 1 %}
+ @if($splits > 1)
<div class="row">
<div class="col-lg-12">
- <h3>{{ 'splits'|_ }}</h3>
+ <h3>{{ __('firefly.splits') }}</h3>
</div>
</div>
@endif
- {% set boxSize=6 %}
- {% if(splits == 2) %}
- {% set boxSize=6 %}
- @endif
- {% if (splits > 2) %}
- {% set boxSize = 4 %}
+ @php
+ $boxSize = 6;
+ @endphp
+ @if($splits > 2)
+ @php
+ $boxSize = 4;
+ @endphp
@endif
<div class="row">
- {% for index, journal in selectedGroup.transactions %}
- <div class="col-lg-{{ boxSize }}">
- <div class="card">
+ @foreach($selectedGroup['transactions'] as $index => $journal)
+ <div class="col-lg-{{ $boxSize }}">
+ <div class="card mb-2">
<div class="card-header">
- <h3 class="card-title">
- {{ journal.description }}
- {% if journal.reconciled %}
- <span class="bi bi-check"></span>
- @endif
- {% if splits > 1 %}
- <small>
- {{ index+1 }} / {{ splits }}
- </small>
- @endif
- </h3>
-
-
- <div class="btn-group btn-group-sm pull-right">
- <button type="button" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown"
- aria-haspopup="true" aria-expanded="false">
- {{ 'actions'|_ }} <span class="caret"></span>
- </button>
- <ul class="dropdown-menu">
- {# edit + delete #}
- <li><a href="{{ route('transactions.edit', [$transactionGroup->id]) }}"><span
- class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>
- {% if groupArray.transactions[0].type != 'reconciliation' and groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'liability credit' %}
- <li><a href="{{ route('transactions.delete', [$transactionGroup->id]) }}"><span
- class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>
- @endif
- {% if journal.reconciled %}
- <li><a class="reconcile-button" href="{{ route('transactions.unreconcile', [journal.transaction_journal_id]) }}"><span
- class="fa fa-history"></span> {{ 'unreconcile'|_ }}</a></li>
- @endif
- {% if groupArray.transactions[0].type != 'reconciliation' and groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'liability credit' %}
- <li role="separator" class="divider"></li>
-
- {# convert to different type #}
- {% if groupArray.transactions[0].type != 'withdrawal' %}
- <li>
- <a href="{{ route('transactions.convert.index', ['withdrawal', $transactionGroup->id]) }}"><span
- class="bi bi-arrow-left-right"></span> {{ 'convert_to_withdrawal'|_ }}</a>
- </li>
- @endif
+ <div class="row">
+ <div class="col">
+ <h3 class="card-title">
+ {{ $journal['description'] }}
+ @if($journal['reconciled'])
+ <span class="bi bi-check"></span>
+ @endif
+ @if($splits > 1)
+ <small>
+ {{ $loop->index+1 }} / {{ $splits }}
+ </small>
+ @endif
+ </h3>
+ </div>
+ <div class="col text-end">
+ <button class="btn btn-sm btn-secondary-outline dropdown-toggle" type="button" id="menu_journal_{{ $journal['transaction_journal_id'] }}" data-bs-toggle="dropdown" aria-expanded="false">{{ __('firefly.actions') }} <span class="caret"></span></button>
+ <ul class="dropdown-menu" aria-labelledby="menu_journal_{{ $journal['transaction_journal_id'] }}">
+ {{-- edit + delete --}}
+ <li><a class="dropdown-item" href="{{ route('transactions.edit', [$transactionGroup->id]) }}"><span
+ class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>
+ @if($groupArray['transactions'][0]['type'] !== 'reconciliation' && $groupArray['transactions'][0]['type'] !== 'opening balance' && $groupArray['transactions'][0]['type'] !== 'liability credit')
+ <li><a class="dropdown-item" href="{{ route('transactions.delete', [$transactionGroup->id]) }}"><span
+ class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>
+ @endif
+ @if($journal['reconciled'])
+ <li><a class="dropdown-item" class="reconcile-button" href="{{ route('transactions.unreconcile', [$journal['transaction_journal_id']]) }}"><span
+ class="fa fa-history"></span> {{ __('firefly.unreconcile') }}</a></li>
+ @endif
+ @if($groupArray['transactions'][0]['type'] !== 'reconciliation' && $groupArray['transactions'][0]['type'] !== 'opening balance' && $groupArray['transactions'][0]['type'] !== 'liability credit')
+ <li role="separator" class="divider"></li>
+
+ {{-- convert to different type --}}
+ @if($groupArray['transactions'][0]['type'] !== 'withdrawal')
+ <li>
+ <a class="dropdown-item" href="{{ route('transactions.convert.index', ['withdrawal', $transactionGroup->id]) }}"><span
+ class="bi bi-arrow-left-right"></span> {{ __('firefly.convert_to_withdrawal') }}</a>
+ </li>
+ @endif
- {% if groupArray.transactions[0].type != 'deposit' %}
- <li>
- <a href="{{ route('transactions.convert.index', ['deposit', $transactionGroup->id]) }}"><span
- class="bi bi-arrow-left-right"></span> {{ 'convert_to_deposit'|_ }}</a></li>
- @endif
+ @if($groupArray['transactions'][0]['type'] !== 'deposit')
+ <li>
+ <a class="dropdown-item" href="{{ route('transactions.convert.index', ['deposit', $transactionGroup->id]) }}"><span
+ class="bi bi-arrow-left-right"></span> {{ __('firefly.convert_to_deposit') }}</a></li>
+ @endif
- {% if groupArray.transactions[0].type != 'transfer' %}
- <li>
- <a href="{{ route('transactions.convert.index', ['transfer', $transactionGroup->id]) }}"><span
- class="bi bi-arrow-left-right"></span> {{ 'convert_to_transfer'|_ }}</a>
- </li>
- @endif
+ @if($groupArray['transactions'][0]['type'] !== 'transfer')
+ <li>
+ <a class="dropdown-item" href="{{ route('transactions.convert.index', ['transfer', $transactionGroup->id]) }}"><span
+ class="bi bi-arrow-left-right"></span> {{ __('firefly.convert_to_transfer') }}</a>
+ </li>
+ @endif
- {# clone #}
- {% if groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'reconciliation' %}
- <li role="separator" class="divider"></li>
- <li><a href="#" data-id="{{ transactionGroup.id }}" class="clone-transaction"><span
- class="bi bi-copy"></span> {{ 'clone'|_ }}</a></li>
- <li><a href="#" data-id="{{ transactionGroup.id }}" class="clone-transaction-and-edit"><span
- class="bi bi-copy"></span> {{ 'clone_and_edit'|_ }}</a></li>
- @endif
+ {{-- clone --}}
+ @if($groupArray['transactions'][0]['type'] !== 'opening balance' && $groupArray['transactions'][0]['type'] !== 'reconciliation')
+ <li role="separator" class="divider"></li>
+ <li><a class="dropdown-item" href="#" data-id="{{ $transactionGroup->id }}" class="clone-transaction"><span
+ class="bi bi-copy"></span> {{ __('firefly.clone') }}</a></li>
+ <li><a class="dropdown-item" href="#" data-id="{{ $transactionGroup->id }}" class="clone-transaction-and-edit"><span
+ class="bi bi-copy"></span> {{ __('firefly.clone_and_edit') }}</a></li>
+ @endif
- <li><a href="#" class="link-modal"
- data-journal="{{ journal.transaction_journal_id }}"><span
- class="fa fa-link"></span>{{ 'link_transaction'|_ }}</a></li>
- <li role="separator" class="divider"></li>
- <li>
- <a href="{{ route('rules.create-from-journal', [journal.transaction_journal_id]) }}"><span
- class="fa fa-random"></span>{{ 'create_rule_from_transaction'|_ }}
- </a></li>
- <li>
- <a href="{{ route('recurring.create-from-journal', [journal.transaction_journal_id]) }}"><span
- class="fa fa-paint-brush"></span>{{ 'create_recurring_from_transaction'|_ }}
- </a></li>
- @endif
- </ul>
+ <li><a class="dropdown-item" href="#" class="link-modal"
+ data-journal="{{ $journal['transaction_journal_id'] }}"><span
+ class="fa fa-link"></span>{{ __('firefly.link_transaction') }}</a></li>
+ <li role="separator" class="divider"></li>
+ <li>
+ <a class="dropdown-item" href="{{ route('rules.create-from-journal', [$journal['transaction_journal_id']]) }}"><span
+ class="fa fa-random"></span>{{ __('firefly.create_rule_from_transaction') }}
+ </a></li>
+ <li>
+ <a class="dropdown-item" href="{{ route('recurring.create-from-journal', [$journal['transaction_journal_id']]) }}"><span
+ class="fa fa-paint-brush"></span>{{ __('firefly.create_recurring_from_transaction') }}
+ </a></li>
+ @endif
+ </ul>
+ </div>
</div>
</div>
<div class="card-body p-0">
<table class="table">
<tr>
<td colspan="2">
- {% if 'Cash account' == journal.source_account_type %}
- <span class="text-success">({{ 'cash'|_ }})</span>
+ @if('Cash account' === $journal['source_account_type'])
+ <span class="text-success">({{ __('firefly.cash') }})</span>
@else
- <a href="{{ route('accounts.show', journal.source_account_id) }}"
- title="{{ journal.source_iban|default(journal.source_account_name) }}">{{ journal.source_account_name }}</a> &rarr;
+ <a href="{{ route('accounts.show', $journal['source_account_id']) }}"
+ title="{{ $journal['source_iban'] ?? $journal['source_account_name'] }}">{{ $journal['source_account_name'] }}</a> &rarr;
@endif
- {% if first.transaction_type_type == 'Withdrawal' %}
- {{ format_amount_by_symbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places) }}
- {% elseif first.transaction_type_type == 'Deposit' %}
- {{ format_amount_by_symbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places) }}
- {% elseif first.transaction_type_type == 'Transfer' or first.transaction_type_type == 'Opening balance' %}
+ @if($first['transaction_type_type'] === 'Withdrawal')
+ {!! format_amount_by_symbol($journal['amount'], $journal['currency_symbol'], $journal['currency_decimal_places']) !!}
+ @elseif($first['transaction_type_type'] === 'Deposit')
+ {!! format_amount_by_symbol($journal['amount']*-1, $journal['currency_symbol'], $journal['currency_decimal_places']) !!}
+ @elseif($first['transaction_type_type'] === 'Transfer' or $first['transaction_type_type'] === 'Opening balance')
<span class="text-info money-transfer">
- {{ format_amount_by_symbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}
+ {!! format_amount_by_symbol($journal['amount']*-1, $journal['currency_symbol'], $journal['currency_decimal_places'], false) !!}
</span>
- {% elseif first.transaction_type_type == 'Liability credit' %}
+ @elseif($first['transaction_type_type'] === 'Liability credit')
<span class="text-info money-transfer">
- {{ format_amount_by_symbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}
+ {!! format_amount_by_symbol($journal['amount']*-1, $journal['currency_symbol'], $journal['currency_decimal_places'], false) !!}
</span>
@endif
<!-- do primary currency amount, if foreign amount is not the same. -->
- {% if null != journal.pc_amount and primaryCurrency.id != journal.currency_id and primaryCurrency.id != journal.foreign_currency_id %}
- {% if first.transaction_type_type == 'Withdrawal' %}
- (~ {{ format_amount_by_symbol(journal.pc_amount, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
- {% elseif first.transaction_type_type == 'Deposit' %}
- (~ {{ format_amount_by_symbol(journal.pc_amount*-1, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
- {% elseif first.transaction_type_type == 'Transfer' %}
+ @if(null !== $journal['pc_amount'] && $primaryCurrency->id !== $journal['currency_id'] && $primaryCurrency->id !== $journal['foreign_currency_id'])
+ @if($first['transaction_type_type'] === 'Withdrawal')
+ (~ {!! format_amount_by_symbol($journal['pc_amount'], $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
+ @elseif($first['transaction_type_type'] === 'Deposit')
+ (~ {!! format_amount_by_symbol($journal['pc_amount']*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
+ @elseif($first['transaction_type_type'] === 'Transfer')
<span class="text-info money-transfer">
- (~ {{ format_amount_by_symbol(journal.pc_amount*-1, primaryCurrency.symbol, primaryCurrency.decimal_places, false) }})
+ (~ {!! format_amount_by_symbol($journal['pc_amount']*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places, false) !!})
</span>
@endif
@endif
<!-- do foreign amount -->
- {% if null != journal.foreign_amount %}
- {% if first.transaction_type_type == 'Withdrawal' %}
- ({{ format_amount_by_symbol(journal.foreign_amount, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }})
- {% elseif first.transaction_type_type == 'Deposit' %}
- ({{ format_amount_by_symbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }})
- {% elseif first.transaction_type_type == 'Transfer' %}
+ @if(null !== $journal['foreign_amount'])
+ @if($first['transaction_type_type'] === 'Withdrawal')
+ ({!! format_amount_by_symbol($journal['foreign_amount'], $journal['foreign_currency_symbol'], $journal['foreign_currency_decimal_places']) !!})
+ @elseif($first['transaction_type_type'] === 'Deposit')
+ ({!! format_amount_by_symbol($journal['foreign_amount']*-1, $journal['foreign_currency_symbol'], $journal['foreign_currency_decimal_places']) !!})
+ @elseif($first['transaction_type_type'] === 'Transfer')
<span class="text-info money-transfer">
- ({{ format_amount_by_symbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
+ ({!! format_amount_by_symbol($journal['foreign_amount']*-1, $journal['foreign_currency_symbol'], $journal['foreign_currency_decimal_places'], false) !!})
</span>
@endif
@endif
<!-- do foreign PC amount -->
- {% if null != journal.pc_foreign_amount %}
- {% if first.transaction_type_type == 'Withdrawal' %}
- ({{ format_amount_by_symbol(journal.pc_foreign_amount, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
- {% elseif first.transaction_type_type == 'Deposit' %}
- ({{ format_amount_by_symbol(journal.pc_foreign_amount*-1, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
- {% elseif first.transaction_type_type == 'Transfer' %}
+ @if(null !== $journal['pc_foreign_amount'])
+ @if($first['transaction_type_type'] === 'Withdrawal')
+ ({!! format_amount_by_symbol($journal['pc_foreign_amount'], $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
+ @elseif($first['transaction_type_type'] === 'Deposit')
+ ({!! format_amount_by_symbol($journal['pc_foreign_amount']*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
+ @elseif($first['transaction_type_type'] === 'Transfer')
<span class="text-info money-transfer">
- ({{ format_amount_by_symbol(journal.pc_foreign_amount*-1, primaryCurrency.symbol, primaryCurrency.decimal_places, false) }})
+ ({!! format_amount_by_symbol($journal['pc_foreign_amount']*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places, false) !!})
</span>
@endif
@endif
&rarr;
- {% if 'Cash account' == journal.destination_account_type %}
- <span class="text-success">({{ 'cash'|_ }})</span>
+ @if('Cash account' === $journal['destination_account_type'])
+ <span class="text-success">({{ __('firefly.cash') }})</span>
@else
- <a href="{{ route('accounts.show', journal.destination_account_id) }}"
- title="{{ journal.destination_iban|default(journal.destination_account_name) }}">{{ journal.destination_account_name }}</a>
+ <a href="{{ route('accounts.show', $journal['destination_account_id']) }}"
+ title="{{ $journal['destination_iban'] ?? $journal['destination_account_name'] }}">{{ $journal['destination_account_name'] }}</a>
@endif
</td>
</tr>
<tr>
- <td>{{ 'transaction_journal_id'|_ }}</td>
- <td>#{{ journal.transaction_journal_id }}</td>
+ <td>{{ __('firefly.transaction_journal_id') }}</td>
+ <td>#{{ $journal['transaction_journal_id'] }}</td>
</tr>
- {% if null != journal.category_id %}
+ @if(null !== $journal['category_id'])
<tr>
- <td class="thirty">{{ 'category'|_ }}</td>
+ <td class="thirty">{{ __('firefly.category') }}</td>
<td>
- <a href="{{ route('categories.show', [journal.category_id]) }}">{{ journal.category_name }}</a>
+ <a href="{{ route('categories.show', [$journal['category_id']]) }}">{{ $journal['category_name'] }}</a>
</td>
</tr>
@endif
- {% if null != journal.budget_id and first.transaction_type_type == 'Withdrawal' %}
+ @if(null !== $journal['budget_id'] && $first['transaction_type_type'] === 'Withdrawal')
<tr>
- <td class="forty">{{ 'budget'|_ }}</td>
+ <td class="forty">{{ __('firefly.budget') }}</td>
<td>
- <a href="{{ route('budgets.show', [journal.budget_id]) }}">{{ journal.budget_name }}</a>
+ <a href="{{ route('budgets.show', [$journal['budget_id']]) }}">{{ $journal['budget_name'] }}</a>
</td>
</tr>
@endif
- {% if null != journal.bill_id and first.transaction_type_type == 'Withdrawal' %}
+ @if(null !== $journal['bill_id'] && $first['transaction_type_type'] === 'Withdrawal')
<tr>
- <td class="forty">{{ 'bill'|_ }}</td>
+ <td class="forty">{{ __('firefly.bill') }}</td>
<td>
- <a href="{{ route('subscriptions.show', [journal.bill_id]) }}">{{ journal.bill_name }}</a>
+ <a href="{{ route('subscriptions.show', [$journal['bill_id']]) }}">{{ $journal['bill_name'] }}</a>
</td>
</tr>
@endif
<!-- other fields -->
- {% for dateField in ['interest_date','book_date','process_date','due_date','payment_date','invoice_date'] %}
- {% if journalHasMeta(journal.transaction_journal_id, dateField) %}
+ @foreach(['interest_date','book_date','process_date','due_date','payment_date','invoice_date'] as $dateField)
+ @if(journal_has_meta($journal['transaction_journal_id'], $dateField))
<tr>
- <td class="forty">{{ trans('list.'~dateField) }}</td>
- <td>{{ journalGetMetaDate(journal.transaction_journal_id, dateField).isoFormat($monthAndDayFormat) }}</td>
+ <td class="forty">{{ trans('list.' . $dateField) }}</td>
+ <td>{{ journal_get_meta_date($journal['transaction_journal_id'], $dateField)->isoFormat($monthAndDayFormat) }}</td>
</tr>
@endif
@endforeach
- {% for metaField in ['external_id','bunq_payment_id','internal_reference','sepa_batch_id','sepa_ct_id','sepa_ct_op','sepa_db','sepa_country','sepa_cc','sepa_ep','sepa_ci','external_url'] %}
- {% if journalHasMeta(journal.transaction_journal_id, metaField) %}
+ @foreach(['external_id','bunq_payment_id','internal_reference','sepa_batch_id','sepa_ct_id','sepa_ct_op','sepa_db','sepa_country','sepa_cc','sepa_ep','sepa_ci','external_url'] as $metaField)
+ @if(journal_has_meta($journal['transaction_journal_id'], $metaField))
<tr>
- <td>{{ trans('list.'~metaField) }}</td>
+ <td>{{ trans('list.' . $metaField) }}</td>
<td class="forty">
- {% if 'external_url' == metaField %}
- {% set url = journalGetMetaField(journal.transaction_journal_id, metaField) %}
- <a href="{{ url }}" rel="noopener noreferrer nofollow" target="_blank">
- {% if url|length > 60 %}
- {{ url|slice(0, 60) ~ '...' }}
+ @if('external_url' === $metaField)
+ <a href="{{ journal_get_meta_field($journal['transaction_journal_id'], $metaField) }}" rel="noopener noreferrer nofollow" target="_blank">
+ @if(strlen(journal_get_meta_field($journal['transaction_journal_id'], $metaField)) > 60)
+ {{ substr(journal_get_meta_field($journal['transaction_journal_id'], $metaField),0,60) }}...
@else
- {{ url }}
+ {{ journal_get_meta_field($journal['transaction_journal_id'], $metaField) }}
@endif
</a>
@endif
- {% if 'external_url' != metaField %}
- {{ journalGetMetaField(journal.transaction_journal_id, metaField) }}
+ @if('external_url' !== $metaField)
+ {{ journal_get_meta_field($journal['transaction_journal_id'], $metaField) }}
@endif
</td>
</tr>
@endif
@endforeach
- {% if null != journal.notes and '' != journal.notes %}
+ @if('' !== (string)$journal['notes'])
<tr>
<td class="forty">{{ trans('list.notes') }}</td>
- <td class="markdown">{{ journal.notes|default('')|markdown }}</td>
+ <td class="markdown">{!! parse_markdown($journal['notes'] ?? '') !!}</td>
</tr>
@endif
- {% if journalHasMeta(journal.transaction_journal_id, 'recurring_total') and journalHasMeta(journal.transaction_journal_id, 'recurring_count') %}
- {% set recurringTotal = journalGetMetaField(journal.transaction_journal_id, 'recurring_total') %}
- {% if 0 == recurringTotal %}
- {% set recurringTotal = '∞' %}
+ @if(journal_has_meta($journal['transaction_journal_id'], 'recurring_total') && journal_has_meta($journal['transaction_journal_id'], 'recurring_count'))
+ @php
+ $recurringTotal = journal_get_meta_field($journal['transaction_journal_id'], 'recurring_total')
+ @endphp
+ @if(0 === $recurringTotal)
+ @php
+ $recurringTotal = '∞'
+ @endphp
@endif
<tr>
<td class="forty">{{ trans('list.recurring_transaction') }}</td>
- <td>{{ trans('firefly.recurring_info', {total: recurringTotal, count: journalGetMetaField(journal.transaction_journal_id, 'recurring_count') }) }}</td>
+ <td>{{ trans('firefly.recurring_info', ['total' => $recurringTotal, 'count' => journal_get_meta_field($journal['transaction_journal_id'], 'recurring_count')]) }}</td>
</tr>
@endif
- {% if journal.tags|length > 0 %}
+ @if(count($journal['tags']) > 0)
<tr>
- <td class="forty">{{ 'tags'|_ }}</td>
+ <td class="forty">{{ __('firefly.tags') }}</td>
<td>
- {% for tag in journal.tags %}
- {% if null != tag.id and '' != tag.id %}
- <h4 class="inline"><a class="badge text-bg-success" href="{{ route('tags.show', [tag.id]) }}"><span class="bi bi-tag"></span>{{ tag.tag }}</a></h4>
+ @foreach($journal['tags'] as $tag)
+ @if(null !== $tag['id'] && '' !== $tag['id'])
+ <h4 class="inline"><a class="badge text-bg-success" href="{{ route('tags.show', [$tag['id']]) }}"><span class="bi bi-tag"></span>{{ $tag['tag'] }}</a></h4>
@endif
@endforeach
</td>
@@ -450,103 +446,102 @@
</div>
<!-- Transaction links -->
- {% if links[journal.transaction_journal_id]|length > 0 %}
- <div class="card">
+ @if(array_key_exists($journal['transaction_journal_id'], $links) && count($links[$journal['transaction_journal_id']]) > 0)
+ <div class="card mb-2">
<div class="card-header">
<h3 class="card-title">
- {{ 'journal_links'|_ }}
+ {{ __('firefly.journal_links') }}
</h3>
</div>
<div class="card-body p-0">
<table class="table">
- {% for link in links[journal.transaction_journal_id] %}
+ @foreach($links[$journal['transaction_journal_id']] as $link)
<tr>
<td class="onetwenty">
<div class="btn-group btn-group-sm">
- <a href="#" class="btn btn-outline-secondary switch-link" data-id="{{ link.id }}"><span
+ <a href="#" class="btn btn-outline-secondary switch-link" data-id="{{ $link['id'] }}"><span
class="fa fa-arrows-h"></span></a>
- <a href="{{ route('transactions.link.delete', [link.id]) }}"
+ <a href="{{ route('transactions.link.delete', [$link['id']]) }}"
class="btn btn-danger"><span class="bi bi-trash"></span></a>
</div>
</td>
<td>
- {% if link.editable %}
- {{ link.link }}
+ @if($link['editable'])
+ {{ $link['link'] }}
@else
- {{ trans('firefly.'~link.link) }}
+ {{ trans('firefly.' . $link['link']) }}
@endif
- "<a href="{{ route('transactions.show', link.group) }}"
- title="{{ link.description }}">{{ link.description }}</a>"
+ "<a href="{{ route('transactions.show', $link['group']) }}"
+ title="{{ $link['description'] }}">{{ $link['description'] }}</a>"
- ({{ link.amount|raw }})
- {% if '' != link.foreign_amount %}
- ({{ link.foreign_amount|raw }})
+ ({{ $link['amount'] }})
+ @if('' !== $link['foreign_amount'])
+ ({{ $link['foreign_amount'] }})
@endif
- {% if link.notes != "" %}
- ({{ link.notes }})
+ @if($link['notes'] !== "")
+ ({{ $link['notes'] }})
@endif
</td>
</tr>
@endforeach
-
</table>
</div>
</div>
@endif
<!-- Attachments -->
- {% if attachments[journal.transaction_journal_id]|length > 0 %}
- <div class="card">
+ @if(array_key_exists($journal['transaction_journal_id'], $attachments) && count($attachments[$journal['transaction_journal_id']]) > 0)
+ <div class="card mb-2">
<div class="card-header">
- <h3 class="card-title">{{ 'attachments'|_ }}</h3>
+ <h3 class="card-title">{{ __('firefly.attachments') }}</h3>
</div>
<div class="card-body p-0">
- {% include 'list.attachments' with {attachments: attachments[journal.transaction_journal_id]} %}
+ {% include 'list.attachments' with {attachments: attachments[$journal['transaction_journal_id']]} %}
</div>
</div>
@endif
<!-- Piggy bank events -->
- {% if events[journal.transaction_journal_id]|length > 0 %}
- <div class="card">
+ @if(array_key_exists($journal['transaction_journal_id'], $events) && count($events[$journal['transaction_journal_id']]) > 0)
+ <div class="card mb-2">
<div class="card-header">
- <h3 class="card-title">{{ 'piggy_events'|_ }}</h3>
+ <h3 class="card-title">{{ __('firefly.piggy_events') }}</h3>
</div>
<div class="card-body p-0">
<table class="table table-hover">
- {% for event in events[journal.transaction_journal_id] %}
+ @foreach($events[$journal['transaction_journal_id']] as $event)
<tr>
- <td class="thirty">{{ event.amount|raw }}</td>
+ <td class="thirty">{{ $event['amount'] }}</td>
<td>
- <a href="{{ route('piggy-banks.show', [event.piggy_id]) }}">{{ event.piggy }}</a>
+ <a href="{{ route('piggy-banks.show', [$event['piggy_id']]) }}">{{ $event['piggy'] }}</a>
</td>
-
</tr>
@endforeach
</table>
</div>
</div>
@endif
- {% if logEntries[journal.transaction_journal_id]|length > 0 %}
- <div class="card">
+ @if(count($logEntries[$journal['transaction_journal_id']]) > 0)
+ <div class="card mb-2">
<div class="card-header">
<h3 class="card-title">
- {{ 'audit_log_entries'|_ }}
+ {{ __('firefly.audit_log_entries') }}
</h3>
</div>
<div class="card-body p-0">
- {% include 'list.ale' with {logEntries: logEntries[journal.transaction_journal_id]} %}
+ {% include 'list.ale' with {logEntries: logEntries[$journal['transaction_journal_id']]} %}
</div>
</div>
@endif
</div>
@endforeach
</div>
- {# modal for linking journals. Will be filled by AJAX #}
+ {{-- modal for linking journals. Will be filled by AJAX --}}
<div class="modal fade" tabindex="-1" role="dialog" id="linkJournalModal">
</div>
@endsection
@section('scripts')
+ @vite(['js/pages/transactions/show.js'])
<script type="text/javascript" nonce="{{ $JS_NONCE }}">
var modalDialogURL = '{{ route('transactions.link.modal', ['%JOURNAL%']) }}';
var acURL = '{{ route('api.v1.autocomplete.transactions-with-id') }}';
diff --git a/resources/views/vendor/passport/authorize.twig b/resources/views/vendor/passport/authorize.twig
index d2339a370d..7c740de5f3 100644
--- a/resources/views/vendor/passport/authorize.twig
+++ b/resources/views/vendor/passport/authorize.twig
@@ -8,18 +8,18 @@
<title>Firefly III v{{ config('firefly.version') }} - {{ 'authorization'|_ }}</title>
- {# CSS things #}
- {# libraries #}
+ {{-- CSS things --}}
+ {{-- libraries --}}
<link href="v1/lib/bs/css/bootstrap.min.css?v={{ $FF_BUILD_TIME }}" rel="stylesheet" type="text/css"
nonce="{{ $JS_NONCE }}">
<link href="v1/lib/fa/css/font-awesome.min.css?v={{ $FF_BUILD_TIME }}" rel="stylesheet" type="text/css"
nonce="{{ $JS_NONCE }}">
- {# the theme #}
+ {{-- the theme --}}
<link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ $FF_BUILD_TIME }}" rel="stylesheet" type="text/css"
nonce="{{ $JS_NONCE }}">
- {# Firefly III customisations #}
+ {{-- Firefly III customisations --}}
<link href="v1/css/firefly.css?v={{ $FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ $JS_NONCE }}">
<style>