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

Updated the transaction everything so views and forms work with the new transaction controller.

Browse Source
This commit is contained in:
James Cole
2014-09-12 17:31:12 +02:00
parent 0ae9ff4575
commit a1ba340ead
5 changed files with 377 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/models/TransactionJournal.php
View File

@@ -95,6 +95,18 @@ use LaravelBook\Ardent\Builder;
* 'Budget[] $budgets
* @property-read \Illuminate\Database\Eloquent\Collection|\
* 'Category[] $categories
* @property integer $recurring_transaction_id
* @property-read \Illuminate\Database\Eloquent\Collection|\
* 'Budget[] $budgets
* @property-read \Illuminate\Database\Eloquent\Collection|\
* 'Category[] $categories
* @property-read \RecurringTransaction $recurringTransaction
* @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereRecurringTransactionId($value)
* @property-read \Illuminate\Database\Eloquent\Collection|\
* 'Budget[] $budgets
* @property-read \Illuminate\Database\Eloquent\Collection|\
* 'Category[] $categories
* @method static \TransactionJournal accountIs($account)
*/
class TransactionJournal extends Ardent
{
@@ -153,7 +165,11 @@ class TransactionJournal extends Ardent
return ['created_at', 'updated_at', 'date'];
}
public function scopeAccount(Builder $query, \Account $account)
/**
* @param Builder $query
* @param Account $account
*/
public function scopeAccountIs(Builder $query, \Account $account)
{
if (!isset($this->joinedTransactions)) {
$query->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id');