From 136b8975e32e4a58cc9e311a33d2b56e0a774b10 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 31 Jul 2015 13:44:56 +0200
Subject: [PATCH] Sort piggy bank list.

---
 .../Controllers/TransactionController.php     | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index d88c7f7d3c..b7093dea48 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -1,5 +1,6 @@
 <?php namespace FireflyIII\Http\Controllers;
 
+use Amount;
 use Auth;
 use Carbon\Carbon;
 use Config;
@@ -8,6 +9,7 @@ use FireflyIII\Events\JournalCreated;
 use FireflyIII\Events\JournalSaved;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Requests\JournalFormRequest;
+use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -51,11 +53,19 @@ class TransactionController extends Controller
         $accounts    = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
         $budgets     = ExpandedForm::makeSelectList(Auth::user()->budgets()->get());
         $budgets[0]  = trans('form.noBudget');
-        $piggies     = ExpandedForm::makeSelectList(Auth::user()->piggyBanks()->get());
-        $piggies[0]  = trans('form.noPiggybank');
-        $preFilled   = Session::has('preFilled') ? Session::get('preFilled') : [];
-        $respondTo   = ['account_id', 'account_from_id'];
-        $subTitle    = trans('form.add_new_' . $what);
+
+        // piggy bank list:
+        $piggyBanks = Auth::user()->piggyBanks()->orderBy('order', 'ASC')->get();
+        /** @var PiggyBank $piggy */
+        foreach ($piggyBanks as $piggy) {
+            $piggy->name = $piggy->name . ' (' . Amount::format($piggy->currentRelevantRep()->currentamount, false) . ')';
+        }
+
+        $piggies    = ExpandedForm::makeSelectList($piggyBanks);
+        $piggies[0] = trans('form.noPiggybank');
+        $preFilled  = Session::has('preFilled') ? Session::get('preFilled') : [];
+        $respondTo  = ['account_id', 'account_from_id'];
+        $subTitle   = trans('form.add_new_' . $what);
 
         foreach ($respondTo as $r) {
             $preFilled[$r] = Input::get($r);