kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Rebuild new layout.

Browse Source
This commit is contained in:
James Cole
2021-04-08 11:21:20 +02:00
parent 6160f99e92
commit 56dff7ea67
70 changed files with 2135 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Services/Internal/Support/AccountServiceTrait.php
View File

@@ -407,9 +407,6 @@ trait AccountServiceTrait
Log::error($e->getMessage());
Log::error($e->getTraceAsString());
}
return $group;
}
}

12
app/Services/Internal/Support/JournalServiceTrait.php
View File

@@ -168,7 +168,7 @@ trait JournalServiceTrait
* @return Account
* @throws FireflyException
*/
private function createAccount(?Account $account, array $data, string $preferredType): Account
private function createAccount(?Account $account, array $data, string $preferredType): ?Account
{
Log::debug('Now in createAccount()', $data);
// return new account.
@@ -192,7 +192,15 @@ trait JournalServiceTrait
Log::debug(sprintf('Account name is now IBAN ("%s")', $data['iban']));
$data['name'] = $data['iban'];
}
// fix name of account if only number is given:
if ('' === (string)$data['name'] && '' !== (string)$data['number']) {
Log::debug(sprintf('Account name is now account number ("%s")', $data['number']));
$data['name'] = $data['number'];
}
// if name is still NULL, return NULL.
if(null === $data['name']) {
return null;
}
$data['name'] = $data['name'] ?? '(no name)';
$account = $this->accountRepository->store(