IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix for #2562

Browse Source
This commit is contained in:
James Cole 2019-09-08 15:28:35 +02:00
parent 4e6bc035ed
commit a2ddd0420a
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Repositories/Tag/TagRepository.php
View File

@ -466,12 +466,12 @@ class TagRepository implements TagRepositoryInterface
->leftJoin('transaction_journals', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') ->leftJoin('transaction_journals', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('transactions', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') ->leftJoin('transactions', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->where( ->where(
function (Builder $query) { static function (Builder $query) {
$query->where('transactions.amount', '>', 0); $query->where('transactions.amount', '>', 0);
$query->orWhereNull('transactions.amount'); $query->orWhereNull('transactions.amount');
} }
) )
->groupBy(['tags.id', 'tags.tag']); ->groupBy(['tags.id', 'tags.tag', 'tags.created_at']);
// add date range (or not): // add date range (or not):
if (null === $year) { if (null === $year) {