kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-02-03 11:02:54 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2026-01-23

Browse Source
This commit is contained in:
JC5
2026-01-23 15:14:29 +01:00
parent 8f15a32bd6
commit eeeba86d38
888 changed files with 10732 additions and 10387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@ trait UserNavigation
AccountTypeEnum::ASSET->value,
AccountTypeEnum::LOAN->value,
AccountTypeEnum::DEBT->value,
AccountTypeEnum::MORTGAGE->value
AccountTypeEnum::MORTGAGE->value,
];
$type = $account->accountType->type;
@@ -78,7 +78,7 @@ 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;
}
@@ -87,7 +87,7 @@ trait UserNavigation
TransactionTypeEnum::WITHDRAWAL->value,
TransactionTypeEnum::TRANSFER->value,
TransactionTypeEnum::DEPOSIT->value,
TransactionTypeEnum::RECONCILIATION->value
TransactionTypeEnum::RECONCILIATION->value,
];
return in_array($type, $editable, true);
@@ -111,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'));
@@ -131,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));
@@ -143,7 +143,7 @@ trait UserNavigation
AccountTypeEnum::REVENUE->value,
AccountTypeEnum::EXPENSE->value,
AccountTypeEnum::RECONCILIATION->value,
AccountTypeEnum::INITIAL_BALANCE->value
AccountTypeEnum::INITIAL_BALANCE->value,
];
/** @var Transaction $transaction */
@@ -157,7 +157,7 @@ trait UserNavigation
return redirect(route('index'));
}
final protected function rememberPreviousUrl(string $identifier): null|string
final protected function rememberPreviousUrl(string $identifier): ?string
{
$return = Steam::getSafePreviousUrl();
session()->put($identifier, $return);