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

Finish up bunq import routine.

Browse Source
This commit is contained in:
James Cole
2018-03-24 18:55:02 +01:00
parent 3c9b7c07af
commit 6a6482dc7f
24 changed files with 696 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Repositories/Account/AccountRepository.php
View File

@@ -302,4 +302,5 @@ class AccountRepository implements AccountRepositoryInterface
return $journal;
}
}

11
app/Repositories/Account/AccountRepositoryInterface.php
View File

@@ -66,6 +66,7 @@ interface AccountRepositoryInterface
* @param string $number
* @param array $types
*
* @deprecated
* @return Account
*/
public function findByAccountNumber(string $number, array $types): Account;
@@ -74,14 +75,24 @@ interface AccountRepositoryInterface
* @param string $iban
* @param array $types
*
* @deprecated
* @return Account
*/
public function findByIban(string $iban, array $types): Account;
/**
* @param string $iban
* @param array $types
*
* @return Account|null
*/
public function findByIbanNull(string $iban, array $types): ?Account;
/**
* @param string $name
* @param array $types
*
* @deprecated
* @return Account|null
*/
public function findByName(string $name, array $types): ?Account;

29
app/Repositories/Account/FindAccountsTrait.php
View File

@@ -41,6 +41,7 @@ trait FindAccountsTrait
/**
* @param $accountId
*
* @deprecated
* @return Account
*/
public function find(int $accountId): Account
@@ -58,6 +59,7 @@ trait FindAccountsTrait
* @param string $number
* @param array $types
*
*
* @deprecated
* @return Account
*/
@@ -109,10 +111,37 @@ trait FindAccountsTrait
return new Account;
}
/**
* @param string $iban
* @param array $types
*
* @return Account|null
*/
public function findByIbanNull(string $iban, array $types): ?Account
{
$query = $this->user->accounts()->where('iban', '!=', '')->whereNotNull('iban');
if (count($types) > 0) {
$query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
$query->whereIn('account_types.type', $types);
}
$accounts = $query->get(['accounts.*']);
/** @var Account $account */
foreach ($accounts as $account) {
if ($account->iban === $iban) {
return $account;
}
}
return null;
}
/**
* @param string $name
* @param array $types
*
* @deprecated
* @return Account|null
*/
public function findByName(string $name, array $types): ?Account