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

Include BIC in import routine

Browse Source
This commit is contained in:
James Cole 2018-03-19 10:03:08 +01:00
parent 31146954d1
commit e2ecaf5bcf
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Import/Object/ImportAccount.php
View File

@ -38,6 +38,8 @@ class ImportAccount
/** @var Account */ /** @var Account */
private $account; private $account;
/** @var array */ /** @var array */
private $accountBic = [];
/** @var array */
private $accountIban = []; private $accountIban = [];
/** @var array */ /** @var array */
private $accountId = []; private $accountId = [];
@ -51,7 +53,7 @@ class ImportAccount
private $expectedType = ''; private $expectedType = '';
/** /**
* This value is used to indicate the other account ID (the opposing transaction's account), * This value is used to indicate the other account ID (the opposing transaction's account),
* if it is know. If so, this particular importaccount may never return an Account with this ID. * if it is know. If so, this particular import account may never return an Account with this ID.
* If it would, this would result in a transaction from-to the same account. * If it would, this would result in a transaction from-to the same account.
* *
* @var int * @var int
@ -105,6 +107,14 @@ class ImportAccount
$this->expectedType = $expectedType; $this->expectedType = $expectedType;
} }
/**
* @param array $accountBic
*/
public function setAccountBic(array $accountBic): void
{
$this->accountBic = $accountBic;
}
/** /**
* @codeCoverageIgnore * @codeCoverageIgnore
* *
@ -388,6 +398,7 @@ class ImportAccount
'active' => true, 'active' => true,
'virtualBalance' => '0', 'virtualBalance' => '0',
'account_type_id' => null, 'account_type_id' => null,
'BIC' => $this->accountBic['value'] ?? null,
]; ];
$this->account = $this->repository->store($data); $this->account = $this->repository->store($data);

3
app/Import/Object/ImportJournal.php
View File

@ -283,6 +283,9 @@ class ImportJournal
case 'opposing-id': case 'opposing-id':
$this->opposing->setAccountId($array); $this->opposing->setAccountId($array);
break; break;
case 'opposing-bic':
$this->opposing->setAccountBic($array);
break;
case 'tags-comma': case 'tags-comma':
case 'tags-space': case 'tags-space':
$this->setTags($array); $this->setTags($array);

6
config/csv.php
View File

@ -266,6 +266,12 @@ return [
'converter' => 'AccountId', 'converter' => 'AccountId',
'mapper' => 'OpposingAccounts', 'mapper' => 'OpposingAccounts',
], ],
'opposing-bic' => [
'mappable' => false,
'pre-process-map' => false,
'field' => 'opposing-account-bic',
'converter' => 'AccountBic',
],
'opposing-name' => [ 'opposing-name' => [
'mappable' => true, 'mappable' => true,
'pre-process-map' => false, 'pre-process-map' => false,