kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-20 16:40:10 +00:00
Code Issues Projects Releases Wiki Activity

First attempt, trying to build an import stuff routine.

Browse Source
This commit is contained in:
James Cole
2014-09-02 08:58:56 +02:00
parent 420b5790e3
commit f472a01a80
25 changed files with 1050 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,6 +148,14 @@ class EloquentAccountRepository implements AccountRepositoryInterface
->get(['accounts.*']);
}
/**
* @param $type
* @return mixed
*/
public function findAccountType($type) {
return \AccountType::where('type',$type)->first();
}
/**
* @return array|mixed
*/
@@ -203,6 +211,14 @@ class EloquentAccountRepository implements AccountRepositoryInterface
{
$type = \AccountType::where('type', 'Cash account')->first();
$cash = \Auth::user()->accounts()->where('account_type_id', $type->id)->first();
if(is_null($cash)) {
$cash = new \Account;
$cash->accountType()->associate($type);
$cash->user()->associate(\Auth::user());
$cash->name = 'Cash account';
$cash->active = 1;
$cash->save();
}
return $cash;
@@ -234,6 +250,9 @@ class EloquentAccountRepository implements AccountRepositoryInterface
&& get_class($data['account_type']) == 'AccountType'
) {
$accountType = $data['account_type'];
} else if (isset($data['account_type']) && is_string($data['account_type'])) {
$accountType = \AccountType::where('type', $data['account_type'])->first();
} else {
$accountType = \AccountType::where('type', 'Default account')->first();
}
@@ -243,7 +262,12 @@ class EloquentAccountRepository implements AccountRepositoryInterface
*/
$account = new \Account;
$account->accountType()->associate($accountType);
$account->user()->associate(\Auth::user());
if (\Auth::check()) {
$account->user()->associate(\Auth::user());
} else {
$account->user_id = $data['user_id'];
}
$account->name = $data['name'];
$account->active
= isset($data['active']) && intval($data['active']) >= 0 && intval($data['active']) <= 1 ? intval(
@@ -256,7 +280,9 @@ class EloquentAccountRepository implements AccountRepositoryInterface
if (isset($data['openingbalance']) && isset($data['openingbalancedate'])) {
$amount = floatval($data['openingbalance']);
$date = new Carbon($data['openingbalancedate']);
$this->_createInitialBalance($account, $amount, $date);
if ($amount != 0) {
$this->_createInitialBalance($account, $amount, $date);
}
}
}
@@ -302,6 +328,20 @@ class EloquentAccountRepository implements AccountRepositoryInterface
return $account;
}
/**
* Used for import
*
* @param $name
*
* @return mixed
*/
public function findByNameAny($name)
{
return \Auth::user()->accounts()
->where('name', 'like', '%' . $name . '%')
->first();
}
/**
* @param \Account $account
* @param int $amount