Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Add URL to link.
James Cole7bab432848bb
diff --git a/resources/views/accounts/reconcile/transactions.blade.php b/resources/views/accounts/reconcile/transactions.blade.phpindex 8ed393dc9a..3d5c23d4a5 100644--- a/resources/views/accounts/reconcile/transactions.blade.php+++ b/resources/views/accounts/reconcile/transactions.blade.php@@ -65,9 +65,9 @@<tr data-date="{{ $journal['date']->format('Y-m-d') }}" data-id="{{ $journal['transaction_journal_id'] }}"><td class="hidden-xs"><div class="btn-group btn-group-sm">- <a href="{{ route('transactions.edit', [$journal['transaction_group_id']]) }}" class="btn btn-sm btn-outline-secondary"><span+ <a href="{{ route('transactions.edit', [$journal['transaction_group_id']]) }}?_from={{ urlencode($FF3_FROM) }}" class="btn btn-sm btn-outline-secondary"><spanclass="bi bi-pencil"></span></a>- <a href="{{ route('transactions.delete', [$journal['transaction_group_id']]) }}" class="btn btn-danger"><span+ <a href="{{ route('transactions.delete', [$journal['transaction_group_id']]) }}?_from={{ urlencode($FF3_FROM) }}" class="btn btn-danger"><spanclass="bi bi-trash"></span></a></div>diff --git a/resources/views/accounts/reconcile/unused-show.blade.php b/resources/views/accounts/reconcile/unused-show.blade.phpindex 747ecc576e..d3dcc402d8 100644--- a/resources/views/accounts/reconcile/unused-show.blade.php+++ b/resources/views/accounts/reconcile/unused-show.blade.php@@ -11,8 +11,8 @@<button id="transaction_menu" class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="bi bi-list"></span></button><ul class="dropdown-menu" role="menu">- <li><a href="{{ route('transactions.edit',[$journal->id]) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>- <li><a href="{{ route('transactions.delete',[$journal->id]) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>+ <li><a href="{{ route('transactions.edit',[$journal->id]) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>+ <li><a href="{{ route('transactions.delete',[$journal->id]) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li></ul></div></div>@@ -48,7 +48,7 @@<div class="text-end"><div class="btn-group"><a class="btn btn-outline-secondary" href="{{ route('transactions.edit',[$journal->id]) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a>- <a href="{{ route('transactions.delete',[$journal->id]) }}" class="btn btn-danger"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}+ <a href="{{ route('transactions.delete',[$journal->id]) }}?_from={{ urlencode($FF3_FROM) }}" class="btn btn-danger"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></div></div>diff --git a/resources/views/attachments/index.blade.php b/resources/views/attachments/index.blade.phpindex a36b2cc53a..f63e4bff8b 100644--- a/resources/views/attachments/index.blade.php+++ b/resources/views/attachments/index.blade.php@@ -25,9 +25,9 @@<tr><td data-value="{{ $att->id }}"><div class="btn-group btn-group-sm">- <a href="{{ route('attachments.edit', $att->id) }}" class="btn btn-outline-secondary"><span class="bi bi-pencil"></span></a>- <a href="{{ route('attachments.delete', $att->id) }}" class="btn btn-outline-danger"><span class="bi bi-trash"></span></a>- <a href="{{ route('attachments.download', $att->id) }}" class="btn btn-outline-secondary"><span class="bi bi-download"></span></a>+ <a href="{{ route('attachments.edit', $att->id) }}?_from={{ urlencode($FF3_FROM) }}" class="btn btn-outline-secondary"><span class="bi bi-pencil"></span></a>+ <a href="{{ route('attachments.delete', $att->id) }}?_from={{ urlencode($FF3_FROM) }}" class="btn btn-outline-danger"><span class="bi bi-trash"></span></a>+ <a href="{{ route('attachments.download', $att->id) }}?_from={{ urlencode($FF3_FROM) }}" class="btn btn-outline-secondary"><span class="bi bi-download"></span></a></div></td><td data-value="{{ $att->filename }}">diff --git a/resources/views/bills/show.blade.php b/resources/views/bills/show.blade.phpindex 5817634004..75c882f6aa 100644--- a/resources/views/bills/show.blade.php+++ b/resources/views/bills/show.blade.php@@ -12,8 +12,8 @@<button class="btn btn-sm btn-secondary-outline dropdown-toggle" type="button" id="card_header_menu" data-bs-toggle="dropdown" aria-expanded="false"><span class="bi bi-list"></span></button><ul class="dropdown-menu" aria-labelledby="card_header_menu">- <li><a class="dropdown-item" href="{{ route('subscriptions.edit', $object['data']['id']) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>- <li><a class="dropdown-item" href="{{ route('subscriptions.delete', $object['data']['id']) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>+ <li><a class="dropdown-item" href="{{ route('subscriptions.edit', $object['data']['id']) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>+ <li><a class="dropdown-item" href="{{ route('subscriptions.delete', $object['data']['id']) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li></ul></div></div>@@ -91,8 +91,8 @@</div><div class="card-footer"><div class="btn-group">- <a class="btn btn-outline-secondary" href="{{ route('subscriptions.edit', [$object['data']['id']]) }}">{{ __('firefly.edit') }}</a>- <a class="btn btn-danger" href="{{ route('subscriptions.delete', [$object['data']['id']]) }}">{{ __('firefly.delete') }}</a>+ <a class="btn btn-outline-secondary" href="{{ route('subscriptions.edit', [$object['data']['id']]) }}?_from={{ urlencode($FF3_FROM) }}">{{ __('firefly.edit') }}</a>+ <a class="btn btn-danger" href="{{ route('subscriptions.delete', [$object['data']['id']]) }}?_from={{ urlencode($FF3_FROM) }}">{{ __('firefly.delete') }}</a></div></div></div>@@ -106,7 +106,7 @@@if($rules->count() > 0)<ul>@foreach($rules as $rule)- <li><a href="{{ route('rules.edit', [$rule->id]) }}">{{ $rule->title }}</a>+ <li><a href="{{ route('rules.edit', [$rule->id]) }}?_from={{ urlencode($FF3_FROM) }}">{{ $rule->title }}</a>@if(!$rule->active)({{ strtolower(__('firefly.list_inactive_rule')) }})@endif</li>@endforeachdiff --git a/resources/views/budgets/index.blade.php b/resources/views/budgets/index.blade.phpindex 1587bb345f..bac11d7667 100644--- a/resources/views/budgets/index.blade.php+++ b/resources/views/budgets/index.blade.php@@ -376,9 +376,9 @@</button><ul class="dropdown-menu"><li>- <a href="{{ route('budgets.edit', $budget['id']) }}" class="dropdown-item"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a>+ <a href="{{ route('budgets.edit', $budget['id']) }}?_from={{ urlencode($FF3_FROM) }}" class="dropdown-item"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>- <li><a href="{{ route('budgets.delete', $budget['id']) }}" class="dropdown-item text-danger">+ <li><a href="{{ route('budgets.delete', $budget['id']) }}?_from={{ urlencode($FF3_FROM) }}" class="dropdown-item text-danger"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li></ul>@@ -459,12 +459,12 @@var budgetIndexUrl = "{{ route('budgets.index',['START','END']) }}";// budget limit create form.- var createBudgetLimitUrl = "{{ route('budget-limits.create', ['REPLACEME', $start->format('Y-m-d'), $end->format('Y-m-d')]) }}";+ var createBudgetLimitUrl = "{{ route('budget-limits.create', ['REPLACEME', $start->format('Y-m-d'), $end->format('Y-m-d')]) }}?_from={{ urlencode($FF3_FROM) }}";var storeBudgetLimitUrl = "{{ route('budget-limits.store') }}";- var updateBudgetLimitUrl = "{{ route('budget-limits.update', ['REPLACEME']) }}";+ var updateBudgetLimitUrl = "{{ route('budget-limits.update', ['REPLACEME']) }}?_from={{ urlencode($FF3_FROM) }}";var showBudgetLimitUrl = "{{ route('budget-limits.show', ['REPLACEME']) }}";- var editBudgetLimitUrl = "{{ route('budget-limits.edit', ['REPLACEME']) }}";- var deleteBudgetLimitUrl = "{{ route('budget-limits.delete', ['REPLACEME']) }}";+ var editBudgetLimitUrl = "{{ route('budget-limits.edit', ['REPLACEME']) }}?_from={{ urlencode($FF3_FROM) }}";+ var deleteBudgetLimitUrl = "{{ route('budget-limits.delete', ['REPLACEME']) }}?_from={{ urlencode($FF3_FROM) }}";var totalBudgetedUrl = "{{ route('json.budget.total-budgeted', ['REPLACEME', $start->format('Y-m-d'), $end->format('Y-m-d')]) }}";// period thing:diff --git a/resources/views/budgets/show.blade.php b/resources/views/budgets/show.blade.phpindex 37f8d7d3f6..1efb5c3fb0 100644--- a/resources/views/budgets/show.blade.php+++ b/resources/views/budgets/show.blade.php@@ -19,8 +19,8 @@<span class="bi bi-list"></span></button><ul class="dropdown-menu" aria-labelledby="card_header_menu">- <li><a class="dropdown-item" href="{{ route('budgets.edit',$budget->id) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>- <li><a class="dropdown-item" href="{{ route('budgets.delete',$budget->id) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>+ <li><a class="dropdown-item" href="{{ route('budgets.edit',$budget->id) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>+ <li><a class="dropdown-item" href="{{ route('budgets.delete',$budget->id) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li></ul></div></div>diff --git a/resources/views/components/lists/ale.blade.php b/resources/views/components/lists/ale.blade.phpindex ad3179806c..81dfd46614 100644--- a/resources/views/components/lists/ale.blade.php+++ b/resources/views/components/lists/ale.blade.php@@ -10,14 +10,14 @@<th class="twenty" scope="row">{{-- link to object: --}}@if ('FireflyIII\\Models\\Rule' == $logEntry->changer_type)- <a href="{{ route('rules.edit', [$logEntry->changer_id] ) }}">- @endif- @if ('FireflyIII\\User' == $logEntry->changer_type)- <a href="{{ route('profile.index') }}">- @endif- {{ str_replace(['FireflyIII\\Models\\', 'FireflyIII\\'], '', $logEntry->changer_type) }}- #{{ $logEntry->changer_id }}- </a>+ <a href="{{ route('rules.edit', [$logEntry->changer_id] ) }}?_from={{ urlencode($FF3_FROM) }}">+ @endif+ @if ('FireflyIII\\User' == $logEntry->changer_type)+ <a href="{{ route('profile.index') }}">+ @endif+ {{ str_replace(['FireflyIII\\Models\\', 'FireflyIII\\'], '', $logEntry->changer_type) }}+ #{{ $logEntry->changer_id }}+ </a></th><td class="thirty" title="{{ $logEntry->created_at->isoFormat($dateTimeFormat) }}">{{ __('firefly.ale_action_' . $logEntry->action) }}diff --git a/resources/views/components/lists/attachments.blade.php b/resources/views/components/lists/attachments.blade.phpindex 761da93d36..cb38596c6d 100644--- a/resources/views/components/lists/attachments.blade.php+++ b/resources/views/components/lists/attachments.blade.php@@ -3,8 +3,8 @@<tr><td class="onetwenty"><div class="btn-group btn-group-sm">- <a href="{{ route('attachments.edit', $attachment['id']) }}" class="btn btn-outline-secondary"><span class="bi bi-pencil"></span></a>- <a href="{{ route('attachments.delete', $attachment['id']) }}" class="btn btn-danger"><span class="bi bi-trash"></span></a>+ <a href="{{ route('attachments.edit', $attachment['id']) }}?_from={{ urlencode($FF3_FROM) }}" class="btn btn-outline-secondary"><span class="bi bi-pencil"></span></a>+ <a href="{{ route('attachments.delete', $attachment['id']) }}?_from={{ urlencode($FF3_FROM) }}" class="btn btn-danger"><span class="bi bi-trash"></span></a>@if($attachment['file_exists'])<a href="{{ route('attachments.download', $attachment['id']) }}" class="btn btn-outline-secondary"><span class="bi bi-download"></span></a>@endifdiff --git a/resources/views/components/lists/categories.blade.php b/resources/views/components/lists/categories.blade.phpindex 66327ef95d..ed88709caf 100644--- a/resources/views/components/lists/categories.blade.php+++ b/resources/views/components/lists/categories.blade.php@@ -38,8 +38,8 @@{{ __('firefly.actions') }}</button><ul class="dropdown-menu">- <li><a class="dropdown-item" href="{{ route('categories.edit', [$category->id]) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>- <li><a class="dropdown-item text-danger" href="{{ route('categories.delete', [$category->id]) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>+ <li><a class="dropdown-item" href="{{ route('categories.edit', [$category->id]) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>+ <li><a class="dropdown-item text-danger" href="{{ route('categories.delete', [$category->id]) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li></ul></div></td>diff --git a/resources/views/components/lists/groups-large.blade.php b/resources/views/components/lists/groups-large.blade.phpindex 99dce47b5a..56c7dae5d0 100644--- a/resources/views/components/lists/groups-large.blade.php+++ b/resources/views/components/lists/groups-large.blade.php@@ -95,8 +95,8 @@<button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" id="group_menu_{{ $group['id'] }}" data-bs-toggle="dropdown" aria-expanded="false">{{ __('firefly.actions') }} <span class="caret"></span></button><ul class="dropdown-menu" aria-labelledby="group_menu_{{ $group['id'] }}">- <li><a class="dropdown-item" href="{{ route('transactions.edit', [$group['id']]) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>- <li><a class="dropdown-item" href="{{ route('transactions.delete', [$group['id']]) }}"><span class="text-danger bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>+ <li><a class="dropdown-item" href="{{ route('transactions.edit', [$group['id']]) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>+ <li><a class="dropdown-item" href="{{ route('transactions.delete', [$group['id']]) }}?_from={{ urlencode($FF3_FROM) }}"><span class="text-danger bi bi-trash"></span> {{ __('firefly.delete') }}</a></li><li><a class="dropdown-item" href="#" data-id="{{ $group['id'] }}" class="clone-transaction"><span class="bi bi-copy"></span> {{ __('firefly.clone') }}</a></li><li><a class="dropdown-item" href="#" data-id="{{ $group['id'] }}" class="clone-transaction-and-edit"><span class="bi bi-copy"></span> {{ __('firefly.clone_and_edit') }}</a></li></ul>@@ -190,9 +190,9 @@<td class="d-xs-none {{ $className }} text-end"><button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" id="journal_menu_{{ $transaction['transaction_journal_id'] }}" data-bs-toggle="dropdown" aria-expanded="false">{{ __('firefly.actions') }} <span class="caret"></span></button><ul class="dropdown-menu" aria-labelledby="journal_menu_{{ $transaction['transaction_journal_id'] }}">- <li><a class="dropdown-item" href="{{ route('transactions.edit', [$group['id']]) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>+ <li><a class="dropdown-item" href="{{ route('transactions.edit', [$group['id']]) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>@if($transaction['transaction_type_type'] !== 'Opening balance' && $transaction['transaction_type_type'] !== 'Liability credit')- <li><a class="dropdown-item" href="{{ route('transactions.delete', [$group['id']]) }}"><span class="text-danger bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>+ <li><a class="dropdown-item" href="{{ route('transactions.delete', [$group['id']]) }}?_from={{ urlencode($FF3_FROM) }}"><span class="text-danger bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>@endif@if($transaction['transaction_type_type'] !== 'Reconciliation' and $transaction['transaction_type_type'] !== 'Opening balance' and $transaction['transaction_type_type'] !== 'Liability credit')<li><a class="dropdown-item" href="#" data-id="{{ $group['id'] }}" class="clone-transaction"><span class="bi bi-copy"></span> {{ __('firefly.clone') }}</a></li>diff --git a/resources/views/components/lists/piggy-banks.blade.php b/resources/views/components/lists/piggy-banks.blade.phpindex 9561e917e5..01e218962d 100644--- a/resources/views/components/lists/piggy-banks.blade.php+++ b/resources/views/components/lists/piggy-banks.blade.php@@ -114,8 +114,8 @@{{__('firefly.actions')}}</button><ul class="dropdown-menu">- <li><a class="dropdown-item" href="{{ route('piggy-banks.edit', $piggy['id']) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>- <li><a class="dropdown-item text-danger" href="{{ route('piggy-banks.delete', $piggy['id']) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>+ <li><a class="dropdown-item" href="{{ route('piggy-banks.edit', $piggy['id']) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>+ <li><a class="dropdown-item text-danger" href="{{ route('piggy-banks.delete', $piggy['id']) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li></ul></div></td>diff --git a/resources/views/components/lists/subscriptions.blade.php b/resources/views/components/lists/subscriptions.blade.phpindex 6680a80a69..1fcd7b7c2c 100644--- a/resources/views/components/lists/subscriptions.blade.php+++ b/resources/views/components/lists/subscriptions.blade.php@@ -45,7 +45,7 @@<ul class="list-unstyled">@foreach($entry['rules'] as $rule)<li>- <a href="{{ route('rules.edit', [$rule['id']]) }}">+ <a href="{{ route('rules.edit', [$rule['id']]) }}?_from={{ urlencode($FF3_FROM) }}">{{ $rule['title'] }}</a>@if(!$rule['active'])@@ -172,8 +172,8 @@{{ __('firefly.actions') }}</button><ul class="dropdown-menu">- <li><a class="dropdown-item" href="{{ route('subscriptions.edit',$entry['id']) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>- <li><a class="dropdown-item text-danger" href="{{ route('subscriptions.delete',$entry['id']) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>+ <li><a class="dropdown-item" href="{{ route('subscriptions.edit',$entry['id']) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>+ <li><a class="dropdown-item text-danger" href="{{ route('subscriptions.delete',$entry['id']) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li></ul></div></td>diff --git a/resources/views/components/report/partial/journals-audit.blade.php b/resources/views/components/report/partial/journals-audit.blade.phpindex 5be2fc389e..4721c993da 100644--- a/resources/views/components/report/partial/journals-audit.blade.php+++ b/resources/views/components/report/partial/journals-audit.blade.php@@ -40,8 +40,8 @@<td class="hide-buttons"><div class="btn-group btn-group-sm">- <a href="{{ route('transactions.edit',$journal['transaction_group_id']) }}" class="btn btn-sm btn-outline-secondary"><span class="bi bi-pencil"></span></a>- <a href="{{ route('transactions.delete',$journal['transaction_group_id']) }}" class="btn btn-sm btn-danger"><span class="bi bi-trash"></span></a>+ <a href="{{ route('transactions.edit',$journal['transaction_group_id']) }}?_from={{ urlencode($FF3_FROM) }}" class="btn btn-sm btn-outline-secondary"><span class="bi bi-pencil"></span></a>+ <a href="{{ route('transactions.delete',$journal['transaction_group_id']) }}?_from={{ urlencode($FF3_FROM) }}" class="btn btn-sm btn-danger"><span class="bi bi-trash"></span></a></div></td>diff --git a/resources/views/currencies/index.blade.php b/resources/views/currencies/index.blade.phpindex 217028336a..cb740e2000 100644--- a/resources/views/currencies/index.blade.php+++ b/resources/views/currencies/index.blade.php@@ -44,8 +44,8 @@</button><ul class="dropdown-menu">@if($isOwner)- <li><a class="dropdown-item" href="{{ route('currencies.edit',[$currency['id']]) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>- <li><a class="dropdown-item text-danger" href="{{ route('currencies.delete',[$currency['id']]) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>+ <li><a class="dropdown-item" href="{{ route('currencies.edit',[$currency['id']]) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>+ <li><a class="dropdown-item text-danger" href="{{ route('currencies.delete',[$currency['id']]) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>@endif@if($currency->userGroupEnabled)<li><a class="dropdown-item disable-currency" href="#" data-code="{{ $currency['code'] }}"><span class="bi bi-app"></span> {{ __('firefly.disable_currency') }}</a></li>diff --git a/resources/views/object-groups/index.blade.php b/resources/views/object-groups/index.blade.phpindex bd109065c0..33cdd9a99c 100644--- a/resources/views/object-groups/index.blade.php+++ b/resources/views/object-groups/index.blade.php@@ -41,8 +41,8 @@{{ __('firefly.actions') }}</button><ul class="dropdown-menu">- <li><a class="dropdown-item" href="{{ route('object-groups.edit', [$objectGroup['id']]) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>- <li><a class="dropdown-item text-danger" href="{{ route('object-groups.delete', [$objectGroup['id']]) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>+ <li><a class="dropdown-item" href="{{ route('object-groups.edit', [$objectGroup['id']]) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>+ <li><a class="dropdown-item text-danger" href="{{ route('object-groups.delete', [$objectGroup['id']]) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li></ul></div></td>diff --git a/resources/views/piggy-banks/show.blade.php b/resources/views/piggy-banks/show.blade.phpindex 1f3b666962..8cd98d857e 100644--- a/resources/views/piggy-banks/show.blade.php+++ b/resources/views/piggy-banks/show.blade.php@@ -24,8 +24,8 @@<span class="bi bi-list"></span></button><ul class="dropdown-menu" aria-labelledby="card_header_menu">- <li><a class="dropdown-item" href="{{ route('piggy-banks.edit', $piggy['id']) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>- <li><a class="dropdown-item" href="{{ route('piggy-banks.delete', $piggy['id']) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>+ <li><a class="dropdown-item" href="{{ route('piggy-banks.edit', $piggy['id']) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>+ <li><a class="dropdown-item" href="{{ route('piggy-banks.delete', $piggy['id']) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li></ul></div></div>diff --git a/resources/views/recurring/index.blade.php b/resources/views/recurring/index.blade.phpindex 45fc6975cb..8ef986f21a 100644--- a/resources/views/recurring/index.blade.php+++ b/resources/views/recurring/index.blade.php@@ -117,8 +117,8 @@{{ __('firefly.actions') }}</button><ul class="dropdown-menu">- <li><a class="dropdown-item" href="{{ route('recurring.edit',$rt['id']) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>- <li><a class="dropdown-item text-danger" href="{{ route('recurring.delete',$rt['id']) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>+ <li><a class="dropdown-item" href="{{ route('recurring.edit',$rt['id']) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>+ <li><a class="dropdown-item text-danger" href="{{ route('recurring.delete',$rt['id']) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li></ul></div></td>diff --git a/resources/views/recurring/show.blade.php b/resources/views/recurring/show.blade.phpindex 608a229881..4bd661b7a9 100644--- a/resources/views/recurring/show.blade.php+++ b/resources/views/recurring/show.blade.php@@ -47,9 +47,9 @@</div><div class="card-footer"><div class="btn-group">- <a href="{{ route('recurring.edit', [$array['id']]) }}" class="btn btn-sm btn-outline-secondary"><span+ <a href="{{ route('recurring.edit', [$array['id']]) }}?_from={{ urlencode($FF3_FROM) }}" class="btn btn-sm btn-outline-secondary"><spanclass="bi bi-pencil"></span> {{ __('firefly.edit') }}</a>- <a href="{{ route('recurring.delete', [$array['id']]) }}" class="btn btn-sm btn-danger">{{ __('firefly.delete') }}+ <a href="{{ route('recurring.delete', [$array['id']]) }}?_from={{ urlencode($FF3_FROM) }}" class="btn btn-sm btn-danger">{{ __('firefly.delete') }}<span class="bi bi-trash"></span></a></div></div>diff --git a/resources/views/rules/index.blade.php b/resources/views/rules/index.blade.phpindex 36d24a5c2d..5fa47e666b 100644--- a/resources/views/rules/index.blade.php+++ b/resources/views/rules/index.blade.php@@ -27,14 +27,14 @@<span class="bi bi-list"></span></button><ul class="dropdown-menu" aria-labelledby="card_header_{{ $ruleGroup->id }}">- <li><a class="dropdown-item" href="{{ route('rule-groups.edit',$ruleGroup->id) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>- <li><a class="dropdown-item" href="{{ route('rule-groups.delete',$ruleGroup->id) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>+ <li><a class="dropdown-item" href="{{ route('rule-groups.edit',$ruleGroup->id) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>+ <li><a class="dropdown-item" href="{{ route('rule-groups.delete',$ruleGroup->id) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li><li><a class="dropdown-item" href="{{ route('rule-groups.select-transactions',$ruleGroup->id) }}"><spanclass="bi bi-power"></span> {{ trans('firefly.apply_rule_group_selection', ['title' => $ruleGroup->title]) }}</a></li>- <li><a class="dropdown-item" href="{{ route('rule-groups.create') }}"><em class="bi bi-plus-circle"></em> {{ __('firefly.new_rule_group') }}</a></li>- <li><a href="{{ route('rules.create', $ruleGroup->id) }}" class="dropdown-item new_rule"><em class="bi bi-plus-circle"></em> {{ __('firefly.new_rule') }}</a></li>+ <li><a class="dropdown-item" href="{{ route('rule-groups.create') }}?_from={{ urlencode($FF3_FROM) }}"><em class="bi bi-plus-circle"></em> {{ __('firefly.new_rule_group') }}</a></li>+ <li><a href="{{ route('rules.create', $ruleGroup->id) }}?_from={{ urlencode($FF3_FROM) }}" class="dropdown-item new_rule"><em class="bi bi-plus-circle"></em> {{ __('firefly.new_rule') }}</a></li>@if($ruleGroup->order > 1)<li><a href="#" class="dropdown-item move-group" data-direction="up" data-id="{{ $ruleGroup->id }}"><span@@ -143,11 +143,11 @@{{ __('firefly.actions') }}</button><ul class="dropdown-menu">- <li><a class="dropdown-item" title="{{ __('firefly.edit') }}" href="{{ route('rules.edit', $rule->id) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }} </a></li>- <li><a class="dropdown-item text-danger" title="{{ __('firefly.delete') }}" href="{{ route('rules.delete', $rule->id) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>- <li><a class="dropdown-item @if(false === $rule->strict) test_rule_triggers @endif" data-id="{{ $rule->id }}" href="{{ route('rules.search',$rule->id) }}"><span data-id="{{ $rule->id }}" class="bi bi-flask"></span> {{ __('firefly.test_rule_triggers') }}</a></li>+ <li><a class="dropdown-item" title="{{ __('firefly.edit') }}" href="{{ route('rules.edit', $rule->id) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }} </a></li>+ <li><a class="dropdown-item text-danger" title="{{ __('firefly.delete') }}" href="{{ route('rules.delete', $rule->id) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>+ <li><a class="dropdown-item @if(false === $rule->strict) test_rule_triggers @endif" data-id="{{ $rule->id }}" href="{{ route('rules.search',$rule->id) }}?_from={{ urlencode($FF3_FROM) }}"><span data-id="{{ $rule->id }}" class="bi bi-flask"></span> {{ __('firefly.test_rule_triggers') }}</a></li>@if($rule->active)- <li><a class="dropdown-item" href="{{ route('rules.select-transactions',$rule->id) }}"><span class="bi bi-power"></span> {{ trans('firefly.apply_rule_selection', ['title' => $rule->title]) }}</a></li>+ <li><a class="dropdown-item" href="{{ route('rules.select-transactions',$rule->id) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-power"></span> {{ trans('firefly.apply_rule_selection', ['title' => $rule->title]) }}</a></li>@endif<li><a class="dropdown-item duplicate-rule" data-id="{{ $rule->id }}" title="{{ trans('firefly.duplicate_rule', ['title' => $rule->title]) }}"><span class="bi bi-copy"></span> {{ trans('firefly.duplicate_rule', ['title' => $rule->title]) }}</a></li></ul>diff --git a/resources/views/search/index.blade.php b/resources/views/search/index.blade.phpindex c9c386e36d..4db9f91382 100644--- a/resources/views/search/index.blade.php+++ b/resources/views/search/index.blade.php@@ -28,7 +28,7 @@<div class="btn-group"><button type="submit" class="btn btn-info"><span class="bi bi-search"></span> {{ __('firefly.search') }}</button>@if($ruleId > 0 && $ruleChanged)- <a href="{{ route('rules.edit', [$ruleId]) }}?from_query={{ $fullQuery }}"+ <a href="{{ route('rules.edit', [$ruleId]) }}?from_query={{ $fullQuery }}&_from={{ urlencode($FF3_FROM) }}"class="btn btn-outline-secondary">{{ trans('firefly.update_rule_from_query', ['rule' => $rule->title]) }}</a>@endif<a href="{{ route('rules.create') }}?from_query={{ $fullQuery }}" class="btn btn-outline-secondary">{{ __('firefly.create_rule_from_query') }}</a>diff --git a/resources/views/settings/link/index.blade.php b/resources/views/settings/link/index.blade.phpindex 4c020a34dc..10697ed166 100644--- a/resources/views/settings/link/index.blade.php+++ b/resources/views/settings/link/index.blade.php@@ -23,9 +23,9 @@<td>@if($linkType->editable)<div class="btn-group btn-group-sm">- <a class="btn btn-outline-secondary btn-sm" href="{{ route('settings.links.edit',$linkType->id) }}"><span+ <a class="btn btn-outline-secondary btn-sm" href="{{ route('settings.links.edit',$linkType->id) }}?_from={{ urlencode($FF3_FROM) }}"><spanclass="bi bi-pencil"></span></a>- <a class="btn btn-danger btn-sm" href="{{ route('settings.links.delete',$linkType->id) }}"><span+ <a class="btn btn-danger btn-sm" href="{{ route('settings.links.delete',$linkType->id) }}?_from={{ urlencode($FF3_FROM) }}"><spanclass="bi bi-trash"></span></a></div>@endifdiff --git a/resources/views/settings/link/show.blade.php b/resources/views/settings/link/show.blade.phpindex a177b40b3f..21a7d865f7 100644--- a/resources/views/settings/link/show.blade.php+++ b/resources/views/settings/link/show.blade.php@@ -23,7 +23,7 @@<tr><td><div class="btn-group btn-group-sm">- <a href="{{ route('transactions.link.delete', [$link->id]) }}" class="btn btn-danger delete-link" data-id="{{ $link->id }}"><span class="bi bi-trash"></span></a>+ <a href="{{ route('transactions.link.delete', [$link->id]) }}?_from={{ urlencode($FF3_FROM) }}" class="btn btn-danger delete-link" data-id="{{ $link->id }}"><span class="bi bi-trash"></span></a><a href="#" class="btn btn-outline-secondary switch-link" data-id="{{ $link->id }}"><spanclass="bi bi-arrow-left-right"></span></a></div>diff --git a/resources/views/settings/users/index.blade.php b/resources/views/settings/users/index.blade.phpindex acae76cd3c..6075d1224f 100644--- a/resources/views/settings/users/index.blade.php+++ b/resources/views/settings/users/index.blade.php@@ -50,9 +50,9 @@<tr><td class="hidden-xs" data-value="{{ $user->id }}"><div class="btn-group btn-group-sm">- <a class="btn btn-outline-secondary" href="{{ route('settings.users.edit',$user->id) }}"><span+ <a class="btn btn-outline-secondary" href="{{ route('settings.users.edit',$user->id) }}?_from={{ urlencode($FF3_FROM) }}"><spanclass="bi bi-pencil"></span></a>- <a class="btn btn-danger" href="{{ route('settings.users.delete',$user->id) }}"><span+ <a class="btn btn-danger" href="{{ route('settings.users.delete',$user->id) }}?_from={{ urlencode($FF3_FROM) }}"><spanclass="bi bi-trash"></span></a></div></td>diff --git a/resources/views/tags/show.blade.php b/resources/views/tags/show.blade.phpindex 7ecf5a26b0..a10ee1536d 100644--- a/resources/views/tags/show.blade.php+++ b/resources/views/tags/show.blade.php@@ -12,10 +12,10 @@<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><spanclass="bi bi-list"></span></button><ul class="dropdown-menu" role="menu">- <li><a href="{{ route('tags.edit',$tag->id) }}"><span+ <li><a href="{{ route('tags.edit',$tag->id) }}?_from={{ urlencode($FF3_FROM) }}"><spanclass="bi bi-pencil"></span> {{ trans('firefly.edit_tag',['tag' => $tag->tag]) }}</a></li>- <li><a href="{{ route('tags.delete',$tag->id) }}"><span+ <li><a href="{{ route('tags.delete',$tag->id) }}?_from={{ urlencode($FF3_FROM) }}"><spanclass="bi bi-trash"></span> {{ trans('firefly.delete_tag',['tag' => $tag->tag]) }}</a></li></ul>@@ -166,9 +166,9 @@</div><div class="card-footer"><div class="btn-group btn-group-sm">- <a href="{{ route('tags.edit',$tag->id) }}" class="btn btn-outline-secondary"><span+ <a href="{{ route('tags.edit',$tag->id) }}?_from={{ urlencode($FF3_FROM) }}" class="btn btn-outline-secondary"><spanclass="bi bi-pencil"></span></a>- <a href="{{ route('tags.delete',$tag->id) }}" class="btn btn-danger"><span+ <a href="{{ route('tags.delete',$tag->id) }}?_from={{ urlencode($FF3_FROM) }}" class="btn btn-danger"><spanclass="bi bi-trash"></span></a></div><p class="text-muted">@@ -186,10 +186,10 @@<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><spanclass="bi bi-list"></span></button><ul class="dropdown-menu" role="menu">- <li><a href="{{ route('tags.edit',$tag->id) }}"><span+ <li><a href="{{ route('tags.edit',$tag->id) }}?_from={{ urlencode($FF3_FROM) }}"><spanclass="bi bi-pencil"></span> {{ trans('firefly.edit_tag',['tag' => $tag->tag]) }}</a></li>- <li><a href="{{ route('tags.delete',$tag->id) }}"><span+ <li><a href="{{ route('tags.delete',$tag->id) }}?_from={{ urlencode($FF3_FROM) }}"><spanclass="bi bi-trash"></span> {{ trans('firefly.delete_tag',['tag' => $tag->tag]) }}</a></li></ul>@@ -243,10 +243,10 @@<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><spanclass="bi bi-list"></span></button><ul class="dropdown-menu" role="menu">- <li><a href="{{ route('tags.edit',$tag->id) }}"><span+ <li><a href="{{ route('tags.edit',$tag->id) }}?_from={{ urlencode($FF3_FROM) }}"><spanclass="bi bi-pencil"></span> {{ trans('firefly.edit_tag',['tag' => $tag->tag]) }}</a></li>- <li><a href="{{ route('tags.delete',$tag->id) }}"><span+ <li><a href="{{ route('tags.delete',$tag->id) }}?_from={{ urlencode($FF3_FROM) }}"><spanclass="bi bi-trash"></span> {{ trans('firefly.delete_tag',['tag' => $tag->tag]) }}</a></li></ul>diff --git a/resources/views/transactions/mass/edit.blade.php b/resources/views/transactions/mass/edit.blade.phpindex b92388e0a6..4b56b23e54 100644--- a/resources/views/transactions/mass/edit.blade.php+++ b/resources/views/transactions/mass/edit.blade.php@@ -30,7 +30,7 @@<tr><td>{{-- LINK TO EDIT FORM --}}- <a href="{{ route('transactions.edit', $journal['transaction_group_id']) }}" class="btn btn-sm btn-outline-secondary"><span+ <a href="{{ route('transactions.edit', $journal['transaction_group_id']) }}?_from={{ urlencode($FF3_FROM) }}" class="btn btn-sm btn-outline-secondary"><spanclass="bi bi-pencil"></span></a><input type="hidden" name="journals[]" value="{{ $journal['transaction_journal_id'] }}"/></td>diff --git a/resources/views/transactions/show.blade.php b/resources/views/transactions/show.blade.phpindex 720b78692e..733a4c7aeb 100644--- a/resources/views/transactions/show.blade.php+++ b/resources/views/transactions/show.blade.php@@ -12,10 +12,10 @@<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+ <li><a class="dropdown-item" href="{{ route('transactions.edit', [$transactionGroup->id]) }}?_from={{ urlencode($FF3_FROM) }}"><spanclass="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+ <li><a class="dropdown-item" href="{{ route('transactions.delete', [$transactionGroup->id]) }}?_from={{ urlencode($FF3_FROM) }}"><spanclass="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')@@ -217,10 +217,10 @@<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+ <li><a class="dropdown-item" href="{{ route('transactions.edit', [$transactionGroup->id]) }}?_from={{ urlencode($FF3_FROM) }}"><spanclass="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+ <li><a class="dropdown-item" href="{{ route('transactions.delete', [$transactionGroup->id]) }}?_from={{ urlencode($FF3_FROM) }}"><spanclass="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>@endif@if($journal['reconciled'])@@ -461,7 +461,7 @@<div class="btn-group btn-group-sm"><a href="#" class="btn btn-outline-secondary switch-link" data-id="{{ $link['id'] }}"><spanclass="bi bi-arrow-left-right"></span></a>- <a href="{{ route('transactions.link.delete', [$link['id']]) }}"+ <a href="{{ route('transactions.link.delete', [$link['id']]) }}?_from={{ urlencode($FF3_FROM) }}"class="btn btn-danger"><span class="bi bi-trash"></span></a></div></td>