Merge branch 'release/3.4.6'

* 'master' of https://github.com/JC5/firefly-iii:
  New images [skip ci]

.env.example

@@ -17,4 +17,5 @@ EMAIL_USERNAME=
 EMAIL_PASSWORD=
 ANALYTICS_ID=
 EMAIL_PRETEND=false
-RUNCLEANUP=true
+RUNCLEANUP=true
+SITE_OWNER=mail@example.com

.scrutinizer.yml

@@ -0,0 +1,5 @@
+# .scrutinizer.yml
+tools:
+  external_code_coverage:
+    timeout: 1800    # Timeout in seconds.
+    runs: 2

.travis.yml

@@ -18,3 +18,5 @@ after_script:
   - php vendor/bin/coveralls
   - CODECLIMATE_REPO_TOKEN=26489f9e854fcdf7e7660ba29c1455694685465b1f90329a79f7d2bf448acb61 ./vendor/bin/test-reporter --stdout > codeclimate.json
   - "curl -X POST -d @codeclimate.json -H 'Content-Type: application/json' -H 'User-Agent: Code Climate (PHP Test Reporter v0.1.1)' https://codeclimate.com/test_reports"
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml

README.md

@@ -1,13 +1,9 @@
-# Firefly III
-#### 3.4.2
+# Firefly III (v3.4.6)
+
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master)
+[![Code Coverage](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master)
+[![Build Status](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/build.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/build-status/master)
 
-[![Build Status](https://travis-ci.org/JC5/firefly-iii.svg?branch=develop)](https://travis-ci.org/JC5/firefly-iii)
-[![Project Status](http://stillmaintained.com/JC5/firefly-iii.png?a=b)](http://stillmaintained.com/JC5/firefly-iii)
-[![SensioLabsInsight](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102/mini.png)](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102)
-[![Code Climate](https://codeclimate.com/github/JC5/firefly-iii/badges/gpa.svg)](https://codeclimate.com/github/JC5/firefly-iii)
-[![Coverage Status](https://coveralls.io/repos/JC5/firefly-iii/badge.svg?branch=master)](https://coveralls.io/r/JC5/firefly-iii?branch=master)
-[![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable.svg)](https://packagist.org/packages/grumpydictator/firefly-iii)
-![GA](https://ga-beacon.appspot.com/UA-58172398-6/firefly-iii/readme)
 ## About
 
 "Firefly III" is a financial manager. It can help you keep track of expenses, income, budgets and everything in between. It even supports credit cards, shared 
@@ -30,7 +26,7 @@ To get to know Firefly, and to see if it fits you, check out these resources:
 and the philosophy behind it.
 
 
-#### About the name (if you care)
+#### About the name (should you care)
 
 It's III, or 3, because [version 2](https://github.com/JC5/Firefly) and version 1 (not online) preceded it. It has been growing steadily ever since.
 
@@ -63,19 +59,19 @@ Everything is organised:
 
 _Please note that everything in these screenshots is fictional and may not be realistic._
 
-![Index](https://i.nder.be/c09vfw90)
+![Index](https://i.nder.be/gdryw73q)
 
-![Accounts](https://i.nder.be/hkn0vhcg)
+![Accounts](https://i.nder.be/hmpkq8q0)
 
-![Budgets](https://i.nder.be/h2snx2mw)
+![Budgets](https://i.nder.be/cbq2n5g9)
 
-![Reports 1](https://i.nder.be/c9f8zy5c)
+![Reports 1](https://i.nder.be/cmwvqrds)
 
-![Reports 2](https://i.nder.be/ghvs5png)
+![Reports 2](https://i.nder.be/cv4dqbp4)
 
-![Bills](https://i.nder.be/h58kh00p)
+![Bills](https://i.nder.be/gmkxqdw7)
 
-![Piggy banks](https://i.nder.be/hkud0h53)
+![Piggy banks](https://i.nder.be/cc5u6h3b)
 
 ## Running and installing
 
@@ -86,12 +82,32 @@ and the **[first use guide](https://github.com/JC5/firefly-iii/wiki/First-use)**
 If you want to try out Firefly III, you can do so on [this dedicated website](https://geld.nder.be/). 
 This site always runs the latest version of Firefly III. If you want to use it, please read the [privacy considerations](https://github.com/JC5/firefly-iii/wiki/Privacy-on-demo-site) for this demo-site.
 
+## Credits
+
+Firefly III uses the following libraries and tools:
+
+* The AdminLTE template by [Almsaseed Studio](https://almsaeedstudio.com/)
+* The [Google charts](https://developers.google.com/chart/) library.
+* [Bootstrap](http://getbootstrap.com/)
+* [Laravel](http://laravel.com/)
+* [Twig](http://twig.sensiolabs.org/)
+* For development, some of the excellent tools made by [Barry van den Heuvel](https://github.com/barryvdh)
+* [Bootstrap sortable](https://github.com/drvic10k/bootstrap-sortable) by [Matúš Brliť](https://github.com/drvic10k).
+* [Date range picker](https://github.com/dangrossman/bootstrap-daterangepicker/) by [Dan Grossman](https://github.com/dangrossman)
+* The [real favicon generator](http://realfavicongenerator.net/)
+* Various other open source components (see [composer.json](https://github.com/JC5/firefly-iii/blob/master/composer.json))
+
 
 ## Current state
 
-Firefly III is pretty much all grown up. Full test coverage (nerd alert!) is coming. One of the things on the todo-list
-is adding translations.
+Firefly III is pretty much all grown up. Full test coverage (nerd alert!) is coming. Translations are a work in progress.
 
 Questions, ideas, bugs or other things to contribute? [Let me know](https://github.com/JC5/firefly-iii/issues/new)!
 
 If you like this tool, feel free to [donate me some beer money](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=2ZMV952UUSCLU&lc=NL&item_name=Development%20of%20Firefly&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted).
+
+[![SensioLabsInsight](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102/mini.png)](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102)
+[![Code Climate](https://codeclimate.com/github/JC5/firefly-iii/badges/gpa.svg)](https://codeclimate.com/github/JC5/firefly-iii)
+[![Project Status](http://stillmaintained.com/JC5/firefly-iii.png?a=b)](http://stillmaintained.com/JC5/firefly-iii)
+[![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable.svg)](https://packagist.org/packages/grumpydictator/firefly-iii)
+![GA](https://ga-beacon.appspot.com/UA-58172398-6/firefly-iii/readme)

app/Exceptions/Handler.php

@@ -2,6 +2,7 @@
 
 use Exception;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 
 /**
  * Class Handler
@@ -33,7 +34,7 @@ class Handler extends ExceptionHandler
      */
     public function render($request, Exception $e)
     {
-        if ($this->isHttpException($e)) {
+        if ($e instanceof HttpException) {
             return $this->renderHttpException($e);
         } else {
             return parent::render($request, $e);

app/Generator/Chart/Account/AccountChartGenerator.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace FireflyIII\Generator\Chart\Account;
+
+use Carbon\Carbon;
+use FireflyIII\Models\Account;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface AccountChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Account
+ */
+interface AccountChartGenerator
+{
+
+    /**
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return array
+     */
+    public function all(Collection $accounts, Carbon $start, Carbon $end);
+
+    /**
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return array
+     */
+    public function frontpage(Collection $accounts, Carbon $start, Carbon $end);
+
+    /**
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return array
+     */
+    public function single(Account $account, Carbon $start, Carbon $end);
+}

app/Generator/Chart/Account/ChartJsAccountChartGenerator.php

@@ -0,0 +1,114 @@
+<?php
+
+namespace FireflyIII\Generator\Chart\Account;
+
+use Carbon\Carbon;
+use Config;
+use FireflyIII\Models\Account;
+use Illuminate\Support\Collection;
+use Preferences;
+use Steam;
+
+/**
+ * Class ChartJsAccountChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Account
+ */
+class ChartJsAccountChartGenerator implements AccountChartGenerator
+{
+
+
+    /**
+     * @codeCoverageIgnore
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return array
+     */
+    public function all(Collection $accounts, Carbon $start, Carbon $end)
+    {
+        return $this->frontpage($accounts, $start, $end);
+    }
+
+    /**
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return array
+     */
+    public function frontpage(Collection $accounts, Carbon $start, Carbon $end)
+    {
+        // language:
+        $language = Preferences::get('language', 'en')->data;
+        $format   = Config::get('firefly.monthAndDay.' . $language);
+        $data     = [
+            'count'    => 0,
+            'labels'   => [],
+            'datasets' => [],
+        ];
+        $current  = clone $start;
+        while ($current <= $end) {
+            $data['labels'][] = $current->formatLocalized($format);
+            $current->addDay();
+        }
+
+        foreach ($accounts as $account) {
+            $set     = [
+                'label'                => $account->name,
+                'fillColor'            => 'rgba(220,220,220,0.2)',
+                'strokeColor'          => 'rgba(220,220,220,1)',
+                'pointColor'           => 'rgba(220,220,220,1)',
+                'pointStrokeColor'     => '#fff',
+                'pointHighlightFill'   => '#fff',
+                'pointHighlightStroke' => 'rgba(220,220,220,1)',
+                'data'                 => [],
+            ];
+            $current = clone $start;
+            while ($current <= $end) {
+                $set['data'][] = Steam::balance($account, $current);
+                $current->addDay();
+            }
+            $data['datasets'][] = $set;
+        }
+        $data['count'] = count($data['datasets']);
+
+        return $data;
+    }
+
+    /**
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return array
+     */
+    public function single(Account $account, Carbon $start, Carbon $end)
+    {
+        // language:
+        $language = Preferences::get('language', 'en')->data;
+        $format   = Config::get('firefly.monthAndDay.' . $language);
+
+        $data = [
+            'count'    => 1,
+            'labels'   => [],
+            'datasets' => [
+                [
+                    'label' => $account->name,
+                    'data'  => []
+                ]
+            ],
+        ];
+
+        $current = clone $start;
+
+        while ($end >= $current) {
+            $data['labels'][]              = $current->formatLocalized($format);
+            $data['datasets'][0]['data'][] = Steam::balance($account, $current);
+            $current->addDay();
+        }
+
+        return $data;
+    }
+}

app/Generator/Chart/Account/GoogleAccountChartGenerator.php

@@ -0,0 +1,122 @@
+<?php
+
+namespace FireflyIII\Generator\Chart\Account;
+
+use Carbon\Carbon;
+use FireflyIII\Models\Account;
+use Grumpydictator\Gchart\GChart;
+use Illuminate\Support\Collection;
+use Steam;
+
+
+/**
+ * Class GoogleAccountChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Account
+ */
+class GoogleAccountChartGenerator implements AccountChartGenerator
+{
+
+
+    /**
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return array
+     */
+    public function all(Collection $accounts, Carbon $start, Carbon $end)
+    {
+        // make chart (original code):
+        $chart = new GChart;
+        $chart->addColumn(trans('firefly.dayOfMonth'), 'date');
+        $index = 1;
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $chart->addColumn(trans('firefly.balanceFor', ['name' => $account->name]), 'number');
+            $chart->addCertainty($index);
+            $index++;
+        }
+        $current = clone $start;
+        $current->subDay();
+        $today = Carbon::now();
+        while ($end >= $current) {
+            $row     = [clone $current];
+            $certain = $current < $today;
+            foreach ($accounts as $account) {
+                $row[] = Steam::balance($account, $current);
+                $row[] = $certain;
+            }
+            $chart->addRowArray($row);
+            $current->addDay();
+        }
+        $chart->generate();
+
+        return $chart->getData();
+    }
+
+    /**
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return array
+     */
+    public function frontpage(Collection $accounts, Carbon $start, Carbon $end)
+    {
+        $chart = new GChart;
+        $chart->addColumn(trans('firefly.dayOfMonth'), 'date');
+
+        $index = 1;
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $chart->addColumn(trans('firefly.balanceFor', ['name' => $account->name]), 'number');
+            $chart->addCertainty($index);
+            $index++;
+        }
+        $current = clone $start;
+        $current->subDay();
+        $today = Carbon::now();
+        while ($end >= $current) {
+            $row     = [clone $current];
+            $certain = $current < $today;
+            foreach ($accounts as $account) {
+                $row[] = Steam::balance($account, $current);
+                $row[] = $certain;
+            }
+            $chart->addRowArray($row);
+            $current->addDay();
+        }
+        $chart->generate();
+
+        return $chart->getData();
+    }
+
+    /**
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return array
+     */
+    public function single(Account $account, Carbon $start, Carbon $end)
+    {
+        $current = clone $start;
+        $today   = new Carbon;
+        $chart   = new GChart;
+        $chart->addColumn(trans('firefly.dayOfMonth'), 'date');
+        $chart->addColumn(trans('firefly.balanceFor', ['name' => $account->name]), 'number');
+        $chart->addCertainty(1);
+
+        while ($end >= $current) {
+            $certain = $current < $today;
+            $chart->addRow(clone $current, Steam::balance($account, $current), $certain);
+            $current->addDay();
+        }
+
+
+        $chart->generate();
+
+        return $chart->getData();
+    }
+}

app/Generator/Chart/Bill/BillChartGenerator.php

@@ -0,0 +1,32 @@
+<?php
+namespace FireflyIII\Generator\Chart\Bill;
+
+
+use FireflyIII\Models\Bill;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface BillChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Bill
+ */
+interface BillChartGenerator
+{
+
+    /**
+     * @param Collection $paid
+     * @param Collection $unpaid
+     *
+     * @return array
+     */
+    public function frontpage(Collection $paid, Collection $unpaid);
+
+    /**
+     * @param Bill       $bill
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function single(Bill $bill, Collection $entries);
+
+}

app/Generator/Chart/Bill/ChartJsBillChartGenerator.php

@@ -0,0 +1,125 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: sander
+ * Date: 27/06/15
+ * Time: 17:21
+ */
+
+namespace FireflyIII\Generator\Chart\Bill;
+
+use Config;
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Support\Collection;
+use Preferences;
+
+/**
+ * Class ChartJsBillChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Bill
+ */
+class ChartJsBillChartGenerator implements BillChartGenerator
+{
+
+    /**
+     * @param Collection $paid
+     * @param Collection $unpaid
+     *
+     * @return array
+     */
+    public function frontpage(Collection $paid, Collection $unpaid)
+    {
+
+        // loop paid and create single entry:
+        $paidDescriptions   = [];
+        $paidAmount         = 0;
+        $unpaidDescriptions = [];
+        $unpaidAmount       = 0;
+
+
+        /** @var TransactionJournal $entry */
+        foreach ($paid as $entry) {
+
+            $paidDescriptions[] = $entry->description;
+            $paidAmount += floatval($entry->amount);
+        }
+
+        // loop unpaid:
+        /** @var Bill $entry */
+        foreach ($unpaid as $entry) {
+            $description          = $entry[0]->name . ' (' . $entry[1]->format('jS M Y') . ')';
+            $amount               = ($entry[0]->amount_max + $entry[0]->amount_min) / 2;
+            $unpaidDescriptions[] = $description;
+            $unpaidAmount += $amount;
+            unset($amount, $description);
+        }
+
+        $data = [
+            [
+                'value'     => $unpaidAmount,
+                'color'     => 'rgba(53, 124, 165,0.7)',
+                'highlight' => 'rgba(53, 124, 165,0.9)',
+                'label'     => trans('firefly.unpaid'),
+            ],
+            [
+                'value'     => $paidAmount,
+                'color'     => 'rgba(0, 141, 76, 0.7)',
+                'highlight' => 'rgba(0, 141, 76, 0.9)',
+                'label'     => trans('firefly.paid'),
+            ]
+        ];
+
+        return $data;
+    }
+
+    /**
+     * @param Bill       $bill
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function single(Bill $bill, Collection $entries)
+    {
+        // language:
+        $language = Preferences::get('language', 'en')->data;
+        $format   = Config::get('firefly.month.' . $language);
+
+        $data = [
+            'count'    => 3,
+            'labels'   => [],
+            'datasets' => [],
+        ];
+
+        // dataset: max amount
+        // dataset: min amount
+        // dataset: actual amount
+
+        $minAmount    = [];
+        $maxAmount    = [];
+        $actualAmount = [];
+        foreach ($entries as $entry) {
+            $data['labels'][] = $entry->date->formatLocalized($format);
+            $minAmount[]      = round($bill->amount_min, 2);
+            $maxAmount[]      = round($bill->amount_max, 2);
+            $actualAmount[]   = round($entry->amount, 2);
+        }
+
+        $data['datasets'][] = [
+            'label' => trans('firefly.minAmount'),
+            'data'  => $minAmount,
+        ];
+        $data['datasets'][] = [
+            'label' => trans('firefly.billEntry'),
+            'data'  => $actualAmount,
+        ];
+        $data['datasets'][] = [
+            'label' => trans('firefly.maxAmount'),
+            'data'  => $maxAmount,
+        ];
+
+        $data['count'] = count($data['datasets']);
+
+        return $data;
+    }
+}

app/Generator/Chart/Bill/GoogleBillChartGenerator.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace FireflyIII\Generator\Chart\Bill;
+
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\TransactionJournal;
+use Grumpydictator\Gchart\GChart;
+use Illuminate\Support\Collection;
+
+/**
+ * Class GoogleBillChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Bill
+ */
+class GoogleBillChartGenerator implements BillChartGenerator
+{
+
+
+    /**
+     * @param Collection $paid
+     * @param Collection $unpaid
+     *
+     * @return array
+     */
+    public function frontpage(Collection $paid, Collection $unpaid)
+    {
+        // loop paid and create single entry:
+        $paidDescriptions   = [];
+        $paidAmount         = 0;
+        $unpaidDescriptions = [];
+        $unpaidAmount       = 0;
+
+
+        /** @var TransactionJournal $entry */
+        foreach ($paid as $entry) {
+
+            $paidDescriptions[] = $entry->description;
+            $paidAmount += floatval($entry->amount);
+        }
+
+        // loop unpaid:
+        /** @var Bill $entry */
+        foreach ($unpaid as $entry) {
+            $description          = $entry[0]->name . ' (' . $entry[1]->format('jS M Y') . ')';
+            $amount               = ($entry[0]->amount_max + $entry[0]->amount_min) / 2;
+            $unpaidDescriptions[] = $description;
+            $unpaidAmount += $amount;
+            unset($amount, $description);
+        }
+
+        $chart = new GChart;
+        $chart->addColumn(trans('firefly.name'), 'string');
+        $chart->addColumn(trans('firefly.amount'), 'number');
+
+        $chart->addRow(trans('firefly.unpaid') . ': ' . join(', ', $unpaidDescriptions), $unpaidAmount);
+        $chart->addRow(trans('firefly.paid') . ': ' . join(', ', $paidDescriptions), $paidAmount);
+
+        $chart->generate();
+
+        return $chart->getData();
+    }
+
+    /**
+     * @param Bill       $bill
+     * @param Collection $entries
+     *
+     * @return mixed
+     */
+    public function single(Bill $bill, Collection $entries)
+    {
+        // make chart:
+        $chart = new GChart;
+        $chart->addColumn(trans('firefly.date'), 'date');
+        $chart->addColumn(trans('firefly.maxAmount'), 'number');
+        $chart->addColumn(trans('firefly.minAmount'), 'number');
+        $chart->addColumn(trans('firefly.billEntry'), 'number');
+
+        /** @var TransactionJournal $result */
+        foreach ($entries as $result) {
+            $chart->addRow(clone $result->date, floatval($bill->amount_max), floatval($bill->amount_min), floatval($result->amount));
+        }
+
+        $chart->generate();
+
+        return $chart->getData();
+    }
+}

app/Generator/Chart/Budget/BudgetChartGenerator.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace FireflyIII\Generator\Chart\Budget;
+
+use Illuminate\Support\Collection;
+
+/**
+ * Interface BudgetChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Budget
+ */
+interface BudgetChartGenerator
+{
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function budget(Collection $entries);
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function budgetLimit(Collection $entries);
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function frontpage(Collection $entries);
+
+    /**
+     * @param Collection $budgets
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function year(Collection $budgets, Collection $entries);
+
+}

app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php

@@ -0,0 +1,139 @@
+<?php
+
+namespace FireflyIII\Generator\Chart\Budget;
+
+
+use Config;
+use Illuminate\Support\Collection;
+use Preferences;
+
+/**
+ * Class ChartJsBudgetChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Budget
+ */
+class ChartJsBudgetChartGenerator implements BudgetChartGenerator
+{
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function budget(Collection $entries)
+    {
+        $data = [
+            'count'    => 1,
+            'labels'   => [],
+            'datasets' => [
+                [
+                    'label' => 'Amount',
+                    'data'  => [],
+                ]
+            ],
+        ];
+
+        /** @var array $entry */
+        foreach ($entries as $entry) {
+            $data['labels'][]              = trans('firefly.spent');
+            $data['datasets'][0]['data'][] = $entry[1];
+
+        }
+
+        return $data;
+    }
+
+    /**
+     * @codeCoverageIgnore
+     *
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function budgetLimit(Collection $entries)
+    {
+        return $this->budget($entries);
+    }
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function frontpage(Collection $entries)
+    {
+        $data = [
+            'count'    => 0,
+            'labels'   => [],
+            'datasets' => [],
+        ];
+        // dataset: left
+        // dataset: spent
+        // dataset: overspent
+        $left      = [];
+        $spent     = [];
+        $overspent = [];
+        foreach ($entries as $entry) {
+            if ($entry[1] != 0 || $entry[2] != 0 || $entry[3] != 0) {
+                $data['labels'][] = $entry[0];
+                $left[]           = round($entry[1], 2);
+                $spent[]          = round($entry[2], 2);
+                $overspent[]      = round($entry[3], 2);
+            }
+        }
+
+        $data['datasets'][] = [
+            'label' => trans('firefly.left'),
+            'data'  => $left,
+        ];
+        $data['datasets'][] = [
+            'label' => trans('firefly.spent'),
+            'data'  => $spent,
+        ];
+        $data['datasets'][] = [
+            'label' => trans('firefly.overspent'),
+            'data'  => $overspent,
+        ];
+
+        $data['count'] = count($data['datasets']);
+
+        return $data;
+    }
+
+    /**
+     * @param Collection $budgets
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function year(Collection $budgets, Collection $entries)
+    {
+        // language:
+        $language = Preferences::get('language', 'en')->data;
+        $format   = Config::get('firefly.month.' . $language);
+
+        $data = [
+            'count'    => 0,
+            'labels'   => [],
+            'datasets' => [],
+        ];
+
+        foreach ($budgets as $budget) {
+            $data['labels'][] = $budget->name;
+        }
+        /** @var array $entry */
+        foreach ($entries as $entry) {
+            $array = [
+                'label' => $entry[0]->formatLocalized($format),
+                'data'  => [],
+            ];
+            array_shift($entry);
+            $array['data']      = $entry;
+            $data['datasets'][] = $array;
+
+        }
+        $data['count'] = count($data['datasets']);
+
+        return $data;
+    }
+}

app/Generator/Chart/Budget/GoogleBudgetChartGenerator.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace FireflyIII\Generator\Chart\Budget;
+
+use Grumpydictator\Gchart\GChart;
+use Illuminate\Support\Collection;
+
+/**
+ * Class GoogleBudgetChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Budget
+ */
+class GoogleBudgetChartGenerator implements BudgetChartGenerator
+{
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function budget(Collection $entries)
+    {
+
+        $chart = new GChart;
+        $chart->addColumn(trans('firefly.period'), 'date');
+        $chart->addColumn(trans('firefly.spent'), 'number');
+
+        /** @var array $entry */
+        foreach ($entries as $entry) {
+            $chart->addRow($entry[0], $entry[1]);
+        }
+
+        $chart->generate();
+
+        return $chart->getData();
+    }
+
+    /**
+     * @codeCoverageIgnore
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function budgetLimit(Collection $entries)
+    {
+        return $this->budget($entries);
+    }
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function frontpage(Collection $entries)
+    {
+        $chart = new GChart;
+        $chart->addColumn(trans('firefly.budget'), 'string');
+        $chart->addColumn(trans('firefly.left'), 'number');
+        $chart->addColumn(trans('firefly.spent'), 'number');
+        $chart->addColumn(trans('firefly.overspent'), 'number');
+
+        /** @var array $entry */
+        foreach ($entries as $entry) {
+            if ($entry[1] != 0 || $entry[2] != 0 || $entry[3] != 0) {
+                $chart->addRow($entry[0], $entry[1], $entry[2], $entry[3]);
+            }
+        }
+
+
+        $chart->generate();
+
+        return $chart->getData();
+
+    }
+
+    /**
+     * @param Collection $budgets
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function year(Collection $budgets, Collection $entries)
+    {
+        $chart = new GChart;
+        // add columns:
+        $chart->addColumn(trans('firefly.month'), 'date');
+        foreach ($budgets as $budget) {
+            $chart->addColumn($budget->name, 'number');
+        }
+
+        /** @var array $entry */
+        foreach ($entries as $entry) {
+
+            $chart->addRowArray($entry);
+        }
+
+        $chart->generate();
+
+        return $chart->getData();
+    }
+}

app/Generator/Chart/Category/CategoryChartGenerator.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace FireflyIII\Generator\Chart\Category;
+
+use Illuminate\Support\Collection;
+
+/**
+ * Interface CategoryChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Category
+ */
+interface CategoryChartGenerator
+{
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function all(Collection $entries);
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function frontpage(Collection $entries);
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function month(Collection $entries);
+
+
+    /**
+     * @param Collection $categories
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function year(Collection $categories, Collection $entries);
+}

app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php

@@ -0,0 +1,116 @@
+<?php
+
+namespace FireflyIII\Generator\Chart\Category;
+
+use Config;
+use Illuminate\Support\Collection;
+use Preferences;
+
+
+/**
+ * Class ChartJsCategoryChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Category
+ */
+class ChartJsCategoryChartGenerator implements CategoryChartGenerator
+{
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function all(Collection $entries)
+    {
+        $data = [
+            'count'    => 1,
+            'labels'   => [],
+            'datasets' => [
+                [
+                    'label' => trans('firefly.spent'),
+                    'data'  => []
+                ]
+            ],
+        ];
+
+        foreach ($entries as $entry) {
+            $data['labels'][]              = trans('firefly.spent');
+            $data['datasets'][0]['data'][] = round($entry[1], 2);
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function frontpage(Collection $entries)
+    {
+        $data = [
+            'count'    => 1,
+            'labels'   => [],
+            'datasets' => [
+                [
+                    'label' => trans('firefly.spent'),
+                    'data'  => []
+                ]
+            ],
+        ];
+        foreach ($entries as $entry) {
+            if ($entry['sum'] != 0) {
+                $data['labels'][]              = $entry['name'];
+                $data['datasets'][0]['data'][] = round($entry['sum'], 2);
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * @codeCoverageIgnore
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function month(Collection $entries)
+    {
+        return $this->all($entries);
+
+    }
+
+    /**
+     * @param Collection $categories
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function year(Collection $categories, Collection $entries)
+    {
+
+        // language:
+        $language = Preferences::get('language', 'en')->data;
+        $format   = Config::get('firefly.month.' . $language);
+
+        $data = [
+            'count'    => 0,
+            'labels'   => [],
+            'datasets' => [],
+        ];
+
+        foreach ($categories as $category) {
+            $data['labels'][] = $category->name;
+        }
+
+        foreach ($entries as $entry) {
+            $date = $entry[0]->formatLocalized($format);
+            array_shift($entry);
+            $data['count']++;
+            $data['datasets'][] = ['label' => $date, 'data' => $entry];
+        }
+
+        return $data;
+
+    }
+}

app/Generator/Chart/Category/GoogleCategoryChartGenerator.php

@@ -0,0 +1,105 @@
+<?php
+
+namespace FireflyIII\Generator\Chart\Category;
+
+use Grumpydictator\Gchart\GChart;
+use Illuminate\Support\Collection;
+
+/**
+ * Class GoogleCategoryChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Category
+ */
+class GoogleCategoryChartGenerator implements CategoryChartGenerator
+{
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function all(Collection $entries)
+    {
+        $chart = new GChart;
+        $chart->addColumn(trans('firefly.period'), 'date');
+        $chart->addColumn(trans('firefly.spent'), 'number');
+
+        /** @var array $entry */
+        foreach ($entries as $entry) {
+            $chart->addRow($entry[0], $entry[1]);
+        }
+
+        $chart->generate();
+
+        return $chart->getData();
+    }
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function frontpage(Collection $entries)
+    {
+        $chart = new GChart;
+        $chart->addColumn(trans('firefly.category'), 'string');
+        $chart->addColumn(trans('firefly.spent'), 'number');
+
+
+        /** @var array $entry */
+        foreach ($entries as $entry) {
+            $sum = $entry['sum'];
+            if ($sum != 0) {
+                $chart->addRow($entry['name'], $sum);
+            }
+        }
+
+        $chart->generate();
+
+        return $chart->getData();
+    }
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function month(Collection $entries)
+    {
+        $chart = new GChart;
+
+        $chart->addColumn(trans('firefly.period'), 'date');
+        $chart->addColumn(trans('firefly.spent'), 'number');
+
+        /** @var array $entry */
+        foreach ($entries as $entry) {
+            $chart->addRow($entry[0], $entry[1]);
+        }
+        $chart->generate();
+
+        return $chart->getData();
+    }
+
+    /**
+     * @param Collection $categories
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function year(Collection $categories, Collection $entries)
+    {
+        $chart = new GChart;
+
+        $chart->addColumn(trans('firefly.month'), 'date');
+        foreach ($categories as $category) {
+            $chart->addColumn($category->name, 'number');
+        }
+        /** @var array $entry */
+        foreach ($entries as $entry) {
+            $chart->addRowArray($entry);
+        }
+        $chart->generate();
+        return $chart->getData();
+
+    }
+}

app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace FireflyIII\Generator\Chart\PiggyBank;
+
+use Carbon\Carbon;
+use Config;
+use Illuminate\Support\Collection;
+use Preferences;
+
+
+/**
+ * Class GooglePiggyBankChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\PiggyBank
+ */
+class ChartJsPiggyBankChartGenerator implements PiggyBankChartGenerator
+{
+
+    /**
+     * @param Collection $set
+     *
+     * @return array
+     */
+    public function history(Collection $set)
+    {
+
+        // language:
+        $language = Preferences::get('language', 'en')->data;
+        $format   = Config::get('firefly.month.' . $language);
+
+        $data = [
+            'count'    => 1,
+            'labels'   => [],
+            'datasets' => [
+                [
+                    'label' => 'Diff',
+                    'data'  => []
+                ]
+            ],
+        ];
+        $sum  = '0';
+        bcscale(2);
+        foreach ($set as $entry) {
+            $date                          = new Carbon($entry->date);
+            $sum                           = bcadd($sum, $entry->sum);
+            $data['labels'][]              = $date->formatLocalized($format);
+            $data['datasets'][0]['data'][] = round($sum, 2);
+        }
+
+        return $data;
+    }
+}

app/Generator/Chart/PiggyBank/GooglePiggyBankChartGenerator.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace FireflyIII\Generator\Chart\PiggyBank;
+
+use Carbon\Carbon;
+use Grumpydictator\Gchart\GChart;
+use Illuminate\Support\Collection;
+
+
+/**
+ * Class GooglePiggyBankChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\PiggyBank
+ */
+class GooglePiggyBankChartGenerator implements PiggyBankChartGenerator
+{
+
+    /**
+     * @param Collection $set
+     *
+     * @return array
+     */
+    public function history(Collection $set)
+    {
+        $chart = new GChart;
+        $chart->addColumn(trans('firefly.date'), 'date');
+        $chart->addColumn(trans('firefly.balance'), 'number');
+
+        $sum = '0';
+        bcscale(2);
+
+        foreach ($set as $entry) {
+            $sum = bcadd($sum, $entry->sum);
+            $chart->addRow(new Carbon($entry->date), $sum);
+        }
+
+        $chart->generate();
+
+        return $chart->getData();
+    }
+}

app/Generator/Chart/PiggyBank/PiggyBankChartGenerator.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace FireflyIII\Generator\Chart\PiggyBank;
+
+use Illuminate\Support\Collection;
+
+/**
+ * Interface PiggyBankChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\PiggyBank
+ */
+interface PiggyBankChartGenerator
+{
+    /**
+     * @param Collection $set
+     *
+     * @return array
+     */
+    public function history(Collection $set);
+}

app/Generator/Chart/Report/ChartJsReportChartGenerator.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace FireflyIII\Generator\Chart\Report;
+
+use Config;
+use Grumpydictator\Gchart\GChart;
+use Illuminate\Support\Collection;
+use Preferences;
+
+/**
+ * Class GoogleReportChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Report
+ */
+class ChartJsReportChartGenerator implements ReportChartGenerator
+{
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function yearInOut(Collection $entries)
+    {
+        // language:
+        $language = Preferences::get('language', 'en')->data;
+        $format   = Config::get('firefly.month.' . $language);
+
+        $data = [
+            'count'    => 2,
+            'labels'   => [],
+            'datasets' => [
+                [
+                    'label' => trans('firefly.income'),
+                    'data'  => []
+                ],
+                [
+                    'label' => trans('firefly.expenses'),
+                    'data'  => []
+                ]
+            ],
+        ];
+
+        foreach ($entries as $entry) {
+            $data['labels'][]              = $entry[0]->formatLocalized($format);
+            $data['datasets'][0]['data'][] = round($entry[1], 2);
+            $data['datasets'][1]['data'][] = round($entry[2], 2);
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param string $income
+     * @param string $expense
+     * @param int    $count
+     *
+     * @return array
+     */
+    public function yearInOutSummarized($income, $expense, $count)
+    {
+
+        $data                          = [
+            'count'    => 2,
+            'labels'   => [],
+            'datasets' => [
+                [
+                    'label' => trans('firefly.income'),
+                    'data'  => []
+                ],
+                [
+                    'label' => trans('firefly.expenses'),
+                    'data'  => []
+                ]
+            ],
+        ];
+        $data['datasets'][0]['data'][] = round($income, 2);
+        $data['datasets'][1]['data'][] = round($expense, 2);
+        $data['datasets'][0]['data'][] = round(($income / $count), 2);
+        $data['datasets'][1]['data'][] = round(($expense / $count), 2);
+        return $data;
+    }
+}

app/Generator/Chart/Report/GoogleReportChartGenerator.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace FireflyIII\Generator\Chart\Report;
+
+use Grumpydictator\Gchart\GChart;
+use Illuminate\Support\Collection;
+
+/**
+ * Class GoogleReportChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Report
+ */
+class GoogleReportChartGenerator implements ReportChartGenerator
+{
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function yearInOut(Collection $entries)
+    {
+        $chart = new GChart;
+        $chart->addColumn(trans('firefly.month'), 'date');
+        $chart->addColumn(trans('firefly.income'), 'number');
+        $chart->addColumn(trans('firefly.expenses'), 'number');
+
+        /** @var array $entry */
+        foreach ($entries as $entry) {
+            $chart->addRowArray($entry);
+        }
+        $chart->generate();
+
+        return $chart->getData();
+    }
+
+    /**
+     * @param string $income
+     * @param string $expense
+     * @param int    $count
+     *
+     * @return array
+     */
+    public function yearInOutSummarized($income, $expense, $count)
+    {
+        $chart = new GChart;
+
+        $chart->addColumn(trans('firefly.summary'), 'string');
+        $chart->addColumn(trans('firefly.income'), 'number');
+        $chart->addColumn(trans('firefly.expenses'), 'number');
+        $chart->addRow(trans('firefly.sum'), $income, $expense);
+        $chart->addRow(trans('firefly.average'), ($income / $count), ($expense / $count));
+
+        $chart->generate();
+
+        return $chart->getData();
+    }
+}

app/Generator/Chart/Report/ReportChartGenerator.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace FireflyIII\Generator\Chart\Report;
+
+use Illuminate\Support\Collection;
+
+/**
+ * Interface ReportChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Report
+ */
+interface ReportChartGenerator
+{
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function yearInOut(Collection $entries);
+
+    /**
+     * @param string $income
+     * @param string $expense
+     * @param int    $count
+     *
+     * @return array
+     */
+    public function yearInOutSummarized($income, $expense, $count);
+
+}

app/Handlers/Events/ConnectJournalToPiggyBank.php

@@ -4,7 +4,6 @@ use Auth;
 use FireflyIII\Events\JournalCreated;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankEvent;
-use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 
 /**
@@ -52,18 +51,16 @@ class ConnectJournalToPiggyBank
         if (is_null($repetition)) {
             return false;
         }
+        bcscale(2);
 
-        $amount = $journal->amount;
-        /** @var Transaction $transaction */
-        foreach ($journal->transactions()->get() as $transaction) {
-            if ($transaction->account_id == $piggyBank->account_id) {
-                if ($transaction->amount < 0) {
-                    $amount = $transaction->amount * -1;
-                }
-            }
+        $amount = $journal->actual_amount;
+        // if piggy account matches source account, the amount is positive
+        if ($piggyBank->account_id == $journal->source_account->id) {
+            $amount = $amount * -1;
         }
 
-        $repetition->currentamount += $amount;
+
+        $repetition->currentamount = bcadd($repetition->currentamount, $amount);
         $repetition->save();
 
         PiggyBankEvent::create(['piggy_bank_id' => $piggyBank->id, 'transaction_journal_id' => $journal->id, 'date' => $journal->date, 'amount' => $amount]);

app/Handlers/Events/UpdateJournalConnection.php

@@ -50,7 +50,7 @@ class UpdateJournalConnection
             return;
         }
         $amount = $journal->amount;
-        $diff   = $amount - $event->amount;// update current repetition
+        $diff   = $amount - $event->amount; // update current repetition
 
         $repetition->currentamount += $diff;
         $repetition->save();

app/Helpers/Collection/BalanceLine.php

@@ -64,6 +64,8 @@ class BalanceLine
         if ($this->getRole() == self::ROLE_DIFFROLE) {
             return trans('firefly.leftUnbalanced');
         }
+
+        return '';
     }
 
     /**
@@ -157,10 +159,11 @@ class BalanceLine
      */
     public function sumOfLeft()
     {
-        $sum = 0.0;
+        $sum = '0';
+        bcscale(2);
         /** @var BalanceEntry $balanceEntry */
         foreach ($this->getBalanceEntries() as $balanceEntry) {
-            $sum += $balanceEntry->getLeft();
+            $sum = bcadd($sum, $balanceEntry->getLeft());
         }
 
         return $sum;

app/Helpers/Collection/Bill.php

@@ -40,7 +40,7 @@ class Bill
      */
     public function getBills()
     {
-        $this->bills->sortBy(
+        $set = $this->bills->sortBy(
             function (BillLine $bill) {
                 $active = intval($bill->getBill()->active) == 0 ? 1 : 0;
                 $name   = $bill->getBill()->name;
@@ -50,7 +50,7 @@ class Bill
         );
 
 
-        return $this->bills;
+        return $set;
     }
 
 }

app/Helpers/Collection/BillLine.php

@@ -16,19 +16,19 @@ class BillLine
 
     /** @var  bool */
     protected $active;
-    /** @var  float */
+    /** @var  string */
     protected $amount;
     /** @var  BillModel */
     protected $bill;
     /** @var  bool */
     protected $hit;
-    /** @var  float */
+    /** @var  string */
     protected $max;
-    /** @var  float */
+    /** @var  string */
     protected $min;
 
     /**
-     * @return float
+     * @return string
      */
     public function getAmount()
     {
@@ -36,7 +36,7 @@ class BillLine
     }
 
     /**
-     * @param float $amount
+     * @param string $amount
      */
     public function setAmount($amount)
     {
@@ -60,7 +60,7 @@ class BillLine
     }
 
     /**
-     * @return float
+     * @return string
      */
     public function getMax()
     {
@@ -68,7 +68,7 @@ class BillLine
     }
 
     /**
-     * @param float $max
+     * @param string $max
      */
     public function setMax($max)
     {
@@ -76,7 +76,7 @@ class BillLine
     }
 
     /**
-     * @return float
+     * @return string
      */
     public function getMin()
     {
@@ -84,7 +84,7 @@ class BillLine
     }
 
     /**
-     * @param float $min
+     * @param string $min
      */
     public function setMin($min)
     {

app/Helpers/Collection/Category.php

@@ -54,14 +54,14 @@ class Category
      */
     public function getCategories()
     {
-        $this->categories->sortByDesc(
+        $set = $this->categories->sortByDesc(
             function (CategoryModel $category) {
                 return $category->spent;
             }
         );
 
 
-        return $this->categories;
+        return $set;
     }
 
     /**

app/Helpers/Collection/Expense.php

@@ -66,13 +66,13 @@ class Expense
      */
     public function getExpenses()
     {
-        $this->expenses->sortByDesc(
+        $set = $this->expenses->sortByDesc(
             function (stdClass $object) {
                 return $object->amount;
             }
         );
 
-        return $this->expenses;
+        return $set;
     }
 
     /**

app/Helpers/Collection/Income.php

@@ -18,7 +18,7 @@ class Income
 
     /** @var Collection */
     protected $incomes;
-    /** @var float */
+    /** @var string */
     protected $total;
 
     /**
@@ -67,17 +67,17 @@ class Income
      */
     public function getIncomes()
     {
-        $this->incomes->sortByDesc(
+        $set = $this->incomes->sortByDesc(
             function (stdClass $object) {
                 return $object->amount;
             }
         );
 
-        return $this->incomes;
+        return $set;
     }
 
     /**
-     * @return float
+     * @return string
      */
     public function getTotal()
     {

app/Helpers/Reminders/ReminderHelper.php

@@ -1,176 +0,0 @@
-<?php
-
-namespace FireflyIII\Helpers\Reminders;
-
-use Amount;
-use Auth;
-use Carbon\Carbon;
-use Config;
-use FireflyIII\Models\PiggyBank;
-use FireflyIII\Models\Reminder;
-use Navigation;
-use Preferences;
-
-/**
- * Class ReminderHelper
- *
- * @package FireflyIII\Helpers\Reminders
- */
-class ReminderHelper implements ReminderHelperInterface
-{
-    /**
-     * @param PiggyBank $piggyBank
-     * @param Carbon    $start
-     * @param Carbon    $end
-     *
-     * @return Reminder
-     */
-    public function createReminder(PiggyBank $piggyBank, Carbon $start, Carbon $end)
-    {
-        $reminder = Auth::user()->reminders()->where('remindersable_id', $piggyBank->id)->onDates($start, $end)->first();
-        if (is_null($reminder)) {
-
-            if (!is_null($piggyBank->targetdate)) {
-                // get ranges again, but now for the start date
-                $ranges      = $this->getReminderRanges($piggyBank, $start);
-                $currentRep  = $piggyBank->currentRelevantRep();
-                $left        = $piggyBank->targetamount - $currentRep->currentamount;
-                $perReminder = count($ranges) == 0 ? $left : $left / count($ranges);
-            } else {
-                $perReminder = null;
-                $ranges      = [];
-                $left        = 0;
-            }
-            $metaData = [
-                'perReminder' => $perReminder,
-                'rangesCount' => count($ranges),
-                'ranges'      => $ranges,
-                'leftToSave'  => $left,
-            ];
-
-            $reminder = new Reminder;
-            $reminder->user()->associate(Auth::user());
-            $reminder->startdate = $start;
-            $reminder->enddate   = $end;
-            $reminder->active    = true;
-            $reminder->metadata  = $metaData;
-            $reminder->notnow    = false;
-            $reminder->remindersable()->associate($piggyBank);
-            $reminder->save();
-
-            return $reminder;
-
-        } else {
-            return $reminder;
-        }
-    }
-
-    /**
-     * Create all reminders for a piggy bank for a given date.
-     *
-     * @param PiggyBank $piggyBank
-     *
-     * @param Carbon    $date
-     *
-     * @return mixed
-     */
-    public function createReminders(PiggyBank $piggyBank, Carbon $date)
-    {
-        $ranges = $this->getReminderRanges($piggyBank);
-
-        foreach ($ranges as $range) {
-            if ($date < $range['end'] && $date > $range['start']) {
-                // create a reminder here!
-                $this->createReminder($piggyBank, $range['start'], $range['end']);
-                // stop looping, we're done.
-                break;
-            }
-
-        }
-    }
-
-    /**
-     * This routine will return an array consisting of two dates which indicate the start
-     * and end date for each reminder that this piggy bank will have, if the piggy bank has
-     * any reminders. For example:
-     *
-     * [12 mar - 15 mar]
-     * [15 mar - 18 mar]
-     *
-     * etcetera.
-     *
-     * Array is filled with tiny arrays with Carbon objects in them.
-     *
-     * @param PiggyBank $piggyBank
-     * @param Carbon    $date ;
-     *
-     * @return array
-     */
-    public function getReminderRanges(PiggyBank $piggyBank, Carbon $date = null)
-    {
-        $ranges = [];
-        if (is_null($date)) {
-            $date = new Carbon;
-        }
-
-        if ($piggyBank->remind_me === false) {
-            return $ranges;
-        }
-
-        if (!is_null($piggyBank->targetdate)) {
-            // count back until now.
-            $start = $piggyBank->targetdate;
-            $end   = $piggyBank->startdate;
-
-            while ($start > $end) {
-                $currentEnd   = clone $start;
-                $start        = Navigation::subtractPeriod($start, $piggyBank->reminder, 1);
-                $currentStart = clone $start;
-                $ranges[]     = ['start' => clone $currentStart, 'end' => clone $currentEnd];
-            }
-        } else {
-            $start = clone $piggyBank->startdate;
-            while ($start < $date) {
-                $currentStart = clone $start;
-                $start        = Navigation::addPeriod($start, $piggyBank->reminder, 0);
-                $currentEnd   = clone $start;
-                $ranges[]     = ['start' => clone $currentStart, 'end' => clone $currentEnd];
-            }
-        }
-
-        return $ranges;
-    }
-
-    /**
-     * Takes a reminder, finds the piggy bank and tells you what to do now.
-     * Aka how much money to put in.
-     *
-     *
-     * @param Reminder $reminder
-     *
-     * @return string
-     */
-    public function getReminderText(Reminder $reminder)
-    {
-        /** @var PiggyBank $piggyBank */
-        $piggyBank = $reminder->remindersable;
-
-        if (is_null($piggyBank)) {
-            return trans('firefly.piggy_bank_not_exists');
-        }
-
-        if (is_null($piggyBank->targetdate)) {
-            return trans('firefly.add_any_amount_to_piggy', ['amount' => Amount::format($piggyBank->targetamount)]);
-        }
-
-        $lang = Preferences::get('language', 'en')->data;
-
-        return trans(
-            'firefly.add_set_amount_to_piggy',
-            [
-                'amount' => Amount::format($reminder->metadata->perReminder),
-                'date'   => $piggyBank->targetdate->formatLocalized(Config::get('firefly.monthAndDay.' . $lang))
-            ]
-        );
-    }
-}

app/Helpers/Reminders/ReminderHelperInterface.php

@@ -1,63 +0,0 @@
-<?php
-
-namespace FireflyIII\Helpers\Reminders;
-
-use Carbon\Carbon;
-use FireflyIII\Models\PiggyBank;
-use FireflyIII\Models\Reminder;
-
-/**
- * Interface ReminderHelperInterface
- *
- * @package FireflyIII\Helpers\Reminders
- */
-interface ReminderHelperInterface
-{
-    /**
-     * Takes a reminder, finds the piggy bank and tells you what to do now.
-     * Aka how much money to put in.
-     *
-     * @param Reminder $reminder
-     *
-     * @return string
-     */
-    public function getReminderText(Reminder $reminder);
-
-    /**
-     * This routine will return an array consisting of two dates which indicate the start
-     * and end date for each reminder that this piggy bank will have, if the piggy bank has
-     * any reminders. For example:
-     *
-     * [12 mar - 15 mar]
-     * [15 mar - 18 mar]
-     *
-     * etcetera.
-     *
-     * Array is filled with tiny arrays with Carbon objects in them.
-     *
-     * @param PiggyBank $piggyBank
-     *
-     * @return array
-     */
-    public function getReminderRanges(PiggyBank $piggyBank);
-
-    /**
-     * @param PiggyBank $piggyBank
-     * @param Carbon    $start
-     * @param Carbon    $end
-     *
-     * @return Reminder
-     */
-    public function createReminder(PiggyBank $piggyBank, Carbon $start, Carbon $end);
-
-    /**
-     * Create all reminders for a piggy bank for a given date.
-     *
-     * @param PiggyBank $piggyBank
-     *
-     * @param Carbon    $date
-     *
-     * @return mixed
-     */
-    public function createReminders(PiggyBank $piggyBank, Carbon $date);
-}

app/Helpers/Report/ReportHelper.php

@@ -53,7 +53,7 @@ class ReportHelper implements ReportHelperInterface
      * @param Carbon $end
      * @param        $shared
      *
-     * @return Account
+     * @return AccountCollection
      */
     public function getAccountReport(Carbon $date, Carbon $end, $shared)
     {
@@ -70,7 +70,9 @@ class ReportHelper implements ReportHelperInterface
                 if ($account->accountType->type != 'Cash account') {
                     return $account;
                 }
-            } // @codeCoverageIgnore
+
+                return null;
+            }
         );
 
         // summarize:
@@ -161,7 +163,8 @@ class ReportHelper implements ReportHelperInterface
         foreach ($accounts as $account) {
             $spent = $this->query->spentNoBudget($account, $start, $end);
             $left  = $tagRepository->coveredByBalancingActs($account, $start, $end);
-            $diff  = $spent + $left;
+            bcscale(2);
+            $diff = bcsub($spent, $left);
 
             // budget
             $budgetEntry = new BalanceEntry;
@@ -214,18 +217,19 @@ class ReportHelper implements ReportHelperInterface
             $billLine = new BillLine;
             $billLine->setBill($bill);
             $billLine->setActive(intval($bill->active) == 1);
-            $billLine->setMin(floatval($bill->amount_min));
-            $billLine->setMax(floatval($bill->amount_max));
+            $billLine->setMin($bill->amount_min);
+            $billLine->setMax($bill->amount_max);
 
             // is hit in period?
+            bcscale(2);
             $set = $repository->getJournalsInRange($bill, $start, $end);
             if ($set->count() == 0) {
                 $billLine->setHit(false);
             } else {
                 $billLine->setHit(true);
-                $amount = 0;
+                $amount = '0';
                 foreach ($set as $entry) {
-                    $amount += $entry->amount;
+                    $amount = bcadd($amount, $entry->amount);
                 }
                 $billLine->setAmount($amount);
             }

app/Helpers/Report/ReportHelperInterface.php

@@ -3,8 +3,9 @@
 namespace FireflyIII\Helpers\Report;
 
 use Carbon\Carbon;
-use FireflyIII\Helpers\Collection\Account;
+use FireflyIII\Helpers\Collection\Account as AccountCollection;
 use FireflyIII\Helpers\Collection\Balance;
+use FireflyIII\Helpers\Collection\Bill as BillCollection;
 use FireflyIII\Helpers\Collection\Budget as BudgetCollection;
 use FireflyIII\Helpers\Collection\Category as CategoryCollection;
 use FireflyIII\Helpers\Collection\Expense;
@@ -26,7 +27,7 @@ interface ReportHelperInterface
      * @param Carbon  $end
      * @param boolean $shared
      *
-     * @return Account
+     * @return AccountCollection
      */
     public function getAccountReport(Carbon $date, Carbon $end, $shared);
 
@@ -38,7 +39,7 @@ interface ReportHelperInterface
      * @param Carbon  $end
      * @param boolean $shared
      *
-     * @return Account
+     * @return BillCollection
      */
     public function getBillReport(Carbon $start, Carbon $end, $shared);
 

app/Helpers/Report/ReportQuery.php

@@ -72,7 +72,9 @@ class ReportQuery implements ReportQueryInterface
                 if ($journal->amount != 0) {
                     return $journal;
                 }
-            } // @codeCoverageIgnore
+
+                return null;
+            }
         );
 
         return $data;
@@ -97,7 +99,6 @@ class ReportQuery implements ReportQueryInterface
                 $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
             }
             )
-                  ->orderBy('accounts.name', 'ASC')
                   ->where(
                       function (Builder $query) {
 
@@ -188,7 +189,9 @@ class ReportQuery implements ReportQueryInterface
                 if ($journal->amount != 0) {
                     return $journal;
                 }
-            } // @codeCoverageIgnore
+
+                return null;
+            }
         );
 
         return $data;
@@ -226,11 +229,11 @@ class ReportQuery implements ReportQueryInterface
      * @param Carbon  $end
      * @param bool    $shared
      *
-     * @return float
+     * @return string
      */
     public function spentNoBudget(Account $account, Carbon $start, Carbon $end, $shared = false)
     {
-        return floatval(
+        return
             Auth::user()->transactionjournals()
                 ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
                 ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
@@ -238,8 +241,7 @@ class ReportQuery implements ReportQueryInterface
                 ->where('transactions.account_id', $account->id)
                 ->before($end)
                 ->after($start)
-                ->whereNull('budget_transaction_journal.budget_id')->get(['transaction_journals.*'])->sum('amount')
-        );
+                ->whereNull('budget_transaction_journal.budget_id')->get(['transaction_journals.*'])->sum('amount');
     }
 
     /**

app/Helpers/Report/ReportQueryInterface.php

@@ -73,7 +73,7 @@ interface ReportQueryInterface
      * @param Carbon  $end
      * @param bool    $shared
      *
-     * @return float
+     * @return string
      */
     public function spentNoBudget(Account $account, Carbon $start, Carbon $end, $shared = false);
 

app/Http/Controllers/AccountController.php

@@ -3,11 +3,11 @@
 use Auth;
 use Carbon\Carbon;
 use Config;
-use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\AccountFormRequest;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use Input;
+use Preferences;
 use Redirect;
 use Session;
 use Steam;
@@ -87,6 +87,7 @@ class AccountController extends Controller
         $repository->destroy($account);
 
         Session::flash('success', trans('firefly.' . $typeName . '_deleted', ['name' => $name]));
+        Preferences::mark();
 
         return Redirect::to(Session::get('accounts.delete.url'));
     }
@@ -95,7 +96,7 @@ class AccountController extends Controller
      * @param AccountRepositoryInterface $repository
      * @param Account                    $account
      *
-     * @return View
+     * @return \Illuminate\View\View
      */
     public function edit(AccountRepositoryInterface $repository, Account $account)
     {
@@ -140,7 +141,7 @@ class AccountController extends Controller
      * @param AccountRepositoryInterface $repository
      * @param                            $what
      *
-     * @return View
+     * @return \Illuminate\View\View
      */
     public function index(AccountRepositoryInterface $repository, $what)
     {
@@ -169,7 +170,7 @@ class AccountController extends Controller
      * @param AccountRepositoryInterface $repository
      * @param Account                    $account
      *
-     * @return View
+     * @return \Illuminate\View\View
      */
     public function show(AccountRepositoryInterface $repository, Account $account)
     {
@@ -200,13 +201,14 @@ class AccountController extends Controller
             'user'                   => Auth::user()->id,
             'accountRole'            => $request->input('accountRole'),
             'openingBalance'         => floatval($request->input('openingBalance')),
-            'openingBalanceDate'     => new Carbon($request->input('openingBalanceDate')),
+            'openingBalanceDate'     => new Carbon((string)$request->input('openingBalanceDate')),
             'openingBalanceCurrency' => intval($request->input('balance_currency_id')),
 
         ];
         $account     = $repository->store($accountData);
 
         Session::flash('success', 'New account "' . $account->name . '" stored!');
+        Preferences::mark();
 
         if (intval(Input::get('create_another')) === 1) {
             // set value so create routine will not overwrite URL:
@@ -226,7 +228,7 @@ class AccountController extends Controller
      * @param AccountRepositoryInterface $repository
      * @param Account                    $account
      *
-     * @return $this|\Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function update(AccountFormRequest $request, AccountRepositoryInterface $repository, Account $account)
     {
@@ -238,7 +240,7 @@ class AccountController extends Controller
             'accountRole'            => $request->input('accountRole'),
             'virtualBalance'         => floatval($request->input('virtualBalance')),
             'openingBalance'         => floatval($request->input('openingBalance')),
-            'openingBalanceDate'     => new Carbon($request->input('openingBalanceDate')),
+            'openingBalanceDate'     => new Carbon((string)$request->input('openingBalanceDate')),
             'openingBalanceCurrency' => intval($request->input('balance_currency_id')),
             'ccType'                 => $request->input('ccType'),
             'ccMonthlyPaymentDate'   => $request->input('ccMonthlyPaymentDate'),
@@ -247,12 +249,13 @@ class AccountController extends Controller
         $repository->update($account, $accountData);
 
         Session::flash('success', 'Account "' . $account->name . '" updated.');
+        Preferences::mark();
 
         if (intval(Input::get('return_to_edit')) === 1) {
             // set value so edit routine will not overwrite URL:
             Session::put('accounts.edit.fromUpdate', true);
 
-            return Redirect::route('accounts.edit', $account->id)->withInput(['return_to_edit' => 1]);
+            return Redirect::route('accounts.edit', [$account->id])->withInput(['return_to_edit' => 1]);
         }
 
         // redirect to previous URL.

app/Http/Controllers/Auth/AuthController.php

@@ -1,14 +1,17 @@
 <?php namespace FireflyIII\Http\Controllers\Auth;
 
+use App;
+use Auth;
 use FireflyIII\Http\Controllers\Controller;
-use Illuminate\Contracts\Auth\Guard;
-use Illuminate\Contracts\Auth\Registrar;
+use FireflyIII\Models\Role;
+use FireflyIII\User;
 use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
 use Illuminate\Http\Request;
 use Illuminate\Mail\Message;
 use Mail;
 use Session;
 use Twig;
+use Validator;
 
 /**
  * Class AuthController
@@ -36,17 +39,11 @@ class AuthController extends Controller
     /**
      * Create a new authentication controller instance.
      *
-     * @param  \Illuminate\Contracts\Auth\Guard     $auth
-     * @param  \Illuminate\Contracts\Auth\Registrar $registrar
-     *
      * @codeCoverageIgnore
      *
      */
-    public function __construct(Guard $auth, Registrar $registrar)
+    public function __construct()
     {
-        $this->auth      = $auth;
-        $this->registrar = $registrar;
-
         $this->middleware('guest', ['except' => 'getLogout']);
     }
 
@@ -67,11 +64,11 @@ class AuthController extends Controller
      *
      * @param  Request $request
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function postRegister(Request $request)
     {
-        $validator = $this->registrar->validator($request->all());
+        $validator = $this->validator($request->all());
 
         if ($validator->fails()) {
             $this->throwValidationException(
@@ -84,25 +81,71 @@ class AuthController extends Controller
         $data             = $request->all();
         $data['password'] = bcrypt($data['password']);
 
-        $this->auth->login($this->registrar->create($data));
+        Auth::login($this->create($data));
 
         // get the email address
-        $email = $this->auth->user()->email;
+        if (Auth::user() instanceof User) {
+            $email   = Auth::user()->email;
+            $address = route('index');
+            // send email.
+            Mail::send(
+                ['emails.registered-html', 'emails.registered'], ['address' => $address], function (Message $message) use ($email) {
+                $message->to($email, $email)->subject('Welcome to Firefly III! ');
+            }
+            );
 
-        // send email.
-        Mail::send(
-            'emails.registered', [], function (Message $message) use ($email) {
-            $message->to($email, $email)->subject('Welcome to Firefly III!');
+            // set flash message
+            Session::flash('success', 'You have registered successfully!');
+            Session::flash('gaEventCategory', 'user');
+            Session::flash('gaEventAction', 'new-registration');
+
+            // first user ever?
+            if (User::count() == 1) {
+                $admin = Role::where('name', 'owner')->first();
+                Auth::user()->attachRole($admin);
+            }
+
+
+            return redirect($this->redirectPath());
         }
-        );
+        // @codeCoverageIgnoreStart
+        App::abort(500, 'Not a user!');
 
-        // set flash message
-        Session::flash('success', 'You have registered successfully!');
-        Session::flash('gaEventCategory', 'user');
-        Session::flash('gaEventAction', 'new-registration');
-
-
-        return redirect($this->redirectPath());
+        return redirect('/');
+        // @codeCoverageIgnoreEnd
     }
 
+    /**
+     * Get a validator for an incoming registration request.
+     *
+     * @param  array $data
+     *
+     * @return \Illuminate\Contracts\Validation\Validator
+     */
+    public function validator(array $data)
+    {
+        return Validator::make(
+            $data, [
+                     'email'    => 'required|email|max:255|unique:users',
+                     'password' => 'required|confirmed|min:6',
+                 ]
+        );
+    }
+
+    /**
+     * Create a new user instance after a valid registration.
+     *
+     * @param  array $data
+     *
+     * @return User
+     */
+    public function create(array $data)
+    {
+        return User::create(
+            [
+                'email'    => $data['email'],
+                'password' => $data['password'],
+            ]
+        );
+    }
 }

app/Http/Controllers/Auth/PasswordController.php

@@ -1,8 +1,6 @@
 <?php namespace FireflyIII\Http\Controllers\Auth;
 
 use FireflyIII\Http\Controllers\Controller;
-use Illuminate\Contracts\Auth\Guard;
-use Illuminate\Contracts\Auth\PasswordBroker;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 
 /**
@@ -33,17 +31,11 @@ class PasswordController extends Controller
     /**
      * Create a new password controller instance.
      *
-     * @param  \Illuminate\Contracts\Auth\Guard          $auth
-     * @param  \Illuminate\Contracts\Auth\PasswordBroker $passwords
-     *
      * @codeCoverageIgnore
      *
      */
-    public function __construct(Guard $auth, PasswordBroker $passwords)
+    public function __construct()
     {
-        $this->auth      = $auth;
-        $this->passwords = $passwords;
-
 
         $this->middleware('guest');
     }

app/Http/Controllers/BillController.php

@@ -1,13 +1,12 @@
 <?php namespace FireflyIII\Http\Controllers;
 
 use Config;
-use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\BillFormRequest;
 use FireflyIII\Models\Bill;
-use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use Input;
+use Preferences;
 use Redirect;
 use Session;
 use URL;
@@ -32,11 +31,13 @@ class BillController extends Controller
     }
 
     /**
-     * @return $this
+     * @return \Illuminate\View\View
      */
     public function create()
     {
-        $periods = Config::get('firefly.periods_to_text');
+        $periods  = Config::get('firefly.periods_to_text');
+        $subTitle = trans('firefly.create_new_bill');
+
 
         // put previous url in session if not redirect from store (not "create another").
         if (Session::get('bills.create.fromStore') !== true) {
@@ -45,7 +46,6 @@ class BillController extends Controller
         Session::forget('bills.create.fromStore');
         Session::flash('gaEventCategory', 'bills');
         Session::flash('gaEventAction', 'create');
-        $subTitle = 'Create new bill';
 
         return view('bills.create', compact('periods', 'subTitle'));
     }
@@ -53,7 +53,7 @@ class BillController extends Controller
     /**
      * @param Bill $bill
      *
-     * @return $this
+     * @return \Illuminate\View\View
      */
     public function delete(Bill $bill)
     {
@@ -77,6 +77,7 @@ class BillController extends Controller
         $repository->destroy($bill);
 
         Session::flash('success', 'The bill was deleted.');
+        Preferences::mark();
 
         return Redirect::to(Session::get('bills.delete.url'));
 
@@ -85,12 +86,12 @@ class BillController extends Controller
     /**
      * @param Bill $bill
      *
-     * @return $this
+     * @return \Illuminate\View\View
      */
     public function edit(Bill $bill)
     {
         $periods  = Config::get('firefly.periods_to_text');
-        $subTitle = 'Edit "' . e($bill->name) . '"';
+        $subTitle = trans('firefly.edit_bill', ['name' => $bill->name]);
 
         // put previous url in session if not redirect from store (not "return_to_edit").
         if (Session::get('bills.edit.fromUpdate') !== true) {
@@ -143,6 +144,7 @@ class BillController extends Controller
 
 
         Session::flash('success', 'Rescanned everything.');
+        Preferences::mark();
 
         return Redirect::to(URL::previous());
     }
@@ -151,7 +153,7 @@ class BillController extends Controller
      * @param BillRepositoryInterface $repository
      * @param Bill                    $bill
      *
-     * @return mixed
+     * @return \Illuminate\View\View
      */
     public function show(BillRepositoryInterface $repository, Bill $bill)
     {
@@ -167,13 +169,14 @@ class BillController extends Controller
      * @param BillFormRequest         $request
      * @param BillRepositoryInterface $repository
      *
-     * @return $this|\Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function store(BillFormRequest $request, BillRepositoryInterface $repository)
     {
         $billData = $request->getBillData();
         $bill     = $repository->store($billData);
         Session::flash('success', 'Bill "' . e($bill->name) . '" stored.');
+        Preferences::mark();
 
         if (intval(Input::get('create_another')) === 1) {
             // set value so create routine will not overwrite URL:
@@ -192,7 +195,7 @@ class BillController extends Controller
      * @param BillRepositoryInterface $repository
      * @param Bill                    $bill
      *
-     * @return $this|\Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function update(BillFormRequest $request, BillRepositoryInterface $repository, Bill $bill)
     {
@@ -200,12 +203,13 @@ class BillController extends Controller
         $bill     = $repository->update($bill, $billData);
 
         Session::flash('success', 'Bill "' . e($bill->name) . '" updated.');
+        Preferences::mark();
 
         if (intval(Input::get('return_to_edit')) === 1) {
             // set value so edit routine will not overwrite URL:
             Session::put('bills.edit.fromUpdate', true);
 
-            return Redirect::route('bills.edit', $bill->id)->withInput(['return_to_edit' => 1]);
+            return Redirect::route('bills.edit', [$bill->id])->withInput(['return_to_edit' => 1]);
         }
 
         // redirect to previous URL.

app/Http/Controllers/BudgetController.php

@@ -3,7 +3,6 @@
 use Amount;
 use Auth;
 use Carbon\Carbon;
-use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\BudgetFormRequest;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\LimitRepetition;
@@ -20,6 +19,7 @@ use View;
  * Class BudgetController
  *
  * @package FireflyIII\Http\Controllers
+ * @SuppressWarnings(PHPMD.TooManyMethods)
  */
 class BudgetController extends Controller
 {
@@ -49,13 +49,14 @@ class BudgetController extends Controller
         if ($amount == 0) {
             $limitRepetition = null;
         }
+        Preferences::mark();
 
         return Response::json(['name' => $budget->name, 'repetition' => $limitRepetition ? $limitRepetition->id : 0]);
 
     }
 
     /**
-     * @return $this
+     * @return \Illuminate\View\View
      */
     public function create()
     {
@@ -102,6 +103,7 @@ class BudgetController extends Controller
 
 
         Session::flash('success', 'The  budget "' . e($name) . '" was deleted.');
+        Preferences::mark();
 
 
         return Redirect::to(Session::get('budgets.delete.url'));
@@ -110,11 +112,11 @@ class BudgetController extends Controller
     /**
      * @param Budget $budget
      *
-     * @return $this
+     * @return \Illuminate\View\View
      */
     public function edit(Budget $budget)
     {
-        $subTitle = 'Edit budget "' . e($budget->name) . '"';
+        $subTitle = trans('firefly.edit_budget', ['name' => $budget->name]);
 
         // put previous url in session if not redirect from store (not "return_to_edit").
         if (Session::get('budgets.edit.fromUpdate') !== true) {
@@ -131,7 +133,7 @@ class BudgetController extends Controller
     /**
      * @param BudgetRepositoryInterface $repository
      *
-     * @return View
+     * @return \Illuminate\View\View
      */
     public function index(BudgetRepositoryInterface $repository)
     {
@@ -173,7 +175,7 @@ class BudgetController extends Controller
     /**
      * @param BudgetRepositoryInterface $repository
      *
-     * @return View
+     * @return \Illuminate\View\View
      */
     public function noBudget(BudgetRepositoryInterface $repository)
     {
@@ -196,6 +198,7 @@ class BudgetController extends Controller
 
         $date = Session::get('start', Carbon::now()->startOfMonth())->format('FY');
         Preferences::set('budgetIncomeTotal' . $date, intval(Input::get('amount')));
+        Preferences::mark();
 
         return Redirect::route('budgets.index');
     }
@@ -205,7 +208,7 @@ class BudgetController extends Controller
      * @param Budget                    $budget
      * @param LimitRepetition           $repetition
      *
-     * @return View
+     * @return \Illuminate\View\View
      */
     public function show(BudgetRepositoryInterface $repository, Budget $budget, LimitRepetition $repetition = null)
     {
@@ -216,12 +219,15 @@ class BudgetController extends Controller
         }
 
         $journals = $repository->getJournals($budget, $repetition);
-        $limits   = !is_null($repetition->id) ? [$repetition->budgetLimit] : $repository->getBudgetLimits($budget);
-        $subTitle = !is_null($repetition->id)
-            ?
-            trans('firefly.budget_in_month', ['name' => $budget->name, 'month' => $repetition->startdate->formatLocalized($this->monthFormat)])
-            :
-            e($budget->name);
+
+        if (is_null($repetition->id)) {
+            $limits   = $repository->getBudgetLimits($budget);
+            $subTitle = e($budget->name);
+        } else {
+            $limits   = [$repetition->budgetLimit];
+            $subTitle = trans('firefly.budget_in_month', ['name' => $budget->name, 'month' => $repetition->startdate->formatLocalized($this->monthFormat)]);
+        }
+
         $journals->setPath('/budgets/show/' . $budget->id);
 
         return view('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle'));
@@ -242,6 +248,7 @@ class BudgetController extends Controller
         $budget     = $repository->store($budgetData);
 
         Session::flash('success', 'New budget "' . $budget->name . '" stored!');
+        Preferences::mark();
 
         if (intval(Input::get('create_another')) === 1) {
             // set value so create routine will not overwrite URL:
@@ -260,7 +267,7 @@ class BudgetController extends Controller
      * @param BudgetRepositoryInterface $repository
      * @param Budget                    $budget
      *
-     * @return $this|\Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function update(BudgetFormRequest $request, BudgetRepositoryInterface $repository, Budget $budget)
     {
@@ -272,12 +279,13 @@ class BudgetController extends Controller
         $repository->update($budget, $budgetData);
 
         Session::flash('success', 'Budget "' . $budget->name . '" updated.');
+        Preferences::mark();
 
         if (intval(Input::get('return_to_edit')) === 1) {
             // set value so edit routine will not overwrite URL:
             Session::put('budgets.edit.fromUpdate', true);
 
-            return Redirect::route('budgets.edit', $budget->id)->withInput(['return_to_edit' => 1]);
+            return Redirect::route('budgets.edit', [$budget->id])->withInput(['return_to_edit' => 1]);
         }
 
         // redirect to previous URL.
@@ -286,7 +294,7 @@ class BudgetController extends Controller
     }
 
     /**
-     * @return View
+     * @return \Illuminate\View\View
      */
     public function updateIncome()
     {

app/Http/Controllers/CategoryController.php

@@ -7,6 +7,7 @@ use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Input;
+use Preferences;
 use Redirect;
 use Session;
 use URL;
@@ -31,7 +32,7 @@ class CategoryController extends Controller
     }
 
     /**
-     * @return $this
+     * @return \Illuminate\View\View
      */
     public function create()
     {
@@ -42,7 +43,7 @@ class CategoryController extends Controller
         Session::forget('categories.create.fromStore');
         Session::flash('gaEventCategory', 'categories');
         Session::flash('gaEventAction', 'create');
-        $subTitle = 'Create a new category';
+        $subTitle = trans('firefly.create_new_category');
 
         return view('categories.create', compact('subTitle'));
     }
@@ -77,6 +78,7 @@ class CategoryController extends Controller
         $repository->destroy($category);
 
         Session::flash('success', 'The  category "' . e($name) . '" was deleted.');
+        Preferences::mark();
 
         return Redirect::to(Session::get('categories.delete.url'));
     }
@@ -84,11 +86,11 @@ class CategoryController extends Controller
     /**
      * @param Category $category
      *
-     * @return $this
+     * @return \Illuminate\View\View
      */
     public function edit(Category $category)
     {
-        $subTitle = 'Edit category "' . e($category->name) . '"';
+        $subTitle = trans('firefly.edit_category', ['name' => $category->name]);
 
         // put previous url in session if not redirect from store (not "return_to_edit").
         if (Session::get('categories.edit.fromUpdate') !== true) {
@@ -105,7 +107,7 @@ class CategoryController extends Controller
     /**
      * @param CategoryRepositoryInterface $repository
      *
-     * @return $this
+     * @return \Illuminate\View\View
      */
     public function index(CategoryRepositoryInterface $repository)
     {
@@ -130,7 +132,10 @@ class CategoryController extends Controller
         $start    = Session::get('start', Carbon::now()->startOfMonth());
         $end      = Session::get('end', Carbon::now()->startOfMonth());
         $list     = $repository->getWithoutCategory($start, $end);
-        $subTitle = 'Transactions without a category between ' . $start->format('jS F Y') . ' and ' . $end->format('jS F Y');
+        $subTitle = trans(
+            'firefly.without_category_between',
+            ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
+        );
 
         return view('categories.noCategory', compact('list', 'subTitle'));
     }
@@ -139,7 +144,7 @@ class CategoryController extends Controller
      * @param CategoryRepositoryInterface $repository
      * @param Category                    $category
      *
-     * @return View
+     * @return \Illuminate\View\View
      */
     public function show(CategoryRepositoryInterface $repository, Category $category)
     {
@@ -157,7 +162,7 @@ class CategoryController extends Controller
      * @param CategoryFormRequest         $request
      * @param CategoryRepositoryInterface $repository
      *
-     * @return mixed
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function store(CategoryFormRequest $request, CategoryRepositoryInterface $repository)
     {
@@ -168,6 +173,7 @@ class CategoryController extends Controller
         $category     = $repository->store($categoryData);
 
         Session::flash('success', 'New category "' . $category->name . '" stored!');
+        Preferences::mark();
 
         if (intval(Input::get('create_another')) === 1) {
             Session::put('categories.create.fromStore', true);
@@ -195,11 +201,12 @@ class CategoryController extends Controller
         $repository->update($category, $categoryData);
 
         Session::flash('success', 'Category "' . $category->name . '" updated.');
+        Preferences::mark();
 
         if (intval(Input::get('return_to_edit')) === 1) {
             Session::put('categories.edit.fromUpdate', true);
 
-            return Redirect::route('categories.edit', $category->id);
+            return Redirect::route('categories.edit', [$category->id]);
         }
 
         // redirect to previous URL.

app/Http/Controllers/Chart/AccountController.php

@@ -2,16 +2,16 @@
 
 namespace FireflyIII\Http\Controllers\Chart;
 
+use App;
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use Grumpydictator\Gchart\GChart;
+use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
 use Preferences;
 use Response;
 use Session;
-use Steam;
 
 /**
  * Class AccountController
@@ -20,25 +20,51 @@ use Steam;
  */
 class AccountController extends Controller
 {
+
+    /** @var  \FireflyIII\Generator\Chart\Account\AccountChartGenerator */
+    protected $generator;
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        // create chart generator:
+        $this->generator = App::make('FireflyIII\Generator\Chart\Account\AccountChartGenerator');
+    }
+
+
     /**
      * Shows the balances for all the user's accounts.
      *
-     * @param GChart                     $chart
      * @param AccountRepositoryInterface $repository
      *
+     * @param                            $year
+     * @param                            $month
+     * @param bool                       $shared
+     *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function all(GChart $chart, AccountRepositoryInterface $repository, $year, $month, $shared = false)
+    public function all(AccountRepositoryInterface $repository, $year, $month, $shared = false)
     {
         $start = new Carbon($year . '-' . $month . '-01');
         $end   = clone $start;
         $end->endOfMonth();
-        $chart->addColumn(trans('firefly.dayOfMonth'), 'date');
+
+        // chart properties for cache:
+        $cache = new CacheProperties();
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('all');
+        $cache->addProperty('accounts');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
 
         /** @var Collection $accounts */
         $accounts = $repository->getAccounts(['Default account', 'Asset account']);
         if ($shared === false) {
-            // remove the shared accounts from the collection:
             /** @var Account $account */
             foreach ($accounts as $index => $account) {
                 if ($account->getMeta('accountRole') == 'sharedAsset') {
@@ -47,104 +73,72 @@ class AccountController extends Controller
             }
         }
 
+        // make chart:
+        $data = $this->generator->all($accounts, $start, $end);
+        $cache->store($data);
 
-        $index = 1;
-        /** @var Account $account */
-        foreach ($accounts as $account) {
-            $chart->addColumn(trans('firefly.balanceFor', ['name' => $account->name]), 'number');
-            $chart->addCertainty($index);
-            $index++;
-        }
-        $current = clone $start;
-        $current->subDay();
-        $today = Carbon::now();
-        while ($end >= $current) {
-            $row     = [clone $current];
-            $certain = $current < $today;
-            foreach ($accounts as $account) {
-                $row[] = Steam::balance($account, $current);
-                $row[] = $certain;
-            }
-            $chart->addRowArray($row);
-            $current->addDay();
-        }
-        $chart->generate();
-
-        return Response::json($chart->getData());
-
+        return Response::json($data);
     }
 
     /**
      * Shows the balances for all the user's frontpage accounts.
      *
-     * @param GChart                     $chart
      * @param AccountRepositoryInterface $repository
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function frontpage(GChart $chart, AccountRepositoryInterface $repository)
+    public function frontpage(AccountRepositoryInterface $repository)
     {
-        $chart->addColumn(trans('firefly.dayOfMonth'), 'date');
-
         $frontPage = Preferences::get('frontPageAccounts', []);
-        $start     = Session::get('start', Carbon::now()->startOfMonth());
-        $end       = Session::get('end', Carbon::now()->endOfMonth());
+        $start     = clone Session::get('start', Carbon::now()->startOfMonth());
+        $end       = clone Session::get('end', Carbon::now()->endOfMonth());
         $accounts  = $repository->getFrontpageAccounts($frontPage);
 
-        $index = 1;
-        /** @var Account $account */
-        foreach ($accounts as $account) {
-            $chart->addColumn(trans('firefly.balanceFor', ['name' => $account->name]), 'number');
-            $chart->addCertainty($index);
-            $index++;
+        // chart properties for cache:
+        $cache = new CacheProperties();
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('frontpage');
+        $cache->addProperty('accounts');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
-        $current = clone $start;
-        $current->subDay();
-        $today = Carbon::now();
-        while ($end >= $current) {
-            $row     = [clone $current];
-            $certain = $current < $today;
-            foreach ($accounts as $account) {
-                $row[] = Steam::balance($account, $current);
-                $row[] = $certain;
-            }
-            $chart->addRowArray($row);
-            $current->addDay();
-        }
-        $chart->generate();
 
-        return Response::json($chart->getData());
+        $data = $this->generator->frontpage($accounts, $start, $end);
+        $cache->store($data);
+
+        return Response::json($data);
 
     }
 
     /**
      * Shows an account's balance for a single month.
      *
-     * @param GChart  $chart
      * @param Account $account
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function single(GChart $chart, Account $account)
+    public function single(Account $account)
     {
-        $chart->addColumn(trans('firefly.dayOfMonth'), 'date');
-        $chart->addColumn(trans('firefly.balanceFor', ['name' => $account->name]), 'number');
-        $chart->addCertainty(1);
 
-        $start   = Session::get('start', Carbon::now()->startOfMonth());
-        $end     = Session::get('end', Carbon::now()->endOfMonth());
-        $current = clone $start;
-        $today   = new Carbon;
 
-        while ($end >= $current) {
-            $certain = $current < $today;
-            $chart->addRow(clone $current, Steam::balance($account, $current), $certain);
-            $current->addDay();
+        $start = Session::get('start', Carbon::now()->startOfMonth());
+        $end   = Session::get('end', Carbon::now()->endOfMonth());
+
+        // chart properties for cache:
+        $cache = new CacheProperties();
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('frontpage');
+        $cache->addProperty('single');
+        $cache->addProperty($account->id);
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
+        $data = $this->generator->single($account, $start, $end);
+        $cache->store($data);
 
-        $chart->generate();
-
-        return Response::json($chart->getData());
+        return Response::json($data);
     }
 }

app/Http/Controllers/Chart/BillController.php

@@ -2,13 +2,13 @@
 
 namespace FireflyIII\Http\Controllers\Chart;
 
+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 Grumpydictator\Gchart\GChart;
+use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
 use Response;
 use Session;
@@ -21,61 +21,49 @@ use Steam;
  */
 class BillController extends Controller
 {
+
+    /** @var  \FireflyIII\Generator\Chart\Bill\BillChartGenerator */
+    protected $generator;
+
     /**
-     * Shows the overview for a bill. The min/max amount and matched journals.
-     *
-     * @param GChart                  $chart
-     * @param BillRepositoryInterface $repository
-     * @param Bill                    $bill
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @codeCoverageIgnore
      */
-    public function single(GChart $chart, BillRepositoryInterface $repository, Bill $bill)
+    public function __construct()
     {
-
-        $chart->addColumn(trans('firefly.date'), 'date');
-        $chart->addColumn(trans('firefly.maxAmount'), 'number');
-        $chart->addColumn(trans('firefly.minAmount'), 'number');
-        $chart->addColumn(trans('firefly.billEntry'), 'number');
-
-        // get first transaction or today for start:
-        $results = $repository->getJournals($bill);
-        /** @var TransactionJournal $result */
-        foreach ($results as $result) {
-            $chart->addRow(clone $result->date, floatval($bill->amount_max), floatval($bill->amount_min), floatval($result->amount));
-        }
-
-        $chart->generate();
-
-        return Response::json($chart->getData());
-
+        parent::__construct();
+        // create chart generator:
+        $this->generator = App::make('FireflyIII\Generator\Chart\Bill\BillChartGenerator');
     }
 
     /**
      * Shows all bills and whether or not theyve been paid this month (pie chart).
      *
-     * @param GChart                     $chart
-     *
      * @param BillRepositoryInterface    $repository
      * @param AccountRepositoryInterface $accounts
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function frontpage(GChart $chart, BillRepositoryInterface $repository, AccountRepositoryInterface $accounts)
+    public function frontpage(BillRepositoryInterface $repository, AccountRepositoryInterface $accounts)
     {
-        $chart->addColumn(trans('firefly.name'), 'string');
-        $chart->addColumn(trans('firefly.amount'), 'number');
 
-        $start  = Session::get('start', Carbon::now()->startOfMonth());
-        $end    = Session::get('end', Carbon::now()->endOfMonth());
+        $start = Session::get('start', Carbon::now()->startOfMonth());
+        $end   = Session::get('end', Carbon::now()->endOfMonth());
+
+
+        // chart properties for cache:
+        $cache = new CacheProperties();
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('bills');
+        $cache->addProperty('frontpage');
+        if ($cache->has()) {
+             return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
         $bills  = $repository->getActiveBills();
         $paid   = new Collection; // journals.
         $unpaid = new Collection; // bills
-        // loop paid and create single entry:
-        $paidDescriptions   = [];
-        $paidAmount         = 0;
-        $unpaidDescriptions = [];
-        $unpaidAmount       = 0;
+
 
         /** @var Bill $bill */
         foreach ($bills as $bill) {
@@ -113,28 +101,37 @@ class BillController extends Controller
             }
         }
 
+        // build chart:
+        $data = $this->generator->frontpage($paid, $unpaid);
+        $cache->store($data);
 
-        /** @var TransactionJournal $entry */
-        foreach ($paid as $entry) {
+        return Response::json($data);
+    }
 
-            $paidDescriptions[] = $entry->description;
-            $paidAmount += floatval($entry->amount);
+    /**
+     * Shows the overview for a bill. The min/max amount and matched journals.
+     *
+     * @param BillRepositoryInterface $repository
+     * @param Bill                    $bill
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function single(BillRepositoryInterface $repository, Bill $bill)
+    {
+        $cache = new CacheProperties;
+        $cache->addProperty('single');
+        $cache->addProperty('bill');
+        $cache->addProperty($bill->id);
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
-        // loop unpaid:
-        /** @var Bill $entry */
-        foreach ($unpaid as $entry) {
-            $description          = $entry[0]->name . ' (' . $entry[1]->format('jS M Y') . ')';
-            $amount               = ($entry[0]->amount_max + $entry[0]->amount_min) / 2;
-            $unpaidDescriptions[] = $description;
-            $unpaidAmount += $amount;
-            unset($amount, $description);
-        }
+        // get first transaction or today for start:
+        $results = $repository->getJournals($bill);
 
-        $chart->addRow(trans('firefly.unpaid') . ': ' . join(', ', $unpaidDescriptions), $unpaidAmount);
-        $chart->addRow(trans('firefly.paid') . ': ' . join(', ', $paidDescriptions), $paidAmount);
-        $chart->generate();
+        $data = $this->generator->single($bill, $results);
+        $cache->store($data);
 
-        return Response::json($chart->getData());
+        return Response::json($data);
     }
 }

app/Http/Controllers/Chart/BudgetController.php

@@ -2,12 +2,13 @@
 
 namespace FireflyIII\Http\Controllers\Chart;
 
+use App;
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\LimitRepetition;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
-use Grumpydictator\Gchart\GChart;
+use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
 use Navigation;
 use Preferences;
@@ -21,17 +22,30 @@ use Session;
  */
 class BudgetController extends Controller
 {
+
+    /** @var  \FireflyIII\Generator\Chart\Budget\BudgetChartGenerator */
+    protected $generator;
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        // create chart generator:
+        $this->generator = App::make('FireflyIII\Generator\Chart\Budget\BudgetChartGenerator');
+    }
+
     /**
-     * @param GChart                    $chart
      * @param BudgetRepositoryInterface $repository
      * @param Budget                    $budget
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function budget(GChart $chart, BudgetRepositoryInterface $repository, Budget $budget)
+    public function budget(BudgetRepositoryInterface $repository, Budget $budget)
     {
-        $chart->addColumn(trans('firefly.period'), 'date');
-        $chart->addColumn(trans('firefly.spent'), 'number');
-
 
+        // dates and times
         $first = $repository->getFirstBudgetLimitDate($budget);
         $range = Preferences::get('viewRange', '1M')->data;
         $last  = Session::get('end', new Carbon);
@@ -39,41 +53,61 @@ class BudgetController extends Controller
         $final->addYears(2);
         $last = Navigation::endOfX($last, $range, $final);
 
+        // chart properties for cache:
+        $cache = new CacheProperties();
+        $cache->addProperty($first);
+        $cache->addProperty($last);
+        $cache->addProperty('budget');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
+        $entries = new Collection;
+
         while ($first < $last) {
             $end = Navigation::addPeriod($first, $range, 0);
-
+            $end->subDay();
+            $chartDate = clone $end;
+            $chartDate->startOfMonth();
             $spent = $repository->spentInPeriodCorrected($budget, $first, $end);
-            $chart->addRow($end, $spent);
-
-
+            $entries->push([$chartDate, $spent]);
             $first = Navigation::addPeriod($first, $range, 0);
         }
 
-        $chart->generate();
+        $data = $this->generator->budget($entries);
+        $cache->store($data);
 
-        return Response::json($chart->getData());
+        return Response::json($data);
     }
 
     /**
      * Shows the amount left in a specific budget limit.
      *
-     * @param GChart                    $chart
      * @param BudgetRepositoryInterface $repository
      * @param Budget                    $budget
      * @param LimitRepetition           $repetition
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function budgetLimit(GChart $chart, BudgetRepositoryInterface $repository, Budget $budget, LimitRepetition $repetition)
+    public function budgetLimit(BudgetRepositoryInterface $repository, Budget $budget, LimitRepetition $repetition)
     {
         $start = clone $repetition->startdate;
         $end   = $repetition->enddate;
 
-        $chart->addColumn(trans('firefly.day'), 'date');
-        $chart->addColumn(trans('firefly.left'), 'number');
+        // chart properties for cache:
+        $cache = new CacheProperties();
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('budget');
+        $cache->addProperty('limit');
+        $cache->addProperty($budget->id);
+        $cache->addProperty($repetition->id);
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
 
-
-        $amount = $repetition->amount;
+        $entries = new Collection;
+        $amount  = $repetition->amount;
 
         while ($start <= $end) {
             /*
@@ -81,101 +115,111 @@ class BudgetController extends Controller
              */
             $sum = $repository->expensesOnDayCorrected($budget, $start);
             $amount += $sum;
-            $chart->addRow(clone $start, $amount);
+            $entries->push([clone $start, $amount]);
             $start->addDay();
         }
-        $chart->generate();
 
-        return Response::json($chart->getData());
+        $data = $this->generator->budgetLimit($entries);
+        $cache->store($data);
+
+        return Response::json($data);
 
     }
 
     /**
      * Shows a budget list with spent/left/overspent.
      *
-     * @param GChart                    $chart
      * @param BudgetRepositoryInterface $repository
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function frontpage(GChart $chart, BudgetRepositoryInterface $repository)
+    public function frontpage(BudgetRepositoryInterface $repository)
     {
-        $chart->addColumn(trans('firefly.budget'), 'string');
-        $chart->addColumn(trans('firefly.left'), 'number');
-        $chart->addColumn(trans('firefly.spent'), 'number');
-        $chart->addColumn(trans('firefly.overspent'), 'number');
-
         $budgets    = $repository->getBudgets();
         $start      = Session::get('start', Carbon::now()->startOfMonth());
         $end        = Session::get('end', Carbon::now()->endOfMonth());
         $allEntries = new Collection;
 
+        // chart properties for cache:
+        $cache = new CacheProperties();
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('budget');
+        $cache->addProperty('all');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
+        bcscale(2);
+
+        /** @var Budget $budget */
         foreach ($budgets as $budget) {
             $repetitions = $repository->getBudgetLimitRepetitions($budget, $start, $end);
             if ($repetitions->count() == 0) {
                 $expenses = $repository->spentInPeriodCorrected($budget, $start, $end, true);
-                $allEntries->push([$budget->name, 0, 0, $expenses]);
+                $allEntries->push([$budget->name, 0, 0, $expenses, 0, 0]);
                 continue;
             }
             /** @var LimitRepetition $repetition */
             foreach ($repetitions as $repetition) {
-                $expenses  = $repository->spentInPeriodCorrected($budget, $repetition->startdate, $repetition->enddate, true);
-                $left      = $expenses < floatval($repetition->amount) ? floatval($repetition->amount) - $expenses : 0;
-                $spent     = $expenses > floatval($repetition->amount) ? floatval($repetition->amount) : $expenses;
-                $overspent = $expenses > floatval($repetition->amount) ? $expenses - floatval($repetition->amount) : 0;
-                $allEntries->push(
-                    [$budget->name . ' (' . $repetition->startdate->formatLocalized($this->monthAndDayFormat) . ')',
-                     $left,
-                     $spent,
-                     $overspent
-                    ]
-                );
+                $expenses = $repository->spentInPeriodCorrected($budget, $repetition->startdate, $repetition->enddate, true);
+                // $left can be less than zero.
+                // $overspent can be more than zero ( = overspending)
+
+                $left      = max(bcsub($repetition->amount, $expenses), 0); // limited at zero.
+                $overspent = max(bcsub($expenses, $repetition->amount), 0); // limited at zero.
+                $name      = $budget->name;
+
+                // $spent is maxed to the repetition amount:
+                $spent = $expenses > $repetition->amount ? $repetition->amount : $expenses;
+
+
+                $allEntries->push([$name, $left, $spent, $overspent, $repetition->amount, $expenses]);
             }
         }
 
-        $noBudgetExpenses = $repository->getWithoutBudgetSum($start, $end);
-        $allEntries->push([trans('firefly.noBudget'), 0, 0, $noBudgetExpenses]);
+        $noBudgetExpenses = $repository->getWithoutBudgetSum($start, $end) * -1;
+        $allEntries->push([trans('firefly.noBudget'), 0, 0, $noBudgetExpenses, 0, 0]);
 
-        foreach ($allEntries as $entry) {
-            if ($entry[1] != 0 || $entry[2] != 0 || $entry[3] != 0) {
-                $chart->addRow($entry[0], $entry[1], $entry[2], $entry[3]);
-            }
-        }
+        $data = $this->generator->frontpage($allEntries);
+        $cache->store($data);
 
-        $chart->generate();
-
-        return Response::json($chart->getData());
+        return Response::json($data);
 
     }
 
     /**
      * Show a yearly overview for a budget.
      *
-     * @param GChart                    $chart
      * @param BudgetRepositoryInterface $repository
      * @param                           $year
      * @param bool                      $shared
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function year(GChart $chart, BudgetRepositoryInterface $repository, $year, $shared = false)
+    public function year(BudgetRepositoryInterface $repository, $year, $shared = false)
     {
         $start   = new Carbon($year . '-01-01');
         $end     = new Carbon($year . '-12-31');
         $shared  = $shared == 'shared' ? true : false;
         $budgets = $repository->getBudgets();
 
-        // add columns:
-        $chart->addColumn(trans('firefly.month'), 'date');
-        foreach ($budgets as $budget) {
-            $chart->addColumn($budget->name, 'number');
+        // chart properties for cache:
+        $cache = new CacheProperties();
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('budget');
+        $cache->addProperty('year');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
+        $entries = new Collection;
+
         while ($start < $end) {
             // month is the current end of the period:
             $month = clone $start;
             $month->endOfMonth();
-            // make a row:
             $row = [clone $start];
 
             // each budget, fill the row:
@@ -183,13 +227,13 @@ class BudgetController extends Controller
                 $spent = $repository->spentInPeriodCorrected($budget, $start, $month, $shared);
                 $row[] = $spent;
             }
-            $chart->addRowArray($row);
-
-            $start->addMonth();
+            $entries->push($row);
+            $start->endOfMonth()->addDay();
         }
 
-        $chart->generate();
+        $data = $this->generator->year($budgets, $entries);
+        $cache->store($data);
 
-        return Response::json($chart->getData());
+        return Response::json($data);
     }
 }

app/Http/Controllers/Chart/CategoryController.php

@@ -3,11 +3,13 @@
 namespace FireflyIII\Http\Controllers\Chart;
 
 
+use App;
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
-use Grumpydictator\Gchart\GChart;
+use FireflyIII\Support\CacheProperties;
+use Illuminate\Support\Collection;
 use Navigation;
 use Preferences;
 use Response;
@@ -20,42 +22,61 @@ use Session;
  */
 class CategoryController extends Controller
 {
+    /** @var  \FireflyIII\Generator\Chart\Category\CategoryChartGenerator */
+    protected $generator;
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        // create chart generator:
+        $this->generator = App::make('FireflyIII\Generator\Chart\Category\CategoryChartGenerator');
+    }
 
 
     /**
      * Show an overview for a category for all time, per month/week/year.
      *
-     * @param GChart                      $chart
      * @param CategoryRepositoryInterface $repository
      * @param Category                    $category
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function all(GChart $chart, CategoryRepositoryInterface $repository, Category $category)
+    public function all(CategoryRepositoryInterface $repository, Category $category)
     {
         // oldest transaction in category:
         $start = $repository->getFirstActivityDate($category);
         $range = Preferences::get('viewRange', '1M')->data;
-        // jump to start of week / month / year / etc
         $start = Navigation::startOfPeriod($start, $range);
+        $end   = new Carbon;
 
-        $chart->addColumn(trans('firefly.period'), 'date');
-        $chart->addColumn(trans('firefly.spent'), 'number');
+        $entries = new Collection;
 
 
-        $end = new Carbon;
-        while ($start <= $end) {
-
-            $currentEnd = Navigation::endOfPeriod($start, $range);
-            $spent      = $repository->spentInPeriodCorrected($category, $start, $currentEnd);
-            $chart->addRow(clone $start, $spent);
-
-            $start = Navigation::addPeriod($start, $range, 0);
+        // chart properties for cache:
+        $cache = new CacheProperties();
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('all');
+        $cache->addProperty('categories');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
-        $chart->generate();
+        while ($start <= $end) {
+            $currentEnd = Navigation::endOfPeriod($start, $range);
+            $spent      = $repository->spentInPeriodCorrected($category, $start, $currentEnd);
+            $entries->push([clone $start, $spent]);
+            $start = Navigation::addPeriod($start, $range, 0);
 
-        return Response::json($chart->getData());
+        }
+
+        $data = $this->generator->all($entries);
+        $cache->store($data);
+
+        return Response::json($data);
 
 
     }
@@ -63,23 +84,30 @@ class CategoryController extends Controller
     /**
      * Show this month's category overview.
      *
-     * @param GChart                      $chart
      * @param CategoryRepositoryInterface $repository
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function frontpage(GChart $chart, CategoryRepositoryInterface $repository)
+    public function frontpage(CategoryRepositoryInterface $repository)
     {
-        $chart->addColumn(trans('firefly.category'), 'string');
-        $chart->addColumn(trans('firefly.spent'), 'number');
 
         $start = Session::get('start', Carbon::now()->startOfMonth());
         $end   = Session::get('end', Carbon::now()->endOfMonth());
-        $set   = $repository->getCategoriesAndExpensesCorrected($start, $end);
 
+        // chart properties for cache:
+        $cache = new CacheProperties;
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('category');
+        $cache->addProperty('frontpage');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
+        $array = $repository->getCategoriesAndExpensesCorrected($start, $end);
         // sort by callback:
         uasort(
-            $set,
+            $array,
             function ($left, $right) {
                 if ($left['sum'] == $right['sum']) {
                     return 0;
@@ -88,45 +116,48 @@ class CategoryController extends Controller
                 return ($left['sum'] < $right['sum']) ? 1 : -1;
             }
         );
+        $set  = new Collection($array);
+        $data = $this->generator->frontpage($set);
 
-
-        foreach ($set as $entry) {
-            $sum = floatval($entry['sum']);
-            if ($sum != 0) {
-                $chart->addRow($entry['name'], $sum);
-            }
-        }
-
-        $chart->generate();
-
-        return Response::json($chart->getData());
+        return Response::json($data);
 
     }
 
     /**
-     * @param GChart                      $chart
      * @param CategoryRepositoryInterface $repository
      * @param Category                    $category
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function month(GChart $chart, CategoryRepositoryInterface $repository, Category $category)
+    public function month(CategoryRepositoryInterface $repository, Category $category)
     {
         $start = clone Session::get('start', Carbon::now()->startOfMonth());
         $end   = Session::get('end', Carbon::now()->endOfMonth());
 
-        $chart->addColumn(trans('firefly.period'), 'date');
-        $chart->addColumn(trans('firefly.spent'), 'number');
+        // chart properties for cache:
+        $cache = new CacheProperties;
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty($category->id);
+        $cache->addProperty('category');
+        $cache->addProperty('month');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+        $entries = new Collection;
+
 
         while ($start <= $end) {
             $spent = $repository->spentOnDaySumCorrected($category, $start);
-            $chart->addRow(clone $start, $spent);
+
+            $entries->push([clone $start, $spent]);
             $start->addDay();
         }
 
-        $chart->generate();
+        $data = $this->generator->month($entries);
+        $cache->store($data);
 
-        return Response::json($chart->getData());
+        return Response::json($data);
 
 
     }
@@ -134,25 +165,31 @@ class CategoryController extends Controller
     /**
      * This chart will only show expenses.
      *
-     * @param GChart                      $chart
      * @param CategoryRepositoryInterface $repository
      * @param                             $year
      * @param bool                        $shared
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function year(GChart $chart, CategoryRepositoryInterface $repository, $year, $shared = false)
+    public function year(CategoryRepositoryInterface $repository, $year, $shared = false)
     {
-        $start      = new Carbon($year . '-01-01');
-        $end        = new Carbon($year . '-12-31');
+        $start = new Carbon($year . '-01-01');
+        $end   = new Carbon($year . '-12-31');
+
+
+        // chart properties for cache:
+        $cache = new CacheProperties;
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('category');
+        $cache->addProperty('year');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
         $shared     = $shared == 'shared' ? true : false;
         $categories = $repository->getCategories();
-
-        // add columns:
-        $chart->addColumn(trans('firefly.month'), 'date');
-        foreach ($categories as $category) {
-            $chart->addColumn($category->name, 'number');
-        }
+        $entries    = new Collection;
 
         while ($start < $end) {
             // month is the current end of the period:
@@ -166,13 +203,14 @@ class CategoryController extends Controller
                 $spent = $repository->spentInPeriodCorrected($category, $start, $month, $shared);
                 $row[] = $spent;
             }
-            $chart->addRowArray($row);
+            $entries->push($row);
 
             $start->addMonth();
         }
 
-        $chart->generate();
+        $data = $this->generator->year($categories, $entries);
+        $cache->store($data);
 
-        return Response::json($chart->getData());
+        return Response::json($data);
     }
 }

app/Http/Controllers/Chart/PiggyBankController.php

@@ -2,11 +2,11 @@
 
 namespace FireflyIII\Http\Controllers\Chart;
 
-use Carbon\Carbon;
+use App;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
-use Grumpydictator\Gchart\GChart;
+use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
 use Response;
 
@@ -18,32 +18,44 @@ use Response;
  */
 class PiggyBankController extends Controller
 {
+
+    /** @var  \FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGenerator */
+    protected $generator;
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        // create chart generator:
+        $this->generator = App::make('FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGenerator');
+    }
+
     /**
      * Shows the piggy bank history.
      *
-     * @param GChart                       $chart
      * @param PiggyBankRepositoryInterface $repository
      * @param PiggyBank                    $piggyBank
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function history(GChart $chart, PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank)
+    public function history(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank)
     {
-        $chart->addColumn(trans('firefly.date'), 'date');
-        $chart->addColumn(trans('firefly.balance'), 'number');
-
-        /** @var Collection $set */
-        $set = $repository->getEventSummarySet($piggyBank);
-        $sum = 0;
-
-        foreach ($set as $entry) {
-            $sum += floatval($entry->sum);
-            $chart->addRow(new Carbon($entry->date), $sum);
+        // chart properties for cache:
+        $cache = new CacheProperties;
+        $cache->addProperty('piggy-history');
+        $cache->addProperty($piggyBank->id);
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
-        $chart->generate();
+        /** @var Collection $set */
+        $set  = new Collection($repository->getEventSummarySet($piggyBank));
+        $data = $this->generator->history($set);
+        $cache->store($data);
 
-        return Response::json($chart->getData());
+        return Response::json($data);
 
     }
 }

app/Http/Controllers/Chart/ReportController.php

@@ -3,10 +3,12 @@
 namespace FireflyIII\Http\Controllers\Chart;
 
 
+use App;
 use Carbon\Carbon;
 use FireflyIII\Helpers\Report\ReportQueryInterface;
 use FireflyIII\Http\Controllers\Controller;
-use Grumpydictator\Gchart\GChart;
+use FireflyIII\Support\CacheProperties;
+use Illuminate\Support\Collection;
 use Response;
 
 /**
@@ -17,85 +19,108 @@ use Response;
 class ReportController extends Controller
 {
 
+    /** @var  \FireflyIII\Generator\Chart\Report\ReportChartGenerator */
+    protected $generator;
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        // create chart generator:
+        $this->generator = App::make('FireflyIII\Generator\Chart\Report\ReportChartGenerator');
+    }
+
 
     /**
      * Summarizes all income and expenses, per month, for a given year.
      *
-     * @param GChart               $chart
      * @param ReportQueryInterface $query
      * @param                      $year
      * @param bool                 $shared
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function yearInOut(GChart $chart, ReportQueryInterface $query, $year, $shared = false)
+    public function yearInOut(ReportQueryInterface $query, $year, $shared = false)
     {
         // get start and end of year
         $start  = new Carbon($year . '-01-01');
         $end    = new Carbon($year . '-12-31');
         $shared = $shared == 'shared' ? true : false;
 
-        $chart->addColumn(trans('firefly.month'), 'date');
-        $chart->addColumn(trans('firefly.income'), 'number');
-        $chart->addColumn(trans('firefly.expenses'), 'number');
+        // chart properties for cache:
+        $cache = new CacheProperties;
+        $cache->addProperty('yearInOut');
+        $cache->addProperty($year);
+        $cache->addProperty($shared);
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
 
+        $entries = new Collection;
         while ($start < $end) {
             $month = clone $start;
             $month->endOfMonth();
             // total income and total expenses:
-            $incomeSum  = floatval($query->incomeInPeriodCorrected($start, $month, $shared)->sum('amount'));
-            $expenseSum = floatval($query->expenseInPeriodCorrected($start, $month, $shared)->sum('amount'));
+            $incomeSum  = $query->incomeInPeriodCorrected($start, $month, $shared)->sum('amount');
+            $expenseSum = $query->expenseInPeriodCorrected($start, $month, $shared)->sum('amount');
 
-            $chart->addRow(clone $start, $incomeSum, $expenseSum);
+            $entries->push([clone $start, $incomeSum, $expenseSum]);
             $start->addMonth();
         }
-        $chart->generate();
 
-        return Response::json($chart->getData());
+        $data = $this->generator->yearInOut($entries);
+        $cache->store($data);
+
+        return Response::json($data);
 
     }
 
     /**
      * Summarizes all income and expenses for a given year. Gives a total and an average.
      *
-     * @param GChart               $chart
      * @param ReportQueryInterface $query
      * @param                      $year
      * @param bool                 $shared
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function yearInOutSummarized(GChart $chart, ReportQueryInterface $query, $year, $shared = false)
+    public function yearInOutSummarized(ReportQueryInterface $query, $year, $shared = false)
     {
+
+        // chart properties for cache:
+        $cache = new CacheProperties;
+        $cache->addProperty('yearInOutSummarized');
+        $cache->addProperty($year);
+        $cache->addProperty($shared);
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
         $start   = new Carbon($year . '-01-01');
         $end     = new Carbon($year . '-12-31');
         $shared  = $shared == 'shared' ? true : false;
-        $income  = 0;
-        $expense = 0;
+        $income  = '0';
+        $expense = '0';
         $count   = 0;
 
-        $chart->addColumn(trans('firefly.summary'), 'string');
-        $chart->addColumn(trans('firefly.income'), 'number');
-        $chart->addColumn(trans('firefly.expenses'), 'number');
+        bcscale(2);
 
         while ($start < $end) {
             $month = clone $start;
             $month->endOfMonth();
             // total income and total expenses:
-            $income += floatval($query->incomeInPeriodCorrected($start, $month, $shared)->sum('amount'));
-            $expense += floatval($query->expenseInPeriodCorrected($start, $month, $shared)->sum('amount'));
+            $income  = bcadd($income, $query->incomeInPeriodCorrected($start, $month, $shared)->sum('amount'));
+            $expense = bcadd($expense, $query->expenseInPeriodCorrected($start, $month, $shared)->sum('amount'));
             $count++;
             $start->addMonth();
         }
 
-        // add total + average:
-        $chart->addRow(trans('firefly.sum'), $income, $expense);
-        $count = $count > 0 ? $count : 1;
-        $chart->addRow(trans('firefly.average'), ($income / $count), ($expense / $count));
+        $data = $this->generator->yearInOutSummarized($income, $expense, $count);
+        $cache->store($data);
 
-        $chart->generate();
-
-        return Response::json($chart->getData());
+        return Response::json($data);
 
     }
 }

app/Http/Controllers/Controller.php

@@ -2,7 +2,7 @@
 
 use Auth;
 use Config;
-use Illuminate\Foundation\Bus\DispatchesCommands;
+use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
 use Preferences;
@@ -16,7 +16,7 @@ use View;
 abstract class Controller extends BaseController
 {
 
-    use DispatchesCommands, ValidatesRequests;
+    use DispatchesJobs, ValidatesRequests;
 
     /** @var string */
     protected $monthAndDayFormat;

app/Http/Controllers/CurrencyController.php

@@ -1,9 +1,8 @@
 <?php namespace FireflyIII\Http\Controllers;
 
+use Auth;
 use Cache;
-use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\CurrencyFormRequest;
-use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Input;
@@ -38,7 +37,7 @@ class CurrencyController extends Controller
     public function create()
     {
         $subTitleIcon = 'fa-plus';
-        $subTitle     = 'Create a new currency';
+        $subTitle     = trans('firefly.create_currency');
 
         // put previous url in session if not redirect from store (not "create another").
         if (Session::get('currency.create.fromStore') !== true) {
@@ -60,6 +59,7 @@ class CurrencyController extends Controller
     {
 
         Preferences::set('currencyPreference', $currency->code);
+        Preferences::mark();
 
         Session::flash('success', $currency->name . ' is now the default currency.');
         Cache::forget('FFCURRENCYSYMBOL');
@@ -88,9 +88,10 @@ class CurrencyController extends Controller
         Session::put('currency.delete.url', URL::previous());
         Session::flash('gaEventCategory', 'currency');
         Session::flash('gaEventAction', 'delete');
+        $subTitle = trans('form.delete_currency', ['name' => $currency->name]);
 
 
-        return view('currency.delete', compact('currency'));
+        return view('currency.delete', compact('currency', 'subTitle'));
     }
 
     /**
@@ -109,8 +110,9 @@ class CurrencyController extends Controller
         }
 
         Session::flash('success', 'Currency "' . e($currency->name) . '" deleted');
-
-        $currency->delete();
+        if (Auth::user()->hasRole('owner')) {
+            $currency->delete();
+        }
 
         return Redirect::to(Session::get('currency.delete.url'));
     }
@@ -123,7 +125,7 @@ class CurrencyController extends Controller
     public function edit(TransactionCurrency $currency)
     {
         $subTitleIcon     = 'fa-pencil';
-        $subTitle         = 'Edit currency "' . e($currency->name) . '"';
+        $subTitle         = trans('firefly.edit_currency', ['name' => $currency->name]);
         $currency->symbol = htmlentities($currency->symbol);
 
         // put previous url in session if not redirect from store (not "return_to_edit").
@@ -148,6 +150,12 @@ class CurrencyController extends Controller
         $currencies      = $repository->get();
         $defaultCurrency = $repository->getCurrencyByPreference(Preferences::get('currencyPreference', 'EUR'));
 
+
+        if (!Auth::user()->hasRole('owner')) {
+            Session::flash('warning', 'Please ask ' . env('SITE_OWNER') . ' to add, remove or edit currencies.');
+        }
+
+
         return view('currency.index', compact('currencies', 'defaultCurrency'));
     }
 
@@ -160,11 +168,12 @@ class CurrencyController extends Controller
      */
     public function store(CurrencyFormRequest $request, CurrencyRepositoryInterface $repository)
     {
-        $data     = $request->getCurrencyData();
-        $currency = $repository->store($data);
+        $data = $request->getCurrencyData();
+        if (Auth::user()->hasRole('owner')) {
+            $currency = $repository->store($data);
+            Session::flash('success', 'Currency "' . $currency->name . '" created');
 
-
-        Session::flash('success', 'Currency "' . $currency->name . '" created');
+        }
 
         if (intval(Input::get('create_another')) === 1) {
             Session::put('currency.create.fromStore', true);
@@ -187,16 +196,18 @@ class CurrencyController extends Controller
      */
     public function update(CurrencyFormRequest $request, CurrencyRepositoryInterface $repository, TransactionCurrency $currency)
     {
-        $data     = $request->getCurrencyData();
-        $currency = $repository->update($currency, $data);
-
+        $data = $request->getCurrencyData();
+        if (Auth::user()->hasRole('owner')) {
+            $currency = $repository->update($currency, $data);
+        }
         Session::flash('success', 'Currency "' . e($currency->name) . '" updated.');
+        Preferences::mark();
 
 
         if (intval(Input::get('return_to_edit')) === 1) {
             Session::put('currency.edit.fromUpdate', true);
 
-            return Redirect::route('currency.edit', $currency->id);
+            return Redirect::route('currency.edit', [$currency->id]);
         }
 
         // redirect to previous URL.

app/Http/Controllers/HomeController.php

@@ -2,11 +2,11 @@
 
 use Carbon\Carbon;
 use Config;
+use FireflyIII\Models\Tag;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use Input;
 use Preferences;
 use Redirect;
-use Route;
 use Session;
 use Steam;
 
@@ -38,6 +38,20 @@ class HomeController extends Controller
      */
     public function flush()
     {
+        // get all tags.
+        // update all counts:
+        $tags = Tag::get();
+
+        /** @var Tag $tag */
+        foreach ($tags as $tag) {
+            foreach ($tag->transactionjournals()->get() as $journal) {
+                $count              = $journal->tags()->count();
+                $journal->tag_count = $count;
+                $journal->save();
+            }
+        }
+
+
         Session::clear();
 
         return Redirect::route('index');
@@ -46,30 +60,39 @@ class HomeController extends Controller
     /**
      * @param AccountRepositoryInterface $repository
      *
-     * @return \Illuminate\View\View
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
      */
     public function index(AccountRepositoryInterface $repository)
     {
+        $types = Config::get('firefly.accountTypesByIdentifier.asset');
+        $count = $repository->countAccounts($types);
+
+
+        if ($count == 0) {
+            return Redirect::route('new-user.index');
+        }
+
+        $title         = 'Firefly';
+        $subTitle      = trans('firefly.welcomeBack');
+        $mainTitleIcon = 'fa-fire';
+        $transactions  = [];
+        $frontPage     = Preferences::get('frontPageAccounts', []);
+        $start         = Session::get('start', Carbon::now()->startOfMonth());
+        $end           = Session::get('end', Carbon::now()->endOfMonth());
+
+        $accounts = $repository->getFrontpageAccounts($frontPage);
+        $savings  = $repository->getSavingsAccounts();
 
-        $types             = Config::get('firefly.accountTypesByIdentifier.asset');
-        $count             = $repository->countAccounts($types);
-        $title             = 'Firefly';
-        $subTitle          = trans('firefly.welcomeBack');
-        $mainTitleIcon     = 'fa-fire';
-        $transactions      = [];
-        $frontPage         = Preferences::get('frontPageAccounts', []);
-        $start             = Session::get('start', Carbon::now()->startOfMonth());
-        $end               = Session::get('end', Carbon::now()->endOfMonth());
-        $accounts          = $repository->getFrontpageAccounts($frontPage);
-        $savings           = $repository->getSavingsAccounts();
         $piggyBankAccounts = $repository->getPiggyBankAccounts();
 
+
         $savingsTotal = 0;
         foreach ($savings as $savingAccount) {
             $savingsTotal += Steam::balance($savingAccount, $end);
         }
 
         $sum = $repository->sumOfEverything();
+
         if ($sum != 0) {
             Session::flash(
                 'error', 'Your transactions are unbalanced. This means a'
@@ -80,6 +103,7 @@ class HomeController extends Controller
 
         foreach ($accounts as $account) {
             $set = $repository->getFrontpageTransactions($account, $start, $end);
+
             if (count($set) > 0) {
                 $transactions[] = [$set, $account];
             }
@@ -87,79 +111,4 @@ class HomeController extends Controller
 
         return view('index', compact('count', 'title', 'savings', 'subTitle', 'mainTitleIcon', 'transactions', 'savingsTotal', 'piggyBankAccounts'));
     }
-
-    /**
-     * @codeCoverageIgnore
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     */
-    public function routes()
-    {
-        $directory = '/vagrant_data/Sites/firefly-iii-help';
-        $languages = array_keys(Config::get('firefly.lang'));
-        $routes    = [];
-        $ignored   = [
-            'debugbar.openhandler', 'debugbar.assets.css', 'debugbar.assets.js', 'register', 'routes', 'daterange',
-            'flush', 'delete-account-post', 'change-password-post', 'logout', 'login', 'tags.hideTagHelp',
-            'budgets.postIncome', 'flush'
-        ];
-
-        $ignoreMatch = ['.store', '.update', '.destroy', 'json.'];
-
-        $routeCollection = Route::getRoutes();
-        /** @var \Illuminate\Routing\Route $object */
-        foreach ($routeCollection as $object) {
-            // get name:
-            $name = $object->getName();
-            // has name and not in ignore list?
-            if (strlen($name) > 0 && !in_array($name, $ignored)) {
-
-                // not in ignoreMatch?
-                $continue = true;
-                foreach ($ignoreMatch as $ignore) {
-                    $match = strpos($name, $ignore);
-                    if (!($match === false)) {
-                        $continue = false;
-                    }
-                }
-                unset($ignore, $match);
-
-                if ($continue) {
-
-                    $routes[] = $name;
-
-                    // check all languages:
-                    foreach ($languages as $lang) {
-                        $file = $directory . '/' . $lang . '/' . $name . '.md';
-                        if (!file_exists($file)) {
-                            touch($file);
-                            echo $name . '<br />';
-                        }
-                    }
-                }
-
-
-            }
-
-        }
-
-        // loop directories with language file.
-        // tag the ones not in the list of approved routes.
-        foreach ($languages as $lang) {
-            $dir = $directory . '/' . $lang;
-            $set = scandir($dir);
-            foreach ($set as $entry) {
-                if ($entry != '.' && $entry != '..') {
-                    $name = str_replace('.md', '', $entry);
-                    if (!in_array($name, $routes)) {
-                        $file = $dir . '/' . $entry;
-                        unlink($file);
-                    }
-                }
-            }
-        }
-        echo 'Done!';
-    }
-
-
 }

app/Http/Controllers/JsonController.php

@@ -10,6 +10,7 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
 use Response;
 use Session;
@@ -33,10 +34,21 @@ class JsonController extends Controller
      */
     public function boxBillsPaid(BillRepositoryInterface $repository, AccountRepositoryInterface $accountRepository)
     {
-        $start  = Session::get('start', Carbon::now()->startOfMonth());
-        $end    = Session::get('end', Carbon::now()->endOfMonth());
+        $start = Session::get('start', Carbon::now()->startOfMonth());
+        $end   = Session::get('end', Carbon::now()->endOfMonth());
+
+        // works for json too!
+        $cache = new CacheProperties;
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('box-bills-paid');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
         $amount = 0;
 
+
         // these two functions are the same as the chart
         $bills = $repository->getActiveBills();
 
@@ -60,8 +72,11 @@ class JsonController extends Controller
                 $amount += $accountRepository->getTransfersInRange($creditCard, $start, $end)->sum('amount');
             }
         }
+        $data = ['box' => 'bills-paid', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount];
+        $cache->store($data);
 
-        return Response::json(['box' => 'bills-paid', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]);
+
+        return Response::json($data);
     }
 
     /**
@@ -75,6 +90,16 @@ class JsonController extends Controller
         $amount = 0;
         $start  = Session::get('start', Carbon::now()->startOfMonth());
         $end    = Session::get('end', Carbon::now()->endOfMonth());
+
+        // works for json too!
+        $cache = new CacheProperties;
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('box-bills-unpaid');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
         $bills  = $repository->getActiveBills();
         $unpaid = new Collection; // bills
 
@@ -109,7 +134,10 @@ class JsonController extends Controller
             $amount += $current;
         }
 
-        return Response::json(['box' => 'bills-unpaid', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]);
+        $data = ['box' => 'bills-unpaid', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount];
+        $cache->store($data);
+
+        return Response::json($data);
     }
 
     /**
@@ -119,11 +147,24 @@ class JsonController extends Controller
      */
     public function boxIn(ReportQueryInterface $reportQuery)
     {
-        $start  = Session::get('start', Carbon::now()->startOfMonth());
-        $end    = Session::get('end', Carbon::now()->endOfMonth());
+        $start = Session::get('start', Carbon::now()->startOfMonth());
+        $end   = Session::get('end', Carbon::now()->endOfMonth());
+
+        // works for json too!
+        $cache = new CacheProperties;
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('box-in');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
         $amount = $reportQuery->incomeInPeriodCorrected($start, $end, true)->sum('amount');
 
-        return Response::json(['box' => 'in', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]);
+        $data = ['box' => 'in', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount];
+        $cache->store($data);
+
+        return Response::json($data);
     }
 
     /**
@@ -133,11 +174,25 @@ class JsonController extends Controller
      */
     public function boxOut(ReportQueryInterface $reportQuery)
     {
-        $start  = Session::get('start', Carbon::now()->startOfMonth());
-        $end    = Session::get('end', Carbon::now()->endOfMonth());
+        $start = Session::get('start', Carbon::now()->startOfMonth());
+        $end   = Session::get('end', Carbon::now()->endOfMonth());
+
+
+        // works for json too!
+        $cache = new CacheProperties;
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('box-out');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
         $amount = $reportQuery->expenseInPeriodCorrected($start, $end, true)->sum('amount');
 
-        return Response::json(['box' => 'out', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]);
+        $data = ['box' => 'out', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount];
+        $cache->store($data);
+
+        return Response::json($data);
     }
 
     /**

app/Http/Controllers/NewUserController.php

@@ -0,0 +1,111 @@
+<?php namespace FireflyIII\Http\Controllers;
+
+use Auth;
+use Carbon\Carbon;
+use Config;
+use FireflyIII\Http\Requests\NewUserFormRequest;
+use FireflyIII\Models\AccountMeta;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use Preferences;
+use Redirect;
+use Session;
+use View;
+
+/**
+ * Class NewUserController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class NewUserController extends Controller
+{
+
+
+    /**
+     * @param AccountRepositoryInterface $repository
+     *
+     * @@return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
+     */
+    public function index(AccountRepositoryInterface $repository)
+    {
+        View::share('title', 'Welcome to Firefly!');
+        View::share('mainTitleIcon', 'fa-fire');
+
+
+        $types = Config::get('firefly.accountTypesByIdentifier.asset');
+        $count = $repository->countAccounts($types);
+
+        if ($count > 0) {
+            return Redirect::route('index');
+
+        }
+
+        return view('new-user.index');
+    }
+
+    /**
+     * @param NewUserFormRequest         $request
+     * @param AccountRepositoryInterface $repository
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function submit(NewUserFormRequest $request, AccountRepositoryInterface $repository)
+    {
+
+        // create normal asset account:
+        $assetAccount = [
+            'name'                   => $request->get('bank_name'),
+            'accountType'            => 'asset',
+            'virtualBalance'         => 0,
+            'active'                 => true,
+            'user'                   => Auth::user()->id,
+            'accountRole'            => 'defaultAsset',
+            'openingBalance'         => floatval($request->input('bank_balance')),
+            'openingBalanceDate'     => new Carbon,
+            'openingBalanceCurrency' => intval($request->input('balance_currency_id')),
+        ];
+
+        $repository->store($assetAccount);
+
+        // create savings account
+        if (strlen($request->get('savings_balance') > 0)) {
+            $savingsAccount = [
+                'name'                   => $request->get('bank_name') . ' savings account',
+                'accountType'            => 'asset',
+                'virtualBalance'         => 0,
+                'active'                 => true,
+                'user'                   => Auth::user()->id,
+                'accountRole'            => 'savingAsset',
+                'openingBalance'         => floatval($request->input('savings_balance')),
+                'openingBalanceDate'     => new Carbon,
+                'openingBalanceCurrency' => intval($request->input('balance_currency_id')),
+            ];
+            $repository->store($savingsAccount);
+        }
+
+
+        // create credit card.
+        if (strlen($request->get('credit_card_limit') > 0)) {
+            $creditAccount = [
+                'name'                   => 'Credit card',
+                'accountType'            => 'asset',
+                'virtualBalance'         => floatval($request->get('credit_card_limit')),
+                'active'                 => true,
+                'user'                   => Auth::user()->id,
+                'accountRole'            => 'ccAsset',
+                'openingBalance'         => null,
+                'openingBalanceDate'     => null,
+                'openingBalanceCurrency' => intval($request->input('balance_currency_id')),
+            ];
+            $creditCard    = $repository->store($creditAccount);
+
+            // store meta for CC:
+            AccountMeta::create(['name' => 'ccType', 'data' => 'monthlyFull', 'account_id' => $creditCard->id,]);
+            AccountMeta::create(['name' => 'ccMonthlyPaymentDate', 'data' => Carbon::now()->year . '-01-01', 'account_id' => $creditCard->id,]);
+
+        }
+        Session::flash('success', 'New account(s) created!');
+        Preferences::mark();
+
+        return Redirect::route('index');
+    }
+}

app/Http/Controllers/PiggyBankController.php

@@ -4,13 +4,13 @@ use Amount;
 use Carbon\Carbon;
 use Config;
 use ExpandedForm;
-use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\PiggyBankFormRequest;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use Illuminate\Support\Collection;
 use Input;
+use Preferences;
 use Redirect;
 use Session;
 use Steam;
@@ -18,6 +18,9 @@ use URL;
 use View;
 
 /**
+ *
+ * @SuppressWarnings(PHPMD.TooManyMethods)
+ *
  * Class PiggyBankController
  *
  * @package FireflyIII\Http\Controllers
@@ -64,7 +67,7 @@ class PiggyBankController extends Controller
 
         $periods      = Config::get('firefly.piggy_bank_periods');
         $accounts     = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
-        $subTitle     = 'Create new piggy bank';
+        $subTitle     = trans('firefly.create_new_piggybank');
         $subTitleIcon = 'fa-plus';
 
         // put previous url in session if not redirect from store (not "create another").
@@ -106,6 +109,7 @@ class PiggyBankController extends Controller
 
 
         Session::flash('success', 'Piggy bank "' . e($piggyBank->name) . '" deleted.');
+        Preferences::mark();
         $repository->destroy($piggyBank);
 
         return Redirect::to(Session::get('piggy-banks.delete.url'));
@@ -138,8 +142,6 @@ class PiggyBankController extends Controller
                       'account_id'   => $piggyBank->account_id,
                       'targetamount' => $piggyBank->targetamount,
                       'targetdate'   => $targetDate,
-                      'reminder'     => $piggyBank->reminder,
-                      'remind_me'    => intval($piggyBank->remind_me) == 1 && !is_null($piggyBank->reminder) ? true : false
         ];
         Session::flash('preFilled', $preFilled);
         Session::flash('gaEventCategory', 'piggy-banks');
@@ -206,6 +208,7 @@ class PiggyBankController extends Controller
         // set all users piggy banks to zero:
         $repository->reset();
 
+
         if (is_array($data)) {
             foreach ($data as $order => $id) {
                 $repository->setOrder(intval($id), (intval($order) + 1));
@@ -237,12 +240,8 @@ class PiggyBankController extends Controller
             // create event
             $repository->createEvent($piggyBank, $amount);
 
-            /*
-             * Create event!
-             */
-            //Event::fire('piggy_bank.addMoney', [$piggyBank, $amount]); // new and used.
-
             Session::flash('success', 'Added ' . Amount::format($amount, false) . ' to "' . e($piggyBank->name) . '".');
+            Preferences::mark();
         } else {
             Session::flash('error', 'Could not add ' . Amount::format($amount, false) . ' to "' . e($piggyBank->name) . '".');
         }
@@ -271,6 +270,7 @@ class PiggyBankController extends Controller
             $repository->createEvent($piggyBank, $amount * -1);
 
             Session::flash('success', 'Removed ' . Amount::format($amount, false) . ' from "' . e($piggyBank->name) . '".');
+            Preferences::mark();
         } else {
             Session::flash('error', 'Could not remove ' . Amount::format($amount, false) . ' from "' . e($piggyBank->name) . '".');
         }
@@ -297,12 +297,7 @@ class PiggyBankController extends Controller
      */
     public function show(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank)
     {
-        $events = $repository->getEvents($piggyBank);
-
-        /*
-         * Number of reminders:
-         */
-
+        $events   = $repository->getEvents($piggyBank);
         $subTitle = e($piggyBank->name);
 
         return view('piggy-banks.show', compact('piggyBank', 'events', 'subTitle'));
@@ -319,18 +314,19 @@ class PiggyBankController extends Controller
     {
 
         $piggyBankData = [
-            'name'         => $request->get('name'),
-            'startdate'    => new Carbon,
-            'account_id'   => intval($request->get('account_id')),
-            'targetamount' => floatval($request->get('targetamount')),
-            'targetdate'   => strlen($request->get('targetdate')) > 0 ? new Carbon($request->get('targetdate')) : null,
-            'reminder'     => $request->get('reminder'),
-            'remind_me'    => $request->get('remind_me'),
+            'name'          => $request->get('name'),
+            'startdate'     => new Carbon,
+            'account_id'    => intval($request->get('account_id')),
+            'targetamount'  => floatval($request->get('targetamount')),
+            'remind_me'     => false,
+            'reminder_skip' => 0,
+            'targetdate'    => strlen($request->get('targetdate')) > 0 ? new Carbon($request->get('targetdate')) : null,
         ];
 
         $piggyBank = $repository->store($piggyBankData);
 
         Session::flash('success', 'Stored piggy bank "' . e($piggyBank->name) . '".');
+        Preferences::mark();
 
         if (intval(Input::get('create_another')) === 1) {
             Session::put('piggy-banks.create.fromStore', true);
@@ -353,23 +349,24 @@ class PiggyBankController extends Controller
     public function update(PiggyBankRepositoryInterface $repository, PiggyBankFormRequest $request, PiggyBank $piggyBank)
     {
         $piggyBankData = [
-            'name'         => $request->get('name'),
-            'startdate'    => is_null($piggyBank->startdate) ? $piggyBank->created_at : $piggyBank->startdate,
-            'account_id'   => intval($request->get('account_id')),
-            'targetamount' => floatval($request->get('targetamount')),
-            'targetdate'   => strlen($request->get('targetdate')) > 0 ? new Carbon($request->get('targetdate')) : null,
-            'reminder'     => $request->get('reminder'),
-            'remind_me'    => $request->get('remind_me')
+            'name'          => $request->get('name'),
+            'startdate'     => is_null($piggyBank->startdate) ? $piggyBank->created_at : $piggyBank->startdate,
+            'account_id'    => intval($request->get('account_id')),
+            'targetamount'  => floatval($request->get('targetamount')),
+            'remind_me'     => false,
+            'reminder_skip' => 0,
+            'targetdate'    => strlen($request->get('targetdate')) > 0 ? new Carbon($request->get('targetdate')) : null,
         ];
 
         $piggyBank = $repository->update($piggyBank, $piggyBankData);
 
         Session::flash('success', 'Updated piggy bank "' . e($piggyBank->name) . '".');
+        Preferences::mark();
 
         if (intval(Input::get('return_to_edit')) === 1) {
             Session::put('piggy-banks.edit.fromUpdate', true);
 
-            return Redirect::route('piggy-banks.edit', $piggyBank->id);
+            return Redirect::route('piggy-banks.edit', [$piggyBank->id]);
         }
 
 

app/Http/Controllers/PreferencesController.php

@@ -77,6 +77,7 @@ class PreferencesController extends Controller
 
 
         Session::flash('success', 'Preferences saved!');
+        Preferences::mark();
 
         return Redirect::route('preferences');
     }

app/Http/Controllers/ProfileController.php

@@ -56,13 +56,13 @@ class ProfileController extends Controller
         if (!Hash::check($request->get('current_password'), Auth::user()->password)) {
             Session::flash('error', 'Invalid current password!');
 
-            return Redirect::route('change-password');
+            return Redirect::route('profile.change-password');
         }
         $result = $this->validatePassword($request->get('current_password'), $request->get('new_password'));
         if (!($result === true)) {
             Session::flash('error', $result);
 
-            return Redirect::route('change-password');
+            return Redirect::route('profile.change-password');
         }
 
         // update the user with the new password.
@@ -103,7 +103,7 @@ class ProfileController extends Controller
         if (!Hash::check($request->get('password'), Auth::user()->password)) {
             Session::flash('error', 'Invalid password!');
 
-            return Redirect::route('delete-account');
+            return Redirect::route('profile.delete-account');
         }
 
         // DELETE!

app/Http/Controllers/ReminderController.php

@@ -1,94 +0,0 @@
-<?php namespace FireflyIII\Http\Controllers;
-
-use FireflyIII\Models\Reminder;
-use FireflyIII\Repositories\Reminder\ReminderRepositoryInterface;
-use Redirect;
-use Session;
-use URL;
-
-/**
- * Class ReminderController
- *
- * @package FireflyIII\Http\Controllers
- */
-class ReminderController extends Controller
-{
-
-
-    /**
-     * @param Reminder $reminder
-     *
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function act(Reminder $reminder)
-    {
-        $data = [
-            'description'   => 'Money for piggy bank "' . $reminder->remindersable->name . '"',
-            'amount'        => round($reminder->metadata->perReminder, 2),
-            'account_to_id' => $reminder->remindersable->account_id,
-            'piggy_bank_id' => $reminder->remindersable_id,
-            'reminder_id'   => $reminder->id,
-        ];
-        Session::flash('_old_input', $data);
-
-        return Redirect::route('transactions.create', 'transfer');
-    }
-
-    /**
-     * @param Reminder $reminder
-     *
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function dismiss(Reminder $reminder)
-    {
-        $reminder->notnow = true;
-        $reminder->save();
-
-        return Redirect::to(URL::previous());
-
-
-    }
-
-    /**
-     * @param ReminderRepositoryInterface $repository
-     *
-     * @return \Illuminate\View\View
-     */
-    public function index(ReminderRepositoryInterface $repository)
-    {
-
-
-        $active    = $repository->getActiveReminders();
-        $expired   = $repository->getExpiredReminders();
-        $inactive  = $repository->getInactiveReminders();
-        $dismissed = $repository->getDismissedReminders();
-
-        $title         = 'Reminders';
-        $mainTitleIcon = 'fa-clock-o';
-
-        return view('reminders.index', compact('dismissed', 'expired', 'inactive', 'active', 'title', 'mainTitleIcon'));
-    }
-
-    /**
-     * @param Reminder $reminder
-     *
-     * @return \Illuminate\View\View
-     */
-    public function show(Reminder $reminder)
-    {
-        $title         = 'Reminder';
-        $mainTitleIcon = 'fa-clock-o';
-        if ($reminder->notnow === true) {
-            $subTitle = 'Dismissed reminder';
-        } else {
-            $subTitle = 'Reminder';
-        }
-        $subTitle .= ' for piggy bank "' . $reminder->remindersable->name . '"';
-
-
-        return view('reminders.show', compact('reminder', 'title', 'subTitle', 'mainTitleIcon'));
-
-
-    }
-
-}

app/Http/Controllers/ReportController.php

@@ -70,14 +70,14 @@ class ReportController extends Controller
     public function month($year = '2014', $month = '1', $shared = false)
     {
         $start            = new Carbon($year . '-' . $month . '-01');
-        $subTitle         = trans('firefly.reportForMonth', ['date' => $start->formatLocalized($this->monthFormat)]);
+        $subTitle         = trans('firefly.reportForMonth', ['month' => $start->formatLocalized($this->monthFormat)]);
         $subTitleIcon     = 'fa-calendar';
         $end              = clone $start;
         $incomeTopLength  = 8;
         $expenseTopLength = 8;
         if ($shared == 'shared') {
             $shared   = true;
-            $subTitle = trans('firefly.reportForMonthShared', ['date' => $start->formatLocalized($this->monthFormat)]);
+            $subTitle = trans('firefly.reportForMonthShared', ['month' => $start->formatLocalized($this->monthFormat)]);
         }
 
         $end->endOfMonth();
@@ -141,18 +141,9 @@ class ReportController extends Controller
         Session::flash('gaEventAction', 'year');
         Session::flash('gaEventLabel', $start->format('Y'));
 
-
         return view(
             'reports.year',
-            compact(
-                'start', // the date for this report.
-                'shared', // is a shared report?
-                'accounts', // all accounts
-                'incomes', 'expenses', // expenses and incomes.
-                'subTitle', 'subTitleIcon', // subtitle and subtitle icon.
-                'incomeTopLength', // length of income top X
-                'expenseTopLength' // length of expense top X.
-            )
+            compact('start', 'shared', 'accounts', 'incomes', 'expenses', 'subTitle', 'subTitleIcon', 'incomeTopLength', 'expenseTopLength')
         );
     }
 

app/Http/Controllers/SearchController.php

@@ -26,7 +26,7 @@ class SearchController extends Controller
         if (!is_null(Input::get('q')) && strlen(Input::get('q')) > 0) {
             $rawQuery = trim(Input::get('q'));
             $words    = explode(' ', $rawQuery);
-            $subTitle = 'Results for "' . e($rawQuery) . '"';
+            $subTitle = trans('firefly.search_results_for', ['query' => $rawQuery]);
 
             $transactions = $searcher->searchTransactions($words);
             $accounts     = $searcher->searchAccounts($words);

app/Http/Controllers/TagController.php

@@ -56,7 +56,7 @@ class TagController extends Controller
      */
     public function create()
     {
-        $subTitle     = 'New tag';
+        $subTitle     = trans('firefly.new_tag');
         $subTitleIcon = 'fa-tag';
 
         $preFilled = [
@@ -106,18 +106,21 @@ class TagController extends Controller
         $repository->destroy($tag);
 
         Session::flash('success', 'Tag "' . e($tagName) . '" was deleted.');
+        Preferences::mark();
 
         return Redirect::to(route('tags.index'));
     }
 
     /**
-     * @param Tag $tag
+     * @param Tag                    $tag
      *
-     * @return View
+     * @param TagRepositoryInterface $repository
+     *
+     * @return \Illuminate\View\View
      */
     public function edit(Tag $tag, TagRepositoryInterface $repository)
     {
-        $subTitle     = 'Edit tag "' . e($tag->tag) . '"';
+        $subTitle     = trans('firefly.edit_tag', ['tag' => $tag->tag]);
         $subTitleIcon = 'fa-tag';
 
         /*
@@ -162,7 +165,7 @@ class TagController extends Controller
         $state = $state == 'true' ? true : false;
         Preferences::set('hideTagHelp', $state);
 
-        return Response::json(true);
+        return Response::json([true]);
     }
 
     /**
@@ -175,9 +178,24 @@ class TagController extends Controller
         $title          = 'Tags';
         $mainTitleIcon  = 'fa-tags';
         $helpHidden     = $helpHiddenPref->data;
-        $tags           = Auth::user()->tags()->get();
 
-        return view('tags.index', compact('title', 'mainTitleIcon', 'helpHidden', 'tags'));
+        // group years.
+        $types = ['nothing', 'balancingAct', 'advancePayment'];
+
+        // loop each types and get the tags, group them by year.
+        $collection = [];
+        foreach ($types as $type) {
+            $tags = Auth::user()->tags()->where('tagMode', $type)->orderBy('date', 'ASC')->get();
+            /** @var Tag $tag */
+            foreach ($tags as $tag) {
+                $year                               = is_null($tag->date) ? trans('firefly.no_year') : $tag->date->year;
+                $month                              = is_null($tag->date) ? trans('firefly.no_month') : $tag->date->formatLocalized($this->monthFormat);
+                $collection[$type][$year][$month][] = $tag;
+            }
+        }
+
+
+        return view('tags.index', compact('title', 'mainTitleIcon', 'types', 'helpHidden', 'collection'));
     }
 
     /**
@@ -198,7 +216,7 @@ class TagController extends Controller
      *
      * @param TagRepositoryInterface $repository
      *
-     * @return $this|\Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function store(TagFormRequest $request, TagRepositoryInterface $repository)
     {
@@ -224,6 +242,7 @@ class TagController extends Controller
         $repository->store($data);
 
         Session::flash('success', 'The tag has been created!');
+        Preferences::mark();
 
         if (intval(Input::get('create_another')) === 1) {
             // set value so create routine will not overwrite URL:
@@ -242,7 +261,7 @@ class TagController extends Controller
      * @param TagRepositoryInterface $repository
      * @param Tag                    $tag
      *
-     * @return $this|\Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function update(TagFormRequest $request, TagRepositoryInterface $repository, Tag $tag)
     {
@@ -266,15 +285,17 @@ class TagController extends Controller
             'tagMode'     => $request->get('tagMode'),
         ];
 
+
         $repository->update($tag, $data);
 
         Session::flash('success', 'Tag "' . e($data['tag']) . '" updated.');
+        Preferences::mark();
 
         if (intval(Input::get('return_to_edit')) === 1) {
             // set value so edit routine will not overwrite URL:
             Session::put('tags.edit.fromUpdate', true);
 
-            return Redirect::route('tags.edit', $tag->id)->withInput(['return_to_edit' => 1]);
+            return Redirect::route('tags.edit', [$tag->id])->withInput(['return_to_edit' => 1]);
         }
 
         // redirect to previous URL.

app/Http/Controllers/TransactionController.php

@@ -5,13 +5,13 @@ use Carbon\Carbon;
 use ExpandedForm;
 use FireflyIII\Events\JournalCreated;
 use FireflyIII\Events\JournalSaved;
-use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\JournalFormRequest;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use Input;
+use Preferences;
 use Redirect;
 use Response;
 use Session;
@@ -39,7 +39,7 @@ class TransactionController extends Controller
      * @param AccountRepositoryInterface $repository
      * @param string                     $what
      *
-     * @return View
+     * @return \Illuminate\View\View
      */
     public function create(AccountRepositoryInterface $repository, $what = 'deposit')
     {
@@ -76,19 +76,19 @@ class TransactionController extends Controller
      *
      * @param TransactionJournal $journal
      *
-     * @return $this
+     * @return \Illuminate\View\View
      */
     public function delete(TransactionJournal $journal)
     {
-        $type     = strtolower($journal->transactionType->type);
-        $subTitle = trans('firefly.delete_' . $type, ['description' => $journal->description]);
+        $what     = strtolower($journal->transactionType->type);
+        $subTitle = trans('firefly.delete_' . $what, ['description' => $journal->description]);
 
         // put previous url in session
         Session::put('transactions.delete.url', URL::previous());
         Session::flash('gaEventCategory', 'transactions');
-        Session::flash('gaEventAction', 'delete-' . $type);
+        Session::flash('gaEventAction', 'delete-' . $what);
 
-        return view('transactions.delete', compact('journal', 'subTitle'));
+        return view('transactions.delete', compact('journal', 'subTitle', 'what'));
 
 
     }
@@ -105,6 +105,8 @@ class TransactionController extends Controller
 
         $repository->delete($transactionJournal);
 
+        Preferences::mark();
+
         // redirect to previous URL:
         return Redirect::to(Session::get('transactions.delete.url'));
     }
@@ -119,15 +121,14 @@ class TransactionController extends Controller
      */
     public function edit(AccountRepositoryInterface $repository, TransactionJournal $journal)
     {
-        $what         = strtolower($journal->transactiontype->type);
-        $accounts     = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
-        $budgets      = ExpandedForm::makeSelectList(Auth::user()->budgets()->get());
-        $budgets[0]   = trans('form.noBudget');
-        $transactions = $journal->transactions()->orderBy('amount', 'DESC')->get();
-        $piggies      = ExpandedForm::makeSelectList(Auth::user()->piggyBanks()->get());
-        $piggies[0]   = trans('form.noPiggybank');
-        $subTitle     = trans('breadcrumbs.edit_journal', ['description' => $journal->description]);
-        $preFilled    = [
+        $what       = strtolower($journal->transactionType->type);
+        $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');
+        $subTitle   = trans('breadcrumbs.edit_journal', ['description' => $journal->description]);
+        $preFilled  = [
             'date'          => $journal->date->format('Y-m-d'),
             'category'      => '',
             'budget_id'     => 0,
@@ -154,12 +155,18 @@ class TransactionController extends Controller
             $preFilled['piggy_bank_id'] = $journal->piggyBankEvents()->orderBy('date', 'DESC')->first()->piggy_bank_id;
         }
 
-        $preFilled['amount']          = $journal->actualAmount;
-        $preFilled['account_id']      = $journal->assetAccount->id;
-        $preFilled['expense_account'] = $transactions[0]->account->name;
-        $preFilled['revenue_account'] = $transactions[1]->account->name;
-        $preFilled['account_from_id'] = $transactions[1]->account->id;
-        $preFilled['account_to_id']   = $transactions[0]->account->id;
+        $preFilled['amount'] = $journal->actual_amount;
+
+        if ($journal->transactionType->type == 'Withdrawal') {
+            $preFilled['account_id']      = $journal->source_account->id;
+            $preFilled['expense_account'] = $journal->destination_account->name_for_editform;
+        } else {
+            $preFilled['account_id']      = $journal->destination_account->id;
+            $preFilled['revenue_account'] = $journal->source_account->name_for_editform;
+        }
+
+        $preFilled['account_from_id'] = $journal->source_account->id;
+        $preFilled['account_to_id']   = $journal->destination_account->id;
 
         Session::flash('preFilled', $preFilled);
         Session::flash('gaEventCategory', 'transactions');
@@ -179,7 +186,7 @@ class TransactionController extends Controller
      * @param JournalRepositoryInterface $repository
      * @param                            $what
      *
-     * @return View
+     * @return \Illuminate\View\View
      */
     public function index(JournalRepositoryInterface $repository, $what)
     {
@@ -236,8 +243,9 @@ class TransactionController extends Controller
                 }
             }
         }
+        Preferences::mark();
 
-        return Response::json(true);
+        return Response::json([true]);
 
     }
 
@@ -245,7 +253,7 @@ class TransactionController extends Controller
      * @param JournalRepositoryInterface $repository
      * @param TransactionJournal         $journal
      *
-     * @return $this
+     * @return \Illuminate\View\View
      */
     public function show(JournalRepositoryInterface $repository, TransactionJournal $journal)
     {
@@ -255,16 +263,17 @@ class TransactionController extends Controller
                 $t->after  = $t->before + $t->amount;
             }
         );
-        $subTitle = trans('firefly.' . $journal->transactiontype->type) . ' "' . e($journal->description) . '"';
+        $what     = strtolower($journal->transactionType->type);
+        $subTitle = trans('firefly.' . $journal->transactionType->type) . ' "' . e($journal->description) . '"';
 
-        return view('transactions.show', compact('journal', 'subTitle'));
+        return view('transactions.show', compact('journal', 'subTitle', 'what'));
     }
 
     /**
      * @param JournalFormRequest         $request
      * @param JournalRepositoryInterface $repository
      *
-     * @return $this|\Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function store(JournalFormRequest $request, JournalRepositoryInterface $repository)
     {
@@ -279,15 +288,14 @@ class TransactionController extends Controller
             event(new JournalCreated($journal, intval($request->get('piggy_bank_id'))));
         }
 
-        $repository->deactivateReminder($request->get('reminder_id'));
-
         Session::flash('success', 'New transaction "' . $journal->description . '" stored!');
+        Preferences::mark();
 
         if (intval(Input::get('create_another')) === 1) {
             // set value so create routine will not overwrite URL:
             Session::put('transactions.create.fromStore', true);
 
-            return Redirect::route('transactions.create', $request->input('what'))->withInput();
+            return Redirect::route('transactions.create', [$request->input('what')])->withInput();
         }
 
         // redirect to previous URL.
@@ -301,7 +309,7 @@ class TransactionController extends Controller
      * @param JournalRepositoryInterface $repository
      * @param TransactionJournal         $journal
      *
-     * @return $this|\Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function update(JournalFormRequest $request, JournalRepositoryInterface $repository, TransactionJournal $journal)
     {
@@ -313,12 +321,13 @@ class TransactionController extends Controller
         // update, get events by date and sort DESC
 
         Session::flash('success', 'Transaction "' . e($journalData['description']) . '" updated.');
+        Preferences::mark();
 
         if (intval(Input::get('return_to_edit')) === 1) {
             // set value so edit routine will not overwrite URL:
             Session::put('transactions.edit.fromUpdate', true);
 
-            return Redirect::route('transactions.edit', $journal->id)->withInput(['return_to_edit' => 1]);
+            return Redirect::route('transactions.edit', [$journal->id])->withInput(['return_to_edit' => 1]);
         }
 
         // redirect to previous URL.

app/Http/Kernel.php

@@ -37,8 +37,6 @@ class Kernel extends HttpKernel
             'auth.basic' => 'Illuminate\Auth\Middleware\AuthenticateWithBasicAuth',
             'guest'      => 'FireflyIII\Http\Middleware\RedirectIfAuthenticated',
             'range'      => 'FireflyIII\Http\Middleware\Range',
-            'cleanup'    => 'FireflyIII\Http\Middleware\Cleanup',
-            'reminders'  => 'FireflyIII\Http\Middleware\Reminders',
 
         ];
 

app/Http/Middleware/Authenticate.php

@@ -1,12 +1,13 @@
 <?php namespace FireflyIII\Http\Middleware;
 
 use App;
+use Carbon\Carbon;
 use Closure;
 use Config;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Http\Request;
 use Preferences;
-use Carbon\Carbon;
+
 /**
  * Class Authenticate
  *

app/Http/Middleware/Cleanup.php

@@ -1,224 +0,0 @@
-<?php namespace FireflyIII\Http\Middleware;
-
-use Closure;
-use FireflyIII\Models\Account;
-use FireflyIII\Models\Bill;
-use FireflyIII\Models\Budget;
-use FireflyIII\Models\Category;
-use FireflyIII\Models\PiggyBank;
-use FireflyIII\Models\Preference;
-use FireflyIII\Models\Reminder;
-use FireflyIII\Models\Transaction;
-use FireflyIII\Models\TransactionJournal;
-use Illuminate\Contracts\Auth\Guard;
-use Illuminate\Http\Request;
-use Session;
-
-/**
- * Class Cleanup
- *
- * @codeCoverageIgnore
- * @package FireflyIII\Http\Middleware
- */
-class Cleanup
-{
-
-    /**
-     * The Guard implementation.
-     *
-     * @var Guard
-     */
-    protected $auth;
-
-    /**
-     * Create a new filter instance.
-     *
-     * @param  Guard $auth
-     *
-     */
-    public function __construct(Guard $auth)
-    {
-        $this->auth = $auth;
-    }
-
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @param  \Closure                 $next
-     *
-     * @return mixed
-     */
-    public function handle(Request $request, Closure $next)
-    {
-        if ($this->auth->guest()) {
-            return response('Unauthorized.', 401);
-        }
-        $count = -1;
-
-        bcscale(0);
-
-        if (env('RUNCLEANUP') == 'true') {
-            $count = 0;
-            $count = bcadd($count, $this->encryptAccountAndBills());
-            $count = bcadd($count, $this->encryptBudgetsAndCategories());
-            $count = bcadd($count, $this->encryptPiggiesAndJournals());
-            $count = bcadd($count, $this->encryptRemindersAndPreferences());
-
-        }
-        if ($count == 0) {
-            Session::flash('warning', 'Please open the .env file and change RUNCLEANUP=true to RUNCLEANUP=false');
-        }
-
-        return $next($request);
-
-    }
-
-    /**
-     * @return int
-     */
-    protected function encryptAccountAndBills()
-    {
-        $count = 0;
-        // encrypt account name
-        $set = Account::where('encrypted', 0)->take(5)->get();
-        /** @var Account $entry */
-        foreach ($set as $entry) {
-            $count++;
-            $name        = $entry->name;
-            $entry->name = $name;
-            $entry->save();
-        }
-        unset($set, $entry, $name);
-
-        // encrypt bill name
-        $set = Bill::where('name_encrypted', 0)->take(5)->get();
-        /** @var Bill $entry */
-        foreach ($set as $entry) {
-            $count++;
-            $name        = $entry->name;
-            $entry->name = $name;
-            $entry->save();
-        }
-        unset($set, $entry, $name);
-
-        // encrypt bill match
-        $set = Bill::where('match_encrypted', 0)->take(5)->get();
-        /** @var Bill $entry */
-        foreach ($set as $entry) {
-            $match        = $entry->match;
-            $entry->match = $match;
-            $entry->save();
-        }
-        unset($set, $entry, $match);
-
-
-        return $count;
-
-    }
-
-    /**
-     * @return int
-     */
-    protected function encryptBudgetsAndCategories()
-    {
-        $count = 0;
-        // encrypt budget name
-        $set = Budget::where('encrypted', 0)->take(5)->get();
-        /** @var Budget $entry */
-        foreach ($set as $entry) {
-            $count++;
-            $name        = $entry->name;
-            $entry->name = $name;
-            $entry->save();
-        }
-        unset($set, $entry, $name);
-
-        // encrypt category name
-        $set = Category::where('encrypted', 0)->take(5)->get();
-        /** @var Category $entry */
-        foreach ($set as $entry) {
-            $count++;
-            $name        = $entry->name;
-            $entry->name = $name;
-            $entry->save();
-        }
-        unset($set, $entry, $name);
-
-        return $count;
-    }
-
-    /**
-     * @return int
-     */
-    protected function encryptPiggiesAndJournals()
-    {
-        $count = 0;
-        // encrypt piggy bank name
-        $set = PiggyBank::where('encrypted', 0)->take(5)->get();
-        /** @var PiggyBank $entry */
-        foreach ($set as $entry) {
-            $count++;
-            $name        = $entry->name;
-            $entry->name = $name;
-            $entry->save();
-        }
-        unset($set, $entry, $name);
-
-        // encrypt transaction journal description
-        $set = TransactionJournal::where('encrypted', 0)->take(5)->get();
-        /** @var TransactionJournal $entry */
-        foreach ($set as $entry) {
-            $count++;
-            $description        = $entry->description;
-            $entry->description = $description;
-            $entry->save();
-        }
-        unset($set, $entry, $description);
-
-        return $count;
-    }
-
-    /**
-     * @return int
-     */
-    protected function encryptRemindersAndPreferences()
-    {
-        $count = 0;
-        // encrypt reminder metadata
-        $set = Reminder::where('encrypted', 0)->take(5)->get();
-        /** @var Reminder $entry */
-        foreach ($set as $entry) {
-            $count++;
-            $metadata        = $entry->metadata;
-            $entry->metadata = $metadata;
-            $entry->save();
-        }
-        unset($set, $entry, $metadata);
-
-        //encrypt preference name
-        $set = Preference::whereNull('name_encrypted')->take(5)->get();
-        /** @var Preference $entry */
-        foreach ($set as $entry) {
-            $count++;
-            $name        = $entry->name;
-            $entry->name = $name;
-            $entry->save();
-        }
-        unset($set, $entry, $name);
-
-        //encrypt preference data
-        $set = Preference::whereNull('data_encrypted')->take(5)->get();
-        /** @var Preference $entry */
-        foreach ($set as $entry) {
-            $count++;
-            $data        = $entry->data;
-            $entry->data = $data;
-            $entry->save();
-        }
-        unset($set, $entry, $data);
-
-        return $count;
-    }
-
-}

app/Http/Middleware/Reminders.php

@@ -1,80 +0,0 @@
-<?php
-
-namespace FireflyIII\Http\Middleware;
-
-use App;
-use Carbon\Carbon;
-use Closure;
-use FireflyIII\Models\PiggyBank;
-use FireflyIII\Models\Reminder;
-use Illuminate\Contracts\Auth\Guard;
-use Illuminate\Http\Request;
-use View;
-
-/**
- * Class Reminders
- *
- * @package FireflyIII\Http\Middleware
- */
-class Reminders
-{
-    /**
-     * The Guard implementation.
-     *
-     * @var Guard
-     */
-    protected $auth;
-
-    /**
-     * Create a new filter instance.
-     *
-     * @param  Guard $auth
-     *
-     */
-    public function __construct(Guard $auth)
-    {
-        $this->auth = $auth;
-    }
-
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @param  \Closure                 $next
-     *
-     * @return mixed
-     */
-    public function handle(Request $request, Closure $next)
-    {
-        if ($this->auth->check() && !$request->isXmlHttpRequest()) {
-            // do reminders stuff.
-            $piggyBanks = $this->auth->user()->piggyBanks()->where('remind_me', 1)->get();
-            /** @var \FireflyIII\Helpers\Reminders\ReminderHelperInterface $helper */
-            $helper = App::make('FireflyIII\Helpers\Reminders\ReminderHelperInterface');
-
-            /** @var PiggyBank $piggyBank */
-            foreach ($piggyBanks as $piggyBank) {
-                $helper->createReminders($piggyBank, new Carbon);
-            }
-            // delete invalid reminders
-            // this is a construction SQLITE cannot handle :(
-            if (env('DB_CONNECTION') != 'sqlite') {
-                Reminder::whereUserId($this->auth->user()->id)
-                        ->leftJoin('piggy_banks', 'piggy_banks.id', '=', 'remindersable_id')
-                        ->whereNull('piggy_banks.id')
-                        ->delete();
-            }
-
-            // get and list active reminders:
-            $reminders = $this->auth->user()->reminders()->today()->get();
-            $reminders->each(
-                function (Reminder $reminder) use ($helper) {
-                    $reminder->description = $helper->getReminderText($reminder);
-                }
-            );
-            View::share('reminders', $reminders);
-        }
-
-        return $next($request);
-    }
-}

app/Http/Requests/BillFormRequest.php

@@ -48,8 +48,8 @@ class BillFormRequest extends Request
      */
     public function rules()
     {
-        $nameRule  = 'required|between:1,255|uniqueObjectForUser:bills,name,name_encrypted';
-        $matchRule = 'required|between:1,255|uniqueObjectForUser:bills,match,match_encrypted';
+        $nameRule  = 'required|between:1,255|uniqueObjectForUser:bills,name';
+        $matchRule = 'required|between:1,255|uniqueObjectForUser:bills,match';
         if (intval(Input::get('id')) > 0) {
             $nameRule .= ',' . intval(Input::get('id'));
             $matchRule .= ',' . intval(Input::get('id'));

app/Http/Requests/BudgetFormRequest.php

@@ -29,9 +29,9 @@ class BudgetFormRequest extends Request
     public function rules()
     {
 
-        $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name,encrypted';
+        $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name';
         if (Budget::find(Input::get('id'))) {
-            $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name,encrypted,' . intval(Input::get('id'));
+            $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name,' . intval(Input::get('id'));
         }
 
         return [

app/Http/Requests/CategoryFormRequest.php

@@ -29,9 +29,9 @@ class CategoryFormRequest extends Request
     public function rules()
     {
 
-        $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,encrypted';
+        $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name';
         if (Category::find(Input::get('id'))) {
-            $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,encrypted,' . intval(Input::get('id'));
+            $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,' . intval(Input::get('id'));
         }
 
         return [

app/Http/Requests/JournalFormRequest.php

@@ -2,6 +2,7 @@
 
 namespace FireflyIII\Http\Requests;
 
+use App;
 use Auth;
 use Carbon\Carbon;
 use Exception;
@@ -60,7 +61,6 @@ class JournalFormRequest extends Request
             'what'               => 'required|in:withdrawal,deposit,transfer',
             'amount'             => 'numeric|required|min:0.01',
             'date'               => 'required|date',
-            'reminder_id'        => 'numeric|exists:reminders,id',
             'amount_currency_id' => 'required|exists:transaction_currencies,id',
 
         ];
@@ -85,7 +85,7 @@ class JournalFormRequest extends Request
                 $rules['category']        = 'between:1,255';
                 break;
             default:
-                throw new Exception('Cannot handle ' . $what);
+                App::abort(500, 'Cannot handle ' . $what);
                 break;
         }
 

app/Http/Requests/NewUserFormRequest.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace FireflyIII\Http\Requests;
+
+use Auth;
+
+/**
+ * Class NewUserFormRequest
+ *
+ * @codeCoverageIgnore
+ * @package FireflyIII\Http\Requests
+ */
+class NewUserFormRequest extends Request
+{
+    /**
+     * @return bool
+     */
+    public function authorize()
+    {
+        // Only allow logged in users
+        return Auth::check();
+    }
+
+    /**
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'bank_name'           => 'required|between:1,200',
+            'bank_balance'        => 'required|numeric',
+            'savings_balance'     => 'numeric',
+            'credit_card_limit'   => 'numeric',
+            'balance_currency_id' => 'exists:transaction_currencies,id',
+        ];
+    }
+}

app/Http/Requests/PiggyBankFormRequest.php

@@ -42,9 +42,6 @@ class PiggyBankFormRequest extends Request
             'amount_currency_id' => 'exists:transaction_currencies,id',
             'startdate'          => 'date',
             'targetdate'         => $targetDateRule,
-            'reminder'           => 'in:day,week,quarter,month,year',
-            'reminder_skip'      => 'integer|min:0|max:99',
-            'remind_me'          => 'boolean|piggyBankReminder',
             'order'              => 'integer|min:1',
 
         ];

app/Http/Requests/TagFormRequest.php

@@ -28,10 +28,10 @@ class TagFormRequest extends Request
     public function rules()
     {
         $idRule  = '';
-        $tagRule = 'required|min:1|uniqueObjectForUser:tags,tag,TRUE';
+        $tagRule = 'required|min:1|uniqueObjectForUser:tags,tag';
         if (Tag::find(Input::get('id'))) {
             $idRule  = 'belongsToUser:tags';
-            $tagRule = 'required|min:1|uniqueObjectForUser:tags,tag,TRUE,' . Input::get('id');
+            $tagRule = 'required|min:1|uniqueObjectForUser:tags,tag,' . Input::get('id');
         }
 
         return [

app/Http/breadcrumbs.php

@@ -7,7 +7,6 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\LimitRepetition;
 use FireflyIII\Models\PiggyBank;
-use FireflyIII\Models\Reminder;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
@@ -36,14 +35,14 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'accounts.index', function (Generator $breadcrumbs, $what) {
     $breadcrumbs->parent('home');
-    $breadcrumbs->push(trans('breadcrumbs.' . strtolower(e($what)) . '_accounts'), route('accounts.index', $what));
+    $breadcrumbs->push(trans('firefly.' . strtolower(e($what)) . '_accounts'), route('accounts.index', [$what]));
 }
 );
 
 Breadcrumbs::register(
     'accounts.create', function (Generator $breadcrumbs, $what) {
     $breadcrumbs->parent('accounts.index', $what);
-    $breadcrumbs->push(trans('breadcrumbs.new_' . strtolower(e($what)) . '_account'), route('accounts.create', $what));
+    $breadcrumbs->push(trans('breadcrumbs.new_' . strtolower(e($what)) . '_account'), route('accounts.create', [$what]));
 }
 );
 
@@ -54,13 +53,13 @@ Breadcrumbs::register(
 
 
     $breadcrumbs->parent('accounts.index', $what);
-    $breadcrumbs->push(e($account->name), route('accounts.show', $account->id));
+    $breadcrumbs->push(e($account->name), route('accounts.show', [$account->id]));
 }
 );
 Breadcrumbs::register(
     'accounts.delete', function (Generator $breadcrumbs, Account $account) {
     $breadcrumbs->parent('accounts.show', $account);
-    $breadcrumbs->push(trans('breadcrumbs.delete_account', ['name' => e($account->name)]), route('accounts.delete', $account->id));
+    $breadcrumbs->push(trans('firefly.delete_account', ['name' => e($account->name)]), route('accounts.delete', [$account->id]));
 }
 );
 
@@ -70,7 +69,7 @@ Breadcrumbs::register(
     $breadcrumbs->parent('accounts.show', $account);
     $what = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type);
 
-    $breadcrumbs->push(trans('breadcrumbs.edit_' . $what . '_account', ['name' => e($account->name)]), route('accounts.edit', $account->id));
+    $breadcrumbs->push(trans('firefly.edit_' . $what . '_account', ['name' => e($account->name)]), route('accounts.edit', [$account->id]));
 }
 );
 
@@ -78,26 +77,26 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'budgets.index', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('home');
-    $breadcrumbs->push(trans('breadcrumbs.budgets'), route('budgets.index'));
+    $breadcrumbs->push(trans('firefly.budgets'), route('budgets.index'));
 }
 );
 Breadcrumbs::register(
     'budgets.create', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('budgets.index');
-    $breadcrumbs->push(trans('breadcrumbs.newBudget'), route('budgets.create'));
+    $breadcrumbs->push(trans('firefly.create_new_budget'), route('budgets.create'));
 }
 );
 
 Breadcrumbs::register(
     'budgets.edit', function (Generator $breadcrumbs, Budget $budget) {
     $breadcrumbs->parent('budgets.show', $budget);
-    $breadcrumbs->push(trans('breadcrumbs.edit_budget', ['name' => e($budget->name)]), route('budgets.edit', $budget->id));
+    $breadcrumbs->push(trans('firefly.edit_budget', ['name' => e($budget->name)]), route('budgets.edit', [$budget->id]));
 }
 );
 Breadcrumbs::register(
     'budgets.delete', function (Generator $breadcrumbs, Budget $budget) {
     $breadcrumbs->parent('budgets.show', $budget);
-    $breadcrumbs->push(trans('breadcrumbs.delete_budget', ['name' => e($budget->name)]), route('budgets.delete', $budget->id));
+    $breadcrumbs->push(trans('firefly.delete_budget', ['name' => e($budget->name)]), route('budgets.delete', [$budget->id]));
 }
 );
 
@@ -111,10 +110,10 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'budgets.show', function (Generator $breadcrumbs, Budget $budget, LimitRepetition $repetition = null) {
     $breadcrumbs->parent('budgets.index');
-    $breadcrumbs->push(e($budget->name), route('budgets.show', $budget->id));
+    $breadcrumbs->push(e($budget->name), route('budgets.show', [$budget->id]));
     if (!is_null($repetition) && !is_null($repetition->id)) {
         $breadcrumbs->push(
-            Navigation::periodShow($repetition->startdate, $repetition->budgetlimit->repeat_freq), route('budgets.show', $budget->id, $repetition->id)
+            Navigation::periodShow($repetition->startdate, $repetition->budgetLimit->repeat_freq), route('budgets.show', [$budget->id, $repetition->id])
         );
     }
 }
@@ -124,7 +123,7 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'categories.index', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('home');
-    $breadcrumbs->push(trans('breadcrumbs.categories'), route('categories.index'));
+    $breadcrumbs->push(trans('firefly.categories'), route('categories.index'));
 }
 );
 Breadcrumbs::register(
@@ -137,20 +136,20 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'categories.edit', function (Generator $breadcrumbs, Category $category) {
     $breadcrumbs->parent('categories.show', $category);
-    $breadcrumbs->push(trans('breadcrumbs.edit_category', ['name' => e($category->name)]), route('categories.edit', $category->id));
+    $breadcrumbs->push(trans('firefly.edit_category', ['name' => e($category->name)]), route('categories.edit', [$category->id]));
 }
 );
 Breadcrumbs::register(
     'categories.delete', function (Generator $breadcrumbs, Category $category) {
     $breadcrumbs->parent('categories.show', $category);
-    $breadcrumbs->push(trans('breadcrumbs.delete_category', ['name' => e($category->name)]), route('categories.delete', $category->id));
+    $breadcrumbs->push(trans('firefly.delete_category', ['name' => e($category->name)]), route('categories.delete', [$category->id]));
 }
 );
 
 Breadcrumbs::register(
     'categories.show', function (Generator $breadcrumbs, Category $category) {
     $breadcrumbs->parent('categories.index');
-    $breadcrumbs->push(e($category->name), route('categories.show', $category->id));
+    $breadcrumbs->push(e($category->name), route('categories.show', [$category->id]));
 
 }
 );
@@ -166,20 +165,27 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'currency.index', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('home');
-    $breadcrumbs->push(trans('breadcrumbs.currencies'), route('currency.index'));
+    $breadcrumbs->push(trans('firefly.currencies'), route('currency.index'));
+}
+);
+
+Breadcrumbs::register(
+    'currency.create', function (Generator $breadcrumbs) {
+    $breadcrumbs->parent('currency.index');
+    $breadcrumbs->push(trans('firefly.create_currency'), route('currency.create'));
 }
 );
 
 Breadcrumbs::register(
     'currency.edit', function (Generator $breadcrumbs, TransactionCurrency $currency) {
     $breadcrumbs->parent('currency.index');
-    $breadcrumbs->push(trans('breadcrumbs.edit_currency', ['name' => e($currency->name)]), route('currency.edit', $currency->id));
+    $breadcrumbs->push(trans('breadcrumbs.edit_currency', ['name' => e($currency->name)]), route('currency.edit', [$currency->id]));
 }
 );
 Breadcrumbs::register(
     'currency.delete', function (Generator $breadcrumbs, TransactionCurrency $currency) {
     $breadcrumbs->parent('currency.index');
-    $breadcrumbs->push(trans('breadcrumbs.delete_currency', ['name' => e($currency->name)]), route('currency.delete', $currency->id));
+    $breadcrumbs->push(trans('breadcrumbs.delete_currency', ['name' => e($currency->name)]), route('currency.delete', [$currency->id]));
 }
 );
 
@@ -201,20 +207,20 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'piggy-banks.edit', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
     $breadcrumbs->parent('piggy-banks.show', $piggyBank);
-    $breadcrumbs->push(trans('breadcrumbs.edit_piggyBank', ['name' => e($piggyBank->name)]), route('piggy-banks.edit', $piggyBank->id));
+    $breadcrumbs->push(trans('breadcrumbs.edit_piggyBank', ['name' => e($piggyBank->name)]), route('piggy-banks.edit', [$piggyBank->id]));
 }
 );
 Breadcrumbs::register(
     'piggy-banks.delete', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
     $breadcrumbs->parent('piggy-banks.show', $piggyBank);
-    $breadcrumbs->push(trans('breadcrumbs.delete_piggyBank', ['name' => e($piggyBank->name)]), route('piggy-banks.delete', $piggyBank->id));
+    $breadcrumbs->push(trans('breadcrumbs.delete_piggyBank', ['name' => e($piggyBank->name)]), route('piggy-banks.delete', [$piggyBank->id]));
 }
 );
 
 Breadcrumbs::register(
     'piggy-banks.show', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
     $breadcrumbs->parent('piggy-banks.index');
-    $breadcrumbs->push(e($piggyBank->name), route('piggy-banks.show', $piggyBank->id));
+    $breadcrumbs->push(e($piggyBank->name), route('piggy-banks.show', [$piggyBank->id]));
 
 }
 );
@@ -261,43 +267,24 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'bills.edit', function (Generator $breadcrumbs, Bill $bill) {
     $breadcrumbs->parent('bills.show', $bill);
-    $breadcrumbs->push(trans('breadcrumbs.edit_bill', ['name' => e($bill->name)]), route('bills.edit', $bill->id));
+    $breadcrumbs->push(trans('breadcrumbs.edit_bill', ['name' => e($bill->name)]), route('bills.edit', [$bill->id]));
 }
 );
 Breadcrumbs::register(
     'bills.delete', function (Generator $breadcrumbs, Bill $bill) {
     $breadcrumbs->parent('bills.show', $bill);
-    $breadcrumbs->push(trans('breadcrumbs.delete_bill', ['name' => e($bill->name)]), route('bills.delete', $bill->id));
+    $breadcrumbs->push(trans('breadcrumbs.delete_bill', ['name' => e($bill->name)]), route('bills.delete', [$bill->id]));
 }
 );
 
 Breadcrumbs::register(
     'bills.show', function (Generator $breadcrumbs, Bill $bill) {
     $breadcrumbs->parent('bills.index');
-    $breadcrumbs->push(e($bill->name), route('bills.show', $bill->id));
+    $breadcrumbs->push(e($bill->name), route('bills.show', [$bill->id]));
 
 }
 );
 
-// reminders
-Breadcrumbs::register(
-    'reminders.index', function (Generator $breadcrumbs) {
-    $breadcrumbs->parent('home');
-    $breadcrumbs->push(trans('breadcrumbs.reminders'), route('reminders.index'));
-
-}
-);
-
-// reminders
-Breadcrumbs::register(
-    'reminders.show', function (Generator $breadcrumbs, Reminder $reminder) {
-    $breadcrumbs->parent('reminders.index');
-    $breadcrumbs->push(trans('breadcrumbs.reminder', ['id' => e($reminder->id)]), route('reminders.show', $reminder->id));
-
-}
-);
-
-
 // reports
 Breadcrumbs::register(
     'reports.index', function (Generator $breadcrumbs) {
@@ -314,18 +301,20 @@ Breadcrumbs::register(
     } else {
         $title = trans('breadcrumbs.yearly_report', ['date' => $date->year]);
     }
-    $breadcrumbs->push($title, route('reports.year', $date->year));
+    $breadcrumbs->push($title, route('reports.year', [$date->year]));
 }
 );
 
 Breadcrumbs::register(
     'reports.month', function (Generator $breadcrumbs, Carbon $date, $shared) {
     $breadcrumbs->parent('reports.year', $date, $shared);
+    $language = Preferences::get('language', 'en')->data;
+    $format   = Config::get('firefly.month.' . $language);
 
     if ($shared) {
-        $title = trans('breadcrumbs.monthly_report_shared', ['date' => $date->year]);
+        $title = trans('breadcrumbs.monthly_report_shared', ['date' => $date->formatLocalized($format)]);
     } else {
-        $title = trans('breadcrumbs.monthly_report', ['date' => $date->year]);
+        $title = trans('breadcrumbs.monthly_report', ['date' => $date->formatLocalized($format)]);
     }
 
     $breadcrumbs->push($title, route('reports.month', [$date->year, $date->month]));
@@ -344,26 +333,26 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'transactions.index', function (Generator $breadcrumbs, $what) {
     $breadcrumbs->parent('home');
-    $breadcrumbs->push(trans('breadcrumbs.' . $what . '_list'), route('transactions.index', $what));
+    $breadcrumbs->push(trans('breadcrumbs.' . $what . '_list'), route('transactions.index', [$what]));
 }
 );
 Breadcrumbs::register(
     'transactions.create', function (Generator $breadcrumbs, $what) {
     $breadcrumbs->parent('transactions.index', $what);
-    $breadcrumbs->push(trans('breadcrumbs.create_' . e($what)), route('transactions.create', $what));
+    $breadcrumbs->push(trans('breadcrumbs.create_' . e($what)), route('transactions.create', [$what]));
 }
 );
 
 Breadcrumbs::register(
     'transactions.edit', function (Generator $breadcrumbs, TransactionJournal $journal) {
     $breadcrumbs->parent('transactions.show', $journal);
-    $breadcrumbs->push(trans('breadcrumbs.edit_journal', ['description' => $journal->description]), route('transactions.edit', $journal->id));
+    $breadcrumbs->push(trans('breadcrumbs.edit_journal', ['description' => $journal->description]), route('transactions.edit', [$journal->id]));
 }
 );
 Breadcrumbs::register(
     'transactions.delete', function (Generator $breadcrumbs, TransactionJournal $journal) {
     $breadcrumbs->parent('transactions.show', $journal);
-    $breadcrumbs->push(trans('breadcrumbs.delete_journal', ['description' => e($journal->description)]), route('transactions.delete', $journal->id));
+    $breadcrumbs->push(trans('breadcrumbs.delete_journal', ['description' => e($journal->description)]), route('transactions.delete', [$journal->id]));
 }
 );
 
@@ -371,7 +360,7 @@ Breadcrumbs::register(
     'transactions.show', function (Generator $breadcrumbs, TransactionJournal $journal) {
 
     $breadcrumbs->parent('transactions.index', strtolower($journal->transactionType->type));
-    $breadcrumbs->push($journal->description, route('transactions.show', $journal->id));
+    $breadcrumbs->push($journal->description, route('transactions.show', [$journal->id]));
 
 }
 );
@@ -394,14 +383,14 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'tags.edit', function (Generator $breadcrumbs, Tag $tag) {
     $breadcrumbs->parent('tags.show', $tag);
-    $breadcrumbs->push(trans('breadcrumbs.edit_tag', ['tag' => e($tag->tag)]), route('tags.edit', $tag->id));
+    $breadcrumbs->push(trans('breadcrumbs.edit_tag', ['tag' => e($tag->tag)]), route('tags.edit', [$tag->id]));
 }
 );
 
 Breadcrumbs::register(
     'tags.delete', function (Generator $breadcrumbs, Tag $tag) {
     $breadcrumbs->parent('tags.show', $tag);
-    $breadcrumbs->push(trans('breadcrumbs.delete_tag', ['tag' => e($tag->tag)]), route('tags.delete', $tag->id));
+    $breadcrumbs->push(trans('breadcrumbs.delete_tag', ['tag' => e($tag->tag)]), route('tags.delete', [$tag->id]));
 }
 );
 
@@ -409,6 +398,6 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'tags.show', function (Generator $breadcrumbs, Tag $tag) {
     $breadcrumbs->parent('tags.index');
-    $breadcrumbs->push(e($tag->tag), route('tags.show', $tag->id));
+    $breadcrumbs->push(e($tag->tag), route('tags.show', [$tag->id]));
 }
 );

app/Http/routes.php

@@ -5,7 +5,6 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\LimitRepetition;
 use FireflyIII\Models\PiggyBank;
-use FireflyIII\Models\Reminder;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
@@ -13,10 +12,9 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 
 // models
-/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
     'account',
-    function ($value, $route) {
+    function ($value) {
         if (Auth::check()) {
             $object = Account::leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
                              ->where('account_types.editable', 1)
@@ -31,9 +29,8 @@ Route::bind(
     }
 );
 
-/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
-    'tj', function ($value, $route) {
+    'tj', function ($value) {
     if (Auth::check()) {
         $object = TransactionJournal::where('id', $value)->where('user_id', Auth::user()->id)->first();
         if ($object) {
@@ -45,9 +42,8 @@ Route::bind(
 }
 );
 
-/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
-    'currency', function ($value, $route) {
+    'currency', function ($value) {
     if (Auth::check()) {
         $object = TransactionCurrency::find($value);
         if ($object) {
@@ -58,9 +54,8 @@ Route::bind(
 }
 );
 
-/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
-    'bill', function ($value, $route) {
+    'bill', function ($value) {
     if (Auth::check()) {
         $object = Bill::where('id', $value)->where('user_id', Auth::user()->id)->first();
         if ($object) {
@@ -72,9 +67,8 @@ Route::bind(
 }
 );
 
-/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
-    'budget', function ($value, $route) {
+    'budget', function ($value) {
     if (Auth::check()) {
         $object = Budget::where('id', $value)->where('user_id', Auth::user()->id)->first();
         if ($object) {
@@ -86,23 +80,8 @@ Route::bind(
 }
 );
 
-/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
-    'reminder', function ($value, $route) {
-    if (Auth::check()) {
-        $object = Reminder::where('id', $value)->where('user_id', Auth::user()->id)->first();
-        if ($object) {
-            return $object;
-        }
-    }
-
-    throw new NotFoundHttpException;
-}
-);
-
-/** @noinspection PhpUnusedParameterInspection */
-Route::bind(
-    'limitrepetition', function ($value, $route) {
+    'limitrepetition', function ($value) {
     if (Auth::check()) {
         $object = LimitRepetition::where('limit_repetitions.id', $value)
                                  ->leftjoin('budget_limits', 'budget_limits.id', '=', 'limit_repetitions.budget_limit_id')
@@ -118,9 +97,8 @@ Route::bind(
 }
 );
 
-/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
-    'piggyBank', function ($value, $route) {
+    'piggyBank', function ($value) {
     if (Auth::check()) {
         $object = PiggyBank::where('piggy_banks.id', $value)
                            ->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')
@@ -135,9 +113,8 @@ Route::bind(
 }
 );
 
-/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
-    'category', function ($value, $route) {
+    'category', function ($value) {
     if (Auth::check()) {
         $object = Category::where('id', $value)->where('user_id', Auth::user()->id)->first();
         if ($object) {
@@ -149,26 +126,8 @@ Route::bind(
 }
 );
 
-/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
-    'reminder', function ($value, $route) {
-    if (Auth::check()) {
-        /** @var \FireflyIII\Models\Reminder $object */
-        $object = Reminder::find($value);
-        if ($object) {
-            if ($object->remindersable->account->user_id == Auth::user()->id) {
-                return $object;
-            }
-        }
-    }
-
-    throw new NotFoundHttpException;
-}
-);
-
-/** @noinspection PhpUnusedParameterInspection */
-Route::bind(
-    'tag', function ($value, $route) {
+    'tag', function ($value) {
     if (Auth::check()) {
         $object = Tag::where('id', $value)->where('user_id', Auth::user()->id)->first();
         if ($object) {
@@ -193,14 +152,14 @@ Route::controllers(
     ]
 );
 
-Route::get('/routes', ['uses' => 'HomeController@routes', 'as' => 'routes']);
 
-/**
- * Home Controller
- */
 Route::group(
-    ['middleware' => ['auth', 'range', 'reminders']], function () {
-    Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index', 'middleware' => 'cleanup']);
+    ['middleware' => ['auth', 'range']], function () {
+
+    /**
+     * Home Controller
+     */
+    Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index']);
     Route::get('/home', ['uses' => 'HomeController@index', 'as' => 'home']);
     Route::post('/daterange', ['uses' => 'HomeController@dateRange', 'as' => 'daterange']);
     Route::get('/flush', ['uses' => 'HomeController@flush', 'as' => 'flush']);
@@ -327,6 +286,12 @@ Route::group(
     Route::get('/json/box/bills-paid', ['uses' => 'JsonController@boxBillsPaid', 'as' => 'json.box.unpaid']);
     Route::get('/json/transaction-journals/{what}', 'JsonController@transactionJournals');
 
+    /**
+     * New user Controller
+     */
+    Route::get('/new-user', ['uses' => 'NewUserController@index', 'as' => 'new-user.index']);
+    Route::post('/new-user/submit', ['uses' => 'NewUserController@submit', 'as' => 'new-user.submit']);
+
     /**
      * Piggy Bank Controller
      */
@@ -354,19 +319,11 @@ Route::group(
      * Profile Controller
      */
     Route::get('/profile', ['uses' => 'ProfileController@index', 'as' => 'profile']);
-    Route::get('/profile/change-password', ['uses' => 'ProfileController@changePassword', 'as' => 'change-password']);
-    Route::get('/profile/delete-account', ['uses' => 'ProfileController@deleteAccount', 'as' => 'delete-account']);
+    Route::get('/profile/change-password', ['uses' => 'ProfileController@changePassword', 'as' => 'profile.change-password']);
+    Route::get('/profile/delete-account', ['uses' => 'ProfileController@deleteAccount', 'as' => 'profile.delete-account']);
     Route::post('/profile/delete-account', ['uses' => 'ProfileController@postDeleteAccount', 'as' => 'delete-account-post']);
     Route::post('/profile/change-password', ['uses' => 'ProfileController@postChangePassword', 'as' => 'change-password-post']);
 
-    /**
-     * Reminder Controller
-     */
-    Route::get('/reminders', ['uses' => 'ReminderController@index', 'as' => 'reminders.index']);
-    Route::get('/reminder/dismiss/{reminder}', ['uses' => 'ReminderController@dismiss', 'as' => 'reminders.dismiss']);
-    Route::get('/reminder/act/{reminder}', ['uses' => 'ReminderController@act', 'as' => 'reminders.act']);
-    Route::get('/reminder/{reminder}', ['uses' => 'ReminderController@show', 'as' => 'reminders.show']);
-
     /**
      * Report Controller
      */

app/Models/Account.php

@@ -11,6 +11,42 @@ use Watson\Validating\ValidatingTrait;
  * Class Account
  *
  * @package FireflyIII\Models
+ * @property integer                                                                        $id
+ * @property \Carbon\Carbon                                                                 $created_at
+ * @property \Carbon\Carbon                                                                 $updated_at
+ * @property \Carbon\Carbon                                                                 $deleted_at
+ * @property integer                                                                        $user_id
+ * @property integer                                                                        $account_type_id
+ * @property string                                                                         $name
+ * @property boolean                                                                        $active
+ * @property boolean                                                                        $encrypted
+ * @property float                                                                          $virtual_balance
+ * @property string                                                                         $virtual_balance_encrypted
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\AccountMeta[] $accountMeta
+ * @property-read \FireflyIII\Models\AccountType                                            $accountType
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBank[]   $piggyBanks
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions
+ * @property-read \FireflyIII\User                                                          $user
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereDeletedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereUserId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereAccountTypeId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereName($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereActive($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereEncrypted($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereVirtualBalance($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereVirtualBalanceEncrypted($value)
+ * @method static \FireflyIII\Models\Account accountTypeIn($types)
+ * @method static \FireflyIII\Models\Account hasMetaValue($name, $value)
+ * @property boolean                                                                        joinedAccountTypes
+ * @property mixed                                                                          startBalance
+ * @property mixed                                                                          endBalance
+ * @property mixed                                                                          lastActivityDate
+ * @property mixed                                                                          piggyBalance
+ * @property mixed                                                                          difference
+ * @property mixed                                                                          percentage
  */
 class Account extends Model
 {
@@ -100,7 +136,7 @@ class Account extends Model
 
     /**
      * @codeCoverageIgnore
-     * @return array
+     * @return string[]
      */
     public function getDates()
     {
@@ -109,7 +145,7 @@ class Account extends Model
 
     /**
      *
-     * @param $fieldName
+     * @param string $fieldName
      *
      * @codeCoverageIgnore
      *
@@ -144,6 +180,20 @@ class Account extends Model
         return $value;
     }
 
+    /**
+     *
+     * @return string
+     */
+    public function getNameForEditformAttribute()
+    {
+        $name = $this->name;
+        if ($this->accountType->type == 'Cash account') {
+            $name = '';
+        }
+
+        return $name;
+    }
+
     /**
      * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\HasMany

app/Models/AccountMeta.php

@@ -8,6 +8,19 @@ use Watson\Validating\ValidatingTrait;
  *
  * @codeCoverageIgnore
  * @package FireflyIII\Models
+ * @property integer                         $id
+ * @property \Carbon\Carbon                  $created_at
+ * @property \Carbon\Carbon                  $updated_at
+ * @property integer                         $account_id
+ * @property string                          $name
+ * @property string                          $data
+ * @property-read \FireflyIII\Models\Account $account
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereAccountId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereName($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereData($value)
  */
 class AccountMeta extends Model
 {

app/Models/AccountType.php

@@ -7,6 +7,17 @@ use Illuminate\Database\Eloquent\Model;
  *
  * @codeCoverageIgnore
  * @package FireflyIII\Models
+ * @property integer                                                                    $id
+ * @property \Carbon\Carbon                                                             $created_at
+ * @property \Carbon\Carbon                                                             $updated_at
+ * @property string                                                                     $type
+ * @property boolean                                                                    $editable
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[] $accounts
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereType($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereEditable($value)
  */
 class AccountType extends Model
 {

app/Models/Bill.php

@@ -4,10 +4,48 @@ use Crypt;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * @codeCoverageIgnore
- * Class Bill
+ * FireflyIII\Models\Bill
  *
- * @package FireflyIII\Models
+ * @codeCoverageIgnore Class Bill
+ * @package            FireflyIII\Models
+ * @property integer                                                                               $id
+ * @property \Carbon\Carbon                                                                        $created_at
+ * @property \Carbon\Carbon                                                                        $updated_at
+ * @property integer                                                                               $user_id
+ * @property string                                                                                $name
+ * @property string                                                                                $match
+ * @property float                                                                                 $amount_min
+ * @property string                                                                                $amount_min_encrypted
+ * @property float                                                                                 $amount_max
+ * @property string                                                                                $amount_max_encrypted
+ * @property \Carbon\Carbon                                                                        $date
+ * @property boolean                                                                               $active
+ * @property boolean                                                                               $automatch
+ * @property string                                                                                $repeat_freq
+ * @property integer                                                                               $skip
+ * @property boolean                                                                               $name_encrypted
+ * @property boolean                                                                               $match_encrypted
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals
+ * @property-read \FireflyIII\User                                                                 $user
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereUserId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereName($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereMatch($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereAmountMin($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereAmountMinEncrypted($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereAmountMax($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereAmountMaxEncrypted($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereDate($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereActive($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereAutomatch($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereRepeatFreq($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereSkip($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereNameEncrypted($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereMatchEncrypted($value)
+ * @property mixed                                                                                 nextExpectedMatch
+ * @property mixed                                                                                 lastFoundMatch
  */
 class Bill extends Model
 {
@@ -17,6 +55,7 @@ class Bill extends Model
 
     protected $hidden = ['amount_min_encrypted', 'amount_max_encrypted', 'name_encrypted', 'match_encrypted'];
 
+
     /**
      * @return array
      */

app/Models/Budget.php

@@ -9,6 +9,25 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  *
  * @codeCoverageIgnore
  * @package FireflyIII\Models
+ * @property integer                                                                               $id
+ * @property \Carbon\Carbon                                                                        $created_at
+ * @property \Carbon\Carbon                                                                        $updated_at
+ * @property \Carbon\Carbon                                                                        $deleted_at
+ * @property string                                                                                $name
+ * @property integer                                                                               $user_id
+ * @property boolean                                                                               $active
+ * @property boolean                                                                               $encrypted
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\BudgetLimit[]        $budgetlimits
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals
+ * @property-read \FireflyIII\User                                                                 $user
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereDeletedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereName($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereUserId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereActive($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereEncrypted($value)
  */
 class Budget extends Model
 {

app/Models/BudgetLimit.php

@@ -7,6 +7,26 @@ use Illuminate\Database\Eloquent\Model;
  *
  * @codeCoverageIgnore
  * @package FireflyIII\Models
+ * @property integer                                                                            $id
+ * @property \Carbon\Carbon                                                                     $created_at
+ * @property \Carbon\Carbon                                                                     $updated_at
+ * @property integer                                                                            $budget_id
+ * @property \Carbon\Carbon                                                                     $startdate
+ * @property float                                                                              $amount
+ * @property string                                                                             $amount_encrypted
+ * @property boolean                                                                            $repeats
+ * @property string                                                                             $repeat_freq
+ * @property-read \FireflyIII\Models\Budget                                                     $budget
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\LimitRepetition[] $limitrepetitions
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereBudgetId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereStartdate($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereAmount($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereAmountEncrypted($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereRepeats($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereRepeatFreq($value)
  */
 class BudgetLimit extends Model
 {

app/Models/Category.php

@@ -7,8 +7,25 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 /**
  * Class Category
  *
- *
  * @package FireflyIII\Models
+ * @property integer                                                                               $id
+ * @property \Carbon\Carbon                                                                        $created_at
+ * @property \Carbon\Carbon                                                                        $updated_at
+ * @property \Carbon\Carbon                                                                        $deleted_at
+ * @property string                                                                                $name
+ * @property integer                                                                               $user_id
+ * @property boolean                                                                               $encrypted
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals
+ * @property-read \FireflyIII\User                                                                 $user
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereDeletedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereName($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereUserId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereEncrypted($value)
+ * @property mixed                                                                                 spent
+ * @property mixed                                                                                 lastActivity
  */
 class Category extends Model
 {
@@ -21,7 +38,7 @@ class Category extends Model
      * @param array $fields
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      *
-     * @return Account|null
+     * @return Category
      */
     public static function firstOrCreateEncrypted(array $fields)
     {
@@ -48,7 +65,7 @@ class Category extends Model
 
     /**
      * @codeCoverageIgnore
-     * @return array
+     * @return string[]
      */
     public function getDates()
     {

app/Models/Component.php

@@ -8,6 +8,20 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  *
  * @codeCoverageIgnore
  * @package FireflyIII\Models
+ * @property integer        $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property \Carbon\Carbon $deleted_at
+ * @property string         $name
+ * @property integer        $user_id
+ * @property string         $class
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereDeletedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereName($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereUserId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereClass($value)
  */
 class Component extends Model
 {

app/Models/LimitRepetition.php

@@ -6,8 +6,24 @@ use Illuminate\Database\Eloquent\Model;
  * Class LimitRepetition
  *
  * @codeCoverageIgnore
- *
  * @package FireflyIII\Models
+ * @property integer                             $id
+ * @property \Carbon\Carbon                      $created_at
+ * @property \Carbon\Carbon                      $updated_at
+ * @property integer                             $budget_limit_id
+ * @property \Carbon\Carbon                      $startdate
+ * @property \Carbon\Carbon                      $enddate
+ * @property float                               $amount
+ * @property string                              $amount_encrypted
+ * @property-read \FireflyIII\Models\BudgetLimit $budgetLimit
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereBudgetLimitId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereStartdate($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereEnddate($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereAmount($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereAmountEncrypted($value)
  */
 class LimitRepetition extends Model
 {

app/Models/Permission.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace FireflyIII\Models;
+
+use Zizaco\Entrust\EntrustPermission;
+
+/**
+ * Class Permission
+ *
+ * @package FireflyIII\Models
+ * @property integer        $id
+ * @property string         $name
+ * @property string         $display_name
+ * @property string         $description
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Config::get('entrust.role')[] $roles
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereName($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereDisplayName($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereDescription($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereUpdatedAt($value)
+ */
+class Permission extends EntrustPermission
+{
+}

app/Models/PiggyBank.php

@@ -8,15 +8,42 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * Class PiggyBank
  *
  * @codeCoverageIgnore
- *
  * @package FireflyIII\Models
+ * @property integer                                                                                $id
+ * @property \Carbon\Carbon                                                                         $created_at
+ * @property \Carbon\Carbon                                                                         $updated_at
+ * @property \Carbon\Carbon                                                                         $deleted_at
+ * @property integer                                                                                $account_id
+ * @property string                                                                                 $name
+ * @property float                                                                                  $targetamount
+ * @property string                                                                                 $targetamount_encrypted
+ * @property \Carbon\Carbon                                                                         $startdate
+ * @property \Carbon\Carbon                                                                         $targetdate
+ * @property integer                                                                                $order
+ * @property boolean                                                                                $encrypted
+ * @property-read \FireflyIII\Models\Account                                                        $account
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankRepetition[] $piggyBankRepetitions
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[]      $piggyBankEvents
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereDeletedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereAccountId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereName($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereTargetamount($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereTargetamountEncrypted($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereStartdate($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereTargetdate($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereOrder($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereEncrypted($value)
+ * @property PiggyBankRepetition                                                                    currentRep
  */
 class PiggyBank extends Model
 {
     use SoftDeletes;
 
     protected $fillable
-                      = ['name', 'account_id', 'order', 'reminder_skip', 'targetamount', 'startdate', 'targetdate', 'reminder', 'remind_me'];
+                      = ['name', 'account_id', 'order', 'targetamount', 'startdate', 'targetdate', 'remind_me', 'reminder_skip'];
     protected $hidden = ['targetamount_encrypted', 'encrypted'];
 
     /**
@@ -55,7 +82,7 @@ class PiggyBank extends Model
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public function getDates()
     {
@@ -78,17 +105,6 @@ class PiggyBank extends Model
         return $value;
     }
 
-    /**
-     *
-     * @param $value
-     *
-     * @return int
-     */
-    public function getRemindMeAttribute($value)
-    {
-        return intval($value) == 1;
-    }
-
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
@@ -97,14 +113,6 @@ class PiggyBank extends Model
         return $this->hasMany('FireflyIII\Models\PiggyBankEvent');
     }
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
-     */
-    public function reminders()
-    {
-        return $this->morphMany('FireflyIII\Models\Reminder', 'remindersable');
-    }
-
     /**
      *
      * @param $value

app/Models/PiggyBankEvent.php

@@ -6,8 +6,25 @@ use Illuminate\Database\Eloquent\Model;
  * Class PiggyBankEvent
  *
  * @codeCoverageIgnore
- *
  * @package FireflyIII\Models
+ * @property integer                                    $id
+ * @property \Carbon\Carbon                             $created_at
+ * @property \Carbon\Carbon                             $updated_at
+ * @property integer                                    $piggy_bank_id
+ * @property integer                                    $transaction_journal_id
+ * @property \Carbon\Carbon                             $date
+ * @property float                                      $amount
+ * @property string                                     $amount_encrypted
+ * @property-read \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)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent wherePiggyBankId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereTransactionJournalId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereDate($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereAmount($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereAmountEncrypted($value)
  */
 class PiggyBankEvent extends Model
 {

app/Models/PiggyBankRepetition.php

@@ -9,6 +9,25 @@ use Illuminate\Database\Eloquent\Model;
  *
  * @codeCoverageIgnore
  * @package FireflyIII\Models
+ * @property integer                           $id
+ * @property \Carbon\Carbon                    $created_at
+ * @property \Carbon\Carbon                    $updated_at
+ * @property integer                           $piggy_bank_id
+ * @property \Carbon\Carbon                    $startdate
+ * @property \Carbon\Carbon                    $targetdate
+ * @property float                             $currentamount
+ * @property string                            $currentamount_encrypted
+ * @property-read \FireflyIII\Models\PiggyBank $piggyBank
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition wherePiggyBankId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereStartdate($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereTargetdate($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereCurrentamount($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereCurrentamountEncrypted($value)
+ * @method static \FireflyIII\Models\PiggyBankRepetition onDates($start, $target)
+ * @method static \FireflyIII\Models\PiggyBankRepetition relevantOnDate($date)
  */
 class PiggyBankRepetition extends Model
 {

app/Models/Preference.php

@@ -8,6 +8,23 @@ use Illuminate\Database\Eloquent\Model;
  *
  * @codeCoverageIgnore
  * @package FireflyIII\Models
+ * @property integer               $id
+ * @property \Carbon\Carbon        $created_at
+ * @property \Carbon\Carbon        $updated_at
+ * @property integer               $user_id
+ * @property string                $name
+ * @property string                $name_encrypted
+ * @property string                $data
+ * @property string                $data_encrypted
+ * @property-read \FireflyIII\User $user
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereUserId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereName($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereNameEncrypted($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereData($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereDataEncrypted($value)
  */
 class Preference extends Model
 {
@@ -38,21 +55,6 @@ class Preference extends Model
         return ['created_at', 'updated_at'];
     }
 
-    /**
-     * @param $value
-     *
-     * @return float|int
-     */
-    public function getNameAttribute($value)
-    {
-        if (is_null($this->name_encrypted)) {
-            return $value;
-        }
-        $value = Crypt::decrypt($this->name_encrypted);
-
-        return $value;
-    }
-
     /**
      * @param $value
      */
@@ -62,15 +64,6 @@ class Preference extends Model
         $this->attributes['data_encrypted'] = Crypt::encrypt(json_encode($value));
     }
 
-    /**
-     * @param $value
-     */
-    public function setNameAttribute($value)
-    {
-        $this->attributes['name_encrypted'] = Crypt::encrypt($value);
-        $this->attributes['name']           = $value;
-    }
-
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */

app/Models/Reminder.php

@@ -1,120 +0,0 @@
-<?php namespace FireflyIII\Models;
-
-use Carbon\Carbon;
-use Crypt;
-use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * Class Reminder
- *
- * @codeCoverageIgnore
- *
- * @package FireflyIII\Models
- */
-class Reminder extends Model
-{
-
-
-    protected $fillable = ['user_id', 'startdate', 'metadata', 'enddate', 'active', 'notnow', 'remindersable_id', 'remindersable_type',];
-    protected $hidden   = ['encrypted'];
-
-    /**
-     *
-     * @param $value
-     *
-     * @return int
-     */
-    public function getActiveAttribute($value)
-    {
-        return intval($value) == 1;
-    }
-
-    /**
-     * @return array
-     */
-    public function getDates()
-    {
-        return ['created_at', 'updated_at', 'startdate', 'enddate'];
-    }
-
-    /**
-     *
-     * @param $value
-     *
-     * @return mixed
-     */
-    public function getMetadataAttribute($value)
-    {
-        if (intval($this->encrypted) == 1) {
-            return json_decode(Crypt::decrypt($value));
-        }
-
-        return json_decode($value);
-    }
-
-    /**
-     *
-     * @param $value
-     *
-     * @return bool
-     */
-    public function getNotnowAttribute($value)
-    {
-        return intval($value) == 1;
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
-     */
-    public function remindersable()
-    {
-        return $this->morphTo();
-    }
-
-    /**
-     *
-     * @param EloquentBuilder $query
-     * @param Carbon          $start
-     * @param Carbon          $end
-     *
-     * @return $this
-     */
-    public function scopeOnDates(EloquentBuilder $query, Carbon $start, Carbon $end)
-    {
-        return $query->where('reminders.startdate', '=', $start->format('Y-m-d 00:00:00'))->where('reminders.enddate', '=', $end->format('Y-m-d 00:00:00'));
-    }
-
-    /**
-     *
-     * @param EloquentBuilder $query
-     *
-     * @return $this
-     */
-    public function scopeToday(EloquentBuilder $query)
-    {
-        $today = new Carbon;
-
-        return $query->where('startdate', '<=', $today->format('Y-m-d 00:00:00'))->where('enddate', '>=', $today->format('Y-m-d 00:00:00'))->where('active', 1)
-                     ->where('notnow', 0);
-    }
-
-    /**
-     *
-     * @param $value
-     */
-    public function setMetadataAttribute($value)
-    {
-        $this->attributes['encrypted'] = true;
-        $this->attributes['metadata']  = Crypt::encrypt(json_encode($value));
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function user()
-    {
-        return $this->belongsTo('FireflyIII\User');
-    }
-
-}

app/Models/Role.php

@@ -0,0 +1,28 @@
+<?php
+namespace FireflyIII\Models;
+
+
+use Zizaco\Entrust\EntrustRole;
+
+/**
+ * Class Role
+ *
+ * @package FireflyIII\Models
+ * @property integer        $id
+ * @property string         $name
+ * @property string         $display_name
+ * @property string         $description
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Config::get('auth.model')[] $users
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Config::get('entrust.permission')[] $perms
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereName($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereDisplayName($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereDescription($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereUpdatedAt($value)
+ */
+class Role extends EntrustRole
+{
+}

app/Models/Tag.php

@@ -10,6 +10,32 @@ use Watson\Validating\ValidatingTrait;
  * Class Tag
  *
  * @package FireflyIII\Models
+ * @property integer                                                                               $id
+ * @property \Carbon\Carbon                                                                        $created_at
+ * @property \Carbon\Carbon                                                                        $updated_at
+ * @property string                                                                                $deleted_at
+ * @property integer                                                                               $user_id
+ * @property string                                                                                $tag
+ * @property string                                                                                $tagMode
+ * @property \Carbon\Carbon                                                                        $date
+ * @property string                                                                                $description
+ * @property float                                                                                 $latitude
+ * @property float                                                                                 $longitude
+ * @property integer                                                                               $zoomLevel
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals
+ * @property-read \FireflyIII\User                                                                 $user
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereDeletedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereUserId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereTag($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereTagMode($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereDate($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereDescription($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereLatitude($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereLongitude($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereZoomLevel($value)
  */
 class Tag extends Model
 {
@@ -18,7 +44,7 @@ class Tag extends Model
     protected $fillable = ['user_id', 'tag', 'date', 'description', 'longitude', 'latitude', 'zoomLevel', 'tagMode'];
     protected $rules
                         = [
-            'tag'         => 'required|min:1|uniqueObjectForUser:tags,tag,TRUE',
+            'tag'         => 'required|min:1',
             'description' => 'min:1',
             'date'        => 'date',
             'latitude'    => 'numeric|min:-90|max:90',
@@ -63,13 +89,40 @@ class Tag extends Model
 
     /**
      * @codeCoverageIgnore
-     * @return array
+     * @return string[]
      */
     public function getDates()
     {
         return ['created_at', 'updated_at', 'date'];
     }
 
+    /**
+     * Save the model to the database.
+     *
+     * @param  array $options
+     *
+     * @return bool
+     */
+    public function save(array $options = [])
+    {
+        foreach ($this->transactionjournals()->get() as $journal) {
+            $count              = $journal->tags()->count();
+            $journal->tag_count = $count;
+            $journal->save();
+        }
+
+        return parent::save($options);
+    }
+
+    /**
+     * @codeCoverageIgnore
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     */
+    public function transactionjournals()
+    {
+        return $this->belongsToMany('FireflyIII\Models\TransactionJournal');
+    }
+
     /**
      * @codeCoverageIgnore
      *
@@ -79,6 +132,10 @@ class Tag extends Model
      */
     public function getDescriptionAttribute($value)
     {
+        if (is_null($value)) {
+            return $value;
+        }
+
         return Crypt::decrypt($value);
     }
 
@@ -114,15 +171,6 @@ class Tag extends Model
         $this->attributes['tag'] = Crypt::encrypt($value);
     }
 
-    /**
-     * @codeCoverageIgnore
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
-     */
-    public function transactionjournals()
-    {
-        return $this->belongsToMany('FireflyIII\Models\TransactionJournal');
-    }
-
     /**
      * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo

app/Models/Transaction.php

@@ -11,6 +11,30 @@ use Watson\Validating\ValidatingTrait;
  *
  * @codeCoverageIgnore
  * @package FireflyIII\Models
+ * @property integer                                    $id
+ * @property \Carbon\Carbon                             $created_at
+ * @property \Carbon\Carbon                             $updated_at
+ * @property \Carbon\Carbon                             $deleted_at
+ * @property integer                                    $account_id
+ * @property integer                                    $transaction_journal_id
+ * @property string                                     $description
+ * @property float                                      $amount
+ * @property string                                     $amount_encrypted
+ * @property-read \FireflyIII\Models\Account            $account
+ * @property-read \FireflyIII\Models\TransactionJournal $transactionJournal
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereDeletedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereAccountId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereTransactionJournalId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereDescription($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereAmount($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereAmountEncrypted($value)
+ * @method static \FireflyIII\Models\Transaction after($date)
+ * @method static \FireflyIII\Models\Transaction before($date)
+ * @property mixed                                      before
+ * @property mixed                                      after
  */
 class Transaction extends Model
 {

app/Models/TransactionCurrency.php

@@ -4,11 +4,25 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
- *
  * Class TransactionCurrency
  *
  * @codeCoverageIgnore
  * @package FireflyIII\Models
+ * @property integer                                                                               $id
+ * @property \Carbon\Carbon                                                                        $created_at
+ * @property \Carbon\Carbon                                                                        $updated_at
+ * @property \Carbon\Carbon                                                                        $deleted_at
+ * @property string                                                                                $code
+ * @property string                                                                                $name
+ * @property string                                                                                $symbol
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereDeletedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereCode($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereName($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereSymbol($value)
  */
 class TransactionCurrency extends Model
 {

app/Models/TransactionGroup.php

@@ -8,6 +8,20 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  *
  * @codeCoverageIgnore
  * @package FireflyIII\Models
+ * @property integer                                                                               $id
+ * @property \Carbon\Carbon                                                                        $created_at
+ * @property \Carbon\Carbon                                                                        $updated_at
+ * @property \Carbon\Carbon                                                                        $deleted_at
+ * @property integer                                                                               $user_id
+ * @property string                                                                                $relation
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals
+ * @property-read \FireflyIII\User                                                                 $user
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereDeletedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereUserId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereRelation($value)
  */
 class TransactionGroup extends Model
 {

app/Models/TransactionJournal.php

@@ -2,6 +2,7 @@
 
 use Carbon\Carbon;
 use Crypt;
+use FireflyIII\Support\CacheProperties;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -12,15 +13,78 @@ use Watson\Validating\ValidatingTrait;
  * Class TransactionJournal
  *
  * @package FireflyIII\Models
+ * @SuppressWarnings (PHPMD.TooManyMethods)
+ * @property integer                                                                             $id
+ * @property \Carbon\Carbon                                                                      $created_at
+ * @property \Carbon\Carbon                                                                      $updated_at
+ * @property \Carbon\Carbon                                                                      $deleted_at
+ * @property integer                                                                             $user_id
+ * @property integer                                                                             $transaction_type_id
+ * @property integer                                                                             $bill_id
+ * @property integer                                                                             $transaction_currency_id
+ * @property string                                                                              $description
+ * @property boolean                                                                             $completed
+ * @property \Carbon\Carbon                                                                      $date
+ * @property boolean                                                                             $encrypted
+ * @property integer                                                                             $order
+ * @property-read \FireflyIII\Models\Bill                                                        $bill
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[]           $budgets
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[]         $categories
+ * @property-read mixed                                                                          $actual_amount
+ * @property-read mixed                                                                          $amount
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Tag[]              $tags
+ * @property-read mixed                                                                          $asset_account
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[]      $transactions
+ * @property-read mixed                                                                          $corrected_actual_amount
+ * @property-read mixed                                                                          $destination_account
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[]   $piggyBankEvents
+ * @property-read \FireflyIII\Models\TransactionCurrency                                         $transactionCurrency
+ * @property-read \FireflyIII\Models\TransactionType                                             $transactionType
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionGroup[] $transactiongroups
+ * @property-read \FireflyIII\User                                                               $user
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereDeletedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereUserId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereTransactionTypeId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereBillId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereTransactionCurrencyId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereDescription($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereCompleted($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereDate($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereEncrypted($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereOrder($value)
+ * @method static \FireflyIII\Models\TransactionJournal accountIs($account)
+ * @method static \FireflyIII\Models\TransactionJournal after($date)
+ * @method static \FireflyIII\Models\TransactionJournal before($date)
+ * @method static \FireflyIII\Models\TransactionJournal onDate($date)
+ * @method static \FireflyIII\Models\TransactionJournal transactionTypes($types)
+ * @method static \FireflyIII\Models\TransactionJournal withRelevantData()
+ * @property-read mixed                                                                          $expense_account
+ * @property string                                                                              account_encrypted
+ * @property bool                                                                                joinedTransactions
+ * @property bool                                                                                joinedTransactionTypes
+ * @property mixed                                                                               account_id
+ * @property mixed                                                                               name
+ * @property mixed                                                                               symbol
+ * @property-read mixed                                                                          $correct_amount
+ * @method static \FireflyIII\Models\TransactionJournal orderBy
+ * @method static \FireflyIII\Models\TransactionJournal|null first
+ * @property-read mixed                                                                          $source_account
+ * @property integer                                                                             $tag_count
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereTagCount($value)
  */
 class TransactionJournal extends Model
 {
     use SoftDeletes, ValidatingTrait;
 
-    protected $fillable = ['user_id', 'transaction_type_id', 'bill_id', 'transaction_currency_id', 'description', 'completed', 'date', 'encrypted'];
-    protected $hidden   = ['encrypted'];
+
+    protected $fillable
+                      = ['user_id', 'transaction_type_id', 'bill_id', 'transaction_currency_id', 'description', 'completed', 'date', 'encrypted', 'tag_count'];
+    protected $hidden = ['encrypted'];
     protected $rules
-                        = [
+                      = [
             'user_id'                 => 'required|exists:users,id',
             'transaction_type_id'     => 'required|exists:transaction_types,id',
             'bill_id'                 => 'exists:bills,id',
@@ -79,6 +143,13 @@ class TransactionJournal extends Model
      */
     public function getAmountAttribute()
     {
+        $cache = new CacheProperties();
+        $cache->addProperty($this->id);
+        $cache->addProperty('amount');
+        if ($cache->has()) {
+            return $cache->get(); // @codeCoverageIgnore
+        }
+
         $amount = '0';
         bcscale(2);
         /** @var Transaction $t */
@@ -88,50 +159,59 @@ class TransactionJournal extends Model
             }
         }
 
-        /*
-         * If the journal has tags, it gets complicated.
-         */
-        if ($this->tags->count() == 0) {
-            return $amount;
+        if (intval($this->tag_count) === 1) {
+            // get amount for single tag:
+            $amount = $this->amountByTag($this->tags()->first(), $amount);
         }
 
-        // if journal is part of advancePayment AND journal is a withdrawal,
-        // then journal is being repaid by other journals, so the actual amount will lower:
-        /** @var Tag $advancePayment */
-        $advancePayment = $this->tags()->where('tagMode', 'advancePayment')->first();
-        if ($advancePayment && $this->transactionType->type == 'Withdrawal') {
-            // loop other deposits, remove from our amount.
-            $others = $advancePayment->transactionJournals()->transactionTypes(['Deposit'])->get();
-            foreach ($others as $other) {
-                $amount = bcsub($amount, $other->actualAmount);
-            }
+        if (intval($this->tag_count) > 1) {
+            // get amount for either tag.
+            $amount = $this->amountByTags($amount);
 
-            return $amount;
         }
+        $cache->store($amount);
 
-        // if this journal is part of an advancePayment AND the journal is a deposit,
-        // then the journal amount is correcting a withdrawal, and the amount is zero:
-        if ($advancePayment && $this->transactionType->type == 'Deposit') {
-            return '0';
-        }
+        return $amount;
 
+    }
 
-        // is balancing act?
-        $balancingAct = $this->tags()->where('tagMode', 'balancingAct')->first();
-
-        if ($balancingAct) {
-            // this is the expense:
+    /**
+     * Assuming the journal has only one tag. Parameter amount is used as fallback.
+     *
+     * @param Tag    $tag
+     * @param string $amount
+     *
+     * @return string
+     */
+    protected function amountByTag(Tag $tag, $amount)
+    {
+        if ($tag->tagMode == 'advancePayment') {
             if ($this->transactionType->type == 'Withdrawal') {
-                $transfer = $balancingAct->transactionJournals()->transactionTypes(['Transfer'])->first();
+                $others = $tag->transactionJournals()->transactionTypes(['Deposit'])->get();
+                foreach ($others as $other) {
+                    $amount = bcsub($amount, $other->actual_amount);
+                }
+
+                return $amount;
+            }
+            if ($this->transactionType->type == 'Deposit') {
+                return '0';
+            }
+        }
+
+        if ($tag->tagMode == 'balancingAct') {
+            if ($this->transactionType->type == 'Withdrawal') {
+                $transfer = $tag->transactionJournals()->transactionTypes(['Transfer'])->first();
                 if ($transfer) {
-                    $amount = bcsub($amount, $transfer->actualAmount);
+                    $amount = bcsub($amount, $transfer->actual_amount);
 
                     return $amount;
                 }
-            } // @codeCoverageIgnore
-        } // @codeCoverageIgnore
+            }
+        }
 
         return $amount;
+
     }
 
     /**
@@ -144,26 +224,39 @@ class TransactionJournal extends Model
     }
 
     /**
-     * @return Account
+     * @param string $amount
+     *
+     * @return string
      */
-    public function getAssetAccountAttribute()
+    public function amountByTags($amount)
     {
-        $positive = true; // the asset account is in the transaction with the positive amount.
-        if ($this->transactionType->type === 'Withdrawal') {
-            $positive = false;
-        }
-        /** @var Transaction $transaction */
-        foreach ($this->transactions()->get() as $transaction) {
-            if (floatval($transaction->amount) > 0 && $positive === true) {
-                return $transaction->account;
-            }
-            if (floatval($transaction->amount) < 0 && $positive === false) {
-                return $transaction->account;
-            }
-
+        $firstBalancingAct = $this->tags()->where('tagMode', 'balancingAct')->first();
+        if ($firstBalancingAct) {
+            return $this->amountByTag($firstBalancingAct, $amount);
         }
 
-        return $this->transactions()->first()->account;
+        $firstAdvancePayment = $this->tags()->where('tagMode', 'advancePayment')->first();
+        if ($firstAdvancePayment) {
+            return $this->amountByTag($firstAdvancePayment, $amount);
+        }
+
+        return $amount;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCorrectAmountAttribute()
+    {
+
+        switch ($this->transactionType->type) {
+            case 'Deposit':
+                return $this->transactions()->where('amount', '>', 0)->first()->amount;
+            case 'Withdrawal':
+                return $this->transactions()->where('amount', '<', 0)->first()->amount;
+        }
+
+        return $this->transactions()->where('amount', '>', 0)->first()->amount;
     }
 
     /**
@@ -175,37 +268,30 @@ class TransactionJournal extends Model
         return $this->hasMany('FireflyIII\Models\Transaction');
     }
 
-    /**
-     * @return float
-     */
-    public function getCorrectedActualAmountAttribute()
-    {
-        $amount = '0';
-        $type   = $this->transactionType->type;
-        /** @var Transaction $t */
-        foreach ($this->transactions as $t) {
-            if ($t->amount > 0 && $type != 'Withdrawal') {
-                $amount = $t->amount;
-                break;
-            }
-            if ($t->amount < 0 && $type == 'Withdrawal') {
-                $amount = $t->amount;
-                break;
-            }
-        }
-
-        return $amount;
-    }
-
     /**
      * @codeCoverageIgnore
-     * @return array
+     * @return string[]
      */
     public function getDates()
     {
         return ['created_at', 'updated_at', 'date', 'deleted_at'];
     }
 
+    /**
+     * Save the model to the database.
+     *
+     * @param  array $options
+     *
+     * @return bool
+     */
+    public function save(array $options = [])
+    {
+        $count           = $this->tags()->count();
+        $this->tag_count = $count;
+
+        return parent::save($options);
+    }
+
     /**
      * @codeCoverageIgnore
      *
@@ -227,14 +313,35 @@ class TransactionJournal extends Model
      */
     public function getDestinationAccountAttribute()
     {
-        /** @var Transaction $transaction */
-        foreach ($this->transactions()->get() as $transaction) {
-            if (floatval($transaction->amount) > 0) {
-                return $transaction->account;
-            }
-        }
+        $cache = new CacheProperties;
+        $cache->addProperty($this->id);
+        $cache->addProperty('destinationAccount');
 
-        return $this->transactions()->first()->account;
+        if ($cache->has()) {
+            return $cache->get(); // @codeCoverageIgnore
+        }
+        $account = $this->transactions()->where('amount', '>', 0)->first()->account;
+        $cache->store($account);
+
+        return $account;
+    }
+
+    /**
+     * @return Account
+     */
+    public function getSourceAccountAttribute()
+    {
+        $cache = new CacheProperties;
+        $cache->addProperty($this->id);
+        $cache->addProperty('sourceAccount');
+        if ($cache->has()) {
+            return $cache->get(); // @codeCoverageIgnore
+        }
+        $account = $this->transactions()->where('amount', '<', 0)->first()->account;
+
+        $cache->store($account);
+
+        return $account;
     }
 
     /**
@@ -267,7 +374,7 @@ class TransactionJournal extends Model
      * @param EloquentBuilder $query
      * @param Carbon          $date
      *
-     * @return mixed
+     * @return EloquentBuilder
      */
     public function scopeAfter(EloquentBuilder $query, Carbon $date)
     {
@@ -280,7 +387,7 @@ class TransactionJournal extends Model
      * @param EloquentBuilder $query
      * @param Carbon          $date
      *
-     * @return mixed
+     * @return EloquentBuilder
      */
     public function scopeBefore(EloquentBuilder $query, Carbon $date)
     {
@@ -293,7 +400,7 @@ class TransactionJournal extends Model
      * @param EloquentBuilder $query
      * @param Carbon          $date
      *
-     * @return mixed
+     * @return EloquentBuilder
      */
     public function scopeOnDate(EloquentBuilder $query, Carbon $date)
     {
@@ -329,7 +436,7 @@ class TransactionJournal extends Model
         $query->with(
             ['transactions' => function (HasMany $q) {
                 $q->orderBy('amount', 'ASC');
-            }, 'transactiontype', 'transactioncurrency', 'budgets', 'categories', 'transactions.account.accounttype', 'bill', 'budgets', 'categories']
+            }, 'transactionType', 'transactionCurrency', 'budgets', 'categories', 'transactions.account.accounttype', 'bill']
         );
     }
 

app/Models/TransactionType.php

@@ -8,6 +8,17 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  *
  * @codeCoverageIgnore
  * @package FireflyIII\Models
+ * @property integer                                                                               $id
+ * @property \Carbon\Carbon                                                                        $created_at
+ * @property \Carbon\Carbon                                                                        $updated_at
+ * @property \Carbon\Carbon                                                                        $deleted_at
+ * @property string                                                                                $type
+ * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereId($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereCreatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereDeletedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereType($value)
  */
 class TransactionType extends Model
 {

app/Providers/EventServiceProvider.php

@@ -5,7 +5,6 @@ use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\LimitRepetition;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankRepetition;
-use FireflyIII\Models\Reminder;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Support\Facades\Navigation;
@@ -53,10 +52,11 @@ class EventServiceProvider extends ServiceProvider
         $this->registerCreateEvents();
         BudgetLimit::saved(
             function (BudgetLimit $budgetLimit) {
-
                 $end = Navigation::addPeriod(clone $budgetLimit->startdate, $budgetLimit->repeat_freq, 0);
                 $end->subDay();
-                $set = $budgetLimit->limitrepetitions()->where('startdate', $budgetLimit->startdate->format('Y-m-d'))->where('enddate', $end->format('Y-m-d'))
+                $set = $budgetLimit->limitrepetitions()
+                                   ->where('startdate', $budgetLimit->startdate->format('Y-m-d 00:00:00'))
+                                   ->where('enddate', $end->format('Y-m-d 00:00:00'))
                                    ->get();
                 if ($set->count() == 0) {
                     $repetition            = new LimitRepetition;
@@ -68,8 +68,7 @@ class EventServiceProvider extends ServiceProvider
                     try {
                         $repetition->save();
                     } catch (QueryException $e) {
-                        Log::error('Trying to save new LimitRepetition failed!');
-                        Log::error($e->getMessage());
+                        Log::error('Trying to save new LimitRepetition failed: ' . $e->getMessage()); // @codeCoverageIgnore
                     }
                 } else {
                     if ($set->count() == 1) {
@@ -99,15 +98,6 @@ class EventServiceProvider extends ServiceProvider
                 }
             }
         );
-        PiggyBank::deleting(
-            function (PiggyBank $piggyBank) {
-                $reminders = $piggyBank->reminders()->get();
-                /** @var Reminder $reminder */
-                foreach ($reminders as $reminder) {
-                    $reminder->delete();
-                }
-            }
-        );
 
         Account::deleted(
             function (Account $account) {

app/Providers/FireflyServiceProvider.php

@@ -89,12 +89,19 @@ class FireflyServiceProvider extends ServiceProvider
         $this->app->bind('FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface', 'FireflyIII\Repositories\PiggyBank\PiggyBankRepository');
         $this->app->bind('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface', 'FireflyIII\Repositories\Currency\CurrencyRepository');
         $this->app->bind('FireflyIII\Repositories\Tag\TagRepositoryInterface', 'FireflyIII\Repositories\Tag\TagRepository');
-        $this->app->bind('FireflyIII\Repositories\Reminder\ReminderRepositoryInterface', 'FireflyIII\Repositories\Reminder\ReminderRepository');
         $this->app->bind('FireflyIII\Support\Search\SearchInterface', 'FireflyIII\Support\Search\Search');
 
+        // make charts:
+        // alternative is Google instead of ChartJs
+        $this->app->bind('FireflyIII\Generator\Chart\Account\AccountChartGenerator', 'FireflyIII\Generator\Chart\Account\ChartJsAccountChartGenerator');
+        $this->app->bind('FireflyIII\Generator\Chart\Bill\BillChartGenerator', 'FireflyIII\Generator\Chart\Bill\ChartJsBillChartGenerator');
+        $this->app->bind('FireflyIII\Generator\Chart\Budget\BudgetChartGenerator', 'FireflyIII\Generator\Chart\Budget\ChartJsBudgetChartGenerator');
+        $this->app->bind('FireflyIII\Generator\Chart\Category\CategoryChartGenerator', 'FireflyIII\Generator\Chart\Category\ChartJsCategoryChartGenerator');
+        $this->app->bind('FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGenerator', 'FireflyIII\Generator\Chart\PiggyBank\ChartJsPiggyBankChartGenerator');
+        $this->app->bind('FireflyIII\Generator\Chart\Report\ReportChartGenerator', 'FireflyIII\Generator\Chart\Report\ChartJsReportChartGenerator');
+
 
         $this->app->bind('FireflyIII\Helpers\Help\HelpInterface', 'FireflyIII\Helpers\Help\Help');
-        $this->app->bind('FireflyIII\Helpers\Reminders\ReminderHelperInterface', 'FireflyIII\Helpers\Reminders\ReminderHelper');
         $this->app->bind('FireflyIII\Helpers\Report\ReportHelperInterface', 'FireflyIII\Helpers\Report\ReportHelper');
         $this->app->bind('FireflyIII\Helpers\Report\ReportQueryInterface', 'FireflyIII\Helpers\Report\ReportQuery');
 

app/Repositories/Account/AccountRepository.php

@@ -15,6 +15,7 @@ use FireflyIII\Models\Preference;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
+use FireflyIII\Support\CacheProperties;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Pagination\LengthAwarePaginator;
@@ -25,6 +26,8 @@ use Steam;
 
 
 /**
+ * @SuppressWarnings(PHPMD.TooManyMethods)
+ *
  * Class AccountRepository
  *
  * @package FireflyIII\Repositories\Account
@@ -65,7 +68,7 @@ class AccountRepository implements AccountRepositoryInterface
             ['accountmeta' => function (HasMany $query) {
                 $query->where('name', 'accountRole');
             }]
-        )->accountTypeIn($types)->orderBy('accounts.name', 'ASC')->get(['accounts.*'])->sortBy('name');
+        )->accountTypeIn($types)->orderBy('accounts.name', 'ASC')->get(['accounts.*']);
 
         return $result;
     }
@@ -107,12 +110,22 @@ class AccountRepository implements AccountRepositoryInterface
      */
     public function getFrontpageAccounts(Preference $preference)
     {
+        $cache = new CacheProperties();
+        $cache->addProperty($preference->data);
+        $cache->addProperty('frontPageaccounts');
+        if ($cache->has()) {
+            return $cache->get(); // @codeCoverageIgnore
+        }
+
+
         if ($preference->data == []) {
             $accounts = Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->orderBy('accounts.name', 'ASC')->get(['accounts.*']);
         } else {
             $accounts = Auth::user()->accounts()->whereIn('id', $preference->data)->orderBy('accounts.name', 'ASC')->get(['accounts.*']);
         }
 
+        $cache->store($accounts);
+
         return $accounts;
     }
 
@@ -129,7 +142,15 @@ class AccountRepository implements AccountRepositoryInterface
      */
     public function getFrontpageTransactions(Account $account, Carbon $start, Carbon $end)
     {
-        return Auth::user()
+        $cache = new CacheProperties();
+        $cache->addProperty($account->id);
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        if ($cache->has()) {
+            return $cache->get(); // @codeCoverageIgnore
+        }
+
+        $set = Auth::user()
                    ->transactionjournals()
                    ->with(['transactions'])
                    ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
@@ -142,6 +163,9 @@ class AccountRepository implements AccountRepositoryInterface
                    ->orderBy('transaction_journals.id', 'DESC')
                    ->take(10)
                    ->get(['transaction_journals.*', 'transaction_currencies.symbol', 'transaction_types.type']);
+        $cache->store($set);
+
+        return $set;
     }
 
     /**
@@ -201,10 +225,18 @@ class AccountRepository implements AccountRepositoryInterface
         $accountIds = DB::table('piggy_banks')->distinct()->get(['piggy_banks.account_id']);
         $accounts   = new Collection;
 
+        /** @var PiggyBank $id */
         foreach ($accountIds as $id) {
             $ids[] = intval($id->account_id);
         }
 
+        $cache = new CacheProperties;
+        $cache->addProperty($ids);
+        $cache->addProperty('piggyAccounts');
+        if ($cache->has()) {
+            return $cache->get(); // @codeCoverageIgnore
+        }
+
         $ids = array_unique($ids);
         if (count($ids) > 0) {
             $accounts = Auth::user()->accounts()->whereIn('id', $ids)->get();
@@ -229,6 +261,8 @@ class AccountRepository implements AccountRepositoryInterface
             }
         );
 
+        $cache->store($accounts);
+
         return $accounts;
 
     }
@@ -306,7 +340,9 @@ class AccountRepository implements AccountRepositoryInterface
                 if ($journal->destination_account->id == $account->id) {
                     return $journal;
                 }
-            } // @codeCoverageIgnore
+
+                return null;
+            }
         );
 
         return $filtered;
@@ -338,16 +374,17 @@ class AccountRepository implements AccountRepositoryInterface
      */
     public function openingBalanceTransaction(Account $account)
     {
-        return TransactionJournal::accountIs($account)
-                                 ->orderBy('transaction_journals.date', 'ASC')
-                                 ->orderBy('created_at', 'ASC')
-                                 ->first(['transaction_journals.*']);
+        return TransactionJournal
+            ::orderBy('transaction_journals.date', 'ASC')
+            ->accountIs($account)
+            ->orderBy('created_at', 'ASC')
+            ->first(['transaction_journals.*']);
     }
 
     /**
      * @param array $data
      *
-     * @return Account;
+     * @return Account
      */
     public function store(array $data)
     {
@@ -359,11 +396,11 @@ class AccountRepository implements AccountRepositoryInterface
         if ($data['openingBalance'] != 0) {
             $type         = $data['openingBalance'] < 0 ? 'expense' : 'revenue';
             $opposingData = [
-                'user'            => $data['user'],
-                'accountType'     => $type,
-                'virtual_balance' => $data['virtualBalance'],
-                'name'            => $data['name'] . ' initial balance',
-                'active'          => false,
+                'user'           => $data['user'],
+                'accountType'    => $type,
+                'virtualBalance' => 0,
+                'name'           => $data['name'] . ' initial balance',
+                'active'         => false,
             ];
             $opposing     = $this->storeAccount($opposingData);
             $this->storeInitialBalance($newAccount, $opposing, $data);
@@ -396,9 +433,7 @@ class AccountRepository implements AccountRepositoryInterface
         $account->virtual_balance = $data['virtualBalance'];
         $account->save();
 
-        // update meta data:
         $this->updateMetadata($account, $data);
-
         $openingBalance = $this->openingBalanceTransaction($account);
 
         // if has openingbalance?
@@ -411,20 +446,19 @@ class AccountRepository implements AccountRepositoryInterface
                 // create new opening balance.
                 $type         = $data['openingBalance'] < 0 ? 'expense' : 'revenue';
                 $opposingData = [
-                    'user'        => $data['user'],
-                    'accountType' => $type,
-                    'name'        => $data['name'] . ' initial balance',
-                    'active'      => false,
+                    'user'           => $data['user'],
+                    'accountType'    => $type,
+                    'name'           => $data['name'] . ' initial balance',
+                    'active'         => false,
+                    'virtualBalance' => 0,
                 ];
                 $opposing     = $this->storeAccount($opposingData);
                 $this->storeInitialBalance($account, $opposing, $data);
             }
 
         } else {
-            // opening balance is zero, should we delete it?
-            if ($openingBalance) {
-                // delete existing opening balance.
-                $openingBalance->delete();
+            if ($openingBalance) { // opening balance is zero, should we delete it?
+                $openingBalance->delete(); // delete existing opening balance.
             }
         }
 
@@ -445,6 +479,7 @@ class AccountRepository implements AccountRepositoryInterface
                 'user_id'         => $data['user'],
                 'account_type_id' => $accountType->id,
                 'name'            => $data['name'],
+                'virtual_balance' => $data['virtualBalance'],
                 'active'          => $data['active'] === true ? true : false,
             ]
         );
@@ -454,6 +489,7 @@ class AccountRepository implements AccountRepositoryInterface
             $searchData      = [
                 'user_id'         => $data['user'],
                 'account_type_id' => $accountType->id,
+                'virtual_balance' => $data['virtualBalance'],
                 'name'            => $data['name']
             ];
             $existingAccount = Account::firstOrNullEncrypted($searchData);