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

Added the ability to see cash accounts. [skip ci]

Browse Source
This commit is contained in:
James Cole
2014-12-28 09:00:22 +01:00
parent 4944b233b6
commit 87fbf9c1a5
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/breadcrumbs.php
View File

@@ -31,6 +31,9 @@ Breadcrumbs::register(
case 'Asset account': case 'Asset account':
$what = 'asset'; $what = 'asset';
break; break;
case 'Cash account':
$what = 'cash';
break;
case 'Expense account': case 'Expense account':
case 'Beneficiary account': case 'Beneficiary account':
$what = 'expense'; $what = 'expense';

2
app/controllers/AccountController.php
View File

@@ -28,6 +28,7 @@ class AccountController extends BaseController
'Expense account' => 'expense', 'Expense account' => 'expense',
'Beneficiary account' => 'expense', 'Beneficiary account' => 'expense',
'Revenue account' => 'revenue', 'Revenue account' => 'revenue',
'Cash account' => 'cash',
]; ];
/** @var array */ /** @var array */
@@ -36,6 +37,7 @@ class AccountController extends BaseController
'asset' => 'fa-money', 'asset' => 'fa-money',
'Asset account' => 'fa-money', 'Asset account' => 'fa-money',
'Default account' => 'fa-money', 'Default account' => 'fa-money',
'Cash account' => 'fa-money',
'expense' => 'fa-shopping-cart', 'expense' => 'fa-shopping-cart',
'Expense account' => 'fa-shopping-cart', 'Expense account' => 'fa-shopping-cart',
'Beneficiary account' => 'fa-shopping-cart', 'Beneficiary account' => 'fa-shopping-cart',

7
app/routes.php
View File

@@ -6,8 +6,11 @@ Route::bind(
function ($value, $route) { function ($value, $route) {
if (Auth::check()) { if (Auth::check()) {
$account = Account:: $account = Account::
leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')->where('account_types.editable', 1)->where('accounts.id', $value) leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
->where('user_id', Auth::user()->id)->first(['accounts.*']); ->where('account_types.editable', 1)
->where('accounts.id', $value)
->where('user_id', Auth::user()->id)
->first(['accounts.*']);
if ($account) { if ($account) {
return $account; return $account;
} }