From ffa88eeb08adb8641d8e374f10c53e91fa050fb2 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Mon, 28 Dec 2015 07:27:16 +0100
Subject: [PATCH] Made deleted piggy banks for piggy bank events visible.

---
 app/Http/Controllers/TransactionController.php | 13 ++++++++++++-
 app/Models/PiggyBankEvent.php                  |  2 +-
 resources/twig/list/piggy-bank-events.twig     |  2 +-
 resources/twig/transactions/show.twig          |  4 ++--
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index 732c6d8047..ca55b40914 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -10,11 +10,13 @@ use FireflyIII\Events\JournalSaved;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Requests\JournalFormRequest;
 use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use Illuminate\Support\Collection;
 use Input;
 use Preferences;
 use Response;
@@ -264,6 +266,15 @@ class TransactionController extends Controller
      */
     public function show(JournalRepositoryInterface $repository, TransactionJournal $journal)
     {
+
+        /** @var Collection $set */
+        $events = $journal->piggyBankEvents()->get();
+        $events->each(
+            function (PiggyBankEvent $event) {
+                $event->piggyBank = $event->piggyBank()->withTrashed()->first();
+            }
+        );
+
         bcscale(2);
         $journal->transactions->each(
             function (Transaction $t) use ($journal, $repository) {
@@ -274,7 +285,7 @@ class TransactionController extends Controller
         $what     = strtolower($journal->getTransactionType());
         $subTitle = trans('firefly.' . $journal->getTransactionType()) . ' "' . e($journal->description) . '"';
 
-        return view('transactions.show', compact('journal', 'subTitle', 'what'));
+        return view('transactions.show', compact('journal','events', 'subTitle', 'what'));
     }
 
     /**
diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php
index 0678ea5865..a06e3dd35a 100644
--- a/app/Models/PiggyBankEvent.php
+++ b/app/Models/PiggyBankEvent.php
@@ -13,7 +13,7 @@ use Illuminate\Database\Eloquent\Model;
  * @property integer                                    $transaction_journal_id
  * @property \Carbon\Carbon                             $date
  * @property float                                      $amount
- * @property-read \FireflyIII\Models\PiggyBank          $piggyBank
+ * @property \FireflyIII\Models\PiggyBank          $piggyBank
  * @property-read \FireflyIII\Models\TransactionJournal $transactionJournal
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereId($value)
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereCreatedAt($value)
diff --git a/resources/twig/list/piggy-bank-events.twig b/resources/twig/list/piggy-bank-events.twig
index 14761b5007..69caeb6247 100644
--- a/resources/twig/list/piggy-bank-events.twig
+++ b/resources/twig/list/piggy-bank-events.twig
@@ -10,7 +10,7 @@
         <tr>
             {% if showPiggyBank %}
                 <td>
-                    <a href="{{ route('piggy-banks.show',event.piggyBank_id) }}">{{ event.piggyBank.name }}</a>
+                    <a href="{{ route('piggy-banks.show',event.piggyBank.id) }}">{{ event.piggyBank.name }}</a>
                 </td>
             {% endif %}
             <td>
diff --git a/resources/twig/transactions/show.twig b/resources/twig/transactions/show.twig
index b6cd21498b..ebb4f439fb 100644
--- a/resources/twig/transactions/show.twig
+++ b/resources/twig/transactions/show.twig
@@ -126,10 +126,10 @@
             {% if journal.piggyBankEvents|length > 0 %}
                 <div class="box">
                     <div class="box-header with-border">
-                        {{ 'piggyBanks'|_ }}
+                        <h3 class="box-title">{{ 'piggyBanks'|_ }}</h3>
                     </div>
                     <div class="box-body">
-                        {% include 'list/piggy-bank-events' with {'events': journal.piggyBankEvents, 'showPiggyBank':true} %}
+                        {% include 'list/piggy-bank-events' with {'events': events, 'showPiggyBank':true} %}
                     </div>
                 </div>
             {% endif %}