kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Code clean up.

Browse Source
This commit is contained in:
James Cole
2017-11-15 10:52:29 +01:00
parent aee17221eb
commit 649dca77f5
305 changed files with 1200 additions and 1600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Models/Account.php
View File

@@ -36,7 +36,6 @@ use Illuminate\Database\Query\JoinClause;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Watson\Validating\ValidatingTrait;
/**
* Class Account
*
@@ -112,7 +111,6 @@ class Account extends Model
$account = self::create($fields);
return $account;
}
/**
@@ -122,7 +120,6 @@ class Account extends Model
*/
public static function routeBinder(Account $value)
{
if (auth()->check()) {
if (intval($value->user_id) === auth()->user()->id) {
return $value;
@@ -211,7 +208,6 @@ class Account extends Model
*/
public function getNameAttribute($value): string
{
if ($this->encrypted) {
return Crypt::decrypt($value);
}
@@ -321,9 +317,10 @@ class Account extends Model
{
$joinName = str_replace('.', '_', $name);
$query->leftJoin(
'account_meta as ' . $joinName, function (JoinClause $join) use ($joinName, $name) {
$join->on($joinName . '.account_id', '=', 'accounts.id')->where($joinName . '.name', '=', $name);
}
'account_meta as ' . $joinName,
function (JoinClause $join) use ($joinName, $name) {
$join->on($joinName . '.account_id', '=', 'accounts.id')->where($joinName . '.name', '=', $name);
}
);
$query->where($joinName . '.data', json_encode($value));
}