diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php index f27e763540..1283863a73 100644 --- a/app/Http/Controllers/Account/ReconcileController.php +++ b/app/Http/Controllers/Account/ReconcileController.php @@ -36,7 +36,7 @@ use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; -use FireflyIII\Support\Http\Controllers\UserRedirection; +use FireflyIII\Support\Http\Controllers\UserNavigation; use Log; /** @@ -46,7 +46,7 @@ use Log; */ class ReconcileController extends Controller { - use UserRedirection; + use UserNavigation; /** @var AccountRepositoryInterface The account repository */ private $accountRepos; /** @var CurrencyRepositoryInterface The currency repository */ diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php index 8c9e8241e1..6bdf2f8f8a 100644 --- a/app/Http/Controllers/Account/ShowController.php +++ b/app/Http/Controllers/Account/ShowController.php @@ -33,7 +33,7 @@ use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Support\CacheProperties; -use FireflyIII\Support\Http\Controllers\UserRedirection; +use FireflyIII\Support\Http\Controllers\UserNavigation; use Illuminate\Http\Request; use Illuminate\Support\Collection; use View; @@ -45,7 +45,7 @@ use View; */ class ShowController extends Controller { - use UserRedirection; + use UserNavigation; /** @var CurrencyRepositoryInterface The currency repository */ private $currencyRepos; diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.php index 8f5e791376..92a6aebfc5 100644 --- a/app/Http/Controllers/Json/ReconcileController.php +++ b/app/Http/Controllers/Json/ReconcileController.php @@ -34,7 +34,7 @@ use FireflyIII\Models\Transaction; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; -use FireflyIII\Support\Http\Controllers\UserRedirection; +use FireflyIII\Support\Http\Controllers\UserNavigation; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Collection; @@ -49,7 +49,7 @@ use Throwable; */ class ReconcileController extends Controller { - use UserRedirection; + use UserNavigation; /** @var AccountRepositoryInterface The account repository */ private $accountRepos; /** @var CurrencyRepositoryInterface The currency repository */ diff --git a/app/Support/Http/Controllers/UserRedirection.php b/app/Support/Http/Controllers/UserRedirection.php deleted file mode 100644 index edbaf8d349..0000000000 --- a/app/Support/Http/Controllers/UserRedirection.php +++ /dev/null @@ -1,65 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace FireflyIII\Support\Http\Controllers; - -use FireflyIII\Models\Account; -use FireflyIII\Models\Transaction; -use Illuminate\Http\RedirectResponse; -use Log; - -/** - * Trait UserRedirection - * - * @package FireflyIII\Support\Http\Controllers - */ -trait UserRedirection -{ - /** - * @param Account $account - * - * @return RedirectResponse|\Illuminate\Routing\Redirector - */ - protected function redirectToOriginalAccount(Account $account) - { - /** @var Transaction $transaction */ - $transaction = $account->transactions()->first(); - if (null === $transaction) { - app('session')->flash('error', trans('firefly.account_missing_transaction', ['name' => $account->name, 'id' => $account->id])); - Log::error(sprintf('Expected a transaction. Account #%d has none. BEEP, error.', $account->id)); - - return redirect(route('index')); - } - - $journal = $transaction->transactionJournal; - /** @var Transaction $opposingTransaction */ - $opposingTransaction = $journal->transactions()->where('transactions.id', '!=', $transaction->id)->first(); - - if (null === $opposingTransaction) { - app('session')->flash('error', trans('firefly.account_missing_transaction', ['name' => $account->name, 'id' => $account->id])); - Log::error(sprintf('Expected an opposing transaction. Account #%d has none. BEEP, error.', $account->id)); - } - - return redirect(route('accounts.show', [$opposingTransaction->account_id])); - } -} \ No newline at end of file