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

Some new report data. Also, the report page now uses in excess of 3000 queries. Lol

Browse Source
This commit is contained in:
James Cole
2014-12-06 09:16:54 +01:00
parent 1997666196
commit f4ecf2d1aa
6 changed files with 301 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/controllers/AccountController.php
View File

@@ -34,8 +34,9 @@ class AccountController extends BaseController
$subTitleIcon = 'fa-download';
break;
}
$subTitle = 'Create a new ' . $what . ' account';
return View::make('accounts.create')->with('subTitle', 'Create a new ' . $what . ' account')->with('what', $what)->with(compact('subTitleIcon'));
return View::make('accounts.create', compact('subTitleIcon', 'what', 'subTitle'));
}
/**
@@ -45,9 +46,9 @@ class AccountController extends BaseController
*/
public function delete(Account $account)
{
return View::make('accounts.delete')->with('account', $account)->with(
'subTitle', 'Delete ' . strtolower($account->accountType->type) . ' "' . $account->name . '"'
);
$subTitle = 'Delete ' . strtolower($account->accountType->type) . ' "' . $account->name . '"';
return View::make('accounts.delete', compact('account', 'subTitle'));
}
/**
@@ -98,29 +99,31 @@ class AccountController extends BaseController
}
/*
* Delete it
* Delete the initial balance as well.
*/
if ($initialBalance) {
$acct->destroy($initialBalance);
}
$name = $account->name;
$acct->destroy($account);
Session::flash('success', 'The account was deleted.');
$return = 'asset';
switch ($type) {
case 'Asset account':
case 'Default account':
return Redirect::route('accounts.index', 'asset');
break;
case 'Expense account':
case 'Beneficiary account':
return Redirect::route('accounts.index', 'expense');
$return = 'expense';
break;
case 'Revenue account':
return Redirect::route('accounts.index', 'revenue');
$return = 'revenue';
break;
}
Session::flash('success', 'The ' . $return . ' account "' . e($name) . '" was deleted.');
return Redirect::route('accounts.index', $return);
}