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

Blind attempt to fix #997

Browse Source
This commit is contained in:
James Cole 2017-11-17 08:22:26 +01:00
parent bf87ffb933
commit 32695ba960
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

@ -331,7 +331,7 @@ 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('transactions.amount', '>', 0) ->where('transactions.amount', '>', 0)
->groupBy('tags.id'); ->groupBy(['tags.id','tags.tag']);
// add date range (or not): // add date range (or not):
if (null === $year) { if (null === $year) {
@ -351,7 +351,7 @@ class TagRepository implements TagRepositoryInterface
$tagsWithAmounts[$tag->id] = strval($tag->amount_sum); $tagsWithAmounts[$tag->id] = strval($tag->amount_sum);
} }
$tags = $query->orderBy('id', 'desc')->get(); $tags = $query->orderBy('id', 'desc')->get(['tags.id','tags.tag']);
$temporary = []; $temporary = [];
/** @var Tag $tag */ /** @var Tag $tag */
foreach ($tags as $tag) { foreach ($tags as $tag) {