Skip to content

Firefly III: a personal finances manager

Fix views for deleted items, correct redirect.

James Cole8f6904de0180
diff --git a/app/Exceptions/GracefulNotFoundHandler.php b/app/Exceptions/GracefulNotFoundHandler.php
index c5794b2925..864bd12e60 100644
--- a/app/Exceptions/GracefulNotFoundHandler.php
+++ b/app/Exceptions/GracefulNotFoundHandler.php
@@ -63,7 +63,6 @@ class GracefulNotFoundHandler extends ExceptionHandler
if (!auth()->check()) {
return parent::render($request, $e);
}
-
switch ($name) {
default:
Log::warning(sprintf('GracefulNotFoundHandler cannot handle route with name "%s"', $name));
@@ -177,6 +176,7 @@ class GracefulNotFoundHandler extends ExceptionHandler
$type = $account->accountType;
$shortType = config(sprintf('firefly.shortNamesByFullName.%s', $type->type));
$request->session()->reflash();
+ session()->flash('info', trans('errors.note_not_found_account', ['name' => $account->name]));
return redirect(route('accounts.index', [$shortType]));
}
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 98547973e2..d3edf1c051 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -184,7 +184,6 @@ class Handler extends ExceptionHandler
'exception' => 'UndisclosedException',
], $errorCode);
}
-
if ($e instanceof NotFoundHttpException) {
Log::debug('Refer to GracefulNotFoundHandler');
$handler = app(GracefulNotFoundHandler::class);
diff --git a/app/Models/Account.php b/app/Models/Account.php
index 9ad9ff7c72..f682e9efaa 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -63,7 +63,7 @@ class Account extends Model
/**
* Route binder. Converts the key in the URL to the specified object (or throw 404).
*
- * @throws NotFoundHttpException
+ * @throws NotFoundHttpException|AuthenticationException
*/
public static function routeBinder(self|string $value): self
{
@@ -81,6 +81,7 @@ class Account extends Model
if (null !== $account) {
return $account;
}
+ throw new NotFoundHttpException();
}
throw new AuthenticationException();
diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php
index 9ecf086cc9..e91c4c73ba 100644
--- a/app/Models/Attachment.php
+++ b/app/Models/Attachment.php
@@ -79,6 +79,7 @@ class Attachment extends Model
if (null !== $attachment) {
return $attachment;
}
+ throw new NotFoundHttpException();
}
throw new AuthenticationException();
diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php
index 19f28c18e8..185addadd6 100644
--- a/app/Models/AvailableBudget.php
+++ b/app/Models/AvailableBudget.php
@@ -80,6 +80,7 @@ class AvailableBudget extends Model
if (null !== $availableBudget) {
return $availableBudget;
}
+ throw new NotFoundHttpException();
}
throw new AuthenticationException();
diff --git a/app/Models/Bill.php b/app/Models/Bill.php
index 2aa706137e..410735eaf1 100644
--- a/app/Models/Bill.php
+++ b/app/Models/Bill.php
@@ -99,6 +99,7 @@ class Bill extends Model
if (null !== $bill) {
return $bill;
}
+ throw new NotFoundHttpException();
}
throw new AuthenticationException();
diff --git a/app/Models/Budget.php b/app/Models/Budget.php
index 1c916e17d4..efb53d79da 100644
--- a/app/Models/Budget.php
+++ b/app/Models/Budget.php
@@ -67,6 +67,7 @@ class Budget extends Model
if (null !== $budget) {
return $budget;
}
+ throw new NotFoundHttpException();
}
throw new AuthenticationException();
diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php
index 97f04e720b..a6db0f9e38 100644
--- a/app/Models/BudgetLimit.php
+++ b/app/Models/BudgetLimit.php
@@ -69,6 +69,7 @@ class BudgetLimit extends Model
if (null !== $budgetLimit) {
return $budgetLimit;
}
+ throw new NotFoundHttpException();
}
throw new AuthenticationException();
diff --git a/app/Models/Category.php b/app/Models/Category.php
index 80a88db088..272f4b5712 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -69,6 +69,7 @@ class Category extends Model
if (null !== $category) {
return $category;
}
+ throw new NotFoundHttpException();
}
throw new AuthenticationException();
diff --git a/app/Models/InvitedUser.php b/app/Models/InvitedUser.php
index 1a577fc7ca..edbb7b4fc1 100644
--- a/app/Models/InvitedUser.php
+++ b/app/Models/InvitedUser.php
@@ -32,6 +32,7 @@ use FireflyIII\User;
use Illuminate\Auth\AuthenticationException;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* @property Carbon $expires
@@ -59,6 +60,7 @@ class InvitedUser extends Model
if (null !== $attempt) {
return $attempt;
}
+ throw new NotFoundHttpException();
}
throw new AuthenticationException();
diff --git a/app/Models/LinkType.php b/app/Models/LinkType.php
index 05791d5ff0..fa12b2ef51 100644
--- a/app/Models/LinkType.php
+++ b/app/Models/LinkType.php
@@ -53,6 +53,7 @@ class LinkType extends Model
if (null !== $linkType) {
return $linkType;
}
+ throw new NotFoundHttpException();
}
throw new AuthenticationException();
diff --git a/app/Models/ObjectGroup.php b/app/Models/ObjectGroup.php
index 106ab94f6b..d072a39a9d 100644
--- a/app/Models/ObjectGroup.php
+++ b/app/Models/ObjectGroup.php
@@ -59,6 +59,7 @@ class ObjectGroup extends Model
if (null !== $objectGroup) {
return $objectGroup;
}
+ throw new NotFoundHttpException();
}
throw new AuthenticationException();
diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php
index c56e410727..78d40432b0 100644
--- a/app/Models/PiggyBank.php
+++ b/app/Models/PiggyBank.php
@@ -83,6 +83,7 @@ class PiggyBank extends Model
if (null !== $piggyBank) {
return $piggyBank;
}
+ throw new NotFoundHttpException();
}
throw new AuthenticationException();
diff --git a/app/Models/Preference.php b/app/Models/Preference.php
index 4ad0174e5c..238e4b1c3d 100644
--- a/app/Models/Preference.php
+++ b/app/Models/Preference.php
@@ -95,6 +95,7 @@ class Preference extends Model
return $preference;
}
+ throw new NotFoundHttpException();
}
throw new AuthenticationException();
diff --git a/app/Models/Recurrence.php b/app/Models/Recurrence.php
index a6fcc7a22c..521e6c9cb9 100644
--- a/app/Models/Recurrence.php
+++ b/app/Models/Recurrence.php
@@ -93,6 +93,7 @@ class Recurrence extends Model
if (null !== $recurrence) {
return $recurrence;
}
+ throw new NotFoundHttpException();
}
throw new AuthenticationException();
diff --git a/app/Models/Rule.php b/app/Models/Rule.php
index c08a368c7a..8a6f13d128 100644
--- a/app/Models/Rule.php
+++ b/app/Models/Rule.php
@@ -71,6 +71,7 @@ class Rule extends Model
if (null !== $rule) {
return $rule;
}
+ throw new NotFoundHttpException();
}
throw new AuthenticationException();
diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php
index 4e1e9b016a..41ed0aa8d7 100644
--- a/app/Models/RuleGroup.php
+++ b/app/Models/RuleGroup.php
@@ -71,6 +71,7 @@ class RuleGroup extends Model
if (null !== $ruleGroup) {
return $ruleGroup;
}
+ throw new NotFoundHttpException();
}
throw new AuthenticationException();
diff --git a/app/Models/Tag.php b/app/Models/Tag.php
index f8bca5df2c..35d50ab4b6 100644
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@@ -73,6 +73,7 @@ class Tag extends Model
if (null !== $tag) {
return $tag;
}
+ throw new NotFoundHttpException();
}
throw new AuthenticationException();
diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php
index c629612180..ad37f71f9f 100644
--- a/app/Models/TransactionCurrency.php
+++ b/app/Models/TransactionCurrency.php
@@ -63,6 +63,7 @@ class TransactionCurrency extends Model
return $currency;
}
+ throw new NotFoundHttpException();
}
throw new AuthenticationException();
diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php
index e43fa60ad3..9bd50919da 100644
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@@ -110,6 +110,7 @@ class TransactionJournal extends Model
if (null !== $journal) {
return $journal;
}
+ throw new NotFoundHttpException();
}
throw new AuthenticationException();
diff --git a/app/Models/TransactionJournalLink.php b/app/Models/TransactionJournalLink.php
index f1624bf148..75225ec22d 100644
--- a/app/Models/TransactionJournalLink.php
+++ b/app/Models/TransactionJournalLink.php
@@ -60,6 +60,7 @@ class TransactionJournalLink extends Model
if (null !== $link) {
return $link;
}
+ throw new NotFoundHttpException();
}
throw new AuthenticationException();
diff --git a/app/Models/WebhookAttempt.php b/app/Models/WebhookAttempt.php
index 739064fe0d..0c15d97b89 100644
--- a/app/Models/WebhookAttempt.php
+++ b/app/Models/WebhookAttempt.php
@@ -59,6 +59,7 @@ class WebhookAttempt extends Model
if (null !== $attempt && $attempt->webhookMessage->webhook->user_id === $user->id) {
return $attempt;
}
+ throw new NotFoundHttpException();
}
throw new AuthenticationException();
diff --git a/app/Models/WebhookMessage.php b/app/Models/WebhookMessage.php
index 28d795f05f..8d77ac76b5 100644
--- a/app/Models/WebhookMessage.php
+++ b/app/Models/WebhookMessage.php
@@ -64,6 +64,7 @@ class WebhookMessage extends Model
if (null !== $message && $message->webhook->user_id === $user->id) {
return $message;
}
+ throw new NotFoundHttpException();
}
throw new AuthenticationException();
diff --git a/app/User.php b/app/User.php
index 7110e3408d..8b4aa0f9d1 100644
--- a/app/User.php
+++ b/app/User.php
@@ -102,6 +102,7 @@ class User extends Authenticatable implements OAuthenticatable
if (null !== $user) {
return $user;
}
+ throw new NotFoundHttpException();
}
throw new NotFoundHttpException();
diff --git a/resources/lang/en_US/errors.php b/resources/lang/en_US/errors.php
index c4cddd2b7a..c761e37705 100644
--- a/resources/lang/en_US/errors.php
+++ b/resources/lang/en_US/errors.php
@@ -28,6 +28,7 @@ return [
'404_send_error' => 'If you were redirected to this page automatically, please accept my apologies. There is a mention of this error in your log files and I would be grateful if you sent me the error to me.',
'404_github_link' => 'If you are sure this page should exist, please open a ticket on <strong><a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a></strong>.',
'whoops' => 'Whoops',
+ 'note_not_found_account' => 'Account ":name" has been deleted and can no longer be viewed. Please enjoy this overview of all other accounts of the same type.',
'fatal_error' => 'There was a fatal error. Please check the log files in "storage/logs" or use "docker logs -f [container]" to see what\'s going on.',
'maintenance_mode' => 'Firefly III is in maintenance mode.',
'be_right_back' => 'Be right back!',
diff --git a/resources/views/accounts/delete.blade.php b/resources/views/accounts/delete.blade.php
index f7ee02805c..29887d54dc 100644
--- a/resources/views/accounts/delete.blade.php
+++ b/resources/views/accounts/delete.blade.php
@@ -43,9 +43,9 @@
</div>
<div class="card-footer text-end">
+ <a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
<input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}"
class="btn btn-danger"/>
- <a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
</div>
</div>
</div>
diff --git a/resources/views/accounts/show.blade.php b/resources/views/accounts/show.blade.php
index ac811ad729..9e62bc56f6 100644
--- a/resources/views/accounts/show.blade.php
+++ b/resources/views/accounts/show.blade.php
@@ -33,9 +33,9 @@
<span class="bi bi-list"></span>
</button>
<ul class="dropdown-menu" aria-labelledby="card_header_menu">
- <li><a class="dropdown-item" href="{{ route('accounts.edit', [$account->id]) }}"><span
+ <li><a class="dropdown-item" href="{{ route('accounts.edit', [$account->id]) }}?_from=/accounts/show/{{ $account->id }}"><span
class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>
- <li><a class="dropdown-item" href="{{ route('accounts.delete', [$account->id]) }}"><span
+ <li><a class="dropdown-item" href="{{ route('accounts.delete', [$account->id]) }}?_from=/accounts/show/{{ $account->id }}"><span
class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>
<li>
<a class="dropdown-item" href="{{ route('accounts.reconcile', [$account->id]) }}"><span class="bi bi-check"></span> {{ __('firefly.reconcile_this_account') }}</a>
diff --git a/resources/views/attachments/delete.blade.php b/resources/views/attachments/delete.blade.php
index bbbb6b00e9..711e477814 100644
--- a/resources/views/attachments/delete.blade.php
+++ b/resources/views/attachments/delete.blade.php
@@ -18,8 +18,8 @@
</p>
</div>
<div class="card-footer text-end">
- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger"/>
<a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger"/>
</div>
</div>
</div>
diff --git a/resources/views/bills/delete.blade.php b/resources/views/bills/delete.blade.php
index d7b102d0da..02943e7ce9 100644
--- a/resources/views/bills/delete.blade.php
+++ b/resources/views/bills/delete.blade.php
@@ -25,9 +25,9 @@
@endif
</p>
</div>
- <div class="card-footer">
- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/>
+ <div class="card-footer text-end">
<a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/>
</div>
</div>
</div>
diff --git a/resources/views/budgets/delete.blade.php b/resources/views/budgets/delete.blade.php
index 6e202b5223..4ddcc1383f 100644
--- a/resources/views/budgets/delete.blade.php
+++ b/resources/views/budgets/delete.blade.php
@@ -24,9 +24,9 @@
</p>
</div>
- <div class="card-footer">
- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/>
+ <div class="card-footer text-end">
<a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/>
</div>
diff --git a/resources/views/categories/delete.blade.php b/resources/views/categories/delete.blade.php
index e80f660be5..1b6a9e2a1d 100644
--- a/resources/views/categories/delete.blade.php
+++ b/resources/views/categories/delete.blade.php
@@ -25,8 +25,8 @@
</p>
</div>
<div class="card-footer text-end">
- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger"/>
<a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger"/>
</div>
</div>
</div>
diff --git a/resources/views/components/lists/groups-large.blade.php b/resources/views/components/lists/groups-large.blade.php
index 4065ffec62..99dce47b5a 100644
--- a/resources/views/components/lists/groups-large.blade.php
+++ b/resources/views/components/lists/groups-large.blade.php
@@ -21,9 +21,9 @@
{{ __('firefly.actions') }}<span class="caret"></span>
</button>
<ul class="dropdown-menu" aria-labelledby="top_action_menu">
- <li><a href="#" class="dropdown-item mass-edit"><span class="bi bi-pencil"></span><span class="txt">{{ __('firefly.mass_edit') }}</span></a></li>
- <li><a href="#" class="dropdown-item bulk-edit"><span class="bi bi-pencil-square-o"></span><span class="txt">{{ __('firefly.bulk_edit') }}</span></a></li>
- <li><a href="#" class="dropdown-item mass-delete"><span class="bi bi-trash"></span><span class="txt">{{ __('firefly.mass_delete') }}</span></a></li>
+ <li><a href="#" class="dropdown-item mass-edit"><span class="bi bi-pencil"></span> <span class="txt">{{ __('firefly.mass_edit') }}</span></a></li>
+ <li><a href="#" class="dropdown-item bulk-edit"><span class="bi bi-pencil-square"></span> <span class="txt">{{ __('firefly.bulk_edit') }}</span></a></li>
+ <li><a href="#" class="dropdown-item mass-delete"><span class="bi bi-trash"></span> <span class="txt">{{ __('firefly.mass_delete') }}</span></a></li>
</ul>
</div>
</td>
@@ -100,18 +100,6 @@
<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>
-
-
- <!--
- <button type="button" class="btn btn-sm btn-outline-secondary dropdown-toggle" data-toggle="dropdown"
- aria-haspopup="true" aria-expanded="false">{{ __('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> {{ __('firefly.clone') }}</a></li>
- <li><a href="#" data-id="{{ $group['id'] }}" class="clone-transaction-and-edit"><span class="bi bi-copy"></span> {{ __('firefly.clone_and_edit') }}</a></li>
- </ul>
- -->
</div>
</td>
<td class="top-light-border d-xs-none">&nbsp;</td><!-- would have checkbox -->
diff --git a/resources/views/currencies/delete.blade.php b/resources/views/currencies/delete.blade.php
index b6f62559b0..864816a0b6 100644
--- a/resources/views/currencies/delete.blade.php
+++ b/resources/views/currencies/delete.blade.php
@@ -18,9 +18,9 @@
{{ trans('form.currency_areYouSure', ['name' => $currency->name]) }}
</p>
</div>
- <div class="card-footer">
- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/>
+ <div class="card-footer text-end">
<a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/>
</div>
</div>
</div>
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
index 6bbda60cfb..d9d8e878f5 100644
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@@ -1,6 +1,6 @@
@extends('layout.v3.blank')
@section('status_code','404')
-@section('status','Not Found')
+@section('status','Page not found')
@section('sub_title', trans('errors.404_header'))
@section('content')
<div class="row">
diff --git a/resources/views/object-groups/delete.blade.php b/resources/views/object-groups/delete.blade.php
index b0e845c649..d6dc2f49fc 100644
--- a/resources/views/object-groups/delete.blade.php
+++ b/resources/views/object-groups/delete.blade.php
@@ -25,8 +25,8 @@
</div>
<div class="card-footer text-end">
- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger"/>
<a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger"/>
</div>
</div>
</div>
diff --git a/resources/views/piggy-banks/delete.blade.php b/resources/views/piggy-banks/delete.blade.php
index 752f746c4f..08e4a0edbc 100644
--- a/resources/views/piggy-banks/delete.blade.php
+++ b/resources/views/piggy-banks/delete.blade.php
@@ -19,8 +19,8 @@
</p>
</div>
<div class="card-footer text-end">
- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger"/>
<a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger"/>
</div>
</div>
</div>
diff --git a/resources/views/recurring/delete.blade.php b/resources/views/recurring/delete.blade.php
index 08bd06ab1a..b54026d649 100644
--- a/resources/views/recurring/delete.blade.php
+++ b/resources/views/recurring/delete.blade.php
@@ -24,9 +24,9 @@
@endif
</p>
</div>
- <div class="card-footer">
- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/>
+ <div class="card-footer text-end">
<a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/>
</div>
</div>
</div>
diff --git a/resources/views/rules/rule-group/delete.blade.php b/resources/views/rules/rule-group/delete.blade.php
index 68a1209934..e643a402b2 100644
--- a/resources/views/rules/rule-group/delete.blade.php
+++ b/resources/views/rules/rule-group/delete.blade.php
@@ -35,9 +35,9 @@
@endif
</div>
- <div class="card-footer">
- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/>
+ <div class="card-footer text-end">
<a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/>
</div>
diff --git a/resources/views/rules/rule/delete.blade.php b/resources/views/rules/rule/delete.blade.php
index 3826a5bbe5..1e44ab51c5 100644
--- a/resources/views/rules/rule/delete.blade.php
+++ b/resources/views/rules/rule/delete.blade.php
@@ -17,9 +17,9 @@
{{ trans('form.rule_areYouSure', ['title' => $rule->title]) }}
</p>
</div>
- <div class="card-footer">
- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/>
+ <div class="card-footer text-end">
<a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/>
</div>
</div>
</div>
diff --git a/resources/views/settings/link/delete.blade.php b/resources/views/settings/link/delete.blade.php
index 0e48a7f0fc..de15cb33b8 100644
--- a/resources/views/settings/link/delete.blade.php
+++ b/resources/views/settings/link/delete.blade.php
@@ -38,9 +38,9 @@
</div>
<div class="card-footer text-end">
+ <a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
<input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}"
class="btn btn-danger"/>
- <a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
</div>
</div>
</div>
diff --git a/resources/views/settings/users/delete.blade.php b/resources/views/settings/users/delete.blade.php
index 0c01b3c693..ec0ee252c2 100644
--- a/resources/views/settings/users/delete.blade.php
+++ b/resources/views/settings/users/delete.blade.php
@@ -19,10 +19,10 @@
{{ trans('form.user_areYouSure', ['email' => $user->email]) }}
</p>
</div>
- <div class="card-footer">
+ <div class="card-footer text-end">
+ <a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
<input type="submit" name="submit"
value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end delete-user"/>
- <a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
</div>
diff --git a/resources/views/tags/delete.blade.php b/resources/views/tags/delete.blade.php
index 28998617bc..06a776b8c5 100644
--- a/resources/views/tags/delete.blade.php
+++ b/resources/views/tags/delete.blade.php
@@ -24,8 +24,8 @@
</p>
</div>
<div class="card-footer text-end">
- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger"/>
<a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger"/>
</div>
</div>
</div>
diff --git a/resources/views/transactions/bulk/edit.blade.php b/resources/views/transactions/bulk/edit.blade.php
index 4313450735..4d1f754bc4 100644
--- a/resources/views/transactions/bulk/edit.blade.php
+++ b/resources/views/transactions/bulk/edit.blade.php
@@ -160,8 +160,8 @@
</div>
<div class="card-footer text-end">
- <input type="submit" name="submit" value="{{ trans('form.update_all_journals') }}" class="btn btn-success "/>
<a href="{{ route('index') }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
+ <input type="submit" name="submit" value="{{ trans('form.update_all_journals') }}" class="btn btn-success "/>
</div>
</div>
diff --git a/resources/views/transactions/delete.blade.php b/resources/views/transactions/delete.blade.php
index 0121135233..edd351908d 100644
--- a/resources/views/transactions/delete.blade.php
+++ b/resources/views/transactions/delete.blade.php
@@ -18,9 +18,9 @@
{{ trans('form.journal_areYouSure', ['description' => $group->title ?? $journal->description]) }}
</p>
</div>
- <div class="card-footer">
- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/>
+ <div class="card-footer text-end">
<a href="{{ $previous }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/>
</div>
</div>
</div>
diff --git a/resources/views/transactions/links/delete.blade.php b/resources/views/transactions/links/delete.blade.php
index 612c94a6dc..d8770c893c 100644
--- a/resources/views/transactions/links/delete.blade.php
+++ b/resources/views/transactions/links/delete.blade.php
@@ -19,8 +19,8 @@
</p>
</div>
<div class="card-footer text-end">
- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger"/>
<a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger"/>
</div>
</div>
</div>
diff --git a/resources/views/transactions/mass/delete.blade.php b/resources/views/transactions/mass/delete.blade.php
index 00aeb97456..1616065962 100644
--- a/resources/views/transactions/mass/delete.blade.php
+++ b/resources/views/transactions/mass/delete.blade.php
@@ -94,8 +94,8 @@
</div>
<div class="card-footer text-end">
- <input type="submit" name="submit" value="{{ trans('form.delete_all_permanently') }}" class="btn btn-danger"/>
<a href="{{ route('index') }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
+ <input type="submit" name="submit" value="{{ trans('form.delete_all_permanently') }}" class="btn btn-danger"/>
</div>
</div>
</div>
diff --git a/resources/views/transactions/mass/edit.blade.php b/resources/views/transactions/mass/edit.blade.php
index c3a9d2448a..b92388e0a6 100644
--- a/resources/views/transactions/mass/edit.blade.php
+++ b/resources/views/transactions/mass/edit.blade.php
@@ -163,8 +163,8 @@
</table>
</div>
<div class="card-footer text-end">
- <input type="submit" name="submit" value="{{ trans('form.update_all_journals') }}" class="btn btn-success "/>
<a href="{{ route('index') }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
+ <input type="submit" name="submit" value="{{ trans('form.update_all_journals') }}" class="btn btn-success "/>
</div>
</div>
</div>
diff --git a/resources/views/transactions/single/delete.blade.php b/resources/views/transactions/single/delete.blade.php
index 90027aee54..04d2f32063 100644
--- a/resources/views/transactions/single/delete.blade.php
+++ b/resources/views/transactions/single/delete.blade.php
@@ -19,7 +19,6 @@
</p>
</div>
<div class="card-footer text-end">
- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger"/>
@if('Withdrawal' === $journal->transaction_type_type)
<a href="{{ route('transactions.index','withdrawal') }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
@endif
@@ -29,6 +28,7 @@
@if('Transfer' === $journal->transaction_type_type)
<a href="{{ route('transactions.index','transfers') }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
@endif
+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger"/>
</div>
</div>
</div>
diff --git a/resources/views/webhooks/delete.blade.php b/resources/views/webhooks/delete.blade.php
index fc745acab7..164f057ba5 100644
--- a/resources/views/webhooks/delete.blade.php
+++ b/resources/views/webhooks/delete.blade.php
@@ -16,9 +16,9 @@
</p>
</div>
<div class="card-footer text-end">
+ <a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
<input type="submit" id="button" name="submit" value="{{ trans('form.deletePermanently') }}"
class="btn btn-danger"/>
- <a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>
</div>
</div>
</div>