Merge branch 'release/3.4.6.1'

# By Richard Ebbers
# Via James Cole (2) and Richard Ebbers (1)
* 'master' of https://github.com/JC5/firefly-iii:
  updated authentication pages to use dynamic urls
  use relative path in login screen

.coveralls.yml

@@ -1,3 +1 @@
-src_dir: .
-coverage_clover: build/logs/clover.xml
-json_path: build/logs/coveralls-upload.json
+src_dir: .

.gitignore

@@ -31,3 +31,5 @@ addNewLines.php
 .phpstorm.meta.php
 .env.backup
 .env.local
+
+tests/_output/*

.scrutinizer.yml

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

.travis.yml

@@ -13,10 +13,3 @@ install:
 
 script:
   - phpunit
-
-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,7 +1,9 @@
-# Firefly III (v3.4.4)
+# Firefly III
+
+[![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable)](https://packagist.org/packages/grumpydictator/firefly-iii)
+[![Total Downloads](https://poser.pugx.org/grumpydictator/firefly-iii/downloads)](https://packagist.org/packages/grumpydictator/firefly-iii)
 
 [![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)
 
 ## About
@@ -26,7 +28,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.
 
@@ -59,19 +61,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
 
@@ -82,11 +84,25 @@ 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)!
 

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,144 @@
+<?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
+     * @param string     $dateFormat
+     *
+     * @return array
+     */
+    public function budget(Collection $entries, $dateFormat = 'month')
+    {
+        // language:
+        $language = Preferences::get('language', 'en')->data;
+        $format   = Config::get('firefly.' . $dateFormat . '.' . $language);
+
+        $data = [
+            'count'    => 1,
+            'labels'   => [],
+            'datasets' => [
+                [
+                    'label' => 'Amount',
+                    'data'  => [],
+                ]
+            ],
+        ];
+
+        /** @var array $entry */
+        foreach ($entries as $entry) {
+            $data['labels'][]              = $entry[0]->formatLocalized($format);
+            $data['datasets'][0]['data'][] = $entry[1];
+
+        }
+
+        return $data;
+    }
+
+    /**
+     * @codeCoverageIgnore
+     *
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function budgetLimit(Collection $entries)
+    {
+        return $this->budget($entries, 'monthAndDay');
+    }
+
+    /**
+     * @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,122 @@
+<?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
+     * @param string $dateFormat
+     *
+     * @return array
+     */
+    public function all(Collection $entries, $dateFormat = 'month')
+    {
+
+        // language:
+        $language = Preferences::get('language', 'en')->data;
+        $format   = Config::get('firefly.' . $dateFormat . '.' . $language);
+
+        $data = [
+            'count'    => 1,
+            'labels'   => [],
+            'datasets' => [
+                [
+                    'label' => trans('firefly.spent'),
+                    'data'  => []
+                ]
+            ],
+        ];
+
+        foreach ($entries as $entry) {
+            $data['labels'][]              = $entry[0]->formatLocalized($format);
+            $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, 'monthAndDay');
+
+    }
+
+    /**
+     * @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

@@ -51,9 +51,15 @@ class ConnectJournalToPiggyBank
         if (is_null($repetition)) {
             return false;
         }
-
-        $amount = $journal->correct_amount;
         bcscale(2);
+
+        $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 = bcadd($repetition->currentamount, $amount);
         $repetition->save();
 

app/Helpers/Collection/BalanceLine.php

@@ -159,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

@@ -67,13 +67,13 @@ class Income
      */
     public function getIncomes()
     {
-        $this->incomes->sortByDesc(
+        $set = $this->incomes->sortByDesc(
             function (stdClass $object) {
                 return $object->amount;
             }
         );
 
-        return $this->incomes;
+        return $set;
     }
 
     /**

app/Helpers/Help/Help.php

@@ -37,10 +37,12 @@ class Help implements HelpInterface
      */
     public function getFromGithub($route)
     {
-        $uri     = 'https://raw.githubusercontent.com/JC5/firefly-iii-help/master/en/' . e($route) . '.md';
-        $content = [
+        $uri        = 'https://raw.githubusercontent.com/JC5/firefly-iii-help/master/en/' . e($route) . '.md';
+        $routeIndex = str_replace('.', '-', $route);
+        $title      = trans('help.' . $routeIndex);
+        $content    = [
             'text'  => '<p>There is no help for this route!</p>',
-            'title' => $route,
+            'title' => $title,
         ];
         try {
             $content['text'] = file_get_contents($uri);
@@ -69,6 +71,18 @@ class Help implements HelpInterface
         return Route::has($route);
     }
 
+    /**
+     * @codeCoverageIgnore
+     *
+     * @param $route
+     *
+     * @return bool
+     */
+    public function inCache($route)
+    {
+        return Cache::has('help.' . $route . '.title') && Cache::has('help.' . $route . '.text');
+    }
+
     /**
      * @codeCoverageIgnore
      *
@@ -82,16 +96,4 @@ class Help implements HelpInterface
         Cache::put('help.' . $route . '.text', $content['text'], 10080); // a week.
         Cache::put('help.' . $route . '.title', $content['title'], 10080);
     }
-
-    /**
-     * @codeCoverageIgnore
-     *
-     * @param $route
-     *
-     * @return bool
-     */
-    public function inCache($route)
-    {
-        return Cache::has('help.' . $route . '.title') && Cache::has('help.' . $route . '.text');
-    }
 }

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

@@ -163,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;
@@ -216,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/ReportQuery.php

@@ -99,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) {
 
@@ -230,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')
@@ -242,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/Auth/AuthController.php

@@ -1,17 +1,17 @@
 <?php namespace FireflyIII\Http\Controllers\Auth;
 
 use App;
+use Auth;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Role;
 use FireflyIII\User;
-use Illuminate\Contracts\Auth\Guard;
-use Illuminate\Contracts\Auth\Registrar;
 use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
 use Illuminate\Http\Request;
 use Illuminate\Mail\Message;
 use Mail;
 use Session;
 use Twig;
+use Validator;
 
 /**
  * Class AuthController
@@ -39,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']);
     }
 
@@ -74,7 +68,7 @@ class AuthController extends Controller
      */
     public function postRegister(Request $request)
     {
-        $validator = $this->registrar->validator($request->all());
+        $validator = $this->validator($request->all());
 
         if ($validator->fails()) {
             $this->throwValidationException(
@@ -87,16 +81,16 @@ 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
-        if ($this->auth->user() instanceof User) {
-            $email = $this->auth->user()->email;
-
+        if (Auth::user() instanceof User) {
+            $email   = Auth::user()->email;
+            $address = route('index');
             // send email.
             Mail::send(
-                'emails.registered', [], function (Message $message) use ($email) {
-                $message->to($email, $email)->subject('Welcome to Firefly III!');
+                ['emails.registered-html', 'emails.registered'], ['address' => $address], function (Message $message) use ($email) {
+                $message->to($email, $email)->subject('Welcome to Firefly III! ');
             }
             );
 
@@ -108,15 +102,50 @@ class AuthController extends Controller
             // first user ever?
             if (User::count() == 1) {
                 $admin = Role::where('name', 'owner')->first();
-                $this->auth->user()->attachRole($admin);
+                Auth::user()->attachRole($admin);
             }
 
 
             return redirect($this->redirectPath());
         }
+        // @codeCoverageIgnoreStart
         App::abort(500, 'Not a user!');
 
         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

@@ -35,7 +35,9 @@ class BillController extends Controller
      */
     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) {
@@ -44,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'));
     }
@@ -90,7 +91,7 @@ class BillController extends Controller
     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) {

app/Http/Controllers/BudgetController.php

@@ -116,7 +116,7 @@ class BudgetController extends Controller
      */
     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) {

app/Http/Controllers/CategoryController.php

@@ -43,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'));
     }
@@ -90,7 +90,7 @@ class CategoryController extends Controller
      */
     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) {
@@ -132,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'));
     }

app/Http/Controllers/Chart/AccountController.php

@@ -2,17 +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 FireflyIII\Support\CacheProperties;
-use Grumpydictator\Gchart\GChart;
 use Illuminate\Support\Collection;
 use Preferences;
 use Response;
 use Session;
-use Steam;
 
 /**
  * Class AccountController
@@ -21,10 +20,24 @@ 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
@@ -33,7 +46,7 @@ class AccountController extends Controller
      *
      * @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;
@@ -49,9 +62,6 @@ class AccountController extends Controller
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
-
-        $chart->addColumn(trans('firefly.dayOfMonth'), 'date');
-
         /** @var Collection $accounts */
         $accounts = $repository->getAccounts(['Default account', 'Asset account']);
         if ($shared === false) {
@@ -63,31 +73,8 @@ class AccountController extends Controller
             }
         }
 
-        //
-
-        $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();
-
-        $data = $chart->getData();
+        // make chart:
+        $data = $this->generator->all($accounts, $start, $end);
         $cache->store($data);
 
         return Response::json($data);
@@ -96,18 +83,15 @@ class AccountController extends Controller
     /**
      * 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);
 
         // chart properties for cache:
@@ -120,30 +104,7 @@ class AccountController extends Controller
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
-
-        $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();
-
-        $data = $chart->getData();
+        $data = $this->generator->frontpage($accounts, $start, $end);
         $cache->store($data);
 
         return Response::json($data);
@@ -153,21 +114,16 @@ class AccountController extends Controller
     /**
      * 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;
+
+        $start = Session::get('start', Carbon::now()->startOfMonth());
+        $end   = Session::get('end', Carbon::now()->endOfMonth());
 
         // chart properties for cache:
         $cache = new CacheProperties();
@@ -180,16 +136,7 @@ class AccountController extends Controller
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
-        while ($end >= $current) {
-            $certain = $current < $today;
-            $chart->addRow(clone $current, Steam::balance($account, $current), $certain);
-            $current->addDay();
-        }
-
-
-        $chart->generate();
-
-        $data = $chart->getData();
+        $data = $this->generator->single($account, $start, $end);
         $cache->store($data);
 
         return Response::json($data);

app/Http/Controllers/Chart/BillController.php

@@ -2,6 +2,7 @@
 
 namespace FireflyIII\Http\Controllers\Chart;
 
+use App;
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Bill;
@@ -9,7 +10,6 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
-use Grumpydictator\Gchart\GChart;
 use Illuminate\Support\Collection;
 use Response;
 use Session;
@@ -22,60 +22,30 @@ 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');
-
-        $cache = new CacheProperties;
-        $cache->addProperty('single');
-        $cache->addProperty('bill');
-        $cache->addProperty($bill->id);
-        if ($cache->has()) {
-            return Response::json($cache->get()); // @codeCoverageIgnore
-        }
-
-        // 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();
-
-        $data = $chart->getData();
-        $cache->store($data);
-
-        return Response::json($data);
+        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());
@@ -94,11 +64,7 @@ class BillController extends Controller
         $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) {
@@ -136,30 +102,42 @@ 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);
+        // resort:
+        $results = $results->sortBy(
+            function (TransactionJournal $journal) {
+                return $journal->date->format('U');
+            }
+        );
 
-        $chart->generate();
-
-        $data = $chart->getData();
+        $data = $this->generator->single($bill, $results);
         $cache->store($data);
 
         return Response::json($data);

app/Http/Controllers/Chart/BudgetController.php

@@ -2,13 +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 FireflyIII\Support\CacheProperties;
-use Grumpydictator\Gchart\GChart;
 use Illuminate\Support\Collection;
 use Navigation;
 use Preferences;
@@ -22,19 +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);
@@ -47,33 +58,23 @@ class BudgetController extends Controller
         $cache->addProperty($first);
         $cache->addProperty($last);
         $cache->addProperty('budget');
-        $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();
-
-            // start date for chart.
             $chartDate = clone $end;
             $chartDate->startOfMonth();
-
             $spent = $repository->spentInPeriodCorrected($budget, $first, $end);
-            $chart->addRow($chartDate, $spent);
-
+            $entries->push([$chartDate, $spent]);
             $first = Navigation::addPeriod($first, $range, 0);
-
-
         }
 
-        $chart->generate();
-
-        $data = $chart->getData();
-
-
+        $data = $this->generator->budget($entries);
         $cache->store($data);
 
         return Response::json($data);
@@ -82,14 +83,13 @@ class BudgetController extends Controller
     /**
      * 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;
@@ -106,11 +106,8 @@ class BudgetController extends Controller
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
-        $chart->addColumn(trans('firefly.day'), 'date');
-        $chart->addColumn(trans('firefly.left'), 'number');
-
-
-        $amount = $repetition->amount;
+        $entries = new Collection;
+        $amount  = $repetition->amount;
 
         while ($start <= $end) {
             /*
@@ -118,12 +115,11 @@ 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();
 
-        $data = $chart->getData();
+        $data = $this->generator->budgetLimit($entries);
         $cache->store($data);
 
         return Response::json($data);
@@ -133,18 +129,12 @@ class BudgetController extends Controller
     /**
      * 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());
@@ -160,43 +150,38 @@ class BudgetController extends Controller
             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) * -1;
-        $allEntries->push([trans('firefly.noBudget'), 0, 0, $noBudgetExpenses]);
+        $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]);
-            }
-        }
-
-        $chart->generate();
-
-        $data = $chart->getData();
+        $data = $this->generator->frontpage($allEntries);
         $cache->store($data);
 
         return Response::json($data);
@@ -206,14 +191,13 @@ class BudgetController extends Controller
     /**
      * 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');
@@ -230,17 +214,12 @@ class BudgetController extends Controller
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
-        // add columns:
-        $chart->addColumn(trans('firefly.month'), 'date');
-        foreach ($budgets as $budget) {
-            $chart->addColumn($budget->name, 'number');
-        }
+        $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:
@@ -248,14 +227,11 @@ class BudgetController extends Controller
                 $spent = $repository->spentInPeriodCorrected($budget, $start, $month, $shared);
                 $row[] = $spent;
             }
-            $chart->addRowArray($row);
-
+            $entries->push($row);
             $start->endOfMonth()->addDay();
         }
 
-        $chart->generate();
-
-        $data = $chart->getData();
+        $data = $this->generator->year($budgets, $entries);
         $cache->store($data);
 
         return Response::json($data);

app/Http/Controllers/Chart/CategoryController.php

@@ -3,12 +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 FireflyIII\Support\CacheProperties;
-use Grumpydictator\Gchart\GChart;
+use Illuminate\Support\Collection;
 use Navigation;
 use Preferences;
 use Response;
@@ -21,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);
 
 
     }
@@ -64,15 +84,12 @@ 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());
@@ -87,11 +104,10 @@ class CategoryController extends Controller
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
-        $set = $repository->getCategoriesAndExpensesCorrected($start, $end);
-
+        $array = $repository->getCategoriesAndExpensesCorrected($start, $end);
         // sort by callback:
         uasort(
-            $set,
+            $array,
             function ($left, $right) {
                 if ($left['sum'] == $right['sum']) {
                     return 0;
@@ -100,48 +116,48 @@ class CategoryController extends Controller
                 return ($left['sum'] < $right['sum']) ? 1 : -1;
             }
         );
-
-
-        foreach ($set as $entry) {
-            $sum = floatval($entry['sum']);
-            if ($sum != 0) {
-                $chart->addRow($entry['name'], $sum);
-            }
-        }
-
-        $chart->generate();
-
-        $data = $chart->getData();
-        $cache->store($data);
+        $set  = new Collection($array);
+        $data = $this->generator->frontpage($set);
 
         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);
 
 
     }
@@ -149,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:
@@ -181,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

@@ -37,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) {
@@ -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'));
     }
 
     /**
@@ -124,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").

app/Http/Controllers/HomeController.php

@@ -1,11 +1,14 @@
 <?php namespace FireflyIII\Http\Controllers;
 
+use Auth;
 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;
 
@@ -37,6 +40,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');
@@ -49,8 +66,6 @@ class HomeController extends Controller
      */
     public function index(AccountRepositoryInterface $repository)
     {
-
-
         $types = Config::get('firefly.accountTypesByIdentifier.asset');
         $count = $repository->countAccounts($types);
 
@@ -98,4 +113,33 @@ class HomeController extends Controller
 
         return view('index', compact('count', 'title', 'savings', 'subTitle', 'mainTitleIcon', 'transactions', 'savingsTotal', 'piggyBankAccounts'));
     }
+
+    /**
+     * @codeCoverageIgnore
+     * @return \Illuminate\Http\RedirectResponse|string
+     */
+    public function routes()
+    {
+        if (!Auth::user()->hasRole('owner')) {
+            Session::flash('warning', 'This page is broken.');
+
+            return Redirect::route('index');
+        }
+
+        // get all routes:
+        $routeCollection = Route::getRoutes();
+        /** @var \Illuminate\Routing\Route $value */
+        foreach ($routeCollection as $value) {
+            $name    = $value->getName();
+            $methods = $value->getMethods();
+            $isPost  = in_array('POST', $methods);
+            $index   = str_replace('.', '-', $name);
+
+            if (strlen($name) > 0 && !$isPost) {
+                echo "'" . $index . "' => '" . $name . "',<br />";
+            }
+        }
+
+        return '&nbsp;';
+    }
 }

app/Http/Controllers/PiggyBankController.php

@@ -67,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").
@@ -142,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');
@@ -299,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'));
@@ -321,13 +314,13 @@ 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);
@@ -356,13 +349,13 @@ 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);

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();

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 = [
@@ -120,7 +120,7 @@ class TagController extends Controller
      */
     public function edit(Tag $tag, TagRepositoryInterface $repository)
     {
-        $subTitle     = 'Edit tag "' . e($tag->tag) . '"';
+        $subTitle     = trans('firefly.edit_tag', ['tag' => $tag->tag]);
         $subTitleIcon = 'fa-tag';
 
         /*
@@ -178,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'));
     }
 
     /**

app/Http/Controllers/TransactionController.php

@@ -88,7 +88,7 @@ class TransactionController extends Controller
         Session::flash('gaEventCategory', 'transactions');
         Session::flash('gaEventAction', 'delete-' . $what);
 
-        return view('transactions.delete', compact('journal', 'subTitle','what'));
+        return view('transactions.delete', compact('journal', 'subTitle', 'what'));
 
 
     }
@@ -121,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,
@@ -156,12 +155,18 @@ class TransactionController extends Controller
             $preFilled['piggy_bank_id'] = $journal->piggyBankEvents()->orderBy('date', 'DESC')->first()->piggy_bank_id;
         }
 
-        $preFilled['amount']          = $journal->actual_amount;
-        $preFilled['account_id']      = $journal->destination_account->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');
@@ -261,7 +266,7 @@ class TransactionController extends Controller
         $what     = strtolower($journal->transactionType->type);
         $subTitle = trans('firefly.' . $journal->transactionType->type) . ' "' . e($journal->description) . '"';
 
-        return view('transactions.show', compact('journal', 'subTitle','what'));
+        return view('transactions.show', compact('journal', 'subTitle', 'what'));
     }
 
     /**
@@ -283,8 +288,6 @@ 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();
 

app/Http/Kernel.php

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

app/Http/Middleware/Reminders.php

@@ -1,96 +0,0 @@
-<?php
-
-namespace FireflyIII\Http\Middleware;
-
-use App;
-use Carbon\Carbon;
-use Closure;
-use FireflyIII\Models\PiggyBank;
-use FireflyIII\Models\Reminder;
-use FireflyIII\Support\CacheProperties;
-use FireflyIII\User;
-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)
-    {
-
-
-        $user = $this->auth->user();
-        if ($this->auth->check() && !$request->isXmlHttpRequest() && $user instanceof User) {
-            // do reminders stuff.
-
-            // abuse CacheProperties to find out if we need to do this:
-            $cache = new CacheProperties;
-
-            $cache->addProperty('reminders');
-            if ($cache->has()) {
-                $reminders = $cache->get();
-                View::share('reminders', $reminders);
-
-                return $next($request);
-            }
-
-            $piggyBanks = $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($user->id)->leftJoin('piggy_banks', 'piggy_banks.id', '=', 'remindersable_id')->whereNull('piggy_banks.id')->delete();
-            }
-
-            // get and list active reminders:
-            $reminders = $user->reminders()->today()->get();
-            $reminders->each(
-                function (Reminder $reminder) use ($helper) {
-                    $reminder->description = $helper->getReminderText($reminder);
-                }
-            );
-            $cache->store($reminders);
-            View::share('reminders', $reminders);
-        }
-
-        return $next($request);
-    }
-}

app/Http/Requests/BudgetFormRequest.php

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

app/Http/Requests/JournalFormRequest.php

@@ -61,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',
 
         ];

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/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,7 +35,7 @@ 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]));
 }
 );
 
@@ -60,7 +59,7 @@ Breadcrumbs::register(
 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]));
 }
 );
 
@@ -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,13 +136,13 @@ 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]));
 }
 );
 
@@ -166,7 +165,14 @@ 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'));
 }
 );
 
@@ -279,25 +285,6 @@ Breadcrumbs::register(
 }
 );
 
-// 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) {
@@ -321,11 +308,13 @@ Breadcrumbs::register(
 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]));

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;
@@ -81,19 +80,6 @@ Route::bind(
 }
 );
 
-Route::bind(
-    'reminder', function ($value) {
-    if (Auth::check()) {
-        $object = Reminder::where('id', $value)->where('user_id', Auth::user()->id)->first();
-        if ($object) {
-            return $object;
-        }
-    }
-
-    throw new NotFoundHttpException;
-}
-);
-
 Route::bind(
     'limitrepetition', function ($value) {
     if (Auth::check()) {
@@ -140,23 +126,6 @@ Route::bind(
 }
 );
 
-/** @noinspection PhpUnusedParameterInspection */
-Route::bind(
-    'reminder', function ($value) {
-    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;
-}
-);
-
 Route::bind(
     'tag', function ($value) {
     if (Auth::check()) {
@@ -183,15 +152,18 @@ Route::controllers(
     ]
 );
 
-/**
- * Home Controller
- */
+
 Route::group(
-    ['middleware' => ['auth', 'range', 'reminders']], function () {
+    ['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']);
+    Route::get('/routes', ['uses' => 'HomeController@routes']);
     /**
      * Account Controller
      */
@@ -348,19 +320,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

@@ -180,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/Budget.php

@@ -37,6 +37,36 @@ class Budget extends Model
     protected $fillable = ['user_id', 'name', 'active'];
     protected $hidden   = ['encrypted'];
 
+    /**
+     * @param array $fields
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @codeCoverageIgnore
+     *
+     * @return Budget
+     */
+    public static function firstOrCreateEncrypted(array $fields)
+    {
+        // everything but the name:
+        $query = Budget::orderBy('id');
+        foreach ($fields as $name => $value) {
+            if ($name != 'name') {
+                $query->where($name, $value);
+            }
+        }
+        $set = $query->get(['budgets.*']);
+        /** @var Budget $budget */
+        foreach ($set as $budget) {
+            if ($budget->name == $fields['name']) {
+                return $budget;
+            }
+        }
+        // create it!
+        $budget = Budget::create($fields);
+
+        return $budget;
+
+    }
+
     /**
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany

app/Models/PiggyBank.php

@@ -19,15 +19,11 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property string                                                                                 $targetamount_encrypted
  * @property \Carbon\Carbon                                                                         $startdate
  * @property \Carbon\Carbon                                                                         $targetdate
- * @property string                                                                                 $reminder
- * @property integer                                                                                $reminder_skip
- * @property boolean                                                                                $remind_me
  * @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
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Reminder[]            $reminders
  * @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)
@@ -38,9 +34,6 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @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 whereReminder($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereReminderSkip($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereRemindMe($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
@@ -50,7 +43,7 @@ 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'];
 
     /**
@@ -112,17 +105,6 @@ class PiggyBank extends Model
         return $value;
     }
 
-    /**
-     *
-     * @param $value
-     *
-     * @return boolean
-     */
-    public function getRemindMeAttribute($value)
-    {
-        return intval($value) == 1;
-    }
-
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
@@ -131,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/Reminder.php

@@ -1,148 +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
- * @property integer               $id
- * @property \Carbon\Carbon        $created_at
- * @property \Carbon\Carbon        $updated_at
- * @property integer               $user_id
- * @property \Carbon\Carbon        $startdate
- * @property \Carbon\Carbon        $enddate
- * @property boolean               $active
- * @property boolean               $notnow
- * @property integer               $remindersable_id
- * @property string                $remindersable_type
- * @property string                $metadata
- * @property boolean               $encrypted
- * @property-read \                $remindersable
- * @property-read \FireflyIII\User $user
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereStartdate($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereEnddate($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereActive($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereNotnow($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereRemindersableId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereRemindersableType($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereMetadata($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereEncrypted($value)
- * @method static \FireflyIII\Models\Reminder onDates($start, $end)
- * @method static \FireflyIII\Models\Reminder today()
- * @property string                description
- */
-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/Tag.php

@@ -96,6 +96,33 @@ class Tag extends Model
         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
      *
@@ -105,6 +132,10 @@ class Tag extends Model
      */
     public function getDescriptionAttribute($value)
     {
+        if (is_null($value)) {
+            return $value;
+        }
+
         return Crypt::decrypt($value);
     }
 
@@ -140,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/TransactionJournal.php

@@ -72,15 +72,19 @@ use Watson\Validating\ValidatingTrait;
  * @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',
@@ -154,14 +158,13 @@ class TransactionJournal extends Model
                 $amount = $t->amount;
             }
         }
-        $count = $this->tags->count();
 
-        if ($count === 1) {
+        if (intval($this->tag_count) === 1) {
             // get amount for single tag:
             $amount = $this->amountByTag($this->tags()->first(), $amount);
         }
 
-        if ($count > 1) {
+        if (intval($this->tag_count) > 1) {
             // get amount for either tag.
             $amount = $this->amountByTags($amount);
 
@@ -274,6 +277,21 @@ class TransactionJournal extends Model
         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
      *
@@ -315,7 +333,7 @@ class TransactionJournal extends Model
     {
         $cache = new CacheProperties;
         $cache->addProperty($this->id);
-        $cache->addProperty('destinationAccount');
+        $cache->addProperty('sourceAccount');
         if ($cache->has()) {
             return $cache->get(); // @codeCoverageIgnore
         }
@@ -418,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/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,8 +52,6 @@ class EventServiceProvider extends ServiceProvider
         $this->registerCreateEvents();
         BudgetLimit::saved(
             function (BudgetLimit $budgetLimit) {
-                Log::debug('Saved!');
-
                 $end = Navigation::addPeriod(clone $budgetLimit->startdate, $budgetLimit->repeat_freq, 0);
                 $end->subDay();
                 $set = $budgetLimit->limitrepetitions()
@@ -101,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

@@ -68,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;
     }
@@ -225,6 +225,7 @@ 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);
         }
@@ -432,7 +433,6 @@ class AccountRepository implements AccountRepositoryInterface
         $account->virtual_balance = $data['virtualBalance'];
         $account->save();
 
-        // update meta data:
         $this->updateMetadata($account, $data);
         $openingBalance = $this->openingBalanceTransaction($account);
 

app/Repositories/Bill/BillRepository.php

@@ -91,7 +91,13 @@ class BillRepository implements BillRepositoryInterface
     public function getBills()
     {
         /** @var Collection $set */
-        $set = Auth::user()->bills()->orderBy('name', 'ASC')->get()->sortBy('name');
+        $set = Auth::user()->bills()->orderBy('name', 'ASC')->get();
+
+        $set = $set->sortBy(
+            function (Bill $bill) {
+                return strtolower($bill->name);
+            }
+        );
 
         return $set;
     }
@@ -284,6 +290,8 @@ class BillRepository implements BillRepositoryInterface
             return true;
         }
 
+        return false;
+
     }
 
     /**

app/Repositories/Budget/BudgetRepository.php

@@ -63,7 +63,6 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
     public function getActiveBudgets()
     {
         $budgets = Auth::user()->budgets()->where('active', 1)->get();
-        $budgets->sortBy('name');
 
         return $budgets;
     }

app/Repositories/Category/CategoryRepository.php

@@ -48,7 +48,7 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
     {
         /** @var Collection $set */
         $set = Auth::user()->categories()->orderBy('name', 'ASC')->get();
-        $set->sortBy(
+        $set = $set->sortBy(
             function (Category $category) {
                 return $category->name;
             }

app/Repositories/Journal/JournalRepository.php

@@ -26,21 +26,6 @@ use Log;
 class JournalRepository implements JournalRepositoryInterface
 {
 
-    /**
-     * @param int $reminderId
-     *
-     * @return boolean|null
-     */
-    public function deactivateReminder($reminderId)
-    {
-        $reminder = Auth::user()->reminders()->find($reminderId);
-        if ($reminder) {
-            $reminder->active = 0;
-            $reminder->save();
-        }
-
-    }
-
     /**
      * @param TransactionJournal $journal
      *

app/Repositories/Journal/JournalRepositoryInterface.php

@@ -16,13 +16,6 @@ use Illuminate\Support\Collection;
  */
 interface JournalRepositoryInterface
 {
-    /**
-     * @param int $reminderId
-     *
-     * @return bool
-     */
-    public function deactivateReminder($reminderId);
-
     /**
      * @param TransactionJournal $journal
      *

app/Repositories/PiggyBank/PiggyBankRepository.php

@@ -116,8 +116,10 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
      */
     public function store(array $data)
     {
-        $data['remind_me'] = isset($data['remind_me']) && $data['remind_me'] == '1' ? true : false;
-        $piggyBank         = PiggyBank::create($data);
+        $data['remind_me']     = false;
+        $data['reminder_skip'] = 0;
+
+        $piggyBank = PiggyBank::create($data);
 
         return $piggyBank;
     }
@@ -130,21 +132,12 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
      */
     public function update(PiggyBank $piggyBank, array $data)
     {
-        /**
-         * 'rep_length'   => $request->get('rep_length'),
-         * 'rep_every'    => intval($request->get('rep_every')),
-         * 'rep_times'    => intval($request->get('rep_times')),
-         * 'remind_me'    => intval($request->get('remind_me')) == 1 ? true : false ,
-         * 'reminder'     => $request->get('reminder'),
-         */
 
         $piggyBank->name         = $data['name'];
         $piggyBank->account_id   = intval($data['account_id']);
         $piggyBank->targetamount = floatval($data['targetamount']);
         $piggyBank->targetdate   = $data['targetdate'];
-        $piggyBank->reminder     = $data['reminder'];
         $piggyBank->startdate    = $data['startdate'];
-        $piggyBank->remind_me    = isset($data['remind_me']) && $data['remind_me'] == '1' ? 1 : 0;
 
         $piggyBank->save();
 

app/Repositories/PiggyBank/PiggybankPart.php

@@ -4,7 +4,6 @@ namespace FireflyIII\Repositories\PiggyBank;
 
 use Carbon\Carbon;
 use FireflyIII\Models\PiggyBankRepetition;
-use FireflyIII\Models\Reminder;
 
 /**
  * Class PiggyBankPart
@@ -20,8 +19,6 @@ class PiggyBankPart
     public $cumulativeAmount;
     /** @var  float */
     public $currentamount;
-    /** @var  Reminder */
-    public $reminder;
 
     /** @var  PiggyBankRepetition */
     public $repetition;
@@ -33,25 +30,19 @@ class PiggyBankPart
     public $targetdate;
 
     /**
-     * @return Reminder
+     * @return PiggyBankRepetition
      */
-    public function getReminder()
+    public function getRepetition()
     {
-        if (is_null($this->reminder)) {
-            $this->reminder = $this->repetition->piggyBank->reminders()->where('startdate', $this->getStartdate()->format('Y-m-d'))->where(
-                'enddate', $this->getTargetdate()->format('Y-m-d')
-            )->first();
-        }
-
-        return $this->reminder;
+        return $this->repetition;
     }
 
     /**
-     * @param Reminder $reminder
+     * @param PiggyBankRepetition $repetition
      */
-    public function setReminder($reminder)
+    public function setRepetition($repetition)
     {
-        $this->reminder = $reminder;
+        $this->repetition = $repetition;
     }
 
     /**
@@ -86,30 +77,6 @@ class PiggyBankPart
         $this->targetdate = $targetdate;
     }
 
-    /**
-     * @return PiggyBankRepetition
-     */
-    public function getRepetition()
-    {
-        return $this->repetition;
-    }
-
-    /**
-     * @param PiggyBankRepetition $repetition
-     */
-    public function setRepetition($repetition)
-    {
-        $this->repetition = $repetition;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasReminder()
-    {
-        return !is_null($this->reminder);
-    }
-
     /**
      * @return float|int
      */

app/Repositories/Reminder/ReminderRepository.php

@@ -1,116 +0,0 @@
-<?php
-
-namespace FireflyIII\Repositories\Reminder;
-
-use App;
-use Auth;
-use Carbon\Carbon;
-use FireflyIII\Models\Reminder;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Collection;
-
-/**
- * Class ReminderRepository
- *
- * @package FireflyIII\Repositories\Reminder
- */
-class ReminderRepository implements ReminderRepositoryInterface
-{
-    /** @var \FireflyIII\Helpers\Reminders\ReminderHelperInterface */
-    protected $helper;
-
-    /**
-     * @codeCoverageIgnore
-     */
-    public function __construct()
-    {
-        /** @var \FireflyIII\Helpers\Reminders\ReminderHelperInterface helper */
-        $this->helper = App::make('FireflyIII\Helpers\Reminders\ReminderHelperInterface');
-    }
-
-    /**
-     * @return Collection
-     */
-    public function getActiveReminders()
-    {
-        $today = new Carbon;
-        // active reminders:
-        $active = Auth::user()->reminders()
-                      ->where('notnow', 0)
-                      ->where('active', 1)
-                      ->where('startdate', '<=', $today->format('Y-m-d 00:00:00'))
-                      ->where('enddate', '>=', $today->format('Y-m-d 00:00:00'))
-                      ->get();
-
-        $active->each(
-            function (Reminder $reminder) {
-                $reminder->description = $this->helper->getReminderText($reminder);
-            }
-        );
-
-        return $active;
-
-    }
-
-    /**
-     * @return Collection
-     */
-    public function getDismissedReminders()
-    {
-        $dismissed = Auth::user()->reminders()
-                         ->where('notnow', 1)
-                         ->get();
-
-        $dismissed->each(
-            function (Reminder $reminder) {
-                $reminder->description = $this->helper->getReminderText($reminder);
-            }
-        );
-
-        return $dismissed;
-    }
-
-    /**
-     * @return Collection
-     */
-    public function getExpiredReminders()
-    {
-
-        $expired = Auth::user()->reminders()
-                       ->where('notnow', 0)
-                       ->where('active', 1)
-                       ->where(
-                           function (Builder $q) {
-                               $today = new Carbon;
-                               $q->where('startdate', '>', $today->format('Y-m-d 00:00:00'));
-                               $q->orWhere('enddate', '<', $today->format('Y-m-d 00:00:00'));
-                           }
-                       )->get();
-
-        $expired->each(
-            function (Reminder $reminder) {
-                $reminder->description = $this->helper->getReminderText($reminder);
-            }
-        );
-
-        return $expired;
-    }
-
-    /**
-     * @return Collection
-     */
-    public function getInactiveReminders()
-    {
-        $inactive = Auth::user()->reminders()
-                        ->where('active', 0)
-                        ->get();
-
-        $inactive->each(
-            function (Reminder $reminder) {
-                $reminder->description = $this->helper->getReminderText($reminder);
-            }
-        );
-
-        return $inactive;
-    }
-}

app/Repositories/Reminder/ReminderRepositoryInterface.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace FireflyIII\Repositories\Reminder;
-
-use Illuminate\Support\Collection;
-
-
-/**
- * Interface ReminderRepositoryInterface
- *
- * @package FireflyIII\Repositories\Reminder
- */
-interface ReminderRepositoryInterface
-{
-    /**
-     * @return Collection
-     */
-    public function getActiveReminders();
-
-    /**
-     * @return Collection
-     */
-    public function getDismissedReminders();
-
-    /**
-     * @return Collection
-     */
-    public function getExpiredReminders();
-
-    /**
-     * @return Collection
-     */
-    public function getInactiveReminders();
-
-}

app/Repositories/Tag/TagRepository.php

@@ -41,6 +41,7 @@ class TagRepository implements TagRepositoryInterface
         switch ($tag->tagMode) {
             case 'nothing':
                 $journal->tags()->save($tag);
+                $journal->save();
 
                 return true;
             case 'balancingAct':
@@ -109,7 +110,7 @@ class TagRepository implements TagRepositoryInterface
     {
         /** @var Collection $tags */
         $tags = Auth::user()->tags()->get();
-        $tags->sortBy(
+        $tags = $tags->sortBy(
             function (Tag $tag) {
                 return $tag->tag;
             }
@@ -248,12 +249,14 @@ class TagRepository implements TagRepositoryInterface
         // only if this is the only withdrawal.
         if ($journal->transaction_type_id == $withdrawal->id && $withdrawals < 1) {
             $journal->tags()->save($tag);
+            $journal->save();
 
             return true;
         }
         // and only if this is the only transfer
         if ($journal->transaction_type_id == $transfer->id && $transfers < 1) {
             $journal->tags()->save($tag);
+            $journal->save();
 
             return true;
         }
@@ -290,6 +293,7 @@ class TagRepository implements TagRepositoryInterface
         // tag is attached just like that:
         if ($withdrawals < 1 && $deposits < 1) {
             $journal->tags()->save($tag);
+            $journal->save();
 
             return true;
         }
@@ -320,12 +324,19 @@ class TagRepository implements TagRepositoryInterface
         $match = true;
         /** @var TransactionJournal $check */
         foreach ($tag->transactionjournals as $check) {
-            if ($check->source_account->id != $journal->source_account->id) {
+            // $checkAccount is the source_account for a withdrawal
+            // $checkAccount is the destination_account for a deposit
+            if ($check->transactionType->type == 'Withdrawal' && $check->source_account->id != $journal->destination_account->id) {
                 $match = false;
             }
+            if ($check->transactionType->type == 'Deposit' && $check->destination_account->id != $journal->destination_account->id) {
+                $match = false;
+            }
+
         }
         if ($match) {
             $journal->tags()->save($tag);
+            $journal->save();
 
             return true;
         }

app/Support/Amount.php

@@ -37,6 +37,7 @@ class Amount
     {
         $currencyPreference = Prefs::get('currencyPreference', 'EUR');
         $currency           = TransactionCurrency::whereCode($currencyPreference->data)->first();
+
         return $currency->symbol;
     }
 

app/Support/ExpandedForm.php

@@ -38,7 +38,9 @@ class ExpandedForm
         $options['min']  = '0.01';
         $defaultCurrency = isset($options['currency']) ? $options['currency'] : Amt::getDefaultCurrency();
         $currencies      = Amt::getAllCurrencies();
-        $html            = View::make('form.amount', compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
+        unset($options['currency']);
+        unset($options['placeholder']);
+        $html = View::make('form.amount', compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
 
         return $html;
 
@@ -140,7 +142,9 @@ class ExpandedForm
         $options['step'] = 'any';
         $defaultCurrency = isset($options['currency']) ? $options['currency'] : Amt::getDefaultCurrency();
         $currencies      = Amt::getAllCurrencies();
-        $html            = View::make('form.balance', compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
+        unset($options['currency']);
+        unset($options['placeholder']);
+        $html = View::make('form.balance', compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
 
         return $html;
     }
@@ -181,7 +185,8 @@ class ExpandedForm
         $options = $this->expandOptionArray($name, $label, $options);
         $classes = $this->getHolderClasses($name);
         $value   = $this->fillFieldValue($name, $value);
-        $html    = View::make('form.date', compact('classes', 'name', 'label', 'value', 'options'))->render();
+        unset($options['placeholder']);
+        $html = View::make('form.date', compact('classes', 'name', 'label', 'value', 'options'))->render();
 
         return $html;
     }
@@ -316,7 +321,9 @@ class ExpandedForm
         $options  = $this->expandOptionArray($name, $label, $options);
         $classes  = $this->getHolderClasses($name);
         $selected = $this->fillFieldValue($name, $selected);
-        $html     = View::make('form.select', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render();
+        unset($options['autocomplete']);
+        unset($options['placeholder']);
+        $html = View::make('form.select', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render();
 
         return $html;
     }

app/Support/Navigation.php

@@ -83,7 +83,7 @@ class Navigation
         $subDay = ['week', 'weekly', '1W', 'month', 'monthly', '1M', '3M', 'quarter', 'quarterly', '6M', 'half-year', 'year', 'yearly'];
 
         if (!isset($functionMap[$repeatFreq])) {
-            throw new FireflyException('Cannot do endOfPeriod for $repeat_freq ' . $repeatFreq);
+            throw new FireflyException('Cannot do endOfPeriod for $repeat_freq "' . $repeatFreq.'"');
         }
         $function = $functionMap[$repeatFreq];
         if (isset($modifierMap[$repeatFreq])) {
@@ -119,7 +119,6 @@ class Navigation
             'year'      => 'endOfYear',
             'yearly'    => 'endOfYear',
         ];
-        $specials    = ['mont', 'monthly'];
 
         $currentEnd = clone $theCurrentEnd;
 
@@ -128,12 +127,7 @@ class Navigation
             $currentEnd->$function();
 
         }
-        if (isset($specials[$repeatFreq])) {
-            $currentEnd->endOfYear();
-            if ($theCurrentEnd->month <= 6) {
-                $currentEnd->subMonths(6);
-            }
-        }
+
         if ($currentEnd > $maxDate) {
             return clone $maxDate;
         }
@@ -142,7 +136,7 @@ class Navigation
     }
 
     /**
-     * @param Carbon         $date
+     * @param \Carbon\Carbon $date
      * @param                $repeatFrequency
      *
      * @return string
@@ -210,7 +204,7 @@ class Navigation
 
             return $date;
         }
-        throw new FireflyException('Cannot do startOfPeriod for $repeat_freq ' . $repeatFreq);
+        throw new FireflyException('Cannot do startOfPeriod for $repeat_freq "' . $repeatFreq.'"');
     }
 
     /**
@@ -252,7 +246,7 @@ class Navigation
             return $date;
         }
 
-        throw new FireflyException('Cannot do subtractPeriod for $repeat_freq ' . $repeatFreq);
+        throw new FireflyException('Cannot do subtractPeriod for $repeat_freq "' . $repeatFreq.'"');
     }
 
     /**
@@ -288,7 +282,7 @@ class Navigation
 
             return $end;
         }
-        throw new FireflyException('updateEndDate cannot handle $range ' . $range);
+        throw new FireflyException('updateEndDate cannot handle $range "' . $range.'"');
     }
 
     /**
@@ -322,7 +316,7 @@ class Navigation
 
             return $start;
         }
-        throw new FireflyException('updateStartDate cannot handle $range ' . $range);
+        throw new FireflyException('updateStartDate cannot handle $range "' . $range.'"');
     }
 
 

app/Support/Search/Search.php

@@ -127,8 +127,7 @@ class Search implements SearchInterface
             }
         );
         $filtered = $set->merge($decrypted);
-
-        $filtered->sortBy(
+        $filtered = $filtered->sortBy(
             function (TransactionJournal $journal) {
                 return intval($journal->date->format('U'));
             }

app/Support/Steam.php

@@ -33,24 +33,11 @@ class Steam
             return $cache->get(); // @codeCoverageIgnore
         }
 
-
-        // find the first known transaction on this account:
-        $firstDateObject = $account
-            ->transactions()
-            ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-            ->orderBy('transaction_journals.date', 'ASC')->first(['transaction_journals.date']);
-
-        $firstDate = is_null($firstDateObject) ? clone $date : new Carbon($firstDateObject->date);
-        $date      = $date < $firstDate ? $firstDate : $date;
-
         bcscale(2);
-        $set     = $account->transactions()->leftJoin(
+
+        $balance = $account->transactions()->leftJoin(
             'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'
-        )->where('transaction_journals.date', '<=', $date->format('Y-m-d'))->get(['transactions.*']);
-        $balance = '0';
-        foreach ($set as $entry) {
-            $balance = bcadd($balance, $entry->amount);
-        }
+        )->where('transaction_journals.date', '<=', $date->format('Y-m-d'))->sum('transactions.amount');
 
         if (!$ignoreVirtualBalance) {
             $balance = bcadd($balance, $account->virtual_balance);

app/Support/Twig/Budget.php

@@ -9,6 +9,7 @@ use Twig_Extension;
 use Twig_SimpleFunction;
 
 /**
+ * @codeCoverageIgnore
  * Class Budget
  *
  * @package FireflyIII\Support\Twig

app/Support/Twig/General.php

@@ -14,6 +14,8 @@ use Twig_SimpleFilter;
 use Twig_SimpleFunction;
 
 /**
+ * @codeCoverageIgnore
+ *
  * Class TwigSupport
  *
  * @package FireflyIII\Support
@@ -204,10 +206,10 @@ class General extends Twig_Extension
             $route = $args[0]; // name of the route.
 
             if (Route::getCurrentRoute()->getName() == $route) {
-                return 'active because-route-matches-strict';
+                return 'active';
             }
 
-            return 'not-xxx-at-all';
+            return '';
         }
         );
     }
@@ -225,10 +227,10 @@ class General extends Twig_Extension
             $args  = func_get_args();
             $route = $args[0]; // name of the route.
             if (!(strpos(Route::getCurrentRoute()->getName(), $route) === false)) {
-                return 'active because-route-matches-non-strict';
+                return 'active';
             }
 
-            return 'not-xxx-at-all';
+            return '';
         }
         );
     }
@@ -249,10 +251,10 @@ class General extends Twig_Extension
             $activeWhat = isset($context['what']) ? $context['what'] : false;
 
             if ($what == $activeWhat && !(strpos(Route::getCurrentRoute()->getName(), $route) === false)) {
-                return 'active because-route-matches-non-strict-what';
+                return 'active';
             }
 
-            return 'not-xxx-at-all';
+            return '';
         }, ['needs_context' => true]
         );
     }

app/Support/Twig/Journal.php

@@ -12,6 +12,8 @@ use Twig_SimpleFilter;
 use Twig_SimpleFunction;
 
 /**
+ * @codeCoverageIgnore
+ *
  * Class Journal
  *
  * @package FireflyIII\Support\Twig
@@ -71,16 +73,16 @@ class Journal extends Twig_Extension
 
             switch ($type) {
                 case 'Withdrawal':
-                    $txt = '<span class="glyphicon glyphicon-arrow-left" title="' . trans('firefly.withdrawal') . '"></span>';
+                    $txt = '<i class="fa fa-long-arrow-left fa-fw" title="' . trans('firefly.withdrawal') . '"></i>';
                     break;
                 case 'Deposit':
-                    $txt = '<span class="glyphicon glyphicon-arrow-right" title="' . trans('firefly.deposit') . '"></span>';
+                    $txt = '<i class="fa fa-long-arrow-right fa-fw" title="' . trans('firefly.deposit') . '"></i>';
                     break;
                 case 'Transfer':
                     $txt = '<i class="fa fa-fw fa-exchange" title="' . trans('firefly.transfer') . '"></i>';
                     break;
                 case 'Opening balance':
-                    $txt = '<span class="glyphicon glyphicon-ban-circle" title="' . trans('firefly.openingBalance') . '"></span>';
+                    $txt = '<i class="fa-fw fa fa-ban" title="' . trans('firefly.openingBalance') . '"></i>';
                     break;
                 default:
                     $txt = '';

app/Support/Twig/PiggyBank.php

@@ -7,6 +7,8 @@ use Twig_Extension;
 use Twig_SimpleFunction;
 
 /**
+ * @codeCoverageIgnore
+ *
  * Class PiggyBank
  *
  * @package FireflyIII\Support\Twig

app/Support/Twig/Translation.php

@@ -6,6 +6,8 @@ use Twig_Extension;
 use Twig_SimpleFilter;
 
 /**
+ * @codeCoverageIgnore
+ *
  * Class Budget
  *
  * @package FireflyIII\Support\Twig

app/User.php

@@ -10,6 +10,8 @@ use Zizaco\Entrust\Traits\EntrustUserTrait;
 /**
  * Class User
  *
+ * @codeCoverageIgnore
+ *
  * @package FireflyIII
  * @property integer                                                                               $id
  * @property \Carbon\Carbon                                                                        $created_at
@@ -24,7 +26,6 @@ use Zizaco\Entrust\Traits\EntrustUserTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[]             $budgets
  * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[]           $categories
  * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Preference[]         $preferences
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Reminder[]           $reminders
  * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereId($value)
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereCreatedAt($value)
@@ -123,14 +124,6 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
         return $this->hasMany('FireflyIII\Models\Preference');
     }
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function reminders()
-    {
-        return $this->hasMany('FireflyIII\Models\Reminder');
-    }
-
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */

app/Validation/FireflyValidator.php

@@ -3,16 +3,15 @@
 namespace FireflyIII\Validation;
 
 use Auth;
-use Carbon\Carbon;
 use Config;
 use Crypt;
 use DB;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
+use FireflyIII\Models\PiggyBank;
 use FireflyIII\User;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Validation\Validator;
-use Navigation;
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
@@ -55,35 +54,6 @@ class FireflyValidator extends Validator
 
     }
 
-    /**
-     * @return bool
-     */
-    public function validatePiggyBankReminder()
-    {
-        $array = $this->data;
-        // no reminder? dont care.
-        if (!isset($array['remind_me'])) {
-            return true;
-        }
-
-        // get or set start date & target date:
-        $startDate  = isset($array['startdate']) ? new Carbon($array['startdate']) : new Carbon;
-        $targetDate = isset($array['targetdate']) && strlen($array['targetdate']) > 0 ? new Carbon($array['targetdate']) : null;
-
-        // target date is null? reminder period is always good.
-        if ($array['remind_me'] == '1' && is_null($targetDate)) {
-            return true;
-        }
-
-        $nextReminder = Navigation::addPeriod($startDate, $array['reminder'], 0);
-        // reminder is beyond target?
-        if ($nextReminder > $targetDate) {
-            return false;
-        }
-
-        return true;
-    }
-
     /**
      * @param $attribute
      * @param $value
@@ -105,6 +75,10 @@ class FireflyValidator extends Validator
         if (isset($this->data['account_type_id'])) {
             return $this->validateByAccountTypeId($value, $parameters);
         }
+        if (isset($this->data['id'])) {
+            return $this->validateByAccountId($value);
+        }
+
 
         return false;
     }
@@ -197,6 +171,33 @@ class FireflyValidator extends Validator
 
     }
 
+    /**
+     * @param $value
+     * @param $parameters
+     *
+     * @return bool
+     */
+    protected function validateByAccountId($value)
+    {
+        /** @var Account $existingAccount */
+        $existingAccount = Account::find($this->data['id']);
+
+        $type   = $existingAccount->accountType;
+        $ignore = $existingAccount->id;
+        $value  = $this->tryDecrypt($value);
+
+        $set = Auth::user()->accounts()->where('account_type_id', $type->id)->where('id', '!=', $ignore)->get();
+        /** @var Account $entry */
+        foreach ($set as $entry) {
+            if ($entry->name == $value) {
+                return false;
+            }
+        }
+
+        return true;
+
+    }
+
     /**
      * @param $attribute
      * @param $value
@@ -273,6 +274,7 @@ class FireflyValidator extends Validator
         }
         $set = $query->get(['piggy_banks.*']);
 
+        /** @var PiggyBank $entry */
         foreach ($set as $entry) {
             $fieldValue = $this->tryDecrypt($entry->name);
             if ($fieldValue == $value) {

bootstrap/app.php

@@ -28,7 +28,6 @@ $app = new Illuminate\Foundation\Application(
 */
 
 
-
 $app->singleton(
     'Illuminate\Contracts\Http\Kernel',
     'FireflyIII\Http\Kernel'
@@ -45,8 +44,6 @@ $app->singleton(
 );
 
 
-
-
 /*
 |--------------------------------------------------------------------------
 | Return The Application

bootstrap/autoload.php

@@ -14,7 +14,7 @@ define('LARAVEL_START', microtime(true));
 |
 */
 
-require __DIR__.'/../vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 /*
 |--------------------------------------------------------------------------
@@ -27,9 +27,8 @@ require __DIR__.'/../vendor/autoload.php';
 |
 */
 
-$compiledPath = __DIR__.'/../storage/framework/compiled.php';
+$compiledPath = __DIR__ . '/cache/compiled.php';
 
-if (file_exists($compiledPath))
-{
-	require $compiledPath;
+if (file_exists($compiledPath)) {
+    require $compiledPath;
 }

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "grumpydictator/firefly-iii",
-    "description": "A web-application to manage your finances. This version will replace grumpydictator/firefly when it's finished.",
+    "description": "Firefly III: a personal finances manager.",
     "keywords": ["finance", "finances", "manager", "euro", "laravel", "money", "financials", "budgets", "transactions", "transfers", "management"],
     "license": "MIT",
     "homepage": "https://github.com/JC5/firefly-iii",
@@ -20,7 +20,7 @@
 
     },
     "require": {
-        "laravel/framework": "5.0.*",
+        "laravel/framework": "5.1.*",
         "davejamesmiller/laravel-breadcrumbs": "~3.0",
         "grumpydictator/gchart": "~1",
         "watson/validating": "~1.0",
@@ -40,9 +40,6 @@
         "league/factory-muffin": "~2.1",
         "codeclimate/php-test-reporter": "^0.1.2",
         "fzaninotto/faker": "^1.4"
-
-
-
     },
     "autoload": {
         "classmap": [