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

Fixed the account role view.

Browse Source
This commit is contained in:
James Cole
2015-01-24 07:15:03 +01:00
parent 0905ceb1d5
commit b766d93d9a
3 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/lib/FireflyIII/Database/Account/Account.php
View File

@@ -52,7 +52,7 @@ class Account implements CUDInterface, CommonDatabaseCallsInterface, AccountInte
* Basic query:
*/
$query = $this->getUser()->accounts()->accountTypeIn($types)->withMeta()->orderBy('name', 'ASC');;
$set = $query->get(['accounts.*']);
$set = $query->get(['accounts.*', 'account_meta.data as accountRole']);
$set->each(
function (\Account $account) {
@@ -60,6 +60,7 @@ class Account implements CUDInterface, CommonDatabaseCallsInterface, AccountInte
* Get last activity date.
*/
$account->lastActivityDate = $this->getLastActivity($account);
$account->accountRole = \Config::get('firefly.accountRoles.' . json_decode($account->accountRole));
}
);
@@ -197,19 +198,19 @@ class Account implements CUDInterface, CommonDatabaseCallsInterface, AccountInte
}
\Event::fire('account.destroy', [$model]);
\Account::
leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
->where(
function (EloquentBuilder $q) use ($model) {
$q->where('id', $model->id);
$q->orWhere(
leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
->where(
function (EloquentBuilder $q) use ($model) {
$q->where('accounts.name', 'LIKE', '%' . $model->name . '%');
$q->where('account_types.type', 'Initial balance account');
$q->where('accounts.active', 0);
$q->where('id', $model->id);
$q->orWhere(
function (EloquentBuilder $q) use ($model) {
$q->where('accounts.name', 'LIKE', '%' . $model->name . '%');
$q->where('account_types.type', 'Initial balance account');
$q->where('accounts.active', 0);
}
);
}
);
}
)->delete();
)->delete();
return true;