kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 17:33:45 +00:00
Code Issues Projects Releases Wiki Activity

Fixed bug #370

Browse Source
This commit is contained in:
James Cole
2016-11-01 18:40:35 +01:00
parent ed33a054ad
commit 1657048181
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/TransactionJournal.php
View File

@@ -408,8 +408,10 @@ class TransactionJournal extends TransactionJournalSupport
if (!self::isJoined($query, 'transaction_types')) { if (!self::isJoined($query, 'transaction_types')) {
$query->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id'); $query->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id');
} }
if (count($types) > 0) {
$query->whereIn('transaction_types.type', $types); $query->whereIn('transaction_types.type', $types);
} }
}
/** /**
* *

5
app/Repositories/Category/CategoryRepository.php
View File

@@ -260,10 +260,9 @@ class CategoryRepository implements CategoryRepositoryInterface
// then collection transactions (harder) // then collection transactions (harder)
$query = $this->user->transactionJournals()->distinct() $query = $this->user->transactionJournals()->distinct()
->leftJoin('transactions', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') ->leftJoin('transactions', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->leftJoin('category_transaction', 'category_transaction.transaction_id', '=', 'transactions.id'); ->leftJoin('category_transaction', 'category_transaction.transaction_id', '=', 'transactions.id')
->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id');
if (count($types) > 0) { if (count($types) > 0) {
$query->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id');
$query->whereIn('transaction_types.type', $types); $query->whereIn('transaction_types.type', $types);
} }
if ($accounts->count() > 0) { if ($accounts->count() > 0) {