kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Last updates, fixes the main list.

Browse Source
This commit is contained in:
James Cole
2016-03-02 12:33:07 +01:00
parent f2c1dd41d0
commit 1ac64fd0b3
3 changed files with 101 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/Models/TransactionJournal.php
View File

@@ -166,6 +166,16 @@ class TransactionJournal extends Model
return $value;
}
/**
* @param $value
*
* @return string
*/
public function getDestinationAccountNameAttribute($value)
{
return Crypt::decrypt($value);
}
/**
*
* @param string $fieldName
@@ -183,6 +193,16 @@ class TransactionJournal extends Model
return '';
}
/**
* @param $value
*
* @return string
*/
public function getSourceAccountNameAttribute($value)
{
return Crypt::decrypt($value);
}
/**
* @return bool
*/
@@ -319,6 +339,8 @@ class TransactionJournal extends Model
// join destination account type
$query->leftJoin('account_types as source_acct_type', 'source_account.account_type_id', '=', 'source_acct_type.id');
$query->with(['categories', 'budgets', 'attachments', 'bill']);
}
@@ -330,9 +352,6 @@ class TransactionJournal extends Model
*/
public function scopeTransactionTypes(EloquentBuilder $query, array $types)
{
$query->leftJoin(
'transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id'
);
$query->whereIn('transaction_types.type', $types);
}