kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 22:21:42 +00:00
Code Issues Projects Releases Wiki Activity

And now also make sure that old meta data isn't changed.

Browse Source
This commit is contained in:
James Cole
2019-08-24 08:22:46 +02:00
parent d836c8217d
commit 7c5e10de33
3 changed files with 83 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,6 +44,13 @@ class AccountUpdateService
/** @var User */
private $user;
/** @var array */
protected $validAssetFields = ['account_role', 'account_number', 'currency_id', 'BIC', 'include_net_worth'];
/** @var array */
protected $validCCFields = ['account_role', 'cc_monthly_payment_date', 'cc_type', 'account_number', 'currency_id', 'BIC', 'include_net_worth'];
/** @var array */
protected $validFields = ['account_number', 'currency_id', 'BIC', 'interest', 'interest_period', 'include_net_worth'];
/**
* Constructor.
*/
@@ -71,21 +78,17 @@ class AccountUpdateService
$this->user = $account->user;
// update the account itself:
$account->name = $data['name'] ?? $account->name;
$account->active = $data['active'] ?? $account->active;
$account->iban = $data['iban'] ?? $account->iban;
// update virtual balance (could be set to zero if empty string).
if (null !== $data['virtual_balance']) {
$account->virtual_balance = '' === trim($data['virtual_balance']) ? '0' : $data['virtual_balance'];
}
$account->iban = $data['iban'] ?? $account->iban;
$account->save();
if (isset($data['currency_id']) && null !== $data['currency_id'] && 0 === $data['currency_id']) {
unset($data['currency_id']);
}
// find currency, or use default currency instead.
if (null !== $data['currency_id'] || null !== $data['currency_code']) {
$currency = $this->getCurrency((int)($data['currency_id'] ?? null), (string)($data['currency_code'] ?? null));
@@ -93,13 +96,6 @@ class AccountUpdateService
$data['currency_id'] = $currency->id;
}
if (null === $data['currency_id']) {
$data['currency_id'] = $this->accountRepository->getMetaValue($account, 'currency_id');
}
if (null === $data['account_role']) {
$data['account_role'] = $this->accountRepository->getMetaValue($account, 'account_role');
}
// update all meta data:
$this->updateMetaData($account, $data);