From 01cab599bb11b7b0062867c0fd1d2e55307d0dbc Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Tue, 26 Apr 2016 08:11:26 +0200
Subject: [PATCH] And now to make sure it works.

---
 app/Helpers/Report/BalanceReportHelper.php | 10 +++++++---
 app/Repositories/Tag/TagRepository.php     |  3 ---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/Helpers/Report/BalanceReportHelper.php b/app/Helpers/Report/BalanceReportHelper.php
index 2945f2a677..1d23fbed31 100644
--- a/app/Helpers/Report/BalanceReportHelper.php
+++ b/app/Helpers/Report/BalanceReportHelper.php
@@ -10,7 +10,9 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Helpers\Report;
 
+use Auth;
 use Carbon\Carbon;
+use DB;
 use FireflyIII\Helpers\Collection\Balance;
 use FireflyIII\Helpers\Collection\BalanceEntry;
 use FireflyIII\Helpers\Collection\BalanceHeader;
@@ -19,8 +21,10 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Models\Budget as BudgetModel;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Collection;
 
 
@@ -99,7 +103,7 @@ class BalanceReportHelper implements BalanceReportHelperInterface
     private function allCoveredByBalancingActs(Collection $accounts, Carbon $start, Carbon $end): Collection
     {
         $ids = $accounts->pluck('id')->toArray();
-        $set = $this->user->tags()
+        $set = Auth::user()->tags()
                           ->leftJoin('tag_transaction_journal', 'tag_transaction_journal.tag_id', '=', 'tags.id')
                           ->leftJoin('transaction_journals', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
                           ->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id')
@@ -109,8 +113,8 @@ class BalanceReportHelper implements BalanceReportHelperInterface
                           }
                           )
                           ->leftJoin(
-                              'transactions AS t_to', function (JoinClause $join) {
-                              $join->on('transaction_journals.id', '=', 't_to.transaction_journal_id')->where('t_to.amount', '>', 0);
+                              'transactions AS t_destination', function (JoinClause $join) {
+                              $join->on('transaction_journals.id', '=', 't_destination.transaction_journal_id')->where('t_destination.amount', '>', 0);
                           }
                           )
                           ->where('tags.tagMode', 'balancingAct')
diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php
index 8722e04d42..0dadc08733 100644
--- a/app/Repositories/Tag/TagRepository.php
+++ b/app/Repositories/Tag/TagRepository.php
@@ -4,13 +4,10 @@ declare(strict_types = 1);
 namespace FireflyIII\Repositories\Tag;
 
 
-use Carbon\Carbon;
-use DB;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\User;
-use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Collection;
 
 /**