From fc7d65629ab5710693ad91fda513d6026b000fa7 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Wed, 1 Jul 2015 13:18:50 +0200
Subject: [PATCH] Reorder bill chart [skip ci]

---
 app/Http/Controllers/Chart/BillController.php | 10 +++++++++-
 database/seeds/TestDataSeeder.php             |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Chart/BillController.php b/app/Http/Controllers/Chart/BillController.php
index 4853e7375e..a17e14049a 100644
--- a/app/Http/Controllers/Chart/BillController.php
+++ b/app/Http/Controllers/Chart/BillController.php
@@ -6,6 +6,7 @@ use App;
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Bill;
+use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
@@ -57,7 +58,7 @@ class BillController extends Controller
         $cache->addProperty('bills');
         $cache->addProperty('frontpage');
         if ($cache->has()) {
-             return Response::json($cache->get()); // @codeCoverageIgnore
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
         $bills  = $repository->getActiveBills();
@@ -129,6 +130,13 @@ class BillController extends Controller
         // get first transaction or today for start:
         $results = $repository->getJournals($bill);
 
+        // resort:
+        $results = $results->sortBy(
+            function (TransactionJournal $journal) {
+                return $journal->date->format('U');
+            }
+        );
+
         $data = $this->generator->single($bill, $results);
         $cache->store($data);
 
diff --git a/database/seeds/TestDataSeeder.php b/database/seeds/TestDataSeeder.php
index f68ffb6d80..2ef6f90674 100644
--- a/database/seeds/TestDataSeeder.php
+++ b/database/seeds/TestDataSeeder.php
@@ -289,6 +289,7 @@ class TestDataSeeder extends Seeder
                 'user_id'                 => $this->user->id,
                 'transaction_type_id'     => 1,
                 'transaction_currency_id' => 1,
+                'bill_id'                 => 1,
                 'description'             => $description,
                 'completed'               => 1,
                 'date'                    => $date,