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

Some cleanup, some bug fixes.

Browse Source
This commit is contained in:
James Cole
2014-09-12 21:47:27 +02:00
parent 0203fee174
commit 44eb67f94e
7 changed files with 141 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,6 +43,16 @@ class EloquentAccountRepository implements AccountRepositoryInterface
return $accounts;
}
/**
* @param $name
* @param \AccountType $type
*
* @return \Account
*/
public function findByNameAndAccountType($name, \AccountType $type) {
return $this->_user->accounts()->where('name',$name)->where('account_type_id',$type->id)->first();
}
/**
* @return mixed
*/
@@ -155,44 +165,44 @@ class EloquentAccountRepository implements AccountRepositoryInterface
// whatever the result, return the account.
return $account;
}
//
// /**
// * @param \Account $account
// * @param int $amount
// * @param Carbon $date
// *
// * @return bool
// * @SuppressWarnings(PHPMD.CamelCaseMethodName)
// */
// protected function _createInitialBalance(\Account $account, $amount = 0, Carbon $date)
// {
// // get account type:
// $initialBalanceAT = \AccountType::where('type', 'Initial balance account')->first();
//
// // create new account:
// $initial = new \Account;
// $initial->accountType()->associate($initialBalanceAT);
// $initial->user()->associate($this->_user);
// $initial->name = $account->name . ' initial balance';
// $initial->active = 0;
// if ($initial->validate()) {
// $initial->save();
// // create new transaction journal (and transactions):
// /** @var \Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface $transactionJournal */
// $transactionJournal = \App::make(
// 'Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface'
// );
// $transactionJournal->overruleUser($this->_user);
//
// $transactionJournal->createSimpleJournal(
// $initial, $account, 'Initial Balance for ' . $account->name, $amount, $date
// );
//
// return true;
// }
//
// return false;
// }
/**
* @param \Account $account
* @param int $amount
* @param Carbon $date
*
* @return bool
* @SuppressWarnings(PHPMD.CamelCaseMethodName)
*/
protected function _createInitialBalance(\Account $account, $amount = 0, Carbon $date)
{
// get account type:
$initialBalanceAT = \AccountType::where('type', 'Initial balance account')->first();
// create new account:
$initial = new \Account;
$initial->accountType()->associate($initialBalanceAT);
$initial->user()->associate($this->_user);
$initial->name = $account->name . ' initial balance';
$initial->active = 0;
if ($initial->validate()) {
$initial->save();
// create new transaction journal (and transactions):
/** @var \Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface $transactionJournal */
$transactionJournal = \App::make(
'Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface'
);
$transactionJournal->overruleUser($this->_user);
$transactionJournal->createSimpleJournal(
$initial, $account, 'Initial Balance for ' . $account->name, $amount, $date
);
return true;
}
return false;
}
/**
* @param \Account $account