gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-10 12:24:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced Ardent with another package.

Browse Source
This commit is contained in:
James Cole
2014-12-06 12:12:55 +01:00
parent f4ecf2d1aa
commit bb3ba42ce2
45 changed files with 329 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
app/controllers/AccountController.php
View File

@@ -60,55 +60,19 @@ class AccountController extends BaseController
{
$type = $account->accountType->type;
$name = $account->name;
/** @var \FireflyIII\Database\Account $acct */
$acct = App::make('FireflyIII\Database\Account');
/** @var \FireflyIII\Database\TransactionJournal $jrnls */
$jrnls = App::make('FireflyIII\Database\TransactionJournal');
/*
* Find the "initial balance account", should it exist:
*/
$initialBalance = $acct->findInitialBalanceAccount($account);
/*
* Get all the transaction journals that are part of this/these account(s):
*/
$journals = [];
if ($initialBalance) {
$transactions = $initialBalance->transactions()->get();
/** @var \Transaction $transaction */
foreach ($transactions as $transaction) {
$journals[] = $transaction->transaction_journal_id;
}
}
/** @var \Transaction $transaction */
foreach ($account->transactions() as $transaction) {
$journals[] = $transaction->transaction_journal_id;
}
$journals = array_unique($journals);
/*
* Delete the journals. Should get rid of the transactions as well.
*/
foreach ($journals as $id) {
$journal = $jrnls->find($id);
$jrnls->destroy($journal);
}
/*
* Delete the initial balance as well.
*/
if ($initialBalance) {
$acct->destroy($initialBalance);
}
$name = $account->name;
// find the initial balance account (the only other account that should be deleted)
// find all journals for both accounts (or just the one) and delete them.
// the rest will take care of itself.
// in the least amount of queries possible.
// and it can be done in ONE query! or maybe two.
$acct->destroy($account);
$return = 'asset';
switch ($type) {
case 'Expense account':
@@ -123,8 +87,6 @@ class AccountController extends BaseController
Session::flash('success', 'The ' . $return . ' account "' . e($name) . '" was deleted.');
return Redirect::route('accounts.index', $return);
}
/**