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

All code for issue #38.

Browse Source
This commit is contained in:
James Cole
2014-12-29 20:28:17 +01:00
parent 40892ccfa7
commit 75f86462e2
32 changed files with 573 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/TransactionJournal.php
View File

@@ -85,9 +85,9 @@ class TransactionJournal extends Eloquent
/**
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function recurringTransaction()
public function bill()
{
return $this->belongsTo('RecurringTransaction');
return $this->belongsTo('Bill');
}
/**
@@ -202,7 +202,7 @@ class TransactionJournal extends Eloquent
$query->with(
['transactions' => function ($q) {
$q->orderBy('amount', 'ASC');
}, 'transactiontype', 'budgets','categories', 'transactions.account.accounttype', 'recurringTransaction', 'budgets', 'categories']
}, 'transactiontype', 'budgets','categories', 'transactions.account.accounttype', 'bill', 'budgets', 'categories']
);
}