kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-02-13 07:12:21 +00:00
Code Issues Projects Releases Wiki Activity

Autoformat lol

Browse Source
This commit is contained in:
James Cole
2026-01-23 15:09:50 +01:00
parent ae1347c550
commit 8f15a32bd6
1071 changed files with 21111 additions and 21687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/Support/Http/Controllers/UserNavigation.php
View File

@@ -24,16 +24,16 @@ declare(strict_types=1);
namespace FireflyIII\Support\Http\Controllers;
use Illuminate\Support\Facades\Log;
use FireflyIII\Enums\AccountTypeEnum;
use FireflyIII\Enums\TransactionTypeEnum;
use FireflyIII\Models\Account;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionGroup;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Support\Facades\Steam;
use Illuminate\Http\RedirectResponse;
use Illuminate\Routing\Redirector;
use FireflyIII\Support\Facades\Steam;
use Illuminate\Support\Facades\Log;
/**
* Trait UserNavigation
@@ -51,7 +51,7 @@ trait UserNavigation
final protected function getPreviousUrl(string $identifier): string
{
Log::debug(sprintf('Trying to retrieve URL stored under "%s"', $identifier));
$url = (string)session($identifier);
$url = (string) session($identifier);
Log::debug(sprintf('The URL is %s', $url));
return Steam::getSafeUrl($url, route('index'));
@@ -62,7 +62,14 @@ trait UserNavigation
*/
final protected function isEditableAccount(Account $account): bool
{
$editable = [AccountTypeEnum::EXPENSE->value, AccountTypeEnum::REVENUE->value, AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value];
$editable = [
AccountTypeEnum::EXPENSE->value,
AccountTypeEnum::REVENUE->value,
AccountTypeEnum::ASSET->value,
AccountTypeEnum::LOAN->value,
AccountTypeEnum::DEBT->value,
AccountTypeEnum::MORTGAGE->value
];
$type = $account->accountType->type;
return in_array($type, $editable, true);
@@ -71,12 +78,17 @@ trait UserNavigation
final protected function isEditableGroup(TransactionGroup $group): bool
{
/** @var null|TransactionJournal $journal */
$journal = $group->transactionJournals()->first();
$journal = $group->transactionJournals()->first();
if (null === $journal) {
return false;
}
$type = $journal->transactionType->type;
$editable = [TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::TRANSFER->value, TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::RECONCILIATION->value];
$editable = [
TransactionTypeEnum::WITHDRAWAL->value,
TransactionTypeEnum::TRANSFER->value,
TransactionTypeEnum::DEPOSIT->value,
TransactionTypeEnum::RECONCILIATION->value
];
return in_array($type, $editable, true);
}
@@ -84,7 +96,11 @@ trait UserNavigation
final protected function redirectAccountToAccount(Account $account): Redirector|RedirectResponse
{
$type = $account->accountType->type;
if (AccountTypeEnum::RECONCILIATION->value === $type || AccountTypeEnum::INITIAL_BALANCE->value === $type || AccountTypeEnum::LIABILITY_CREDIT->value === $type) {
if (
AccountTypeEnum::RECONCILIATION->value === $type
|| AccountTypeEnum::INITIAL_BALANCE->value === $type
|| AccountTypeEnum::LIABILITY_CREDIT->value === $type
) {
// reconciliation must be stored somewhere in this account's transactions.
/** @var null|Transaction $transaction */
@@ -95,10 +111,10 @@ trait UserNavigation
return redirect(route('index'));
}
$journal = $transaction->transactionJournal;
$journal = $transaction->transactionJournal;
/** @var null|Transaction $other */
$other = $journal->transactions()->where('id', '!=', $transaction->id)->first();
$other = $journal->transactions()->where('id', '!=', $transaction->id)->first();
if (null === $other) {
Log::error(sprintf('Account #%d has no valid journals. Dont know where it belongs.', $account->id));
session()->flash('error', trans('firefly.cant_find_redirect_account'));
@@ -115,7 +131,7 @@ trait UserNavigation
final protected function redirectGroupToAccount(TransactionGroup $group): Redirector|RedirectResponse
{
/** @var null|TransactionJournal $journal */
$journal = $group->transactionJournals()->first();
$journal = $group->transactionJournals()->first();
if (null === $journal) {
Log::error(sprintf('No journals in group #%d', $group->id));
@@ -123,7 +139,12 @@ trait UserNavigation
}
// prefer redirect to everything but expense and revenue:
$transactions = $journal->transactions;
$ignore = [AccountTypeEnum::REVENUE->value, AccountTypeEnum::EXPENSE->value, AccountTypeEnum::RECONCILIATION->value, AccountTypeEnum::INITIAL_BALANCE->value];
$ignore = [
AccountTypeEnum::REVENUE->value,
AccountTypeEnum::EXPENSE->value,
AccountTypeEnum::RECONCILIATION->value,
AccountTypeEnum::INITIAL_BALANCE->value
];
/** @var Transaction $transaction */
foreach ($transactions as $transaction) {
@@ -136,7 +157,7 @@ trait UserNavigation
return redirect(route('index'));
}
final protected function rememberPreviousUrl(string $identifier): ?string
final protected function rememberPreviousUrl(string $identifier): null|string
{
$return = Steam::getSafePreviousUrl();
session()->put($identifier, $return);