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

Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop

Browse Source 
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  Blind attempt to fix #997
This commit is contained in:
James Cole 2017-11-17 19:32:17 +01:00
commit de41f23fb1
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

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