IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-27 01:11:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Sneaky bug. [skip ci]

Browse Source
This commit is contained in:
James Cole 2014-08-05 20:07:02 +02:00
parent 52663de13d
commit 2d0820873a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/lib/Firefly/Storage/Account/EloquentAccountRepository.php
View File

@ -34,10 +34,11 @@ class EloquentAccountRepository implements AccountRepositoryInterface
*
* @return \Account|mixed
*/
public function createOrFind($name, \AccountType $type)
public function createOrFind($name, \AccountType $type = null)
{
$beneficiary = $this->findByName($name);
if (!$beneficiary) {
$account = $this->findByName($name, $type);
if (!$account) {
$data = [
'name' => $name,
'account_type' => $type
@ -46,7 +47,7 @@ class EloquentAccountRepository implements AccountRepositoryInterface
return $this->store($data);
}
return $beneficiary;
return $account;
}
/**
@ -92,9 +93,10 @@ class EloquentAccountRepository implements AccountRepositoryInterface
*
* @return mixed
*/
public function findByName($name)
public function findByName($name, \AccountType $type = null)
{
return \Auth::user()->accounts()->where('name', 'like', '%' . $name . '%')->first();
$type = is_null($type) ? \AccountType::where('description', 'Default account')->first() : $type;
return \Auth::user()->accounts()->where('account_type_id',$type->id)->where('name', 'like', '%' . $name . '%')->first();
}
/**