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

Account controller #185

Browse Source
This commit is contained in:
James Cole 2016-03-12 11:05:26 +01:00
parent 1aea4045a3
commit 919aa70251
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/AccountController.php
View File

@ -87,7 +87,7 @@ class AccountController extends Controller
$type = $account->accountType->type; $type = $account->accountType->type;
$typeName = Config::get('firefly.shortNamesByFullName.' . $type); $typeName = Config::get('firefly.shortNamesByFullName.' . $type);
$name = $account->name; $name = $account->name;
$moveTo = Auth::user()->accounts()->find(intval(Input::get('move_account_before_delete'))); $moveTo = $repository->find(intval(Input::get('move_account_before_delete')));
$repository->destroy($account, $moveTo); $repository->destroy($account, $moveTo);

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

@ -66,9 +66,9 @@ class AccountRepository implements AccountRepositoryInterface
* *
* @return bool * @return bool
*/ */
public function destroy(Account $account, Account $moveTo = null): bool public function destroy(Account $account, Account $moveTo): bool
{ {
if (!is_null($moveTo)) { if (!is_null($moveTo->id)) {
// update all transactions: // update all transactions:
DB::table('transactions')->where('account_id', $account->id)->update(['account_id' => $moveTo->id]); DB::table('transactions')->where('account_id', $account->id)->update(['account_id' => $moveTo->id]);
} }
@ -79,15 +79,16 @@ class AccountRepository implements AccountRepositoryInterface
} }
/** /**
* @deprecated
*
* @param int $accountId * @param int $accountId
* *
* @return Account * @return Account
*/ */
public function find(int $accountId): Account public function find(int $accountId): Account
{ {
return $this->user->accounts()->findOrNew($accountId); $entry = $this->user->accounts()->find($accountId);
if (is_null($entry)) {
return new Account;
}
} }
/** /**

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

@ -32,13 +32,11 @@ interface AccountRepositoryInterface
* *
* @return boolean * @return boolean
*/ */
public function destroy(Account $account, Account $moveTo = null): bool; public function destroy(Account $account, Account $moveTo): bool;
/** /**
* @param int $accountId * @param int $accountId
* *
* @deprecated
*
* @return Account * @return Account
*/ */
public function find(int $accountId): Account; public function find(int $accountId): Account;