kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-03 20:14:31 +00:00
Code Issues Projects Releases Wiki Activity

Extend rule set for import.

Browse Source
This commit is contained in:
James Cole
2016-08-11 18:44:11 +02:00
parent 186b704509
commit 0aaf9a6fda
32 changed files with 349 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Crud/Account/AccountCrud.php
View File

@@ -158,10 +158,12 @@ class AccountCrud implements AccountCrudInterface
/** @var Account $account */
foreach ($accounts as $account) {
if ($account->name === $name) {
Log::debug('Account name is an exact match. ', ['db' => $account->name, 'source' => $name,'id' => $account->id]);
Log::debug('Account name is an exact match. ', ['db' => $account->name, 'source' => $name, 'id' => $account->id]);
return $account;
}
}
Log::warning('Found nothing in findByName()', ['name' => $name, 'types' => $types]);
Log::debug('Found nothing in findByName()', ['name' => $name, 'types' => $types]);
return new Account;
}
@@ -233,7 +235,7 @@ class AccountCrud implements AccountCrudInterface
public function store(array $data): Account
{
$newAccount = $this->storeAccount($data);
if (!is_null($newAccount)) {
if (!is_null($newAccount->id)) {
$this->storeMetadata($newAccount, $data);
}
@@ -327,8 +329,8 @@ class AccountCrud implements AccountCrudInterface
];
$existingAccount = Account::firstOrNullEncrypted($searchData);
if (!$existingAccount) {
Log::error('Account create error: ' . $newAccount->getErrors()->toJson());
abort(500);
Log::error('Account create error', $newAccount->getErrors()->toArray());
return new Account;
}
$newAccount = $existingAccount;