IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Will not store fields with empty strings or weird value

Browse Source
This commit is contained in:
James Cole 2018-04-22 08:07:33 +02:00
parent 529dd490b7
commit 49421f50ac
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,18 +329,22 @@ trait AccountServiceTrait
/** @var AccountMeta $entry */ /** @var AccountMeta $entry */
$entry = $account->accountMeta()->where('name', $field)->first(); $entry = $account->accountMeta()->where('name', $field)->first();
// if $data has field and $entry is null, create new one: // must not be an empty string:
if (isset($data[$field]) && null === $entry) { if (isset($data[$field]) && strlen((string)$data[$field]) > 0) {
Log::debug(sprintf('Created meta-field "%s":"%s" for account #%d ("%s") ', $field, $data[$field], $account->id, $account->name));
$factory->create(['account_id' => $account->id, 'name' => $field, 'data' => $data[$field],]);
}
// if $data has field and $entry is not null, update $entry: // if $data has field and $entry is null, create new one:
// let's not bother with a service. if (null === $entry) {
if (isset($data[$field]) && null !== $entry) { Log::debug(sprintf('Created meta-field "%s":"%s" for account #%d ("%s") ', $field, $data[$field], $account->id, $account->name));
$entry->data = $data[$field]; $factory->create(['account_id' => $account->id, 'name' => $field, 'data' => $data[$field],]);
$entry->save(); }
Log::debug(sprintf('Updated meta-field "%s":"%s" for #%d ("%s") ', $field, $data[$field], $account->id, $account->name));
// if $data has field and $entry is not null, update $entry:
// let's not bother with a service.
if (null !== $entry) {
$entry->data = $data[$field];
$entry->save();
Log::debug(sprintf('Updated meta-field "%s":"%s" for #%d ("%s") ', $field, $data[$field], $account->id, $account->name));
}
} }
} }
} }

4
app/Services/Internal/Update/AccountUpdateService.php
View File

@ -51,6 +51,10 @@ class AccountUpdateService
$account->iban = $data['iban']; $account->iban = $data['iban'];
$account->save(); $account->save();
if($data['currency_id'] === 0) {
unset($data['currency_id']);
}
// update all meta data: // update all meta data:
$this->updateMetaData($account, $data); $this->updateMetaData($account, $data);