Merge branch 'hotfix/chart-fix'

* 'develop' of https://github.com/JC5/firefly-iii:
  Fix a bug where the frontpage would not honor transaction order.
  Fix a bug where the report page would mess up the session dates.

.env.example

@@ -1,6 +1,7 @@
 APP_ENV=production
 APP_DEBUG=false
-APP_KEY=SomeRandomString
+APP_KEY=SomeRandomStringOf32CharsExactly
+
 
 DB_CONNECTION=mysql
 DB_HOST=localhost
@@ -11,14 +12,22 @@ DB_PASSWORD=secret
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 
+DEFAULT_CURRENCY=EUR
+DEFAULT_LANGUAGE=en_US
+
 EMAIL_SMTP=
 EMAIL_DRIVER=smtp
 EMAIL_USERNAME=
 EMAIL_PASSWORD=
-ANALYTICS_ID=
 EMAIL_PRETEND=false
+
+SHOW_INCOMPLETE_TRANSLATIONS=false
+
+ANALYTICS_ID=
 RUNCLEANUP=true
 SITE_OWNER=mail@example.com
 
 SENDGRID_USERNAME=
-SENDGRID_PASSWORD=
+SENDGRID_PASSWORD=
+
+BLOCKED_DOMAINS=

.gitignore

@@ -5,7 +5,7 @@ Thumbs.db
 .idea/
 tests/_output/*
 _ide_helper.php
-/build/logs/clover.xml
+/build/logs
 index.html*
 app/storage/firefly-export*
 .vagrant

.travis.yml

@@ -10,6 +10,9 @@ install:
   - composer update
   - php artisan env
   - mv -v .env.testing .env
+  - touch storage/database/testing.db
+  - php artisan migrate --env=testing
+  - php artisan migrate --seed --env=testing
 
 script:
   - phpunit

README.md

@@ -19,7 +19,6 @@ their current cashflow. There are tons of ways to save and earn money.
 
 Firefly works on the principle that if you know where you're money is going, you can stop it from going there.
 
- 
 To get to know Firefly, and to see if it fits you, check out these resources:
 
 - The screenshots below on this very page.
@@ -61,19 +60,19 @@ Everything is organised:
 
 _Please note that everything in these screenshots is fictional and may not be realistic._
 
-![Index](https://i.nder.be/c6hz06d3)
+![Index](https://i.nder.be/hmp5mhw5)
 
-![Accounts](https://i.nder.be/gzxxyz6n)
+![Accounts](https://i.nder.be/hf5k02g9)
 
-![Budgets](https://i.nder.be/hhu3krqk)
+![Budgets](https://i.nder.be/gzv635mz)
 
-![Reports 1](https://i.nder.be/cc3yspf6)
+![Reports 1](https://i.nder.be/g0w698s3)
 
-![Reports 2](https://i.nder.be/h6fp7xkb)
+![Reports 2](https://i.nder.be/cr77nyxq)
 
-![Bills](https://i.nder.be/c30zkcpv)
+![Bills](https://i.nder.be/c7sugsz5)
 
-![Piggy banks](https://i.nder.be/g20k0mdq)
+![Piggy banks](https://i.nder.be/gy2nk0y4)
 
 ## Running and installing
 
@@ -82,7 +81,19 @@ If you're still interested please read [the installation guide](https://github.c
 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.
+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. Accounts on the demo sites will stop working after one month. It's a trial.
+
+## Security
+
+You should always run Firefly III on a site with TLS enabled (https://). Please note that although some parts of the
+database are encrypted (transaction descriptions, names, etc.) some parts are _not_ (amounts, dates, etc). If you need
+more security, you must enable transparent database encryption or a comparable technology. Please remember that this
+is open source software under active development, and it is in no way guaranteed to be safe or secure.
+
+## Translations
+
+Firefly III is currently available in Dutch and English. Support for other languages is being worked on. I can use
+your help. Checkout [Crowdin](https://crowdin.com/project/firefly-iii) for more information.
 
 ## Credits
 

app/Generator/Chart/Account/AccountChartGenerator.php

@@ -14,15 +14,6 @@ use Illuminate\Support\Collection;
 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
@@ -40,4 +31,13 @@ interface AccountChartGenerator
      * @return array
      */
     public function single(Account $account, Carbon $start, Carbon $end);
+
+    /**
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return array
+     */
+    public function expenseAccounts(Collection $accounts, Carbon $start, Carbon $end);
 }

app/Generator/Chart/Account/ChartJsAccountChartGenerator.php

@@ -3,10 +3,8 @@
 namespace FireflyIII\Generator\Chart\Account;
 
 use Carbon\Carbon;
-use Config;
 use FireflyIII\Models\Account;
 use Illuminate\Support\Collection;
-use Preferences;
 use Steam;
 
 /**
@@ -17,21 +15,69 @@ use Steam;
 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)
+    public function expenseAccounts(Collection $accounts, Carbon $start, Carbon $end)
     {
-        return $this->frontpage($accounts, $start, $end);
+        $data = [
+            'count'  => 1,
+            'labels' => [], 'datasets' => [[
+                                               'label' => trans('firefly.spent'),
+                                               'data'  => []]]];
+
+        bcscale(2);
+        $start->subDay();
+        $ids           = $this->getIdsFromCollection($accounts);
+        $startBalances = Steam::balancesById($ids, $start);
+        $endBalances   = Steam::balancesById($ids, $end);
+
+        $accounts->each(
+            function (Account $account) use ($startBalances, $endBalances) {
+                $id                  = $account->id;
+                $startBalance        = $this->isInArray($startBalances, $id);
+                $endBalance          = $this->isInArray($endBalances, $id);
+                $diff                = bcsub($endBalance, $startBalance);
+                $account->difference = round($diff, 2);
+            }
+        );
+
+        $accounts = $accounts->sortByDesc(
+            function (Account $account) {
+                return $account->difference;
+            }
+        );
+
+        foreach ($accounts as $account) {
+            if ($account->difference > 0) {
+                $data['labels'][]              = $account->name;
+                $data['datasets'][0]['data'][] = $account->difference;
+            }
+        }
+
+        return $data;
     }
 
+    /**
+     * @param $array
+     * @param $entryId
+     *
+     * @return string
+     */
+    protected function isInArray($array, $entryId)
+    {
+        if (isset($array[$entryId])) {
+            return $array[$entryId];
+        }
+
+        return '0';
+    }
+
+
     /**
      * @param Collection $accounts
      * @param Carbon     $start
@@ -42,21 +88,21 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator
     public function frontpage(Collection $accounts, Carbon $start, Carbon $end)
     {
         // language:
-        $language = Preferences::get('language', 'en')->data;
-        $format   = Config::get('firefly.monthAndDay.' . $language);
-        $data     = [
+        $format  = trans('config.month_and_day');
+        $data    = [
             'count'    => 0,
             'labels'   => [],
             'datasets' => [],
         ];
-        $current  = clone $start;
+        $current = clone $start;
         while ($current <= $end) {
             $data['labels'][] = $current->formatLocalized($format);
             $current->addDay();
         }
 
+
         foreach ($accounts as $account) {
-            $set     = [
+            $set      = [
                 'label'                => $account->name,
                 'fillColor'            => 'rgba(220,220,220,0.2)',
                 'strokeColor'          => 'rgba(220,220,220,1)',
@@ -66,9 +112,15 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator
                 'pointHighlightStroke' => 'rgba(220,220,220,1)',
                 'data'                 => [],
             ];
-            $current = clone $start;
+            $current  = clone $start;
+            $range    = Steam::balanceInRange($account, $start, $end);
+            $previous = array_values($range)[0];
             while ($current <= $end) {
-                $set['data'][] = Steam::balance($account, $current);
+                $format  = $current->format('Y-m-d');
+                $balance = isset($range[$format]) ? $range[$format] : $previous;
+
+                $set['data'][] = $balance;
+                $previous      = $balance;
                 $current->addDay();
             }
             $data['datasets'][] = $set;
@@ -88,8 +140,7 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator
     public function single(Account $account, Carbon $start, Carbon $end)
     {
         // language:
-        $language = Preferences::get('language', 'en')->data;
-        $format   = Config::get('firefly.monthAndDay.' . $language);
+        $format = trans('config.month_and_day');
 
         $data = [
             'count'    => 1,
@@ -112,4 +163,20 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator
 
         return $data;
     }
+
+    /**
+     * @param Collection $collection
+     *
+     * @return array
+     */
+    protected function getIdsFromCollection(Collection $collection)
+    {
+        $ids = [];
+        foreach ($collection as $entry) {
+            $ids[] = $entry->id;
+        }
+
+        return array_unique($ids);
+
+    }
 }

app/Generator/Chart/Account/GoogleAccountChartGenerator.php

@@ -1,97 +0,0 @@
-<?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)
-    {
-        return $this->all($accounts, $start, $end);
-    }
-
-    /**
-     * @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/ChartJsBillChartGenerator.php

@@ -33,7 +33,7 @@ class ChartJsBillChartGenerator implements BillChartGenerator
         /** @var TransactionJournal $entry */
         foreach ($paid as $entry) { // loop paid and create single entry:
             $paidDescriptions[] = $entry->description;
-            $paidAmount         = bcadd($paidAmount, $entry->amount);
+            $paidAmount         = bcadd($paidAmount, $entry->amount_positive);
         }
         /** @var Bill $entry */
         foreach ($unpaid as $entry) { // loop unpaid:
@@ -71,8 +71,7 @@ class ChartJsBillChartGenerator implements BillChartGenerator
     public function single(Bill $bill, Collection $entries)
     {
         // language:
-        $language = Preferences::get('language', 'en')->data;
-        $format   = Config::get('firefly.month.' . $language);
+        $format   = trans('config.month');
 
         $data = [
             'count'    => 3,
@@ -91,7 +90,7 @@ class ChartJsBillChartGenerator implements BillChartGenerator
             $data['labels'][] = $entry->date->formatLocalized($format);
             $minAmount[]      = round($bill->amount_min, 2);
             $maxAmount[]      = round($bill->amount_max, 2);
-            $actualAmount[]   = round($entry->amount, 2);
+            $actualAmount[]   = round(($entry->amount * -1), 2);
         }
 
         $data['datasets'][] = [

app/Generator/Chart/Bill/GoogleBillChartGenerator.php

@@ -1,94 +0,0 @@
-<?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;
-
-        bcscale(2);
-
-
-        /** @var TransactionJournal $entry */
-        foreach ($paid as $entry) {
-
-            $paidDescriptions[] = $entry->description;
-            $paidAmount         = bcadd($paidAmount, $entry->amount);
-        }
-
-        // loop unpaid:
-        /** @var Bill $entry */
-        foreach ($unpaid as $entry) {
-            $description          = $entry[0]->name . ' (' . $entry[1]->format('jS M Y') . ')';
-            $amount               = bcdiv(bcadd($entry[0]->amount_max, $entry[0]->amount_min), 2);
-            $unpaidDescriptions[] = $description;
-            $unpaidAmount         = bcadd($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,
-                round($bill->amount_max, 2),
-                round($bill->amount_min, 2),
-                round($result->amount, 2)
-            );
-        }
-
-        $chart->generate();
-
-        return $chart->getData();
-    }
-}

app/Generator/Chart/Budget/BudgetChartGenerator.php

@@ -32,6 +32,13 @@ interface BudgetChartGenerator
      */
     public function frontpage(Collection $entries);
 
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function multiYear(Collection $entries);
+
     /**
      * @param Collection $budgets
      * @param Collection $entries

app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php

@@ -24,7 +24,7 @@ class ChartJsBudgetChartGenerator implements BudgetChartGenerator
     public function budget(Collection $entries, $dateFormat = 'month')
     {
         // language:
-        $language = Preferences::get('language', 'en')->data;
+        $language = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US'))->data;
         $format   = Config::get('firefly.' . $dateFormat . '.' . $language);
 
         $data = [
@@ -33,7 +33,7 @@ class ChartJsBudgetChartGenerator implements BudgetChartGenerator
                 [
                     'label' => 'Amount',
                     'data'  => [],
-                ]
+                ],
             ],
         ];
 
@@ -115,8 +115,7 @@ class ChartJsBudgetChartGenerator implements BudgetChartGenerator
     public function year(Collection $budgets, Collection $entries)
     {
         // language:
-        $language = Preferences::get('language', 'en')->data;
-        $format   = Config::get('firefly.month.' . $language);
+        $format = trans('config.month');
 
         $data = [
             'labels'   => [],
@@ -141,4 +140,37 @@ class ChartJsBudgetChartGenerator implements BudgetChartGenerator
 
         return $data;
     }
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function multiYear(Collection $entries)
+    {
+        // dataset:
+        $data = [
+            'count'    => 0,
+            'labels'   => [],
+            'datasets' => [],
+        ];
+        // get labels from one of the budgets (assuming there's at least one):
+        $first = $entries->first();
+        foreach ($first['budgeted'] as $year => $noInterest) {
+            $data['labels'][] = strval($year);
+        }
+
+        // then, loop all entries and create datasets:
+        foreach ($entries as $entry) {
+            $name               = $entry['name'];
+            $spent              = $entry['spent'];
+            $budgeted           = $entry['budgeted'];
+            $data['datasets'][] = ['label' => 'Spent on ' . $name, 'data' => array_values($spent)];
+            $data['datasets'][] = ['label' => 'Budgeted for ' . $name, 'data' => array_values($budgeted)];
+        }
+        $data['count'] = count($data['datasets']);
+
+        return $data;
+
+    }
 }

app/Generator/Chart/Budget/GoogleBudgetChartGenerator.php

@@ -1,102 +0,0 @@
-<?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

@@ -19,6 +19,14 @@ interface CategoryChartGenerator
      */
     public function all(Collection $entries);
 
+    /**
+     * @param Collection $categories
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function earnedInPeriod(Collection $categories, Collection $entries);
+
     /**
      * @param Collection $entries
      *
@@ -31,8 +39,14 @@ interface CategoryChartGenerator
      *
      * @return array
      */
-    public function month(Collection $entries);
+    public function multiYear(Collection $entries);
 
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function period(Collection $entries);
 
     /**
      * @param Collection $categories
@@ -40,5 +54,5 @@ interface CategoryChartGenerator
      *
      * @return array
      */
-    public function year(Collection $categories, Collection $entries);
+    public function spentInYear(Collection $categories, Collection $entries);
 }

app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php

@@ -2,9 +2,7 @@
 
 namespace FireflyIII\Generator\Chart\Category;
 
-use Config;
 use Illuminate\Support\Collection;
-use Preferences;
 
 
 /**
@@ -17,31 +15,35 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
 
     /**
      * @param Collection $entries
-     * @param string     $dateFormat
      *
      * @return array
      */
-    public function all(Collection $entries, $dateFormat = 'month')
+    public function all(Collection $entries)
     {
 
-        // language:
-        $language = Preferences::get('language', 'en')->data;
-        $format   = Config::get('firefly.' . $dateFormat . '.' . $language);
 
         $data = [
-            'count'    => 1,
+            'count'    => 2,
             'labels'   => [],
             'datasets' => [
                 [
                     'label' => trans('firefly.spent'),
                     'data'  => []
+                ],
+                [
+                    'label' => trans('firefly.earned'),
+                    'data'  => []
                 ]
             ],
         ];
 
         foreach ($entries as $entry) {
-            $data['labels'][]              = $entry[0]->formatLocalized($format);
-            $data['datasets'][0]['data'][] = round($entry[1], 2);
+            $data['labels'][] = $entry[1];
+            $spent            = round($entry[2], 2);
+            $earned           = round($entry[3], 2);
+
+            $data['datasets'][0]['data'][] = $spent == 0 ? null : $spent * -1;
+            $data['datasets'][1]['data'][] = $earned == 0 ? null : $earned;
         }
 
         return $data;
@@ -67,7 +69,7 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
         foreach ($entries as $entry) {
             if ($entry['sum'] != 0) {
                 $data['labels'][]              = $entry['name'];
-                $data['datasets'][0]['data'][] = round($entry['sum'], 2);
+                $data['datasets'][0]['data'][] = round(($entry['sum'] * -1), 2);
             }
         }
 
@@ -81,9 +83,9 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
      *
      * @return array
      */
-    public function month(Collection $entries)
+    public function period(Collection $entries)
     {
-        return $this->all($entries, 'monthAndDay');
+        return $this->all($entries);
 
     }
 
@@ -93,12 +95,11 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
      *
      * @return array
      */
-    public function year(Collection $categories, Collection $entries)
+    public function spentInYear(Collection $categories, Collection $entries)
     {
 
         // language:
-        $language = Preferences::get('language', 'en')->data;
-        $format   = Config::get('firefly.month.' . $language);
+        $format = trans('config.month');
 
         $data = [
             'count'    => 0,
@@ -120,4 +121,107 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
         return $data;
 
     }
+
+    /**
+     * @param Collection $categories
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function earnedInPeriod(Collection $categories, Collection $entries)
+    {
+
+        // language:
+        $format = trans('config.month');
+
+        $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;
+
+    }
+
+    /**
+     * @param Collection $categories
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function spentInPeriod(Collection $categories, Collection $entries)
+    {
+
+        // language:
+        $format = trans('config.month');
+
+        $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;
+
+    }
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function multiYear(Collection $entries)
+    {
+        // dataset:
+        $data = [
+            'count'    => 0,
+            'labels'   => [],
+            'datasets' => [],
+        ];
+        // get labels from one of the categories (assuming there's at least one):
+        $first = $entries->first();
+        foreach ($first['spent'] as $year => $noInterest) {
+            $data['labels'][] = strval($year);
+        }
+
+        // then, loop all entries and create datasets:
+        foreach ($entries as $entry) {
+            $name   = $entry['name'];
+            $spent  = $entry['spent'];
+            $earned = $entry['earned'];
+            if (array_sum(array_values($spent)) != 0) {
+                $data['datasets'][] = ['label' => 'Spent in category ' . $name, 'data' => array_values($spent)];
+            }
+            if (array_sum(array_values($earned)) != 0) {
+                $data['datasets'][] = ['label' => 'Earned in category ' . $name, 'data' => array_values($earned)];
+            }
+        }
+        $data['count'] = count($data['datasets']);
+
+        return $data;
+
+    }
 }

app/Generator/Chart/Category/GoogleCategoryChartGenerator.php

@@ -1,106 +0,0 @@
-<?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

@@ -9,7 +9,7 @@ use Preferences;
 
 
 /**
- * Class GooglePiggyBankChartGenerator
+ * Class ChartJsPiggyBankChartGenerator
  *
  * @package FireflyIII\Generator\Chart\PiggyBank
  */
@@ -25,8 +25,7 @@ class ChartJsPiggyBankChartGenerator implements PiggyBankChartGenerator
     {
 
         // language:
-        $language = Preferences::get('language', 'en')->data;
-        $format   = Config::get('firefly.monthAndDay.' . $language);
+        $format   = trans('config.month_and_day');
 
         $data = [
             'count'    => 1,

app/Generator/Chart/PiggyBank/GooglePiggyBankChartGenerator.php

@@ -1,41 +0,0 @@
-<?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/Report/ChartJsReportChartGenerator.php

@@ -7,7 +7,7 @@ use Illuminate\Support\Collection;
 use Preferences;
 
 /**
- * Class GoogleReportChartGenerator
+ * Class ChartJsReportChartGenerator
  *
  * @package FireflyIII\Generator\Chart\Report
  */
@@ -22,8 +22,7 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
     public function yearInOut(Collection $entries)
     {
         // language:
-        $language = Preferences::get('language', 'en')->data;
-        $format   = Config::get('firefly.month.' . $language);
+        $format   = trans('config.month');
 
         $data = [
             'count'    => 2,
@@ -49,6 +48,39 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
         return $data;
     }
 
+    /**
+     * Same as above but other translations.
+     *
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function multiYearInOut(Collection $entries)
+    {
+        $data = [
+            'count'    => 2,
+            'labels'   => [],
+            'datasets' => [
+                [
+                    'label' => trans('firefly.income'),
+                    'data'  => []
+                ],
+                [
+                    'label' => trans('firefly.expenses'),
+                    'data'  => []
+                ]
+            ],
+        ];
+
+        foreach ($entries as $entry) {
+            $data['labels'][]              = $entry[0]->formatLocalized('%Y');
+            $data['datasets'][0]['data'][] = round($entry[1], 2);
+            $data['datasets'][1]['data'][] = round($entry[2], 2);
+        }
+
+        return $data;
+    }
+
     /**
      * @param string $income
      * @param string $expense
@@ -80,4 +112,35 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
 
         return $data;
     }
+
+    /**
+     * @param string $income
+     * @param string $expense
+     * @param int    $count
+     *
+     * @return array
+     */
+    public function multiYearInOutSummarized($income, $expense, $count)
+    {
+        $data                          = [
+            'count'    => 2,
+            'labels'   => [trans('firefly.sum_of_years'), trans('firefly.average_of_years')],
+            '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

@@ -1,58 +0,0 @@
-<?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

@@ -12,6 +12,22 @@ use Illuminate\Support\Collection;
 interface ReportChartGenerator
 {
 
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function multiYearInOut(Collection $entries);
+
+    /**
+     * @param string $income
+     * @param string $expense
+     * @param int    $count
+     *
+     * @return array
+     */
+    public function multiYearInOutSummarized($income, $expense, $count);
+
     /**
      * @param Collection $entries
      *

app/Handlers/Events/ConnectJournalToPiggyBank.php

@@ -53,7 +53,7 @@ class ConnectJournalToPiggyBank
         }
         bcscale(2);
 
-        $amount = $journal->actual_amount;
+        $amount = $journal->amount_positive;
         // if piggy account matches source account, the amount is positive
         if ($piggyBank->account_id == $journal->source_account->id) {
             $amount = $amount * -1;

app/Helpers/Collection/BalanceLine.php

@@ -150,24 +150,4 @@ class BalanceLine
     {
         $this->balanceEntries = $balanceEntries;
     }
-
-    /**
-     * If the BalanceEntries for a BalanceLine have a "left" value, the amount
-     * of money left in the entire BalanceLine is returned here:
-     *
-     * @return float
-     */
-    public function sumOfLeft()
-    {
-        $sum = '0';
-        bcscale(2);
-        /** @var BalanceEntry $balanceEntry */
-        foreach ($this->getBalanceEntries() as $balanceEntry) {
-            $sum = bcadd($sum, $balanceEntry->getLeft());
-        }
-
-        return $sum;
-    }
-
-
 }

app/Helpers/Collection/Category.php

@@ -34,8 +34,10 @@ class Category
      */
     public function addCategory(CategoryModel $category)
     {
-        if ($category->spent > 0) {
+        // spent is minus zero for an expense report:
+        if ($category->spent < 0) {
             $this->categories->push($category);
+            $this->addTotal($category->spent);
         }
     }
 
@@ -54,7 +56,7 @@ class Category
      */
     public function getCategories()
     {
-        $set = $this->categories->sortByDesc(
+        $set = $this->categories->sortBy(
             function (CategoryModel $category) {
                 return $category->spent;
             }

app/Helpers/Collection/Expense.php

@@ -33,19 +33,24 @@ class Expense
      */
     public function addOrCreateExpense(TransactionJournal $entry)
     {
+        bcscale(2);
 
         $accountId = $entry->account_id;
+        $amount    = strval(round($entry->amount, 2));
+        if (bccomp('0', $amount) === -1) {
+            $amount = bcmul($amount, '-1');
+        }
+
         if (!$this->expenses->has($accountId)) {
             $newObject         = new stdClass;
-            $newObject->amount = strval(round($entry->amount, 2));
+            $newObject->amount = $amount;
             $newObject->name   = $entry->name;
             $newObject->count  = 1;
             $newObject->id     = $accountId;
             $this->expenses->put($accountId, $newObject);
         } else {
-            bcscale(2);
             $existing         = $this->expenses->get($accountId);
-            $existing->amount = bcadd($existing->amount, $entry->amount);
+            $existing->amount = bcadd($existing->amount, $amount);
             $existing->count++;
             $this->expenses->put($accountId, $existing);
         }
@@ -56,8 +61,18 @@ class Expense
      */
     public function addToTotal($add)
     {
-        $add = strval(round($add, 2));
         bcscale(2);
+
+
+        $add = strval(round($add, 2));
+        if (bccomp('0', $add) === -1) {
+            $add = bcmul($add, '-1');
+        }
+
+        // if amount is positive, the original transaction
+        // was a transfer. But since this is an expense report,
+        // that amount must be negative.
+
         $this->total = bcadd($this->total, $add);
     }
 
@@ -66,7 +81,7 @@ class Expense
      */
     public function getExpenses()
     {
-        $set = $this->expenses->sortByDesc(
+        $set = $this->expenses->sortBy(
             function (stdClass $object) {
                 return $object->amount;
             }

app/Helpers/Collection/Income.php

@@ -38,7 +38,7 @@ class Income
         $accountId = $entry->account_id;
         if (!$this->incomes->has($accountId)) {
             $newObject         = new stdClass;
-            $newObject->amount = strval(round($entry->amount, 2));
+            $newObject->amount = strval(round($entry->amount_positive, 2));
             $newObject->name   = $entry->name;
             $newObject->count  = 1;
             $newObject->id     = $accountId;
@@ -46,7 +46,7 @@ class Income
         } else {
             bcscale(2);
             $existing         = $this->incomes->get($accountId);
-            $existing->amount = bcadd($existing->amount, $entry->amount);
+            $existing->amount = bcadd($existing->amount, $entry->amount_positive);
             $existing->count++;
             $this->incomes->put($accountId, $existing);
         }

app/Helpers/Csv/Converter/Date.php

@@ -3,6 +3,9 @@
 namespace FireflyIII\Helpers\Csv\Converter;
 
 use Carbon\Carbon;
+use FireflyIII\Exceptions\FireflyException;
+use InvalidArgumentException;
+use Log;
 use Session;
 
 /**
@@ -19,8 +22,16 @@ class Date extends BasicConverter implements ConverterInterface
     public function convert()
     {
         $format = Session::get('csv-date-format');
+        try {
+            $date = Carbon::createFromFormat($format, $this->value);
+        } catch (InvalidArgumentException $e) {
+            Log::error('Date conversion error: ' . $e->getMessage() . '. Value was "' . $this->value . '", format was "' . $format . '".');
+
+            $message = trans('firefly.csv_date_parse_error', ['format' => $format, 'value' => $this->value]);
+
+            throw new FireflyException($message);
+        }
 
-        $date = Carbon::createFromFormat($format, $this->value);
 
         return $date;
     }

app/Helpers/Csv/Importer.php

@@ -124,7 +124,7 @@ class Importer
      */
     protected function parseRow($index)
     {
-        return (($this->data->hasHeaders() && $index > 1) || !$this->data->hasHeaders());
+        return (($this->data->hasHeaders() && $index >= 1) || !$this->data->hasHeaders());
     }
 
     /**
@@ -296,7 +296,7 @@ class Importer
 
         // some debug info:
         $journalId = $journal->id;
-        $type      = $journal->transactionType->type;
+        $type      = $journal->getTransactionType();
         /** @var Account $asset */
         $asset = $this->importData['asset-account-object'];
         /** @var Account $opposing */
@@ -314,13 +314,13 @@ class Importer
      */
     protected function getTransactionType()
     {
-        $transactionType = TransactionType::where('type', 'Deposit')->first();
+        $transactionType = TransactionType::where('type', TransactionType::DEPOSIT)->first();
         if ($this->importData['amount'] < 0) {
-            $transactionType = TransactionType::where('type', 'Withdrawal')->first();
+            $transactionType = TransactionType::where('type', TransactionType::WITHDRAWAL)->first();
         }
 
         if (in_array($this->importData['opposing-account-object']->accountType->type, ['Asset account', 'Default account'])) {
-            $transactionType = TransactionType::where('type', 'Transfer')->first();
+            $transactionType = TransactionType::where('type', TransactionType::TRANSFER)->first();
         }
 
         return $transactionType;

app/Helpers/Csv/PostProcessing/Currency.php

@@ -24,7 +24,7 @@ class Currency implements PostProcessorInterface
 
         // fix currency
         if (is_null($this->data['currency'])) {
-            $currencyPreference     = Preferences::get('currencyPreference', 'EUR');
+            $currencyPreference     = Preferences::get('currencyPreference', env('DEFAULT_CURRENCY', 'EUR'));
             $this->data['currency'] = TransactionCurrency::whereCode($currencyPreference->data)->first();
         }
 

app/Helpers/Report/ReportHelper.php

@@ -19,6 +19,8 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\Budget as BudgetModel;
 use FireflyIII\Models\LimitRepetition;
+use Illuminate\Support\Collection;
+use Steam;
 
 /**
  * Class ReportHelper
@@ -43,48 +45,113 @@ class ReportHelper implements ReportHelperInterface
 
     }
 
+    /**
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return CategoryCollection
+     */
+    public function getCategoryReport(Carbon $start, Carbon $end, Collection $accounts)
+    {
+        $object = new CategoryCollection;
+
+        /**
+         * GET CATEGORIES:
+         */
+        /** @var \FireflyIII\Repositories\Category\CategoryRepositoryInterface $repository */
+        $repository = app('FireflyIII\Repositories\Category\CategoryRepositoryInterface');
+        $set        = $repository->getCategories();
+        foreach ($set as $category) {
+            $spent           = $repository->balanceInPeriod($category, $start, $end, $accounts);
+            $category->spent = $spent;
+            $object->addCategory($category);
+        }
+
+        return $object;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return array
+     */
+    public function listOfMonths(Carbon $date)
+    {
+
+        $start  = clone $date;
+        $end    = Carbon::now();
+        $months = [];
+        while ($start <= $end) {
+            $year = $start->year;
+
+            if (!isset($months[$year])) {
+                $months[$year] = [
+                    'start'  => Carbon::createFromDate($year, 1, 1)->format('Y-m-d'),
+                    'end'    => Carbon::createFromDate($year, 12, 31)->format('Y-m-d'),
+                    'months' => [],
+                ];
+            }
+
+            $currentEnd = clone $start;
+            $currentEnd->endOfMonth();
+            $months[$year]['months'][] = [
+                'formatted' => $start->formatLocalized('%B %Y'),
+                'start'     => $start->format('Y-m-d'),
+                'end'       => $currentEnd->format('Y-m-d'),
+                'month'     => $start->month,
+                'year'      => $year,
+            ];
+            $start->addMonth();
+        }
+
+        return $months;
+    }
 
     /**
      * This method generates a full report for the given period on all
-     * the users asset and cash accounts.
+     * given accounts
      *
-     * @param Carbon $date
-     * @param Carbon $end
-     * @param        $shared
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
      * @return AccountCollection
      */
-    public function getAccountReport(Carbon $date, Carbon $end, $shared)
+    public function getAccountReport(Carbon $start, Carbon $end, Collection $accounts)
     {
-
-
-        $accounts = $this->query->getAllAccounts($date, $end, $shared);
-        $start    = '0';
-        $end      = '0';
-        $diff     = '0';
+        $startAmount = '0';
+        $endAmount   = '0';
+        $diff        = '0';
         bcscale(2);
 
-        // remove cash account, if any:
-        $accounts = $accounts->filter(
-            function (Account $account) {
-                if ($account->accountType->type != 'Cash account') {
-                    return $account;
-                }
+        $accounts->each(
+            function (Account $account) use ($start, $end) {
+                /**
+                 * The balance for today always incorporates transactions
+                 * made on today. So to get todays "start" balance, we sub one
+                 * day.
+                 */
+                $yesterday = clone $start;
+                $yesterday->subDay();
 
-                return null;
+                /** @noinspection PhpParamsInspection */
+                $account->startBalance = Steam::balance($account, $yesterday);
+                $account->endBalance   = Steam::balance($account, $end);
             }
         );
 
+
         // summarize:
         foreach ($accounts as $account) {
-            $start = bcadd($start, $account->startBalance);
-            $end   = bcadd($end, $account->endBalance);
-            $diff  = bcadd($diff, bcsub($account->endBalance, $account->startBalance));
+            $startAmount = bcadd($startAmount, $account->startBalance);
+            $endAmount   = bcadd($endAmount, $account->endBalance);
+            $diff        = bcadd($diff, bcsub($account->endBalance, $account->startBalance));
         }
 
         $object = new AccountCollection;
-        $object->setStart($start);
-        $object->setEnd($end);
+        $object->setStart($startAmount);
+        $object->setEnd($endAmount);
         $object->setDifference($diff);
         $object->setAccounts($accounts);
 
@@ -92,37 +159,136 @@ class ReportHelper implements ReportHelperInterface
     }
 
     /**
+     * Get a full report on the users incomes during the period for the given accounts.
      *
-     * The balance report contains a Balance object which in turn contains:
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
-     * A BalanceHeader object which contains all relevant user asset accounts for the report.
+     * @return Income
+     */
+    public function getIncomeReport($start, $end, Collection $accounts)
+    {
+        $object = new Income;
+        $set    = $this->query->incomeInPeriod($start, $end, $accounts);
+        foreach ($set as $entry) {
+            $object->addToTotal($entry->amount_positive);
+            $object->addOrCreateIncome($entry);
+        }
+
+        return $object;
+    }
+
+    /**
+     * Get a full report on the users expenses during the period for a list of accounts.
      *
-     * A number of BalanceLine objects, which hold:
-     * - A budget
-     * - A number of BalanceEntry objects.
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
-     * The BalanceEntry object holds:
-     *   - The same budget (again)
-     *   - A user asset account as mentioned in the BalanceHeader
-     *   - The amount of money spent on the budget by the user asset account
+     * @return Expense
+     */
+    public function getExpenseReport($start, $end, Collection $accounts)
+    {
+        $object = new Expense;
+        $set    = $this->query->expenseInPeriod($start, $end, $accounts);
+        foreach ($set as $entry) {
+            $object->addToTotal($entry->amount); // can be positive, if it's a transfer
+            $object->addOrCreateExpense($entry);
+        }
+
+        return $object;
+    }
+
+    /**
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
-     * @param Carbon  $start
-     * @param Carbon  $end
-     * @param boolean $shared
+     * @return BudgetCollection
+     */
+    public function getBudgetReport(Carbon $start, Carbon $end, Collection $accounts)
+    {
+        $object = new BudgetCollection;
+        /** @var \FireflyIII\Repositories\Budget\BudgetRepositoryInterface $repository */
+        $repository = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface');
+        $set        = $repository->getBudgets();
+
+        bcscale(2);
+
+        foreach ($set as $budget) {
+
+            $repetitions = $repository->getBudgetLimitRepetitions($budget, $start, $end);
+
+            // no repetition(s) for this budget:
+            if ($repetitions->count() == 0) {
+                $spent      = $repository->balanceInPeriod($budget, $start, $end, $accounts);
+                $budgetLine = new BudgetLine;
+                $budgetLine->setBudget($budget);
+                $budgetLine->setOverspent($spent);
+                $object->addOverspent($spent);
+                $object->addBudgetLine($budgetLine);
+                continue;
+            }
+
+            // one or more repetitions for budget:
+            /** @var LimitRepetition $repetition */
+            foreach ($repetitions as $repetition) {
+                $budgetLine = new BudgetLine;
+                $budgetLine->setBudget($budget);
+                $budgetLine->setRepetition($repetition);
+                $expenses = $repository->balanceInPeriod($budget, $start, $end, $accounts);
+
+                // 200 en -100 is 100, vergeleken met 0 === 1
+                // 200 en -200 is 0, vergeleken met 0 === 0
+                // 200 en -300 is -100, vergeleken met 0 === -1
+
+                $left      = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? bcadd($repetition->amount, $expenses) : 0;
+                $spent     = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? $expenses : '0';
+                $overspent = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? '0' : bcadd($expenses, $repetition->amount);
+
+                $budgetLine->setLeft($left);
+                $budgetLine->setSpent($spent);
+                $budgetLine->setOverspent($overspent);
+                $budgetLine->setBudgeted($repetition->amount);
+
+                $object->addBudgeted($repetition->amount);
+                $object->addSpent($spent);
+                $object->addLeft($left);
+                $object->addOverspent($overspent);
+                $object->addBudgetLine($budgetLine);
+
+            }
+
+        }
+
+        // stuff outside of budgets:
+        $noBudget   = $repository->getWithoutBudgetSum($start, $end);
+        $budgetLine = new BudgetLine;
+        $budgetLine->setOverspent($noBudget);
+        $budgetLine->setSpent($noBudget);
+        $object->addOverspent($noBudget);
+        $object->addBudgetLine($budgetLine);
+
+        return $object;
+    }
+
+    /**
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
      * @return Balance
      */
-    public function getBalanceReport(Carbon $start, Carbon $end, $shared)
+    public function getBalanceReport(Carbon $start, Carbon $end, Collection $accounts)
     {
         $repository    = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface');
         $tagRepository = app('FireflyIII\Repositories\Tag\TagRepositoryInterface');
         $balance       = new Balance;
 
         // build a balance header:
-        $header = new BalanceHeader;
-
-        $accounts = $this->query->getAllAccounts($start, $end, $shared);
-        $budgets  = $repository->getBudgets();
+        $header  = new BalanceHeader;
+        $budgets = $repository->getBudgets();
         foreach ($accounts as $account) {
             $header->addAccount($account);
         }
@@ -133,7 +299,8 @@ class ReportHelper implements ReportHelperInterface
             $line->setBudget($budget);
 
             // get budget amount for current period:
-            $rep = $repository->getCurrentRepetition($budget, $start);
+            $rep = $repository->getCurrentRepetition($budget, $start, $end);
+            // could be null?
             $line->setRepetition($rep);
 
             // loop accounts:
@@ -142,7 +309,7 @@ class ReportHelper implements ReportHelperInterface
                 $balanceEntry->setAccount($account);
 
                 // get spent:
-                $spent = $this->query->spentInBudgetCorrected($account, $budget, $start, $end); // I think shared is irrelevant.
+                $spent = $this->query->spentInBudget($account, $budget, $start, $end); // I think shared is irrelevant.
 
                 $balanceEntry->setSpent($spent);
                 $line->addBalanceEntry($balanceEntry);
@@ -153,6 +320,7 @@ class ReportHelper implements ReportHelperInterface
 
         // then a new line for without budget.
         // and one for the tags:
+        // and one for "left unbalanced".
         $empty    = new BalanceLine;
         $tags     = new BalanceLine;
         $diffLine = new BalanceLine;
@@ -164,7 +332,7 @@ class ReportHelper implements ReportHelperInterface
             $spent = $this->query->spentNoBudget($account, $start, $end);
             $left  = $tagRepository->coveredByBalancingActs($account, $start, $end);
             bcscale(2);
-            $diff = bcsub($spent, $left);
+            $diff = bcadd($spent, $left);
 
             // budget
             $budgetEntry = new BalanceEntry;
@@ -199,16 +367,19 @@ class ReportHelper implements ReportHelperInterface
      * This method generates a full report for the given period on all
      * the users bills and their payments.
      *
-     * @param Carbon $start
-     * @param Carbon $end
+     * Excludes bills which have not had a payment on the mentioned accounts.
+     *
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
      * @return BillCollection
      */
-    public function getBillReport(Carbon $start, Carbon $end)
+    public function getBillReport(Carbon $start, Carbon $end, Collection $accounts)
     {
         /** @var \FireflyIII\Repositories\Bill\BillRepositoryInterface $repository */
         $repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface');
-        $bills      = $repository->getBills();
+        $bills      = $repository->getBillsForAccounts($accounts);
         $collection = new BillCollection;
 
         /** @var Bill $bill */
@@ -238,167 +409,5 @@ class ReportHelper implements ReportHelperInterface
         }
 
         return $collection;
-
-    }
-
-    /**
-     * @param Carbon  $start
-     * @param Carbon  $end
-     * @param boolean $shared
-     *
-     * @return BudgetCollection
-     */
-    public function getBudgetReport(Carbon $start, Carbon $end, $shared)
-    {
-        $object = new BudgetCollection;
-        /** @var \FireflyIII\Repositories\Budget\BudgetRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface');
-        $set        = $repository->getBudgets();
-
-        bcscale(2);
-
-        foreach ($set as $budget) {
-
-            $repetitions = $repository->getBudgetLimitRepetitions($budget, $start, $end);
-
-            // no repetition(s) for this budget:
-            if ($repetitions->count() == 0) {
-                $spent      = $repository->spentInPeriodCorrected($budget, $start, $end, $shared);
-                $budgetLine = new BudgetLine;
-                $budgetLine->setBudget($budget);
-                $budgetLine->setOverspent($spent);
-                $object->addOverspent($spent);
-                $object->addBudgetLine($budgetLine);
-                continue;
-            }
-
-            // one or more repetitions for budget:
-            /** @var LimitRepetition $repetition */
-            foreach ($repetitions as $repetition) {
-                $budgetLine = new BudgetLine;
-                $budgetLine->setBudget($budget);
-                $budgetLine->setRepetition($repetition);
-                $expenses  = $repository->spentInPeriodCorrected($budget, $repetition->startdate, $repetition->enddate, $shared);
-                $left      = $expenses < $repetition->amount ? bcsub($repetition->amount, $expenses) : 0;
-                $spent     = $expenses > $repetition->amount ? 0 : $expenses;
-                $overspent = $expenses > $repetition->amount ? bcsub($expenses, $repetition->amount) : 0;
-
-                $budgetLine->setLeft($left);
-                $budgetLine->setSpent($spent);
-                $budgetLine->setOverspent($overspent);
-                $budgetLine->setBudgeted($repetition->amount);
-
-                $object->addBudgeted($repetition->amount);
-                $object->addSpent($spent);
-                $object->addLeft($left);
-                $object->addOverspent($overspent);
-                $object->addBudgetLine($budgetLine);
-
-            }
-
-        }
-
-        // stuff outside of budgets:
-        $noBudget   = $repository->getWithoutBudgetSum($start, $end);
-        $budgetLine = new BudgetLine;
-        $budgetLine->setOverspent($noBudget);
-        $object->addOverspent($noBudget);
-        $object->addBudgetLine($budgetLine);
-
-        return $object;
-    }
-
-    /**
-     * @param Carbon  $start
-     * @param Carbon  $end
-     * @param boolean $shared
-     *
-     * @return CategoryCollection
-     */
-    public function getCategoryReport(Carbon $start, Carbon $end, $shared)
-    {
-        $object = new CategoryCollection;
-
-
-        /**
-         * GET CATEGORIES:
-         */
-        /** @var \FireflyIII\Repositories\Category\CategoryRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Category\CategoryRepositoryInterface');
-        $set        = $repository->getCategories();
-        foreach ($set as $category) {
-            $spent           = $repository->spentInPeriodCorrected($category, $start, $end, $shared);
-            $category->spent = $spent;
-            $object->addCategory($category);
-            $object->addTotal($spent);
-        }
-
-        return $object;
-    }
-
-    /**
-     * Get a full report on the users expenses during the period.
-     *
-     * @param Carbon  $start
-     * @param Carbon  $end
-     * @param boolean $shared
-     *
-     * @return Expense
-     */
-    public function getExpenseReport($start, $end, $shared)
-    {
-        $object = new Expense;
-        $set    = $this->query->expenseInPeriodCorrected($start, $end, $shared);
-        foreach ($set as $entry) {
-            $object->addToTotal($entry->amount);
-            $object->addOrCreateExpense($entry);
-        }
-
-        return $object;
-    }
-
-    /**
-     * Get a full report on the users incomes during the period.
-     *
-     * @param Carbon  $start
-     * @param Carbon  $end
-     * @param boolean $shared
-     *
-     * @return Income
-     */
-    public function getIncomeReport($start, $end, $shared)
-    {
-        $object = new Income;
-        $set    = $this->query->incomeInPeriodCorrected($start, $end, $shared);
-        foreach ($set as $entry) {
-            $object->addToTotal($entry->amount);
-            $object->addOrCreateIncome($entry);
-        }
-
-        return $object;
-    }
-
-    /**
-     * @param Carbon $date
-     *
-     * @return array
-     */
-    public function listOfMonths(Carbon $date)
-    {
-
-        $start  = clone $date;
-        $end    = Carbon::now();
-        $months = [];
-        while ($start <= $end) {
-            $year            = $start->year;
-            $months[$year][] = [
-                'formatted' => $start->formatLocalized('%B %Y'),
-                'month'     => $start->month,
-                'year'      => $year,
-            ];
-            $start->addMonth();
-        }
-
-        return $months;
     }
 }

app/Helpers/Report/ReportHelperInterface.php

@@ -10,6 +10,7 @@ use FireflyIII\Helpers\Collection\Budget as BudgetCollection;
 use FireflyIII\Helpers\Collection\Category as CategoryCollection;
 use FireflyIII\Helpers\Collection\Expense;
 use FireflyIII\Helpers\Collection\Income;
+use Illuminate\Support\Collection;
 
 /**
  * Interface ReportHelperInterface
@@ -21,75 +22,78 @@ interface ReportHelperInterface
 
     /**
      * This method generates a full report for the given period on all
-     * the users asset and cash accounts.
+     * given accounts
      *
-     * @param Carbon  $date
-     * @param Carbon  $end
-     * @param boolean $shared
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
      * @return AccountCollection
      */
-    public function getAccountReport(Carbon $date, Carbon $end, $shared);
+    public function getAccountReport(Carbon $start, Carbon $end, Collection $accounts);
 
     /**
      * This method generates a full report for the given period on all
      * the users bills and their payments.
      *
-     * @param Carbon $start
-     * @param Carbon $end
+     * Excludes bills which have not had a payment on the mentioned accounts.
+     *
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
      * @return BillCollection
      */
-    public function getBillReport(Carbon $start, Carbon $end);
+    public function getBillReport(Carbon $start, Carbon $end, Collection $accounts);
 
     /**
-     * @param Carbon  $start
-     * @param Carbon  $end
-     * @param boolean $shared
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
      * @return Balance
      */
-    public function getBalanceReport(Carbon $start, Carbon $end, $shared);
+    public function getBalanceReport(Carbon $start, Carbon $end, Collection $accounts);
 
     /**
-     * @param Carbon  $start
-     * @param Carbon  $end
-     * @param boolean $shared
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
      * @return BudgetCollection
      */
-    public function getBudgetReport(Carbon $start, Carbon $end, $shared);
+    public function getBudgetReport(Carbon $start, Carbon $end, Collection $accounts);
 
     /**
-     * @param Carbon  $start
-     * @param Carbon  $end
-     * @param boolean $shared
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
      * @return CategoryCollection
      */
-    public function getCategoryReport(Carbon $start, Carbon $end, $shared);
+    public function getCategoryReport(Carbon $start, Carbon $end, Collection $accounts);
 
     /**
-     * Get a full report on the users expenses during the period.
+     * Get a full report on the users expenses during the period for a list of accounts.
      *
-     * @param Carbon  $start
-     * @param Carbon  $end
-     * @param boolean $shared
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
      * @return Expense
      */
-    public function getExpenseReport($start, $end, $shared);
+    public function getExpenseReport($start, $end, Collection $accounts);
 
     /**
-     * Get a full report on the users incomes during the period.
+     * Get a full report on the users incomes during the period for the given accounts.
      *
-     * @param Carbon  $start
-     * @param Carbon  $end
-     * @param boolean $shared
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
      * @return Income
      */
-    public function getIncomeReport($start, $end, $shared);
+    public function getIncomeReport($start, $end, Collection $accounts);
 
     /**
      * @param Carbon $date

app/Helpers/Report/ReportQuery.php

@@ -8,10 +8,10 @@ use Crypt;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionType;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Collection;
-use Steam;
 
 /**
  * Class ReportQuery
@@ -20,185 +20,6 @@ use Steam;
  */
 class ReportQuery implements ReportQueryInterface
 {
-    /**
-     * See ReportQueryInterface::incomeInPeriodCorrected.
-     *
-     * This method's length is caused mainly by the query build stuff. Therefor:
-     *
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     *
-     * @param Carbon $start
-     * @param Carbon $end
-     * @param bool   $includeShared
-     *
-     * @return Collection
-     *
-     */
-    public function expenseInPeriodCorrected(Carbon $start, Carbon $end, $includeShared = false)
-    {
-        $query = $this->queryJournalsWithTransactions($start, $end);
-        if ($includeShared === false) {
-            $query->where(
-                function (Builder $query) {
-                    $query->where(
-                        function (Builder $q) { // only get withdrawals not from a shared account
-                            $q->where('transaction_types.type', 'Withdrawal');
-                            $q->where('acm_from.data', '!=', '"sharedAsset"');
-                        }
-                    );
-                    $query->orWhere(
-                        function (Builder $q) { // and transfers from a shared account.
-                            $q->where('transaction_types.type', 'Transfer');
-                            $q->where('acm_to.data', '=', '"sharedAsset"');
-                        }
-                    );
-                }
-            );
-        } else {
-            $query->where('transaction_types.type', 'Withdrawal'); // any withdrawal is fine.
-        }
-        $query->orderBy('transaction_journals.date');
-        $data = $query->get( // get everything
-            ['transaction_journals.*', 'transaction_types.type', 'ac_to.name as name', 'ac_to.id as account_id', 'ac_to.encrypted as account_encrypted']
-        );
-
-        $data->each(
-            function (TransactionJournal $journal) {
-                if (intval($journal->account_encrypted) == 1) {
-                    $journal->name = Crypt::decrypt($journal->name);
-                }
-            }
-        );
-        $data = $data->filter(
-            function (TransactionJournal $journal) {
-                if ($journal->amount != 0) {
-                    return $journal;
-                }
-
-                return null;
-            }
-        );
-
-        return $data;
-    }
-
-    /**
-     * Get a users accounts combined with various meta-data related to the start and end date.
-     *
-     * @param Carbon $start
-     * @param Carbon $end
-     * @param bool   $includeShared
-     *
-     * @return Collection
-     */
-    public function getAllAccounts(Carbon $start, Carbon $end, $includeShared = false)
-    {
-        $query = Auth::user()->accounts()->orderBy('accounts.name', 'ASC')
-                     ->accountTypeIn(['Default account', 'Asset account', 'Cash account']);
-        if ($includeShared === false) {
-            $query->leftJoin(
-                'account_meta', function (JoinClause $join) {
-                $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
-            }
-            )
-                  ->where(
-                      function (Builder $query) {
-
-                          $query->where('account_meta.data', '!=', '"sharedAsset"');
-                          $query->orWhereNull('account_meta.data');
-
-                      }
-                  );
-        }
-        $set = $query->get(['accounts.*']);
-        $set->each(
-            function (Account $account) use ($start, $end) {
-                /**
-                 * The balance for today always incorporates transactions
-                 * made on today. So to get todays "start" balance, we sub one
-                 * day.
-                 */
-                $yesterday = clone $start;
-                $yesterday->subDay();
-
-                /** @noinspection PhpParamsInspection */
-                $account->startBalance = Steam::balance($account, $yesterday);
-                $account->endBalance   = Steam::balance($account, $end);
-            }
-        );
-
-        return $set;
-    }
-
-
-    /**
-     * This method works the same way as ReportQueryInterface::incomeInPeriod does, but instead of returning results
-     * will simply list the transaction journals only. This should allow any follow up counting to be accurate with
-     * regards to tags.
-     *
-     * This method returns all "income" journals in a certain period, which are both transfers from a shared account
-     * and "ordinary" deposits. The query used is almost equal to ReportQueryInterface::journalsByRevenueAccount but it does
-     * not group and returns different fields.
-     *
-     * @param Carbon $start
-     * @param Carbon $end
-     * @param bool   $includeShared
-     *
-     * @return Collection
-     */
-    public function incomeInPeriodCorrected(Carbon $start, Carbon $end, $includeShared = false)
-    {
-        $query = $this->queryJournalsWithTransactions($start, $end);
-        if ($includeShared === false) {
-            // only get deposits not to a shared account
-            // and transfers to a shared account.
-            $query->where(
-                function (Builder $query) {
-                    $query->where(
-                        function (Builder $q) {
-                            $q->where('transaction_types.type', 'Deposit');
-                            $q->where('acm_to.data', '!=', '"sharedAsset"');
-                        }
-                    );
-                    $query->orWhere(
-                        function (Builder $q) {
-                            $q->where('transaction_types.type', 'Transfer');
-                            $q->where('acm_from.data', '=', '"sharedAsset"');
-                        }
-                    );
-                }
-            );
-        } else {
-            // any deposit is fine.
-            $query->where('transaction_types.type', 'Deposit');
-        }
-        $query->orderBy('transaction_journals.date');
-
-        // get everything
-        $data = $query->get(
-            ['transaction_journals.*', 'transaction_types.type', 'ac_from.name as name', 'ac_from.id as account_id', 'ac_from.encrypted as account_encrypted']
-        );
-
-        $data->each(
-            function (TransactionJournal $journal) {
-                if (intval($journal->account_encrypted) == 1) {
-                    $journal->name = Crypt::decrypt($journal->name);
-                }
-            }
-        );
-        $data = $data->filter(
-            function (TransactionJournal $journal) {
-                if ($journal->amount != 0) {
-                    return $journal;
-                }
-
-                return null;
-            }
-        );
-
-        return $data;
-    }
-
     /**
      * Covers tags
      *
@@ -209,22 +30,18 @@ class ReportQuery implements ReportQueryInterface
      *
      * @return float
      */
-    public function spentInBudgetCorrected(Account $account, Budget $budget, Carbon $start, Carbon $end)
+    public function spentInBudget(Account $account, Budget $budget, Carbon $start, Carbon $end)
     {
 
-        bcscale(2);
-
-        return bcmul(
-            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')
-                ->transactionTypes(['Withdrawal'])
-                ->where('transactions.account_id', $account->id)
-                ->before($end)
-                ->after($start)
-                ->where('budget_transaction_journal.budget_id', $budget->id)
-                ->get(['transaction_journals.*'])->sum('amount'), -1
-        );
+        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')
+                   ->transactionTypes([TransactionType::WITHDRAWAL])
+                   ->where('transactions.account_id', $account->id)
+                   ->before($end)
+                   ->after($start)
+                   ->where('budget_transaction_journal.budget_id', $budget->id)
+                   ->get(['transaction_journals.*'])->sum('amount');
     }
 
     /**
@@ -240,7 +57,7 @@ class ReportQuery implements ReportQueryInterface
             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')
-                ->transactionTypes(['Withdrawal'])
+                ->transactionTypes([TransactionType::WITHDRAWAL])
                 ->where('transactions.account_id', $account->id)
                 ->before($end)
                 ->after($start)
@@ -283,4 +100,144 @@ class ReportQuery implements ReportQueryInterface
 
         return $query;
     }
+
+    /**
+     * This method works the same way as ReportQueryInterface::incomeInPeriod does, but instead of returning results
+     * will simply list the transaction journals only. This should allow any follow up counting to be accurate with
+     * regards to tags. It will only get the incomes to the specified accounts.
+     *
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return Collection
+     */
+    public function incomeInPeriod(Carbon $start, Carbon $end, Collection $accounts)
+    {
+        $query = $this->queryJournalsWithTransactions($start, $end);
+
+        $ids = [];
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $ids[] = $account->id;
+        }
+
+        // OR is a deposit
+        // OR any transfer TO the accounts in $accounts, not FROM any of the accounts in $accounts.
+        $query->where(
+            function (Builder $query) use ($ids) {
+                $query->where(
+                    function (Builder $q) {
+                        $q->where('transaction_types.type', TransactionType::DEPOSIT);
+                    }
+                );
+                $query->orWhere(
+                    function (Builder $q) use ($ids) {
+                        $q->where('transaction_types.type', TransactionType::TRANSFER);
+                        $q->whereNotIn('ac_from.id', $ids);
+                        $q->whereIn('ac_to.id', $ids);
+                    }
+                );
+            }
+        );
+
+        // only include selected accounts.
+        $query->whereIn('ac_to.id', $ids);
+        $query->orderBy('transaction_journals.date');
+
+        // get everything
+        $data = $query->get(
+            ['transaction_journals.*',
+             'transaction_types.type', 'ac_from.name as name',
+             't_from.amount as from_amount',
+             't_to.amount as to_amount',
+             'ac_from.id as account_id', 'ac_from.encrypted as account_encrypted']
+        );
+
+        $data->each(
+            function (TransactionJournal $journal) {
+                if (intval($journal->account_encrypted) == 1) {
+                    $journal->name = Crypt::decrypt($journal->name);
+                }
+            }
+        );
+//        $data = $data->filter(
+//            function (TransactionJournal $journal) {
+//                if ($journal->amount != 0) {
+//                    return $journal;
+//                }
+//
+//                return null;
+//            }
+//        );
+
+        return $data;
+    }
+
+    /**
+     * See ReportQueryInterface::incomeInPeriod
+     *
+     * This method returns all "expense" journals in a certain period, which are both transfers to a shared account
+     * and "ordinary" withdrawals. The query used is almost equal to ReportQueryInterface::journalsByRevenueAccount but it does
+     * not group and returns different fields.
+     *
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return Collection
+     *
+     */
+    public function expenseInPeriod(Carbon $start, Carbon $end, Collection $accounts)
+    {
+        $ids = [];
+
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $ids[] = $account->id;
+        }
+
+        $query = $this->queryJournalsWithTransactions($start, $end);
+
+        // withdrawals from any account are an expense.
+        // transfers away, from an account in the list, to an account not in the list, are an expense.
+
+        $query->where(
+            function (Builder $query) use ($ids) {
+                $query->where(
+                    function (Builder $q) {
+                        $q->where('transaction_types.type', TransactionType::WITHDRAWAL);
+                    }
+                );
+                $query->orWhere(
+                    function (Builder $q) use ($ids) {
+                        $q->where('transaction_types.type', TransactionType::TRANSFER);
+                        $q->whereIn('ac_from.id', $ids);
+                        $q->whereNotIn('ac_to.id', $ids);
+                    }
+                );
+            }
+        );
+
+        // expense goes from the selected accounts:
+        $query->whereIn('ac_from.id', $ids);
+
+        $query->orderBy('transaction_journals.date');
+        $data = $query->get( // get everything
+            ['transaction_journals.*', 'transaction_types.type',
+             't_from.amount as from_amount',
+             't_to.amount as to_amount',
+             'ac_to.name as name', 'ac_to.id as account_id', 'ac_to.encrypted as account_encrypted']
+        );
+
+        $data->each(
+            function (TransactionJournal $journal) {
+                if (intval($journal->account_encrypted) == 1) {
+                    $journal->name = Crypt::decrypt($journal->name);
+                }
+            }
+        );
+
+        return $data;
+    }
 }

app/Helpers/Report/ReportQueryInterface.php

@@ -16,44 +16,33 @@ interface ReportQueryInterface
 {
 
     /**
-     * See ReportQueryInterface::incomeInPeriodCorrected
+     * See ReportQueryInterface::incomeInPeriod
      *
      * This method returns all "expense" journals in a certain period, which are both transfers to a shared account
      * and "ordinary" withdrawals. The query used is almost equal to ReportQueryInterface::journalsByRevenueAccount but it does
      * not group and returns different fields.
      *
-     * @param Carbon $start
-     * @param Carbon $end
-     * @param bool   $includeShared
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
      * @return Collection
      *
      */
-    public function expenseInPeriodCorrected(Carbon $start, Carbon $end, $includeShared = false);
-
-    /**
-     * Get a users accounts combined with various meta-data related to the start and end date.
-     *
-     * @param Carbon $start
-     * @param Carbon $end
-     * @param bool   $includeShared
-     *
-     * @return Collection
-     */
-    public function getAllAccounts(Carbon $start, Carbon $end, $includeShared = false);
+    public function expenseInPeriod(Carbon $start, Carbon $end, Collection $accounts);
 
     /**
      * This method works the same way as ReportQueryInterface::incomeInPeriod does, but instead of returning results
      * will simply list the transaction journals only. This should allow any follow up counting to be accurate with
-     * regards to tags.
+     * regards to tags. It will only get the incomes to the specified accounts.
      *
-     * @param Carbon $start
-     * @param Carbon $end
-     * @param bool   $includeShared
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
      * @return Collection
      */
-    public function incomeInPeriodCorrected(Carbon $start, Carbon $end, $includeShared = false);
+    public function incomeInPeriod(Carbon $start, Carbon $end, Collection $accounts);
 
     /**
      * Covers tags as well.
@@ -65,7 +54,7 @@ interface ReportQueryInterface
      *
      * @return float
      */
-    public function spentInBudgetCorrected(Account $account, Budget $budget, Carbon $start, Carbon $end);
+    public function spentInBudget(Account $account, Budget $budget, Carbon $start, Carbon $end);
 
     /**
      * @param Account $account

app/Http/Controllers/AccountController.php

@@ -38,6 +38,8 @@ class AccountController extends Controller
      */
     public function create($what = 'asset')
     {
+
+
         $subTitleIcon = Config::get('firefly.subIconsByIdentifier.' . $what);
         $subTitle     = trans('firefly.make_new_' . $what . '_account');
 
@@ -211,13 +213,14 @@ class AccountController extends Controller
             'name'                   => $request->input('name'),
             'accountType'            => $request->input('what'),
             'virtualBalance'         => round($request->input('virtualBalance'), 2),
+            'virtualBalanceCurrency' => intval($request->input('amount_currency_id_virtualBalance')),
             'active'                 => true,
             'user'                   => Auth::user()->id,
             'iban'                   => $request->input('iban'),
             'accountRole'            => $request->input('accountRole'),
             'openingBalance'         => round($request->input('openingBalance'), 2),
             'openingBalanceDate'     => new Carbon((string)$request->input('openingBalanceDate')),
-            'openingBalanceCurrency' => intval($request->input('balance_currency_id')),
+            'openingBalanceCurrency' => intval($request->input('amount_currency_id_openingBalance')),
 
         ];
 

app/Http/Controllers/Auth/AuthController.php

@@ -1,6 +1,7 @@
 <?php namespace FireflyIII\Http\Controllers\Auth;
 
 use Auth;
+use Config;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Role;
 use FireflyIII\User;
@@ -8,6 +9,7 @@ use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
 use Illuminate\Foundation\Auth\ThrottlesLogins;
 use Illuminate\Http\Request;
 use Illuminate\Mail\Message;
+use Log;
 use Mail;
 use Request as Rq;
 use Session;
@@ -23,6 +25,18 @@ class AuthController extends Controller
 {
     use AuthenticatesAndRegistersUsers, ThrottlesLogins;
 
+    /**
+     * Log the user out of the application.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function getLogout()
+    {
+        Auth::logout();
+
+        return redirect('/auth/login');
+    }
+
     /**
      * Show the application registration form.
      *
@@ -74,7 +88,10 @@ class AuthController extends Controller
         $foundUser = User::where('email', $credentials['email'])->where('blocked', 1)->first();
         if (!is_null($foundUser)) {
             // if it exists, show message:
-            $code    = $foundUser->blocked_code;
+            $code = $foundUser->blocked_code;
+            if (strlen($code) == 0) {
+                $code = 'general_blocked';
+            }
             $message = trans('firefly.' . $code . '_error', ['email' => $credentials['email']]);
         }
 
@@ -143,21 +160,35 @@ class AuthController extends Controller
         }
         // @codeCoverageIgnoreEnd
 
+
         $data             = $request->all();
         $data['password'] = bcrypt($data['password']);
 
+        // is user email domain blocked?
+        if ($this->isBlockedDomain($data['email'])) {
+            $validator->getMessageBag()->add('email', trans('validation.invalid_domain'));
+            $this->throwValidationException(
+                $request, $validator
+            );
+        }
+
         Auth::login($this->create($data));
 
         // get the email address
         if (Auth::user() instanceof User) {
-            $email   = Auth::user()->email;
-            $address = route('index');
+            $email     = Auth::user()->email;
+            $address   = route('index');
+            $ipAddress = $request->ip();
             // send email.
-            Mail::send(
-                ['emails.registered-html', 'emails.registered'], ['address' => $address], function (Message $message) use ($email) {
-                $message->to($email, $email)->subject('Welcome to Firefly III! ');
+            try {
+                Mail::send(
+                    ['emails.registered-html', 'emails.registered'], ['address' => $address, 'ip' => $ipAddress], function (Message $message) use ($email) {
+                    $message->to($email, $email)->subject('Welcome to Firefly III! ');
+                }
+                );
+            } catch (\Swift_TransportException $e) {
+                Log::error($e->getMessage());
             }
-            );
 
             // set flash message
             Session::flash('success', 'You have registered successfully!');
@@ -180,6 +211,35 @@ class AuthController extends Controller
         // @codeCoverageIgnoreEnd
     }
 
+    /**
+     * @return array
+     */
+    protected function getBlockedDomains()
+    {
+        $set     = Config::get('mail.blocked_domains');
+        $domains = [];
+        foreach ($set as $entry) {
+            $domain = trim($entry);
+            if (strlen($domain) > 0) {
+                $domains[] = $domain;
+            }
+        }
+
+        return $domains;
+    }
+
+    protected function isBlockedDomain($email)
+    {
+        $parts   = explode('@', $email);
+        $blocked = $this->getBlockedDomains();
+
+        if (isset($parts[1]) && in_array($parts[1], $blocked)) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Get a validator for an incoming registration request.
      *

app/Http/Controllers/Auth/PasswordController.php

@@ -1,7 +1,11 @@
 <?php namespace FireflyIII\Http\Controllers\Auth;
 
 use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\User;
 use Illuminate\Foundation\Auth\ResetsPasswords;
+use Illuminate\Http\Request;
+use Illuminate\Mail\Message;
+use Illuminate\Support\Facades\Password;
 
 /**
  * Class PasswordController
@@ -41,4 +45,38 @@ class PasswordController extends Controller
         $this->middleware('guest');
     }
 
+    /**
+     * Send a reset link to the given user.
+     *
+     * @param  \Illuminate\Http\Request $request
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function postEmail(Request $request)
+    {
+        $this->validate($request, ['email' => 'required|email']);
+
+        $user = User::whereEmail($request->get('email'))->first();
+
+        if (!is_null($user) && intval($user->blocked) === 1) {
+            $response = 'passwords.blocked';
+        } else {
+            $response = Password::sendResetLink(
+                $request->only('email'), function (Message $message) {
+                $message->subject($this->getEmailSubject());
+            }
+            );
+        }
+
+        switch ($response) {
+            case Password::RESET_LINK_SENT:
+                return redirect()->back()->with('status', trans($response));
+
+            case Password::INVALID_USER:
+            case 'passwords.blocked':
+                return redirect()->back()->withErrors(['email' => trans($response)]);
+
+        }
+    }
+
 }

app/Http/Controllers/BudgetController.php

@@ -6,8 +6,10 @@ use Carbon\Carbon;
 use FireflyIII\Http\Requests\BudgetFormRequest;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use Input;
+use Navigation;
 use Preferences;
 use Response;
 use Session;
@@ -134,26 +136,31 @@ class BudgetController extends Controller
      *
      * @return \Illuminate\View\View
      */
-    public function index(BudgetRepositoryInterface $repository)
+    public function index(BudgetRepositoryInterface $repository, AccountRepositoryInterface $accountRepository)
     {
-        $budgets  = $repository->getActiveBudgets();
-        $inactive = $repository->getInactiveBudgets();
-        $spent    = '0';
-        $budgeted = '0';
+        $budgets           = $repository->getActiveBudgets();
+        $inactive          = $repository->getInactiveBudgets();
+        $spent             = '0';
+        $budgeted          = '0';
+        $range             = Preferences::get('viewRange', '1M')->data;
+        $start             = Navigation::startOfPeriod(Session::get('start', new Carbon), $range);
+        $end               = Navigation::endOfPeriod($start, $range);
+        $key               = 'budgetIncomeTotal' . $start->format('Ymd') . $end->format('Ymd');
+        $budgetIncomeTotal = Preferences::get($key, 1000)->data;
+        $period            = Navigation::periodShow($start, $range);
+        $accounts          = $accountRepository->getAccounts(['Default account', 'Asset account', 'Cash account']);
+
         bcscale(2);
         /**
          * Do some cleanup:
          */
         $repository->cleanupBudgets();
 
-
         // loop the budgets:
         /** @var Budget $budget */
         foreach ($budgets as $budget) {
-            $date               = Session::get('start', Carbon::now()->startOfMonth());
-            $end                = Session::get('end', Carbon::now()->endOfMonth());
-            $budget->spent      = $repository->spentInPeriodCorrected($budget, $date, $end);
-            $budget->currentRep = $repository->getCurrentRepetition($budget, $date);
+            $budget->spent      = $repository->balanceInPeriod($budget, $start, $end, $accounts);
+            $budget->currentRep = $repository->getCurrentRepetition($budget, $start, $end);
             if ($budget->currentRep) {
                 $budgeted = bcadd($budgeted, $budget->currentRep->amount);
             }
@@ -161,13 +168,12 @@ class BudgetController extends Controller
 
         }
 
-        $dateAsString      = Session::get('start', Carbon::now()->startOfMonth())->format('FY');
-        $budgetIncomeTotal = Preferences::get('budgetIncomeTotal' . $dateAsString, 1000)->data;
-        $budgetMaximum     = Preferences::get('budgetMaximum', 1000)->data;
-        $defaultCurrency   = Amount::getDefaultCurrency();
+
+        $budgetMaximum   = Preferences::get('budgetMaximum', 1000)->data;
+        $defaultCurrency = Amount::getDefaultCurrency();
 
         return view(
-            'budgets.index', compact('budgetMaximum', 'budgetIncomeTotal', 'defaultCurrency', 'inactive', 'budgets', 'spent', 'budgeted')
+            'budgets.index', compact('budgetMaximum', 'period', 'range', 'budgetIncomeTotal', 'defaultCurrency', 'inactive', 'budgets', 'spent', 'budgeted')
         );
     }
 
@@ -178,8 +184,9 @@ class BudgetController extends Controller
      */
     public function noBudget(BudgetRepositoryInterface $repository)
     {
-        $start    = Session::get('start', Carbon::now()->startOfMonth());
-        $end      = Session::get('end', Carbon::now()->startOfMonth());
+        $range    = Preferences::get('viewRange', '1M')->data;
+        $start    = Navigation::startOfPeriod(Session::get('start', new Carbon), $range);
+        $end      = Navigation::endOfPeriod($start, $range);
         $list     = $repository->getWithoutBudget($start, $end);
         $subTitle = trans(
             'firefly.without_budget_between',
@@ -194,9 +201,12 @@ class BudgetController extends Controller
      */
     public function postUpdateIncome()
     {
+        $range = Preferences::get('viewRange', '1M')->data;
+        $start = Navigation::startOfPeriod(Session::get('start', new Carbon), $range);
+        $end   = Navigation::endOfPeriod($start, $range);
+        $key   = 'budgetIncomeTotal' . $start->format('Ymd') . $end->format('Ymd');
 
-        $date = Session::get('start', Carbon::now()->startOfMonth())->format('FY');
-        Preferences::set('budgetIncomeTotal' . $date, intval(Input::get('amount')));
+        Preferences::set($key, intval(Input::get('amount')));
         Preferences::mark();
 
         return redirect(route('budgets.index'));
@@ -272,7 +282,7 @@ class BudgetController extends Controller
     {
         $budgetData = [
             'name'   => $request->input('name'),
-            'active' => intval($request->input('active')) == 1
+            'active' => intval($request->input('active')) == 1,
         ];
 
         $repository->update($budget, $budgetData);
@@ -297,8 +307,11 @@ class BudgetController extends Controller
      */
     public function updateIncome()
     {
-        $date   = Session::get('start', Carbon::now()->startOfMonth())->format('FY');
-        $amount = Preferences::get('budgetIncomeTotal' . $date, 1000);
+        $range  = Preferences::get('viewRange', '1M')->data;
+        $start  = Navigation::startOfPeriod(Session::get('start', new Carbon), $range);
+        $end    = Navigation::endOfPeriod($start, $range);
+        $key    = 'budgetIncomeTotal' . $start->format('Ymd') . $end->format('Ymd');
+        $amount = Preferences::get($key, 1000);
 
         return view('budgets.income', compact('amount'));
     }

app/Http/Controllers/CategoryController.php

@@ -5,8 +5,11 @@ use Carbon\Carbon;
 use FireflyIII\Http\Requests\CategoryFormRequest;
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Support\CacheProperties;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
 use Input;
+use Navigation;
 use Preferences;
 use Session;
 use URL;
@@ -139,6 +142,31 @@ class CategoryController extends Controller
         return view('categories.noCategory', compact('list', 'subTitle'));
     }
 
+    /**
+     * @param CategoryRepositoryInterface $repository
+     * @param Category                    $category
+     *
+     * @return \Illuminate\View\View
+     */
+    public function showWithDate(CategoryRepositoryInterface $repository, Category $category, $date)
+    {
+        $carbon   = new Carbon($date);
+        $range    = Preferences::get('viewRange', '1M')->data;
+        $start    = Navigation::startOfPeriod($carbon, $range);
+        $end      = Navigation::endOfPeriod($carbon, $range);
+        $subTitle = $category->name;
+
+        $hideCategory = true; // used in list.
+        $page         = intval(Input::get('page'));
+
+        $set      = $repository->getJournalsInRange($category, $page, $start, $end);
+        $count    = $repository->countJournalsInRange($category, $start, $end);
+        $journals = new LengthAwarePaginator($set, $count, 50, $page);
+        $journals->setPath('categories/show/' . $category->id . '/' . $date);
+
+        return view('categories.show_with_date', compact('category', 'journals', 'hideCategory', 'subTitle', 'carbon'));
+    }
+
     /**
      * @param CategoryRepositoryInterface $repository
      * @param Category                    $category
@@ -151,10 +179,47 @@ class CategoryController extends Controller
         $page         = intval(Input::get('page'));
         $set          = $repository->getJournals($category, $page);
         $count        = $repository->countJournals($category);
+        $subTitle     = $category->name;
         $journals     = new LengthAwarePaginator($set, $count, 50, $page);
         $journals->setPath('categories/show/' . $category->id);
 
-        return view('categories.show', compact('category', 'journals', 'hideCategory'));
+        // list of ranges for list of periods:
+
+        // oldest transaction in category:
+        $start   = $repository->getFirstActivityDate($category);
+        $range   = Preferences::get('viewRange', '1M')->data;
+        $start   = Navigation::startOfPeriod($start, $range);
+        $end     = Navigation::endOfX(new Carbon, $range);
+        $entries = new Collection;
+
+        // chart properties for cache:
+        $cache = new CacheProperties();
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('category-show');
+        $cache->addProperty($category->id);
+        if ($cache->has()) {
+            $entries = $cache->get();
+        } else {
+
+            while ($end >= $start) {
+                $end        = Navigation::startOfPeriod($end, $range);
+                $currentEnd = Navigation::endOfPeriod($end, $range);
+
+                // here do something.
+                $spent    = $repository->spentInPeriod($category, $end, $currentEnd);
+                $earned   = $repository->earnedInPeriod($category, $end, $currentEnd);
+                $dateStr  = $end->format('Y-m-d');
+                $dateName = Navigation::periodShow($end, $range);
+                $entries->push([$dateStr, $dateName, $spent, $earned]);
+
+                $end = Navigation::subtractPeriod($end, $range, 1);
+
+            }
+            $cache->store($entries);
+        }
+
+        return view('categories.show', compact('category', 'journals', 'entries', 'hideCategory', 'subTitle'));
     }
 
     /**

app/Http/Controllers/Chart/AccountController.php

@@ -35,50 +35,67 @@ class AccountController extends Controller
 
 
     /**
-     * Shows the balances for all the user's accounts.
+     * Shows the balances for a given set of dates and accounts.
+     *
+     * TODO fix parameters.
      *
      * @param AccountRepositoryInterface $repository
      *
-     * @param                            $year
-     * @param                            $month
-     * @param bool                       $shared
+     * @param                            $url
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function all(AccountRepositoryInterface $repository, $year, $month, $shared = false)
+    public function report($report_type, Carbon $start, Carbon $end, Collection $accounts)
     {
-        $start = new Carbon($year . '-' . $month . '-01');
-        $end   = clone $start;
-        $end->endOfMonth();
-
         // chart properties for cache:
         $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty('all');
         $cache->addProperty('accounts');
+        $cache->addProperty('default');
+        $cache->addProperty($accounts);
         if ($cache->has()) {
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
-        /** @var Collection $accounts */
-        $accounts = $repository->getAccounts(['Default account', 'Asset account']);
-        if ($shared === false) {
-            /** @var Account $account */
-            foreach ($accounts as $index => $account) {
-                if ($account->getMeta('accountRole') == 'sharedAsset') {
-                    $accounts->forget($index);
-                }
-            }
-        }
-
         // make chart:
-        $data = $this->generator->all($accounts, $start, $end);
+        $data = $this->generator->frontpage($accounts, $start, $end);
         $cache->store($data);
 
         return Response::json($data);
     }
 
+    /**
+     * Shows the balances for all the user's expense accounts.
+     *
+     * @param AccountRepositoryInterface $repository
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function expenseAccounts(AccountRepositoryInterface $repository)
+    {
+        $start    = clone Session::get('start', Carbon::now()->startOfMonth());
+        $end      = clone Session::get('end', Carbon::now()->endOfMonth());
+        $accounts = $repository->getAccounts(['Expense account', 'Beneficiary account']);
+
+        // chart properties for cache:
+        $cache = new CacheProperties();
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('expenseAccounts');
+        $cache->addProperty('accounts');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
+        $data = $this->generator->expenseAccounts($accounts, $start, $end);
+        $cache->store($data);
+
+        return Response::json($data);
+
+    }
+
     /**
      * Shows the balances for all the user's frontpage accounts.
      *

app/Http/Controllers/Chart/BudgetController.php

@@ -6,6 +6,7 @@ use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
@@ -35,13 +36,86 @@ class BudgetController extends Controller
         $this->generator = app('FireflyIII\Generator\Chart\Budget\BudgetChartGenerator');
     }
 
+    /**
+     * @param BudgetRepositoryInterface $repository
+     * @param                           $report_type
+     * @param Carbon                    $start
+     * @param Carbon                    $end
+     * @param Collection                $accounts
+     * @param Collection                $budgets
+     */
+    public function multiYear(BudgetRepositoryInterface $repository, $report_type, Carbon $start, Carbon $end, Collection $accounts, Collection $budgets)
+    {
+        // chart properties for cache:
+        $cache = new CacheProperties();
+        $cache->addProperty($report_type);
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty($accounts);
+        $cache->addProperty($budgets);
+        $cache->addProperty('multiYearBudget');
+
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
+        /**
+         *  budget
+         *   year:
+         *    spent: x
+         *    budgeted: x
+         *   year
+         *    spent: x
+         *    budgeted: x
+         */
+        $entries = new Collection;
+        // go by budget, not by year.
+        foreach ($budgets as $budget) {
+            $entry = ['name' => '', 'spent' => [], 'budgeted' => []];
+
+            $currentStart = clone $start;
+            while ($currentStart < $end) {
+                // fix the date:
+                $currentEnd = clone $currentStart;
+                $currentEnd->endOfYear();
+
+                // get data:
+                if (is_null($budget->id)) {
+                    $name     = trans('firefly.noBudget');
+                    $sum      = $repository->getWithoutBudgetSum($currentStart, $currentEnd);
+                    $budgeted = 0;
+                } else {
+                    $name     = $budget->name;
+                    $sum      = $repository->balanceInPeriod($budget, $currentStart, $currentEnd, $accounts);
+                    $budgeted = $repository->getBudgetLimitRepetitions($budget, $currentStart, $currentEnd)->sum('amount');
+                }
+
+                // save to array:
+                $year                     = $currentStart->year;
+                $entry['name']            = $name;
+                $entry['spent'][$year]    = ($sum * -1);
+                $entry['budgeted'][$year] = $budgeted;
+
+                // jump to next year.
+                $currentStart = clone $currentEnd;
+                $currentStart->addDay();
+            }
+            $entries->push($entry);
+        }
+        // generate chart with data:
+        $data = $this->generator->multiYear($entries);
+
+        return Response::json($data);
+
+    }
+
     /**
      * @param BudgetRepositoryInterface $repository
      * @param Budget                    $budget
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function budget(BudgetRepositoryInterface $repository, Budget $budget)
+    public function budget(BudgetRepositoryInterface $repository, AccountRepositoryInterface $accountRepository, Budget $budget)
     {
 
         // dates and times
@@ -50,7 +124,9 @@ class BudgetController extends Controller
         $last  = Session::get('end', new Carbon);
         $final = clone $last;
         $final->addYears(2);
-        $last = Navigation::endOfX($last, $range, $final);
+        $last     = Navigation::endOfX($last, $range, $final);
+        $accounts = $accountRepository->getAccounts(['Default account', 'Asset account', 'Cash account']);
+
 
         // chart properties for cache:
         $cache = new CacheProperties();
@@ -68,7 +144,7 @@ class BudgetController extends Controller
             $end->subDay();
             $chartDate = clone $end;
             $chartDate->startOfMonth();
-            $spent = $repository->spentInPeriodCorrected($budget, $first, $end);
+            $spent = $repository->balanceInPeriod($budget, $first, $end, $accounts) * -1;
             $entries->push([$chartDate, $spent]);
             $first = Navigation::addPeriod($first, $range, 0);
         }
@@ -113,7 +189,7 @@ class BudgetController extends Controller
             /*
              * Sum of expenses on this day:
              */
-            $sum    = $repository->expensesOnDayCorrected($budget, $start);
+            $sum    = $repository->expensesOnDay($budget, $start);
             $amount = bcadd($amount, $sum);
             $entries->push([clone $start, $amount]);
             $start->addDay();
@@ -133,12 +209,13 @@ class BudgetController extends Controller
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function frontpage(BudgetRepositoryInterface $repository)
+    public function frontpage(BudgetRepositoryInterface $repository, AccountRepositoryInterface $accountRepository)
     {
         $budgets    = $repository->getBudgets();
         $start      = Session::get('start', Carbon::now()->startOfMonth());
         $end        = Session::get('end', Carbon::now()->endOfMonth());
         $allEntries = new Collection;
+        $accounts   = $accountRepository->getAccounts(['Default account', 'Asset account', 'Cash account']);
 
         // chart properties for cache:
         $cache = new CacheProperties();
@@ -156,13 +233,13 @@ class BudgetController extends Controller
         foreach ($budgets as $budget) {
             $repetitions = $repository->getBudgetLimitRepetitions($budget, $start, $end);
             if ($repetitions->count() == 0) {
-                $expenses = $repository->spentInPeriodCorrected($budget, $start, $end, true);
+                $expenses = $repository->balanceInPeriod($budget, $start, $end, $accounts) * -1;
                 $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);
+                $expenses = $repository->balanceInPeriod($budget, $repetition->startdate, $repetition->enddate, $accounts) * -1;
                 // $left can be less than zero.
                 // $overspent can be more than zero ( = overspending)
 
@@ -197,23 +274,31 @@ class BudgetController extends Controller
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function year(BudgetRepositoryInterface $repository, $year, $shared = false)
+    public function year(BudgetRepositoryInterface $repository, $report_type, Carbon $start, Carbon $end, Collection $accounts)
     {
-        $start   = new Carbon($year . '-01-01');
-        $end     = new Carbon($year . '-12-31');
-        $shared  = $shared == 'shared' ? true : false;
-        $budgets = $repository->getBudgets();
+        $allBudgets = $repository->getBudgets();
+        $budgets    = new Collection;
 
         // chart properties for cache:
         $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
+        $cache->addProperty($report_type);
+        $cache->addProperty($accounts);
         $cache->addProperty('budget');
         $cache->addProperty('year');
         if ($cache->has()) {
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
+//         filter empty budgets:
+        foreach ($allBudgets as $budget) {
+            $spent = $repository->balanceInPeriod($budget, $start, $end, $accounts);
+            if ($spent != 0) {
+                $budgets->push($budget);
+            }
+        }
+
         $entries = new Collection;
 
         while ($start < $end) {
@@ -224,8 +309,8 @@ class BudgetController extends Controller
 
             // each budget, fill the row:
             foreach ($budgets as $budget) {
-                $spent = $repository->spentInPeriodCorrected($budget, $start, $month, $shared);
-                $row[] = $spent;
+                $spent = $repository->balanceInPeriod($budget, $start, $month, $accounts);
+                $row[] = $spent * -1;
             }
             $entries->push($row);
             $start->endOfMonth()->addDay();

app/Http/Controllers/Chart/CategoryController.php

@@ -46,11 +46,10 @@ class CategoryController extends Controller
     public function all(CategoryRepositoryInterface $repository, Category $category)
     {
         // oldest transaction in category:
-        $start = $repository->getFirstActivityDate($category);
-        $range = Preferences::get('viewRange', '1M')->data;
-        $start = Navigation::startOfPeriod($start, $range);
-        $end   = new Carbon;
-
+        $start   = $repository->getFirstActivityDate($category);
+        $range   = Preferences::get('viewRange', '1M')->data;
+        $start   = Navigation::startOfPeriod($start, $range);
+        $end     = new Carbon;
         $entries = new Collection;
 
 
@@ -66,11 +65,16 @@ class CategoryController extends Controller
 
         while ($start <= $end) {
             $currentEnd = Navigation::endOfPeriod($start, $range);
-            $spent      = $repository->spentInPeriodCorrected($category, $start, $currentEnd);
-            $entries->push([clone $start, $spent]);
+            $spent      = $repository->spentInPeriod($category, $start, $currentEnd);
+            $earned     = $repository->earnedInPeriod($category, $start, $currentEnd);
+            $date       = Navigation::periodShow($start, $range);
+            $entries->push([clone $start, $date, $spent, $earned]);
             $start = Navigation::addPeriod($start, $range, 0);
-
         }
+        // limit the set to the last 40:
+        $entries = $entries->reverse();
+        $entries = $entries->slice(0, 48);
+        $entries = $entries->reverse();
 
         $data = $this->generator->all($entries);
         $cache->store($data);
@@ -103,7 +107,7 @@ class CategoryController extends Controller
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
-        $array = $repository->getCategoriesAndExpensesCorrected($start, $end);
+        $array = $repository->getCategoriesAndExpenses($start, $end);
         // sort by callback:
         uasort(
             $array,
@@ -112,11 +116,89 @@ class CategoryController extends Controller
                     return 0;
                 }
 
-                return ($left['sum'] < $right['sum']) ? 1 : -1;
+                return ($left['sum'] < $right['sum']) ? -1 : 1;
             }
         );
         $set  = new Collection($array);
         $data = $this->generator->frontpage($set);
+        $cache->store($data);
+
+
+        return Response::json($data);
+
+    }
+
+    /**
+     * @param CategoryRepositoryInterface $repository
+     * @param                             $report_type
+     * @param Carbon                      $start
+     * @param Carbon                      $end
+     * @param Collection                  $accounts
+     * @param Collection                  $categories
+     */
+    public function multiYear(CategoryRepositoryInterface $repository, $report_type, Carbon $start, Carbon $end, Collection $accounts, Collection $categories)
+    {
+        // chart properties for cache:
+        $cache = new CacheProperties();
+        $cache->addProperty($report_type);
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty($accounts);
+        $cache->addProperty($categories);
+        $cache->addProperty('multiYearCategory');
+
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
+        /**
+         *  category
+         *   year:
+         *    spent: x
+         *    earned: x
+         *   year
+         *    spent: x
+         *    earned: x
+         */
+        $entries = new Collection;
+        // go by budget, not by year.
+        /** @var Category $category */
+        foreach ($categories as $category) {
+            $entry = ['name' => '', 'spent' => [], 'earned' => []];
+
+            $currentStart = clone $start;
+            while ($currentStart < $end) {
+                // fix the date:
+                $currentEnd = clone $currentStart;
+                $currentEnd->endOfYear();
+
+                // get data:
+                if (is_null($category->id)) {
+                    $name   = trans('firefly.noCategory');
+                    $spent  = $repository->spentNoCategoryForAccounts($accounts, $currentStart, $currentEnd);
+                    $earned = $repository->earnedNoCategoryForAccounts($accounts, $currentStart, $currentEnd);
+                } else {
+                    $name   = $category->name;
+                    $spent  = $repository->spentInPeriodForAccounts($category, $accounts, $currentStart, $currentEnd);
+                    $earned = $repository->earnedInPeriodForAccounts($category, $accounts, $currentStart, $currentEnd);
+                }
+
+                // save to array:
+                $year                   = $currentStart->year;
+                $entry['name']          = $name;
+                $entry['spent'][$year]  = ($spent * -1);
+                $entry['earned'][$year] = $earned;
+
+                // jump to next year.
+                $currentStart = clone $currentEnd;
+                $currentStart->addDay();
+            }
+            $entries->push($entry);
+        }
+        // generate chart with data:
+        $data = $this->generator->multiYear($entries);
+        $cache->store($data);
+
 
         return Response::json($data);
 
@@ -128,7 +210,7 @@ class CategoryController extends Controller
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function month(CategoryRepositoryInterface $repository, Category $category)
+    public function currentPeriod(CategoryRepositoryInterface $repository, Category $category)
     {
         $start = clone Session::get('start', Carbon::now()->startOfMonth());
         $end   = Session::get('end', Carbon::now()->endOfMonth());
@@ -139,7 +221,7 @@ class CategoryController extends Controller
         $cache->addProperty($end);
         $cache->addProperty($category->id);
         $cache->addProperty('category');
-        $cache->addProperty('month');
+        $cache->addProperty('currentPeriod');
         if ($cache->has()) {
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
@@ -147,13 +229,57 @@ class CategoryController extends Controller
 
 
         while ($start <= $end) {
-            $spent = $repository->spentOnDaySumCorrected($category, $start);
-
-            $entries->push([clone $start, $spent]);
+            $spent  = $repository->spentOnDaySum($category, $start);
+            $earned = $repository->earnedOnDaySum($category, $start);
+            $date   = Navigation::periodShow($start, '1D');
+            $entries->push([clone $start, $date, $spent, $earned]);
             $start->addDay();
         }
 
-        $data = $this->generator->month($entries);
+        $data = $this->generator->period($entries);
+        $cache->store($data);
+
+        return Response::json($data);
+
+
+    }
+
+    /**
+     * @param CategoryRepositoryInterface $repository
+     * @param Category                    $category
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function specificPeriod(CategoryRepositoryInterface $repository, Category $category, $date)
+    {
+        $carbon = new Carbon($date);
+        $range  = Preferences::get('viewRange', '1M')->data;
+        $start  = Navigation::startOfPeriod($carbon, $range);
+        $end    = Navigation::endOfPeriod($carbon, $range);
+
+        // chart properties for cache:
+        $cache = new CacheProperties;
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty($category->id);
+        $cache->addProperty('category');
+        $cache->addProperty('specificPeriod');
+        $cache->addProperty($date);
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+        $entries = new Collection;
+
+
+        while ($start <= $end) {
+            $spent   = $repository->spentOnDaySum($category, $start);
+            $earned  = $repository->earnedOnDaySum($category, $start);
+            $theDate = Navigation::periodShow($start, '1D');
+            $entries->push([clone $start, $theDate, $spent, $earned]);
+            $start->addDay();
+        }
+
+        $data = $this->generator->period($entries);
         $cache->store($data);
 
         return Response::json($data);
@@ -165,28 +291,39 @@ class CategoryController extends Controller
      * This chart will only show expenses.
      *
      * @param CategoryRepositoryInterface $repository
-     * @param                             $year
-     * @param bool                        $shared
+     * @param                             $report_type
+     * @param Carbon                      $start
+     * @param Carbon                      $end
+     * @param Collection                  $accounts
      *
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @return \Illuminate\Http\JsonResponse
      */
-    public function year(CategoryRepositoryInterface $repository, $year, $shared = false)
+    public function spentInYear(CategoryRepositoryInterface $repository, $report_type, Carbon $start, Carbon $end, Collection $accounts)
     {
-        $start = new Carbon($year . '-01-01');
-        $end   = new Carbon($year . '-12-31');
 
         $cache = new CacheProperties; // chart properties for cache:
         $cache->addProperty($start);
+        $cache->addProperty($report_type);
         $cache->addProperty($end);
+        $cache->addProperty($accounts);
         $cache->addProperty('category');
-        $cache->addProperty('year');
+        $cache->addProperty('spent-in-year');
         if ($cache->has()) {
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
-        $shared     = $shared == 'shared' ? true : false;
-        $categories = $repository->getCategories();
-        $entries    = new Collection;
+        $allCategories = $repository->getCategories();
+        $entries       = new Collection;
+        $categories    = $allCategories->filter(
+            function (Category $category) use ($repository, $start, $end, $accounts) {
+                $spent = $repository->balanceInPeriod($category, $start, $end, $accounts);
+                if ($spent < 0) {
+                    return $category;
+                }
+
+                return null;
+            }
+        );
 
         while ($start < $end) {
             $month = clone $start; // month is the current end of the period
@@ -194,17 +331,211 @@ class CategoryController extends Controller
             $row = [clone $start]; // make a row:
 
             foreach ($categories as $category) { // each budget, fill the row
-                $spent = $repository->spentInPeriodCorrected($category, $start, $month, $shared);
-                $row[] = $spent;
+                $spent = $repository->balanceInPeriod($category, $start, $month, $accounts);
+                if ($spent < 0) {
+                    $row[] = $spent * -1;
+                } else {
+                    $row[] = 0;
+                }
             }
             $entries->push($row);
-
             $start->addMonth();
         }
-
-        $data = $this->generator->year($categories, $entries);
+        $data = $this->generator->spentInYear($categories, $entries);
         $cache->store($data);
 
         return Response::json($data);
     }
+
+    /**
+     * Returns a chart of what has been earned in this period in each category
+     * grouped by month.
+     *
+     * @param CategoryRepositoryInterface $repository
+     * @param                             $report_type
+     * @param Carbon                      $start
+     * @param Carbon                      $end
+     * @param Collection                  $accounts
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function earnedInPeriod(CategoryRepositoryInterface $repository, $report_type, Carbon $start, Carbon $end, Collection $accounts)
+    {
+        $original = clone $start;
+        $cache    = new CacheProperties; // chart properties for cache:
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty($report_type);
+        $cache->addProperty($accounts);
+        $cache->addProperty('category');
+        $cache->addProperty('earned-in-period');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+        $categories = new Collection;
+        $sets       = new Collection;
+        $entries    = new Collection;
+
+        // run a very special query each month:
+        $start = clone $original;
+        while ($start < $end) {
+            $currentEnd   = clone $start;
+            $currentStart = clone $start;
+            $currentStart->startOfMonth();
+            $currentEnd->endOfMonth();
+            // get a list of categories, and what the user has earned for that category
+            // (if the user has earned anything)
+            $set        = $repository->earnedForAccounts($accounts, $currentStart, $currentEnd);
+            $categories = $categories->merge($set);
+            // save the set combined with the data that is in it:
+            // for example:
+            // [december 2015, salary:1000, bonus:200]
+            $sets->push([$currentStart, $set]);
+            $start->addMonth();
+        }
+        // filter categories into a single bunch. Useful later on.
+        // $categories contains all the categories the user has earned money
+        // in in this period.
+        $categories = $categories->unique('id');
+        $categories = $categories->sortBy(
+            function (Category $category) {
+                return $category->name;
+            }
+        );
+
+        // start looping the time again, this time processing the
+        // data for each month.
+        $start = clone $original;
+        while ($start < $end) {
+            $currentEnd   = clone $start;
+            $currentStart = clone $start;
+            $currentStart->startOfMonth();
+            $currentEnd->endOfMonth();
+
+            // in $sets we have saved all the sets of data for each month
+            // so now we need to retrieve the corrent one.
+            // match is on date of course.
+            $currentSet = $sets->first(
+                function ($key, $value) use ($currentStart) {
+                    // set for this date.
+                    return ($value[0] == $currentStart);
+                }
+            );
+            // create a row used later on.
+            $row = [clone $currentStart];
+
+            // loop all categories:
+            /** @var Category $category */
+            foreach ($categories as $category) {
+                // if entry is not null, we've earned money in this period for this category.
+                $entry = $currentSet[1]->first(
+                    function ($key, $value) use ($category) {
+                        return $value->id == $category->id;
+                    }
+                );
+                // save amount
+                if (!is_null($entry)) {
+                    $row[] = $entry->earned;
+                } else {
+                    $row[] = 0;
+                }
+            }
+            $entries->push($row);
+            $start->addMonth();
+        }
+
+        $data = $this->generator->earnedInPeriod($categories, $entries);
+        $cache->store($data);
+
+        return $data;
+
+    }
+
+    /**
+     * Returns a chart of what has been spent in this period in each category
+     * grouped by month.
+     *
+     * @param CategoryRepositoryInterface $repository
+     * @param                             $report_type
+     * @param Carbon                      $start
+     * @param Carbon                      $end
+     * @param Collection                  $accounts
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function spentInPeriod(CategoryRepositoryInterface $repository, $report_type, Carbon $start, Carbon $end, Collection $accounts)
+    {
+        $original = clone $start;
+        $cache    = new CacheProperties; // chart properties for cache:
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty($report_type);
+        $cache->addProperty($accounts);
+        $cache->addProperty('category');
+        $cache->addProperty('spent-in-period');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+        $categories = new Collection;
+        $sets       = new Collection;
+        $entries    = new Collection;
+
+        // run a very special query each month:
+        $start = clone $original;
+        while ($start < $end) {
+            $currentEnd   = clone $start;
+            $currentStart = clone $start;
+            $currentStart->startOfMonth();
+            $currentEnd->endOfMonth();
+            $set        = $repository->spentForAccounts($accounts, $currentStart, $currentEnd);
+            $categories = $categories->merge($set);
+            $sets->push([$currentStart, $set]);
+            $start->addMonth();
+        }
+        $categories = $categories->unique('id');
+        $categories = $categories->sortBy(
+            function (Category $category) {
+                return $category->name;
+            }
+        );
+
+        $start = clone $original;
+        while ($start < $end) {
+            $currentEnd   = clone $start;
+            $currentStart = clone $start;
+            $currentStart->startOfMonth();
+            $currentEnd->endOfMonth();
+            $currentSet = $sets->first(
+                function ($key, $value) use ($currentStart) {
+                    // set for this date.
+                    return ($value[0] == $currentStart);
+                }
+            );
+            $row        = [clone $currentStart];
+
+            /** @var Category $category */
+            foreach ($categories as $category) {
+                /** @var Category $entry */
+                $entry = $currentSet[1]->first(
+                    function ($key, $value) use ($category) {
+                        return $value->id == $category->id;
+                    }
+                );
+                if (!is_null($entry)) {
+                    $row[] = $entry->spent;
+                } else {
+                    $row[] = 0;
+                }
+            }
+            $entries->push($row);
+            $start->addMonth();
+        }
+
+        $data = $this->generator->spentInPeriod($categories, $entries);
+        $cache->store($data);
+
+        return $data;
+
+    }
+
 }

app/Http/Controllers/Chart/ReportController.php

@@ -36,41 +36,66 @@ class ReportController extends Controller
      * Summarizes all income and expenses, per month, for a given year.
      *
      * @param ReportQueryInterface $query
-     * @param                      $year
-     * @param bool                 $shared
+     * @param                      $report_type
+     * @param Carbon               $start
+     * @param Carbon               $end
+     * @param Collection           $accounts
      *
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @return \Illuminate\Http\JsonResponse
      */
-    public function yearInOut(ReportQueryInterface $query, $year, $shared = false)
+    public function yearInOut(ReportQueryInterface $query, $report_type, Carbon $start, Carbon $end, Collection $accounts)
     {
-        // get start and end of year
-        $start  = new Carbon($year . '-01-01');
-        $end    = new Carbon($year . '-12-31');
-        $shared = $shared == 'shared' ? true : false;
-
         // chart properties for cache:
         $cache = new CacheProperties;
         $cache->addProperty('yearInOut');
-        $cache->addProperty($year);
-        $cache->addProperty($shared);
+        $cache->addProperty($start);
+        $cache->addProperty($accounts);
+        $cache->addProperty($end);
         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  = $query->incomeInPeriodCorrected($start, $month, $shared)->sum('amount');
-            $expenseSum = $query->expenseInPeriodCorrected($start, $month, $shared)->sum('amount');
 
-            $entries->push([clone $start, $incomeSum, $expenseSum]);
-            $start->addMonth();
+        // per year?
+        if ($start->diffInMonths($end) > 12) {
+
+            $entries = new Collection;
+            while ($start < $end) {
+                $startOfYear = clone $start;
+                $startOfYear->startOfYear();
+                $endOfYear = clone $startOfYear;
+                $endOfYear->endOfYear();
+
+                // total income and total expenses:
+                $incomeSum  = $query->incomeInPeriod($startOfYear, $endOfYear, $accounts)->sum('amount_positive');
+                $expenseSum = $query->expenseInPeriod($startOfYear, $endOfYear, $accounts)->sum('amount_positive');
+
+                $entries->push([clone $start, $incomeSum, $expenseSum]);
+                $start->addYear();
+            }
+
+            $data = $this->generator->multiYearInOut($entries);
+            $cache->store($data);
+        } else {
+            // per month:
+
+            $entries = new Collection;
+            while ($start < $end) {
+                $month = clone $start;
+                $month->endOfMonth();
+                // total income and total expenses:
+                $incomeSum  = $query->incomeInPeriod($start, $month, $accounts)->sum('amount_positive');
+                $expenseSum = $query->expenseInPeriod($start, $month, $accounts)->sum('amount_positive');
+
+
+                $entries->push([clone $start, $incomeSum, $expenseSum]);
+                $start->addMonth();
+            }
+
+            $data = $this->generator->yearInOut($entries);
+            $cache->store($data);
         }
 
-        $data = $this->generator->yearInOut($entries);
-        $cache->store($data);
 
         return Response::json($data);
 
@@ -80,44 +105,71 @@ class ReportController extends Controller
      * Summarizes all income and expenses for a given year. Gives a total and an average.
      *
      * @param ReportQueryInterface $query
-     * @param                      $year
-     * @param bool                 $shared
+     * @param                      $report_type
+     * @param Carbon               $start
+     * @param Carbon               $end
+     * @param Collection           $accounts
      *
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @return \Illuminate\Http\JsonResponse
      */
-    public function yearInOutSummarized(ReportQueryInterface $query, $year, $shared = false)
+    public function yearInOutSummarized(ReportQueryInterface $query, $report_type, Carbon $start, Carbon $end, Collection $accounts)
     {
 
         // chart properties for cache:
         $cache = new CacheProperties;
         $cache->addProperty('yearInOutSummarized');
-        $cache->addProperty($year);
-        $cache->addProperty($shared);
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty($accounts);
         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';
         $count   = 0;
 
         bcscale(2);
 
-        while ($start < $end) {
-            $month = clone $start;
-            $month->endOfMonth();
-            // total income and total expenses:
-            $income  = bcadd($income, $query->incomeInPeriodCorrected($start, $month, $shared)->sum('amount'));
-            $expense = bcadd($expense, $query->expenseInPeriodCorrected($start, $month, $shared)->sum('amount'));
-            $count++;
-            $start->addMonth();
+        if ($start->diffInMonths($end) > 12) {
+            // per year
+            while ($start < $end) {
+                $startOfYear = clone $start;
+                $startOfYear->startOfYear();
+                $endOfYear = clone $startOfYear;
+                $endOfYear->endOfYear();
+
+                // total income and total expenses:
+                $currentIncome  = $query->incomeInPeriod($startOfYear, $endOfYear, $accounts)->sum('amount_positive');
+                $currentExpense = $query->expenseInPeriod($startOfYear, $endOfYear, $accounts)->sum('amount_positive');
+                $income         = bcadd($income, $currentIncome);
+                $expense        = bcadd($expense, $currentExpense);
+
+                $count++;
+                $start->addYear();
+            }
+
+            $data = $this->generator->multiYearInOutSummarized($income, $expense, $count);
+            $cache->store($data);
+        } else {
+            // per month!
+            while ($start < $end) {
+                $month = clone $start;
+                $month->endOfMonth();
+                // total income and total expenses:
+                $currentIncome  = $query->incomeInPeriod($start, $month, $accounts)->sum('amount_positive');
+                $currentExpense = $query->expenseInPeriod($start, $month, $accounts)->sum('amount_positive');
+                $income         = bcadd($income, $currentIncome);
+                $expense        = bcadd($expense, $currentExpense);
+
+                $count++;
+                $start->addMonth();
+            }
+
+            $data = $this->generator->yearInOutSummarized($income, $expense, $count);
+            $cache->store($data);
         }
 
-        $data = $this->generator->yearInOutSummarized($income, $expense, $count);
-        $cache->store($data);
 
         return Response::json($data);
 

app/Http/Controllers/Controller.php

@@ -34,14 +34,15 @@ abstract class Controller extends BaseController
         View::share('hideTags', false);
 
         if (Auth::check()) {
-            $pref                    = Preferences::get('language', 'en');
+            $pref                    = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US'));
             $lang                    = $pref->data;
-            $this->monthFormat       = Config::get('firefly.month.' . $lang);
-            $this->monthAndDayFormat = Config::get('firefly.monthAndDay.' . $lang);
+            $this->monthFormat       = trans('config.month');
+            $this->monthAndDayFormat = trans('config.month_and_day');
 
             View::share('monthFormat', $this->monthFormat);
             View::share('monthAndDayFormat', $this->monthAndDayFormat);
             View::share('language', $lang);
+            View::share('localeconv', localeconv());
         }
     }
 }

app/Http/Controllers/CronController.php

@@ -25,32 +25,42 @@ class CronController extends Controller
 
         if (strlen(env('SENDGRID_USERNAME')) > 0 && strlen(env('SENDGRID_PASSWORD')) > 0) {
 
-            $URL        = 'https://api.sendgrid.com/api/bounces.get.json';
-            $parameters = [
-                'api_user' => env('SENDGRID_USERNAME'),
-                'api_key'  => env('SENDGRID_PASSWORD'),
-                'date'     => 1,
-                'days'     => 7
-            ];
-            $fullURL    = $URL . '?' . http_build_query($parameters);
-            $data       = json_decode(file_get_contents($fullURL));
+            $set = [
+                'blocks'   => 'https://api.sendgrid.com/api/blocks.get.json',
+                'bounces'  => 'https://api.sendgrid.com/api/bounces.get.json',
+                'invalids' => 'https://api.sendgrid.com/api/invalidemails.get.json',
 
-            /*
-             * Loop the result, if any.
-             */
-            if (is_array($data)) {
-                echo 'Found ' . count($data) . ' entries in the SendGrid bounce list.' . "\n";
-                foreach ($data as $entry) {
-                    $address = $entry->email;
-                    $user    = User::where('email', $address)->where('blocked', 0)->first();
-                    if (!is_null($user)) {
-                        echo 'Found a user: ' . $address . ', who is now blocked.' . "\n";
-                        $user->blocked      = 1;
-                        $user->blocked_code = 'bounced';
-                        $user->password     = 'bounced';
-                        $user->save();
-                    } else {
-                        echo 'Found no user: ' . $address . ', did nothing.' . "\n";
+            ];
+            echo '<pre>';
+            foreach ($set as $name => $URL) {
+
+
+                $parameters = [
+                    'api_user' => env('SENDGRID_USERNAME'),
+                    'api_key'  => env('SENDGRID_PASSWORD'),
+                    'date'     => 1,
+                    'days'     => 7
+                ];
+                $fullURL    = $URL . '?' . http_build_query($parameters);
+                $data       = json_decode(file_get_contents($fullURL));
+
+                /*
+                 * Loop the result, if any.
+                 */
+                if (is_array($data)) {
+                    echo 'Found ' . count($data) . ' entries in the SendGrid ' . $name . ' list.' . "\n";
+                    foreach ($data as $entry) {
+                        $address = $entry->email;
+                        $user    = User::where('email', $address)->where('blocked', 0)->first();
+                        if (!is_null($user)) {
+                            echo 'Found a user: ' . $address . ', who is now blocked.' . "\n";
+                            $user->blocked      = 1;
+                            $user->blocked_code = 'bounced';
+                            $user->password     = 'bounced';
+                            $user->save();
+                        } else {
+                            echo 'Found no user: ' . $address . ', did nothing.' . "\n";
+                        }
                     }
                 }
             }

app/Http/Controllers/CurrencyController.php

@@ -147,7 +147,7 @@ class CurrencyController extends Controller
     public function index(CurrencyRepositoryInterface $repository)
     {
         $currencies      = $repository->get();
-        $defaultCurrency = $repository->getCurrencyByPreference(Preferences::get('currencyPreference', 'EUR'));
+        $defaultCurrency = $repository->getCurrencyByPreference(Preferences::get('currencyPreference', env('DEFAULT_CURRENCY', 'EUR')));
 
 
         if (!Auth::user()->hasRole('owner')) {

app/Http/Controllers/HomeController.php

@@ -79,18 +79,16 @@ class HomeController extends Controller
             return redirect(route('new-user.index'));
         }
 
-        $title         = 'Firefly';
-        $subTitle      = trans('firefly.welcomeBack');
-        $mainTitleIcon = 'fa-fire';
-        $transactions  = [];
-        $frontPage     = Preferences::get('frontPageAccounts', []);
-        $start         = Session::get('start', Carbon::now()->startOfMonth());
-        $end           = Session::get('end', Carbon::now()->endOfMonth());
-        $showTour      = Preferences::get('tour', true)->data;
-
-        $accounts = $repository->getFrontpageAccounts($frontPage);
-        $savings  = $repository->getSavingsAccounts();
-
+        $title             = 'Firefly';
+        $subTitle          = trans('firefly.welcomeBack');
+        $mainTitleIcon     = 'fa-fire';
+        $transactions      = [];
+        $frontPage         = Preferences::get('frontPageAccounts', []);
+        $start             = Session::get('start', Carbon::now()->startOfMonth());
+        $end               = Session::get('end', Carbon::now()->endOfMonth());
+        $showTour          = Preferences::get('tour', true)->data;
+        $accounts          = $repository->getFrontpageAccounts($frontPage);
+        $savings           = $repository->getSavingsAccounts();
         $piggyBankAccounts = $repository->getPiggyBankAccounts();
 
 
@@ -122,33 +120,4 @@ class HomeController extends Controller
         );
     }
 
-    /**
-     * @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'));
-        }
-        Log::debug('Make log.');
-
-        // 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/JsonController.php

@@ -15,7 +15,6 @@ use Illuminate\Support\Collection;
 use Preferences;
 use Response;
 use Session;
-use Steam;
 
 /**
  * Class JsonController
@@ -72,9 +71,8 @@ class JsonController extends Controller
      */
     public function boxBillsPaid(BillRepositoryInterface $repository, AccountRepositoryInterface $accountRepository)
     {
-        $start  = Session::get('start', Carbon::now()->startOfMonth());
-        $end    = Session::get('end', Carbon::now()->endOfMonth());
-        $amount = 0;
+        $start = Session::get('start', Carbon::now()->startOfMonth());
+        $end   = Session::get('end', Carbon::now()->endOfMonth());
         bcscale(2);
 
         // works for json too!
@@ -85,19 +83,14 @@ class JsonController extends Controller
         if ($cache->has()) {
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
-        $bills = $repository->getActiveBills(); // these two functions are the same as the chart
+        // get amount from bills
+        $amount = $repository->billsPaidInRange($start, $end)->sum('paid');
 
-        /** @var Bill $bill */
-        foreach ($bills as $bill) {
-            $amount = bcadd($amount, $repository->billPaymentsInRange($bill, $start, $end));
-        }
-        unset($bill, $bills);
-
-        $creditCards = $accountRepository->getCreditCards(); // Find credit card accounts and possibly unpaid credit card bills.
+        // add credit card bill.
+        $creditCards = $accountRepository->getCreditCards($end); // Find credit card accounts and possibly unpaid credit card bills.
         /** @var Account $creditCard */
         foreach ($creditCards as $creditCard) {
-            $balance = Steam::balance($creditCard, $end, true); // if the balance is not zero, the monthly payment is still underway.
-            if ($balance == 0) {
+            if ($creditCard->balance == 0) {
                 // find a transfer TO the credit card which should account for
                 // anything paid. If not, the CC is not yet used.
                 $amount = bcadd($amount, $accountRepository->getTransfersInRange($creditCard, $start, $end)->sum('amount'));
@@ -147,14 +140,15 @@ class JsonController extends Controller
         }
         unset($bill, $bills, $range, $ranges);
 
-        $creditCards = $accountRepository->getCreditCards();
+        $creditCards = $accountRepository->getCreditCards($end);
+
+        /** @var Account $creditCard */
         foreach ($creditCards as $creditCard) {
-            $balance = Steam::balance($creditCard, $end, true);
-            $date    = new Carbon($creditCard->getMeta('ccMonthlyPaymentDate'));
-            if ($balance < 0) {
+            $date = new Carbon($creditCard->getMeta('ccMonthlyPaymentDate'));
+            if ($creditCard->balance < 0) {
                 // unpaid! create a fake bill that matches the amount.
                 $description = $creditCard->name;
-                $fakeAmount  = $balance * -1;
+                $fakeAmount  = $creditCard->balance * -1;
                 $fakeBill    = $repository->createFakeBill($description, $date, $fakeAmount);
                 $unpaid->push([$fakeBill, $date]);
             }
@@ -176,7 +170,7 @@ class JsonController extends Controller
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function boxIn(ReportQueryInterface $reportQuery)
+    public function boxIn(ReportQueryInterface $reportQuery, AccountRepositoryInterface $accountRepository)
     {
         $start = Session::get('start', Carbon::now()->startOfMonth());
         $end   = Session::get('end', Carbon::now()->endOfMonth());
@@ -189,8 +183,8 @@ class JsonController extends Controller
         if ($cache->has()) {
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
-
-        $amount = $reportQuery->incomeInPeriodCorrected($start, $end, true)->sum('amount');
+        $accounts = $accountRepository->getAccounts(['Default account', 'Asset account', 'Cash account']);
+        $amount   = $reportQuery->incomeInPeriod($start, $end, $accounts)->sum('to_amount');
 
         $data = ['box' => 'in', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount];
         $cache->store($data);
@@ -203,11 +197,12 @@ class JsonController extends Controller
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function boxOut(ReportQueryInterface $reportQuery)
+    public function boxOut(ReportQueryInterface $reportQuery, AccountRepositoryInterface $accountRepository)
     {
         $start = Session::get('start', Carbon::now()->startOfMonth());
         $end   = Session::get('end', Carbon::now()->endOfMonth());
 
+        $accounts = $accountRepository->getAccounts(['Default account', 'Asset account', 'Cash account']);
 
         // works for json too!
         $cache = new CacheProperties;
@@ -218,7 +213,7 @@ class JsonController extends Controller
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
-        $amount = $reportQuery->expenseInPeriodCorrected($start, $end, true)->sum('amount');
+        $amount = $reportQuery->expenseInPeriod($start, $end, $accounts)->sum('to_amount');
 
         $data = ['box' => 'out', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount];
         $cache->store($data);
@@ -240,7 +235,6 @@ class JsonController extends Controller
         foreach ($list as $entry) {
             $return[] = $entry->name;
         }
-        sort($return);
 
         return Response::json($return);
     }

app/Http/Controllers/NewUserController.php

@@ -49,7 +49,6 @@ class NewUserController extends Controller
      */
     public function submit(NewUserFormRequest $request, AccountRepositoryInterface $repository)
     {
-
         // create normal asset account:
         $assetAccount = [
             'name'                   => $request->get('bank_name'),
@@ -61,7 +60,7 @@ class NewUserController extends Controller
             'accountRole'            => 'defaultAsset',
             'openingBalance'         => round($request->input('bank_balance'), 2),
             'openingBalanceDate'     => new Carbon,
-            'openingBalanceCurrency' => intval($request->input('balance_currency_id')),
+            'openingBalanceCurrency' => intval($request->input('amount_currency_id_bank_balance')),
         ];
 
         $repository->store($assetAccount);
@@ -78,7 +77,7 @@ class NewUserController extends Controller
                 'accountRole'            => 'savingAsset',
                 'openingBalance'         => round($request->input('savings_balance'), 2),
                 'openingBalanceDate'     => new Carbon,
-                'openingBalanceCurrency' => intval($request->input('balance_currency_id')),
+                'openingBalanceCurrency' => intval($request->input('amount_currency_id_savings_balance')),
             ];
             $repository->store($savingsAccount);
         }
@@ -96,7 +95,7 @@ class NewUserController extends Controller
                 'accountRole'            => 'ccAsset',
                 'openingBalance'         => null,
                 'openingBalanceDate'     => null,
-                'openingBalanceCurrency' => intval($request->input('balance_currency_id')),
+                'openingBalanceCurrency' => intval($request->input('amount_currency_id_credit_card_limit')),
             ];
             $creditCard    = $repository->store($creditAccount);
 

app/Http/Controllers/PreferencesController.php

@@ -37,10 +37,12 @@ class PreferencesController extends Controller
         $viewRange         = $viewRangePref->data;
         $frontPageAccounts = Preferences::get('frontPageAccounts', []);
         $budgetMax         = Preferences::get('budgetMaximum', 1000);
-        $language          = Preferences::get('language', 'en')->data;
+        $language          = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US'))->data;
         $budgetMaximum     = $budgetMax->data;
 
-        return view('preferences.index', compact('budgetMaximum', 'language', 'accounts', 'frontPageAccounts', 'viewRange'));
+        $showIncomplete = env('SHOW_INCOMPLETE_TRANSLATIONS', 'false') == 'true';
+
+        return view('preferences.index', compact('budgetMaximum', 'language', 'accounts', 'frontPageAccounts', 'viewRange', 'showIncomplete'));
     }
 
     /**
@@ -70,7 +72,7 @@ class PreferencesController extends Controller
 
         // language:
         $lang = Input::get('language');
-        if (in_array($lang, array_keys(Config::get('firefly.lang')))) {
+        if (in_array($lang, array_keys(Config::get('firefly.languages')))) {
             Preferences::set('language', $lang);
         }
 

app/Http/Controllers/ProfileController.php

@@ -66,7 +66,7 @@ class ProfileController extends Controller
         }
 
         // update the user with the new password.
-        Auth::user()->password = $request->get('new_password');
+        Auth::user()->password = bcrypt($request->get('new_password'));
         Auth::user()->save();
 
         Session::flash('success', trans('firefly.password_changed'));

app/Http/Controllers/ReportController.php

@@ -4,6 +4,7 @@ use Carbon\Carbon;
 use FireflyIII\Helpers\Report\ReportHelperInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use Illuminate\Support\Collection;
 use Session;
 use View;
 
@@ -41,111 +42,190 @@ class ReportController extends Controller
      */
     public function index(AccountRepositoryInterface $repository)
     {
-        $start  = Session::get('first');
-        $months = $this->helper->listOfMonths($start);
+        $start        = Session::get('first');
+        $months       = $this->helper->listOfMonths($start);
+        $startOfMonth = clone Session::get('start');
+        $endOfMonth   = clone Session::get('start');
+        $startOfYear  = clone Session::get('start');
+        $endOfYear    = clone Session::get('start');
+        $startOfMonth->startOfMonth();
+        $endOfMonth->endOfMonth();
+        $startOfYear->startOfYear();
+        $endOfYear->endOfYear();
 
         // does the user have shared accounts?
-        $accounts  = $repository->getAccounts(['Default account', 'Asset account']);
-        $hasShared = false;
-
+        $accounts = $repository->getAccounts(['Default account', 'Asset account']);
+        // get id's for quick links:
+        $accountIds = [];
         /** @var Account $account */
         foreach ($accounts as $account) {
-            if ($account->getMeta('accountRole') == 'sharedAsset') {
-                $hasShared = true;
-            }
+            $accountIds [] = $account->id;
         }
+        $accountList = join(',', $accountIds);
 
 
-        return view('reports.index', compact('months', 'hasShared'));
+        return view('reports.index', compact('months', 'accounts', 'start', 'accountList',
+                                             'startOfMonth', 'endOfMonth', 'startOfYear', 'endOfYear'
+        ));
     }
 
     /**
-     * @param string $year
-     * @param string $month
+     * @param            $report_type
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
-     * @param bool   $shared
-     *
-     * @return \Illuminate\View\View
+     * @return View
      */
-    public function month($year = '2014', $month = '1', $shared = false)
+    public function defaultYear($report_type, Carbon $start, Carbon $end, Collection $accounts)
     {
-        $start            = new Carbon($year . '-' . $month . '-01');
-        $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', ['month' => $start->formatLocalized($this->monthFormat)]);
-        }
-
-        $end->endOfMonth();
-
-        $accounts   = $this->helper->getAccountReport($start, $end, $shared);
-        $incomes    = $this->helper->getIncomeReport($start, $end, $shared);
-        $expenses   = $this->helper->getExpenseReport($start, $end, $shared);
-        $budgets    = $this->helper->getBudgetReport($start, $end, $shared);
-        $categories = $this->helper->getCategoryReport($start, $end, $shared);
-        $balance    = $this->helper->getBalanceReport($start, $end, $shared);
-        $bills      = $this->helper->getBillReport($start, $end);
-
-        Session::flash('gaEventCategory', 'report');
-        Session::flash('gaEventAction', 'month');
-        Session::flash('gaEventLabel', $start->format('F Y'));
-
-
-        return view(
-            'reports.month',
-            compact(
-                'start', 'shared',
-                'subTitle', 'subTitleIcon',
-                'accounts',
-                'incomes', 'incomeTopLength',
-                'expenses', 'expenseTopLength',
-                'budgets', 'balance',
-                'categories',
-                'bills'
-            )
-        );
-
-    }
-
-    /**
-     * @param      $year
-     *
-     * @param bool $shared
-     *
-     * @return $this
-     */
-    public function year($year, $shared = false)
-    {
-        $start            = new Carbon('01-01-' . $year);
-        $end              = clone $start;
-        $subTitle         = trans('firefly.reportForYear', ['year' => $year]);
-        $subTitleIcon     = 'fa-bar-chart';
         $incomeTopLength  = 8;
         $expenseTopLength = 8;
 
-        if ($shared == 'shared') {
-            $shared   = true;
-            $subTitle = trans('firefly.reportForYearShared', ['year' => $year]);
-        }
-        $end->endOfYear();
-
-        $accounts = $this->helper->getAccountReport($start, $end, $shared);
-        $incomes  = $this->helper->getIncomeReport($start, $end, $shared);
-        $expenses = $this->helper->getExpenseReport($start, $end, $shared);
+        $accountReport = $this->helper->getAccountReport($start, $end, $accounts);
+        $incomes       = $this->helper->getIncomeReport($start, $end, $accounts);
+        $expenses      = $this->helper->getExpenseReport($start, $end, $accounts);
 
         Session::flash('gaEventCategory', 'report');
         Session::flash('gaEventAction', 'year');
         Session::flash('gaEventLabel', $start->format('Y'));
 
+        // and some id's, joined:
+        $accountIds = [];
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $accountIds[] = $account->id;
+        }
+        $accountIds = join(',', $accountIds);
+
         return view(
-            'reports.year',
-            compact('start', 'shared', 'accounts', 'incomes', 'expenses', 'subTitle', 'subTitleIcon', 'incomeTopLength', 'expenseTopLength')
+            'reports.default.year',
+            compact(
+                'start', 'accountReport', 'incomes', 'report_type', 'accountIds', 'end',
+                'expenses', 'incomeTopLength', 'expenseTopLength'
+            )
         );
     }
 
 
+    /**
+     * @param            $report_type
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return View
+     */
+    public function defaultMonth($report_type, Carbon $start, Carbon $end, Collection $accounts)
+    {
+        $incomeTopLength  = 8;
+        $expenseTopLength = 8;
+
+        // get report stuff!
+        $accountReport = $this->helper->getAccountReport($start, $end, $accounts);
+        $incomes       = $this->helper->getIncomeReport($start, $end, $accounts);
+        $expenses      = $this->helper->getExpenseReport($start, $end, $accounts);
+        $budgets       = $this->helper->getBudgetReport($start, $end, $accounts);
+        $categories    = $this->helper->getCategoryReport($start, $end, $accounts);
+        $balance       = $this->helper->getBalanceReport($start, $end, $accounts);
+        $bills         = $this->helper->getBillReport($start, $end, $accounts);
+
+        // and some id's, joined:
+        $accountIds = [];
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $accountIds[] = $account->id;
+        }
+        $accountIds = join(',', $accountIds);
+
+        // continue!
+        return view(
+            'reports.default.month',
+            compact(
+                'start', 'end', 'report_type',
+                'accountReport',
+                'incomes', 'incomeTopLength',
+                'expenses', 'expenseTopLength',
+                'budgets', 'balance',
+                'categories',
+                'bills',
+                'accountIds', 'report_type'
+            )
+        );
+    }
+
+    public function defaultMultiYear($report_type, $start, $end, $accounts)
+    {
+
+
+        // list of users stuff:
+        $budgets    = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface')->getActiveBudgets();
+        $categories = app('FireflyIII\Repositories\Category\CategoryRepositoryInterface')->getCategories();
+
+        // and some id's, joined:
+        $accountIds = [];
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $accountIds[] = $account->id;
+        }
+        $accountIds = join(',', $accountIds);
+
+        return view(
+            'reports.default.multi-year', compact('budgets', 'accounts', 'categories', 'start', 'end', 'accountIds', 'report_type')
+        );
+    }
+
+    /**
+     * @param            $report_type
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return View
+     */
+    public function report($report_type, Carbon $start, Carbon $end, Collection $accounts)
+    {
+        // throw an error if necessary.
+        if ($end < $start) {
+            return view('error')->with('message', 'End date cannot be before start date, silly!');
+        }
+
+        // lower threshold
+        if ($start < Session::get('first')) {
+            $start = Session::get('first');
+        }
+
+        switch ($report_type) {
+            default:
+            case 'default':
+
+                View::share(
+                    'subTitle', trans(
+                                  'firefly.report_default',
+                                  [
+                                      'start' => $start->formatLocalized($this->monthFormat),
+                                      'end'   => $end->formatLocalized($this->monthFormat),
+                                  ]
+                              )
+                );
+                View::share('subTitleIcon', 'fa-calendar');
+
+                // more than one year date difference means year report.
+                if ($start->diffInMonths($end) > 12) {
+                    //                    return view('error')->with('message', 'No report yet for this time period.');
+                    return $this->defaultMultiYear($report_type, $start, $end, $accounts);
+                }
+                // more than two months date difference means year report.
+                if ($start->diffInMonths($end) > 1) {
+                    return $this->defaultYear($report_type, $start, $end, $accounts);
+                }
+
+                return $this->defaultMonth($report_type, $start, $end, $accounts);
+                break;
+        }
+
+
+    }
+
+
 }

app/Http/Controllers/TagController.php

@@ -44,9 +44,9 @@ class TagController extends Controller
         View::share('mainTitleIcon', 'fa-tags');
         View::share('hideTags', true);
         $this->tagOptions = [
-            'nothing'        => 'Just a regular tag.',
-            'balancingAct'   => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
-            'advancePayment' => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
+            'nothing'        => trans('firefly.regular_tag'),
+            'balancingAct'   => trans('firefly.balancing_act'),
+            'advancePayment' => trans('firefly.advance_payment'),
         ];
         View::share('tagOptions', $this->tagOptions);
     }
@@ -190,7 +190,8 @@ class TagController extends Controller
             $tags = Auth::user()->tags()->where('tagMode', $type)->orderBy('date', 'ASC')->get();
             $tags = $tags->sortBy(
                 function (Tag $tag) {
-                    $date = $tag->date->format('Ymd');
+                    $date = !is_null($tag->date) ? $tag->date->format('Ymd') : '000000';
+
 
                     return strtolower($date . $tag->tag);
                 }

app/Http/Controllers/TransactionController.php

@@ -1,5 +1,6 @@
 <?php namespace FireflyIII\Http\Controllers;
 
+use Amount;
 use Auth;
 use Carbon\Carbon;
 use Config;
@@ -8,8 +9,10 @@ use FireflyIII\Events\JournalCreated;
 use FireflyIII\Events\JournalSaved;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Requests\JournalFormRequest;
+use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use Input;
@@ -43,19 +46,28 @@ class TransactionController extends Controller
      *
      * @return \Illuminate\View\View
      */
-    public function create(AccountRepositoryInterface $repository, $what = 'deposit')
+    public function create(AccountRepositoryInterface $repository, $what = TransactionType::DEPOSIT)
     {
+        $what        = strtolower($what);
         $maxFileSize = Steam::phpBytes(ini_get('upload_max_filesize'));
         $maxPostSize = Steam::phpBytes(ini_get('post_max_size'));
         $uploadSize  = min($maxFileSize, $maxPostSize);
         $accounts    = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
         $budgets     = ExpandedForm::makeSelectList(Auth::user()->budgets()->get());
         $budgets[0]  = trans('form.noBudget');
-        $piggies     = ExpandedForm::makeSelectList(Auth::user()->piggyBanks()->get());
-        $piggies[0]  = trans('form.noPiggybank');
-        $preFilled   = Session::has('preFilled') ? Session::get('preFilled') : [];
-        $respondTo   = ['account_id', 'account_from_id'];
-        $subTitle    = trans('form.add_new_' . $what);
+
+        // piggy bank list:
+        $piggyBanks = Auth::user()->piggyBanks()->orderBy('order', 'ASC')->get();
+        /** @var PiggyBank $piggy */
+        foreach ($piggyBanks as $piggy) {
+            $piggy->name = $piggy->name . ' (' . Amount::format($piggy->currentRelevantRep()->currentamount, false) . ')';
+        }
+
+        $piggies    = ExpandedForm::makeSelectList($piggyBanks);
+        $piggies[0] = trans('form.noPiggybank');
+        $preFilled  = Session::has('preFilled') ? Session::get('preFilled') : [];
+        $respondTo  = ['account_id', 'account_from_id'];
+        $subTitle   = trans('form.add_new_' . $what);
 
         foreach ($respondTo as $r) {
             $preFilled[$r] = Input::get($r);
@@ -85,7 +97,7 @@ class TransactionController extends Controller
      */
     public function delete(TransactionJournal $journal)
     {
-        $what     = strtolower($journal->transactionType->type);
+        $what     = strtolower($journal->getTransactionType());
         $subTitle = trans('firefly.delete_' . $what, ['description' => $journal->description]);
 
         // put previous url in session
@@ -126,10 +138,16 @@ class TransactionController extends Controller
      */
     public function edit(AccountRepositoryInterface $repository, TransactionJournal $journal)
     {
+        // cannot edit opening balance
+        if ($journal->isOpeningBalance()) {
+            return view('error')->with('message', 'Cannot edit this transaction. Edit the account instead!');
+        }
+
+
         $maxFileSize = Steam::phpBytes(ini_get('upload_max_filesize'));
         $maxPostSize = Steam::phpBytes(ini_get('post_max_size'));
         $uploadSize  = min($maxFileSize, $maxPostSize);
-        $what        = strtolower($journal->transactionType->type);
+        $what        = strtolower($journal->getTransactionType());
         $accounts    = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
         $budgets     = ExpandedForm::makeSelectList(Auth::user()->budgets()->get());
         $budgets[0]  = trans('form.noBudget');
@@ -163,9 +181,9 @@ class TransactionController extends Controller
             $preFilled['piggy_bank_id'] = $journal->piggyBankEvents()->orderBy('date', 'DESC')->first()->piggy_bank_id;
         }
 
-        $preFilled['amount'] = $journal->actual_amount;
+        $preFilled['amount'] = $journal->amount_positive;
 
-        if ($journal->transactionType->type == 'Withdrawal') {
+        if ($journal->isWithdrawal()) {
             $preFilled['account_id']      = $journal->source_account->id;
             $preFilled['expense_account'] = $journal->destination_account->name_for_editform;
         } else {
@@ -253,8 +271,8 @@ class TransactionController extends Controller
                 $t->after  = bcadd($t->before, $t->amount);
             }
         );
-        $what     = strtolower($journal->transactionType->type);
-        $subTitle = trans('firefly.' . $journal->transactionType->type) . ' "' . e($journal->description) . '"';
+        $what     = strtolower($journal->getTransactionType());
+        $subTitle = trans('firefly.' . $journal->getTransactionType()) . ' "' . e($journal->description) . '"';
 
         return view('transactions.show', compact('journal', 'subTitle', 'what'));
     }
@@ -271,7 +289,7 @@ class TransactionController extends Controller
         $journalData = $request->getJournalData();
 
         // if not withdrawal, unset budgetid.
-        if ($journalData['what'] != 'withdrawal') {
+        if ($journalData['what'] != strtolower(TransactionType::WITHDRAWAL)) {
             $journalData['budget_id'] = 0;
         }
 
@@ -292,7 +310,7 @@ class TransactionController extends Controller
         // rescan journal, UpdateJournalConnection
         event(new JournalSaved($journal));
 
-        if ($journal->transactionType->type == 'Transfer' && intval($request->get('piggy_bank_id')) > 0) {
+        if ($journal->isTransfer() && intval($request->get('piggy_bank_id')) > 0) {
             event(new JournalCreated($journal, intval($request->get('piggy_bank_id'))));
         }
 
@@ -323,6 +341,11 @@ class TransactionController extends Controller
     public function update(JournalFormRequest $request, JournalRepositoryInterface $repository, AttachmentHelperInterface $att, TransactionJournal $journal)
     {
 
+        // cannot edit opening balance
+        if ($journal->isOpeningBalance()) {
+            return view('error')->with('message', 'Cannot edit this transaction. Edit the account instead!');
+        }
+
         $journalData = $request->getJournalData();
         $repository->update($journal, $journalData);
 

app/Http/Middleware/Authenticate.php

@@ -1,6 +1,7 @@
 <?php namespace FireflyIII\Http\Middleware;
 
 use App;
+use Auth;
 use Carbon\Carbon;
 use Closure;
 use Config;
@@ -54,15 +55,20 @@ class Authenticate
         }
 
         if (intval($this->auth->user()->blocked) == 1) {
-            return redirect()->route('logout');
+            Auth::logout();
+
+            return redirect()->route('index');
         }
 
         // if logged in, set user language:
-        $pref = Preferences::get('language', 'en');
+        $pref = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'));
         App::setLocale($pref->data);
-        Carbon::setLocale($pref->data);
+        Carbon::setLocale(substr($pref->data,0,2));
+        $locale = explode(',', trans('config.locale'));
+        $locale = array_map('trim', $locale);
 
-        setlocale(LC_TIME, Config::get('firefly.locales.' . $pref->data));
+        setlocale(LC_TIME, $locale);
+        setlocale(LC_MONETARY, $locale);
 
         return $next($request);
     }

app/Http/Requests/AccountFormRequest.php

@@ -41,18 +41,19 @@ class AccountFormRequest extends Request
         }
 
         return [
-            'id'                   => $idRule,
-            'name'                 => $nameRule,
-            'openingBalance'       => 'numeric',
-            'iban'                 => 'iban',
-            'virtualBalance'       => 'numeric',
-            'openingBalanceDate'   => 'date',
-            'accountRole'          => 'in:' . $accountRoles,
-            'active'               => 'boolean',
-            'ccType'               => 'in:' . $ccPaymentTypes,
-            'ccMonthlyPaymentDate' => 'date',
-            'balance_currency_id'  => 'exists:transaction_currencies,id',
-            'what'                 => 'in:' . $types
+            'id'                                => $idRule,
+            'name'                              => $nameRule,
+            'openingBalance'                    => 'numeric',
+            'iban'                              => 'iban',
+            'virtualBalance'                    => 'numeric',
+            'openingBalanceDate'                => 'date',
+            'accountRole'                       => 'in:' . $accountRoles,
+            'active'                            => 'boolean',
+            'ccType'                            => 'in:' . $ccPaymentTypes,
+            'ccMonthlyPaymentDate'              => 'date',
+            'amount_currency_id_openingBalance' => 'exists:transaction_currencies,id',
+            'amount_currency_id_virtualBalance' => 'exists:transaction_currencies,id',
+            'what'                              => 'in:' . $types
         ];
     }
 }

app/Http/Requests/BillFormRequest.php

@@ -29,17 +29,18 @@ class BillFormRequest extends Request
     public function getBillData()
     {
         return [
-            'name'               => $this->get('name'),
-            'match'              => $this->get('match'),
-            'amount_min'         => round($this->get('amount_min'), 2),
-            'amount_currency_id' => round($this->get('amount_currency_id'), 2),
-            'amount_max'         => round($this->get('amount_max'), 2),
-            'date'               => new Carbon($this->get('date')),
-            'user'               => Auth::user()->id,
-            'repeat_freq'        => $this->get('repeat_freq'),
-            'skip'               => intval($this->get('skip')),
-            'automatch'          => intval($this->get('automatch')) === 1,
-            'active'             => intval($this->get('active')) === 1,
+            'name'                          => $this->get('name'),
+            'match'                         => $this->get('match'),
+            'amount_min'                    => round($this->get('amount_min'), 2),
+            'amount_currency_id_amount_min' => intval($this->get('amount_currency_id_amount_min')),
+            'amount_currency_id_amount_max' => intval($this->get('amount_currency_id_amount_max')),
+            'amount_max'                    => round($this->get('amount_max'), 2),
+            'date'                          => new Carbon($this->get('date')),
+            'user'                          => Auth::user()->id,
+            'repeat_freq'                   => $this->get('repeat_freq'),
+            'skip'                          => intval($this->get('skip')),
+            'automatch'                     => intval($this->get('automatch')) === 1,
+            'active'                        => intval($this->get('active')) === 1,
         ];
     }
 
@@ -56,16 +57,17 @@ class BillFormRequest extends Request
         }
 
         $rules = [
-            'name'               => $nameRule,
-            'match'              => $matchRule,
-            'amount_min'         => 'required|numeric|min:0.01',
-            'amount_max'         => 'required|numeric|min:0.01',
-            'amount_currency_id' => 'required|exists:transaction_currencies,id',
-            'date'               => 'required|date',
-            'repeat_freq'        => 'required|in:weekly,monthly,quarterly,half-year,yearly',
-            'skip'               => 'required|between:0,31',
-            'automatch'          => 'in:1',
-            'active'             => 'in:1',
+            'name'                          => $nameRule,
+            'match'                         => $matchRule,
+            'amount_min'                    => 'required|numeric|min:0.01',
+            'amount_max'                    => 'required|numeric|min:0.01',
+            'amount_currency_id_amount_min' => 'required|exists:transaction_currencies,id',
+            'amount_currency_id_amount_max' => 'required|exists:transaction_currencies,id',
+            'date'                          => 'required|date',
+            'repeat_freq'                   => 'required|in:weekly,monthly,quarterly,half-year,yearly',
+            'skip'                          => 'required|between:0,31',
+            'automatch'                     => 'in:1',
+            'active'                        => 'in:1',
         ];
 
         return $rules;

app/Http/Requests/JournalFormRequest.php

@@ -5,6 +5,7 @@ namespace FireflyIII\Http\Requests;
 use Auth;
 use Carbon\Carbon;
 use Exception;
+use FireflyIII\Models\TransactionType;
 use Input;
 
 /**
@@ -30,20 +31,20 @@ class JournalFormRequest extends Request
     public function getJournalData()
     {
         return [
-            'what'               => $this->get('what'),
-            'description'        => $this->get('description'),
-            'account_id'         => intval($this->get('account_id')),
-            'account_from_id'    => intval($this->get('account_from_id')),
-            'account_to_id'      => intval($this->get('account_to_id')),
-            'expense_account'    => $this->get('expense_account'),
-            'revenue_account'    => $this->get('revenue_account'),
-            'amount'             => round($this->get('amount'), 2),
-            'user'               => Auth::user()->id,
-            'amount_currency_id' => intval($this->get('amount_currency_id')),
-            'date'               => new Carbon($this->get('date')),
-            'budget_id'          => intval($this->get('budget_id')),
-            'category'           => $this->get('category'),
-            'tags'               => explode(',', $this->get('tags')),
+            'what'                      => $this->get('what'),
+            'description'               => $this->get('description'),
+            'account_id'                => intval($this->get('account_id')),
+            'account_from_id'           => intval($this->get('account_from_id')),
+            'account_to_id'             => intval($this->get('account_to_id')),
+            'expense_account'           => $this->get('expense_account'),
+            'revenue_account'           => $this->get('revenue_account'),
+            'amount'                    => round($this->get('amount'), 2),
+            'user'                      => Auth::user()->id,
+            'amount_currency_id_amount' => intval($this->get('amount_currency_id_amount')),
+            'date'                      => new Carbon($this->get('date')),
+            'budget_id'                 => intval($this->get('budget_id')),
+            'category'                  => $this->get('category'),
+            'tags'                      => explode(',', $this->get('tags')),
         ];
     }
 
@@ -56,16 +57,16 @@ class JournalFormRequest extends Request
     {
         $what  = Input::get('what');
         $rules = [
-            'description'        => 'required|min:1,max:255',
-            'what'               => 'required|in:withdrawal,deposit,transfer',
-            'amount'             => 'numeric|required|min:0.01',
-            'date'               => 'required|date',
-            'amount_currency_id' => 'required|exists:transaction_currencies,id',
+            'description'               => 'required|min:1,max:255',
+            'what'                      => 'required|in:withdrawal,deposit,transfer',
+            'amount'                    => 'numeric|required|min:0.01',
+            'date'                      => 'required|date',
+            'amount_currency_id_amount' => 'required|exists:transaction_currencies,id',
 
         ];
 
         switch ($what) {
-            case 'withdrawal':
+            case strtolower(TransactionType::WITHDRAWAL):
                 $rules['account_id']      = 'required|exists:accounts,id|belongsToUser:accounts';
                 $rules['expense_account'] = 'between:1,255';
                 $rules['category']        = 'between:1,255';
@@ -73,12 +74,12 @@ class JournalFormRequest extends Request
                     $rules['budget_id'] = 'exists:budgets,id|belongsToUser:budgets';
                 }
                 break;
-            case 'deposit':
+            case strtolower(TransactionType::DEPOSIT):
                 $rules['category']        = 'between:1,255';
                 $rules['account_id']      = 'required|exists:accounts,id|belongsToUser:accounts';
                 $rules['revenue_account'] = 'between:1,255';
                 break;
-            case 'transfer':
+            case strtolower(TransactionType::TRANSFER):
                 $rules['account_from_id'] = 'required|exists:accounts,id|belongsToUser:accounts|different:account_to_id';
                 $rules['account_to_id']   = 'required|exists:accounts,id|belongsToUser:accounts|different:account_from_id';
                 $rules['category']        = 'between:1,255';

app/Http/Requests/NewUserFormRequest.php

@@ -27,11 +27,13 @@ class NewUserFormRequest extends Request
     public function rules()
     {
         return [
-            'bank_name'           => 'required|between:1,200',
-            'bank_balance'        => 'required|numeric',
-            'savings_balance'     => 'numeric',
-            'credit_card_limit'   => 'numeric',
-            'balance_currency_id' => 'exists:transaction_currencies,id',
+            'bank_name'                            => 'required|between:1,200',
+            'bank_balance'                         => 'required|numeric',
+            'savings_balance'                      => 'numeric',
+            'credit_card_limit'                    => 'numeric',
+            'amount_currency_id_bank_balance'      => 'exists:transaction_currencies,id',
+            'amount_currency_id_savings_balance'   => 'exists:transaction_currencies,id',
+            'amount_currency_id_credit_card_limit' => 'exists:transaction_currencies,id',
         ];
     }
 }

app/Http/Requests/PiggyBankFormRequest.php

@@ -36,13 +36,13 @@ class PiggyBankFormRequest extends Request
 
 
         $rules = [
-            'name'               => $nameRule,
-            'account_id'         => 'required|belongsToUser:accounts',
-            'targetamount'       => 'required|min:0.01',
-            'amount_currency_id' => 'exists:transaction_currencies,id',
-            'startdate'          => 'date',
-            'targetdate'         => $targetDateRule,
-            'order'              => 'integer|min:1',
+            'name'                            => $nameRule,
+            'account_id'                      => 'required|belongsToUser:accounts',
+            'targetamount'                    => 'required|min:0.01',
+            'amount_currency_id_targetamount' => 'exists:transaction_currencies,id',
+            'startdate'                       => 'date',
+            'targetdate'                      => $targetDateRule,
+            'order'                           => 'integer|min:1',
 
         ];
 

app/Http/breadcrumbs.php

@@ -42,7 +42,7 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'accounts.create', function (Generator $breadcrumbs, $what) {
     $breadcrumbs->parent('accounts.index', $what);
-    $breadcrumbs->push(trans('breadcrumbs.new_' . strtolower(e($what)) . '_account'), route('accounts.create', [$what]));
+    $breadcrumbs->push(trans('firefly.new_' . strtolower(e($what)) . '_account'), route('accounts.create', [$what]));
 }
 );
 
@@ -129,7 +129,7 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'categories.create', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('categories.index');
-    $breadcrumbs->push(trans('breadcrumbs.newCategory'), route('categories.create'));
+    $breadcrumbs->push(trans('firefly.new_category'), route('categories.create'));
 }
 );
 
@@ -154,6 +154,19 @@ Breadcrumbs::register(
 }
 );
 
+Breadcrumbs::register(
+    'categories.show.date', function (Generator $breadcrumbs, Category $category, Carbon $date) {
+
+    // get current period preference.
+    $range = Preferences::get('viewRange', '1M')->data;
+
+    $breadcrumbs->parent('categories.index');
+    $breadcrumbs->push(e($category->name), route('categories.show', [$category->id]));
+    $breadcrumbs->push(Navigation::periodShow($date, $range), route('categories.show.date', [$category->id, $date->format('Y-m-d')]));
+
+}
+);
+
 Breadcrumbs::register(
     'categories.noCategory', function (Generator $breadcrumbs, $subTitle) {
     $breadcrumbs->parent('categories.index');
@@ -231,7 +244,7 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'piggy-banks.index', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('home');
-    $breadcrumbs->push(trans('breadcrumbs.piggyBanks'), route('piggy-banks.index'));
+    $breadcrumbs->push(trans('firefly.piggyBanks'), route('piggy-banks.index'));
 }
 );
 Breadcrumbs::register(
@@ -250,7 +263,7 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'piggy-banks.delete', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
     $breadcrumbs->parent('piggy-banks.show', $piggyBank);
-    $breadcrumbs->push(trans('breadcrumbs.delete_piggyBank', ['name' => e($piggyBank->name)]), route('piggy-banks.delete', [$piggyBank->id]));
+    $breadcrumbs->push(trans('firefly.delete_piggy_bank', ['name' => e($piggyBank->name)]), route('piggy-banks.delete', [$piggyBank->id]));
 }
 );
 
@@ -338,30 +351,13 @@ Breadcrumbs::register(
 );
 
 Breadcrumbs::register(
-    'reports.year', function (Generator $breadcrumbs, Carbon $date, $shared) {
+    'reports.report', function (Generator $breadcrumbs, Carbon $start, Carbon $end, $reportType, $accountIds) {
     $breadcrumbs->parent('reports.index');
-    if ($shared) {
-        $title = trans('breadcrumbs.yearly_report_shared', ['date' => $date->year]);
-    } else {
-        $title = trans('breadcrumbs.yearly_report', ['date' => $date->year]);
-    }
-    $breadcrumbs->push($title, route('reports.year', [$date->year]));
-}
-);
 
-Breadcrumbs::register(
-    'reports.month', function (Generator $breadcrumbs, Carbon $date, $shared) {
-    $breadcrumbs->parent('reports.year', $date, $shared);
-    $language = Preferences::get('language', 'en')->data;
-    $format   = Config::get('firefly.month.' . $language);
+    $monthFormat = trans('config.month_and_day');
+    $title       = trans('firefly.report_default', ['start' => $start->formatLocalized($monthFormat), 'end' => $end->formatLocalized($monthFormat)]);
 
-    if ($shared) {
-        $title = trans('breadcrumbs.monthly_report_shared', ['date' => $date->formatLocalized($format)]);
-    } else {
-        $title = trans('breadcrumbs.monthly_report', ['date' => $date->formatLocalized($format)]);
-    }
-
-    $breadcrumbs->push($title, route('reports.month', [$date->year, $date->month]));
+    $breadcrumbs->push($title, route('reports.report', ['url' => 'abcde']));
 }
 );
 
@@ -403,7 +399,7 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'transactions.show', function (Generator $breadcrumbs, TransactionJournal $journal) {
 
-    $breadcrumbs->parent('transactions.index', strtolower($journal->transactionType->type));
+    $breadcrumbs->parent('transactions.index', strtolower($journal->getTransactionType()));
     $breadcrumbs->push($journal->description, route('transactions.show', [$journal->id]));
 
 }

app/Http/routes.php

@@ -1,4 +1,5 @@
 <?php
+use Carbon\Carbon;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Attachment;
 use FireflyIII\Models\Bill;
@@ -29,6 +30,111 @@ Route::bind(
         throw new NotFoundHttpException;
     }
 );
+// account list! Yay!
+Route::bind(
+    'accountList',
+    function ($value) {
+        if (Auth::check()) {
+            $ids = explode(',', $value);
+            /** @var \Illuminate\Support\Collection $object */
+            $object = Account::leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
+                             ->where('account_types.editable', 1)
+                             ->whereIn('accounts.id', $ids)
+                             ->where('user_id', Auth::user()->id)
+                             ->get(['accounts.*']);
+            if ($object->count() > 0) {
+                return $object;
+            }
+        }
+        throw new NotFoundHttpException;
+    }
+);
+// budget list
+Route::bind(
+    'budgetList',
+    function ($value) {
+        if (Auth::check()) {
+            $ids = explode(',', $value);
+            /** @var \Illuminate\Support\Collection $object */
+            $object = Budget::where('active', 1)
+                            ->whereIn('id', $ids)
+                            ->where('user_id', Auth::user()->id)
+                            ->get();
+
+            // add empty budget if applicable.
+            if (in_array('0', $ids)) {
+                $object->push(new Budget);
+            }
+
+            if ($object->count() > 0) {
+                return $object;
+            }
+        }
+        throw new NotFoundHttpException;
+    }
+);
+
+// category list
+Route::bind(
+    'categoryList',
+    function ($value) {
+        if (Auth::check()) {
+            $ids = explode(',', $value);
+            /** @var \Illuminate\Support\Collection $object */
+            $object = Category::whereIn('id', $ids)
+                              ->where('user_id', Auth::user()->id)
+                              ->get();
+
+            // add empty budget if applicable.
+            if (in_array('0', $ids)) {
+                $object->push(new Category);
+            }
+
+            if ($object->count() > 0) {
+                return $object;
+            }
+        }
+        throw new NotFoundHttpException;
+    }
+);
+
+// Date
+Route::bind(
+    'start_date',
+    function ($value) {
+        if (Auth::check()) {
+
+            try {
+                $date = new Carbon($value);
+            } catch (Exception $e) {
+                Log::error('Could not parse date "' . $value . '" for user #' . Auth::user()->id);
+                throw new NotFoundHttpException;
+            }
+
+            return $date;
+        }
+        throw new NotFoundHttpException;
+    }
+);
+
+// Date
+Route::bind(
+    'end_date',
+    function ($value) {
+        if (Auth::check()) {
+
+            try {
+                $date = new Carbon($value);
+            } catch (Exception $e) {
+                Log::error('Could not parse date "' . $value . '" for user #' . Auth::user()->id);
+                throw new NotFoundHttpException;
+            }
+
+            return $date;
+        }
+        throw new NotFoundHttpException;
+    }
+);
 
 Route::bind(
     'tj', function ($value) {
@@ -178,7 +284,6 @@ Route::group(
     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
      */
@@ -244,6 +349,7 @@ Route::group(
     Route::get('/categories/edit/{category}', ['uses' => 'CategoryController@edit', 'as' => 'categories.edit']);
     Route::get('/categories/delete/{category}', ['uses' => 'CategoryController@delete', 'as' => 'categories.delete']);
     Route::get('/categories/show/{category}', ['uses' => 'CategoryController@show', 'as' => 'categories.show']);
+    Route::get('/categories/show/{category}/{date}', ['uses' => 'CategoryController@showWithDate', 'as' => 'categories.show.date']);
     Route::get('/categories/list/noCategory', ['uses' => 'CategoryController@noCategory', 'as' => 'categories.noCategory']);
     Route::post('/categories/store', ['uses' => 'CategoryController@store', 'as' => 'categories.store']);
     Route::post('/categories/update/{category}', ['uses' => 'CategoryController@update', 'as' => 'categories.update']);
@@ -282,9 +388,8 @@ Route::group(
      */
     // accounts:
     Route::get('/chart/account/frontpage', ['uses' => 'Chart\AccountController@frontpage']);
-    Route::get('/chart/account/month/{year}/{month}/{shared?}', ['uses' => 'Chart\AccountController@all'])->where(
-        ['year' => '[0-9]{4}', 'month' => '[0-9]{1,2}', 'shared' => 'shared']
-    );
+    Route::get('/chart/account/expense', ['uses' => 'Chart\AccountController@expenseAccounts']);
+    Route::get('/chart/account/report/{report_type}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\AccountController@report']);
     Route::get('/chart/account/{account}', ['uses' => 'Chart\AccountController@single']);
 
 
@@ -294,24 +399,34 @@ Route::group(
 
     // budgets:
     Route::get('/chart/budget/frontpage', ['uses' => 'Chart\BudgetController@frontpage']);
-    Route::get('/chart/budget/year/{year}/{shared?}', ['uses' => 'Chart\BudgetController@year'])->where(['year' => '[0-9]{4}', 'shared' => 'shared']);
+
+    // this chart is used in reports:
+    Route::get('/chart/budget/year/{report_type}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\BudgetController@year']);
+    Route::get('/chart/budget/multi-year/{report_type}/{start_date}/{end_date}/{accountList}/{budgetList}', ['uses' => 'Chart\BudgetController@multiYear']);
+
     Route::get('/chart/budget/{budget}/{limitrepetition}', ['uses' => 'Chart\BudgetController@budgetLimit']);
     Route::get('/chart/budget/{budget}', ['uses' => 'Chart\BudgetController@budget']);
 
     // categories:
     Route::get('/chart/category/frontpage', ['uses' => 'Chart\CategoryController@frontpage']);
-    Route::get('/chart/category/year/{year}/{shared?}', ['uses' => 'Chart\CategoryController@year'])->where(['year' => '[0-9]{4}', 'shared' => 'shared']);
-    Route::get('/chart/category/{category}/month', ['uses' => 'Chart\CategoryController@month']); // should be period.
+
+    // these three charts are for reports:
+    Route::get('/chart/category/earned-in-period/{report_type}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\CategoryController@earnedInPeriod']);
+    Route::get('/chart/category/spent-in-period/{report_type}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\CategoryController@spentInPeriod']);
+    Route::get(
+        '/chart/category/multi-year/{report_type}/{start_date}/{end_date}/{accountList}/{categoryList}', ['uses' => 'Chart\CategoryController@multiYear']
+    );
+
+    Route::get('/chart/category/{category}/period', ['uses' => 'Chart\CategoryController@currentPeriod']);
+    Route::get('/chart/category/{category}/period/{date}', ['uses' => 'Chart\CategoryController@specificPeriod']);
     Route::get('/chart/category/{category}/all', ['uses' => 'Chart\CategoryController@all']);
 
     // piggy banks:
     Route::get('/chart/piggyBank/{piggyBank}', ['uses' => 'Chart\PiggyBankController@history']);
 
     // reports:
-    Route::get('/chart/report/in-out/{year}/{shared?}', ['uses' => 'Chart\ReportController@yearInOut'])->where(['year' => '[0-9]{4}', 'shared' => 'shared']);
-    Route::get('/chart/report/in-out-sum/{year}/{shared?}', ['uses' => 'Chart\ReportController@yearInOutSummarized'])->where(
-        ['year' => '[0-9]{4}', 'shared' => 'shared']
-    );
+    Route::get('/chart/report/in-out/{report_type}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\ReportController@yearInOut']);
+    Route::get('/chart/report/in-out-sum/{report_type}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\ReportController@yearInOutSummarized']);
 
 
     /**
@@ -377,12 +492,7 @@ Route::group(
      * Report Controller
      */
     Route::get('/reports', ['uses' => 'ReportController@index', 'as' => 'reports.index']);
-    Route::get('/reports/{year}/{shared?}', ['uses' => 'ReportController@year', 'as' => 'reports.year'])->where(['year' => '[0-9]{4}', 'shared' => 'shared']);
-    Route::get('/reports/{year}/{month}/{shared?}', ['uses' => 'ReportController@month', 'as' => 'reports.month'])->where(
-        ['year' => '[0-9]{4}', 'month' => '[0-9]{1,2}', 'shared' => 'shared']
-    );
-
-    // pop ups for budget report:
+    Route::get('/reports/report/{report_type}/{start_date}/{end_date}/{accountList}', ['uses' => 'ReportController@report', 'as' => 'reports.report']);
 
     /**
      * Search Controller

app/Models/Bill.php

@@ -39,8 +39,8 @@ use Illuminate\Database\Eloquent\Model;
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereSkip($value)
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereNameEncrypted($value)
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereMatchEncrypted($value)
- * @property-read \Carbon\Carbon                                                                   $nextExpectedMatch
- * @property-read \Carbon\Carbon                                                                   $lastFoundMatch
+ * @property \Carbon\Carbon                                                                        $nextExpectedMatch
+ * @property \Carbon\Carbon                                                                        $lastFoundMatch
  */
 class Bill extends Model
 {

app/Models/Category.php

@@ -25,7 +25,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereUserId($value)
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereEncrypted($value)
  * @property-read float                                                                            $spent
- * @property-read \Carbon\Carbon                                                                   $lastActivity
+ * @property \Carbon\Carbon                                                                        $lastActivity
  */
 class Category extends Model
 {

app/Models/TransactionJournal.php

@@ -68,7 +68,9 @@ use Watson\Validating\ValidatingTrait;
  * @property-read int                                                                            $account_id
  * @property string                                                                              $name
  * @property-read string                                                                         $symbol
+ * @property-read string                                                                         $type
  * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[]       $attachments
+ * @property-read mixed                                                                          $amount_positive
  */
 class TransactionJournal extends Model
 {
@@ -120,7 +122,7 @@ class TransactionJournal extends Model
     /**
      * @return string
      */
-    public function getActualAmountAttribute()
+    public function getAmountPositiveAttribute()
     {
         $amount = '0';
         /** @var Transaction $t */
@@ -146,18 +148,10 @@ class TransactionJournal extends Model
         }
 
         bcscale(2);
-        $set    = $this->transactions->sortByDesc('amount');
-        $amount = $set->first()->amount;
-
-        if (intval($this->tag_count) === 1) {
-            // get amount for single tag:
-            $amount = $this->amountByTag($this->tags()->first(), $amount);
-        }
-
-        if (intval($this->tag_count) > 1) {
-            // get amount for either tag.
-            $amount = $this->amountByTags($amount);
-
+        $transaction = $this->transactions->sortByDesc('amount')->first();
+        $amount      = $transaction->amount;
+        if ($this->isWithdrawal()) {
+            $amount = $amount * -1;
         }
         $cache->store($amount);
 
@@ -173,15 +167,15 @@ class TransactionJournal extends Model
      */
     protected function amountByTagAdvancePayment(Tag $tag, $amount)
     {
-        if ($this->transactionType->type == 'Withdrawal') {
-            $others = $tag->transactionJournals()->transactionTypes(['Deposit'])->get();
+        if ($this->isWithdrawal()) {
+            $others = $tag->transactionJournals()->transactionTypes([TransactionType::DEPOSIT])->get();
             foreach ($others as $other) {
-                $amount = bcsub($amount, $other->actual_amount);
+                $amount = bcsub($amount, $other->amount_positive);
             }
 
             return $amount;
         }
-        if ($this->transactionType->type == 'Deposit') {
+        if ($this->isDeposit()) {
             return '0';
         }
 
@@ -196,10 +190,10 @@ class TransactionJournal extends Model
      */
     protected function amountByTagBalancingAct($tag, $amount)
     {
-        if ($this->transactionType->type == 'Withdrawal') {
-            $transfer = $tag->transactionJournals()->transactionTypes(['Transfer'])->first();
+        if ($this->isWithdrawal()) {
+            $transfer = $tag->transactionJournals()->transactionTypes([TransactionType::TRANSFER])->first();
             if ($transfer) {
-                $amount = bcsub($amount, $transfer->actual_amount);
+                $amount = bcsub($amount, $transfer->amount_positive);
 
                 return $amount;
             }
@@ -260,21 +254,6 @@ class TransactionJournal extends Model
         return $amount;
     }
 
-    /**
-     * @return string
-     */
-    public function getCorrectAmountAttribute()
-    {
-
-        switch ($this->transactionType->type) {
-            case 'Deposit':
-                return $this->transactions()->where('amount', '>', 0)->first()->amount;
-            case 'Withdrawal':
-                return $this->transactions()->where('amount', '<', 0)->first()->amount;
-        }
-
-        return $this->transactions()->where('amount', '>', 0)->first()->amount;
-    }
 
     /**
      * @codeCoverageIgnore
@@ -512,4 +491,59 @@ class TransactionJournal extends Model
         return $this->belongsTo('FireflyIII\User');
     }
 
+    /**
+     * @return string
+     */
+    public function getTransactionType()
+    {
+        return $this->transactionType->type;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isWithdrawal()
+    {
+        if (!is_null($this->type)) {
+            return $this->type == TransactionType::WITHDRAWAL;
+        }
+
+        return $this->transactionType->isWithdrawal();
+    }
+
+    /**
+     * @return bool
+     */
+    public function isDeposit()
+    {
+        if (!is_null($this->type)) {
+            return $this->type == TransactionType::DEPOSIT;
+        }
+
+        return $this->transactionType->isDeposit();
+    }
+
+    /**
+     * @return bool
+     */
+    public function isTransfer()
+    {
+        if (!is_null($this->type)) {
+            return $this->type == TransactionType::TRANSFER;
+        }
+
+        return $this->transactionType->isTransfer();
+    }
+
+    /**
+     * @return bool
+     */
+    public function isOpeningBalance()
+    {
+        if (!is_null($this->type)) {
+            return $this->type == TransactionType::OPENING_BALANCE;
+        }
+
+        return $this->transactionType->isOpeningBalance();
+    }
 }

app/Models/TransactionType.php

@@ -23,6 +23,11 @@ class TransactionType extends Model
 {
     use SoftDeletes;
 
+    const WITHDRAWAL      = 'Withdrawal';
+    const DEPOSIT         = 'Deposit';
+    const TRANSFER        = 'Transfer';
+    const OPENING_BALANCE = 'Opening balance';
+
     /**
      * @return array
      */
@@ -31,6 +36,38 @@ class TransactionType extends Model
         return ['created_at', 'updated_at', 'deleted_at'];
     }
 
+    /**
+     * @return bool
+     */
+    public function isDeposit()
+    {
+        return $this->type === TransactionType::DEPOSIT;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isOpeningBalance()
+    {
+        return $this->type === TransactionType::OPENING_BALANCE;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isTransfer()
+    {
+        return $this->type === TransactionType::TRANSFER;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isWithdrawal()
+    {
+        return $this->type === TransactionType::WITHDRAWAL;
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */

app/Providers/FireflyServiceProvider.php

@@ -98,7 +98,6 @@ class FireflyServiceProvider extends ServiceProvider
         $this->app->bind('FireflyIII\Helpers\Attachments\AttachmentHelperInterface', 'FireflyIII\Helpers\Attachments\AttachmentHelper');
 
         // 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');

app/Repositories/Account/AccountRepository.php

@@ -41,7 +41,16 @@ class AccountRepository implements AccountRepositoryInterface
      */
     public function countAccounts(array $types)
     {
-        return Auth::user()->accounts()->accountTypeIn($types)->count();
+        $cache = new CacheProperties;
+        $cache->addProperty('user-count-accounts');
+        if ($cache->has()) {
+            return $cache->get(); // @codeCoverageIgnore
+        }
+
+        $count = Auth::user()->accounts()->accountTypeIn($types)->count();
+        $cache->store($count);
+
+        return $count;
     }
 
     /**
@@ -69,6 +78,14 @@ class AccountRepository implements AccountRepositoryInterface
      */
     public function getAccounts(array $types)
     {
+        $cache = new CacheProperties();
+        $cache->addProperty('get-accounts');
+        $cache->addProperty($types);
+
+        if ($cache->has()) {
+            return $cache->get();
+        }
+
         /** @var Collection $result */
         $result = Auth::user()->accounts()->with(
             ['accountmeta' => function (HasMany $query) {
@@ -82,23 +99,39 @@ class AccountRepository implements AccountRepositoryInterface
             }
         );
 
+        $cache->store($result);
+
         return $result;
     }
 
 
     /**
+     * This method returns the users credit cards, along with some basic information about the
+     * balance they have on their CC. To be used in the JSON boxes on the front page that say
+     * how many bills there are still left to pay. The balance will be saved in field "balance".
+     *
+     * To get the balance, the field "date" is necessary.
+     *
+     * @param Carbon $date
+     *
      * @return Collection
      */
-    public function getCreditCards()
+    public function getCreditCards(Carbon $date)
     {
         return Auth::user()->accounts()
                    ->hasMetaValue('accountRole', 'ccAsset')
                    ->hasMetaValue('ccType', 'monthlyFull')
+                   ->leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
+                   ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+                   ->whereNull('transactions.deleted_at')
+                   ->where('transaction_journals.date', '<=', $date->format('Y-m-d'))
+                   ->groupBy('accounts.id')
                    ->get(
                        [
                            'accounts.*',
                            'ccType.data as ccType',
-                           'accountRole.data as accountRole'
+                           'accountRole.data as accountRole',
+                           DB::Raw('SUM(`transactions`.`amount`) AS `balance`')
                        ]
                    );
     }
@@ -111,8 +144,18 @@ class AccountRepository implements AccountRepositoryInterface
      */
     public function getFirstTransaction(TransactionJournal $journal, Account $account)
     {
+        $cache = new CacheProperties();
+        $cache->addProperty('first-transaction');
+        $cache->addProperty($journal->id);
+        $cache->addProperty($account->id);
 
-        return $journal->transactions()->where('account_id', $account->id)->first();
+        if ($cache->has()) {
+            return $cache->get();
+        }
+        $transaction = $journal->transactions()->where('account_id', $account->id)->first();
+        $cache->store($transaction);
+
+        return $transaction;
     }
 
     /**
@@ -123,8 +166,7 @@ class AccountRepository implements AccountRepositoryInterface
     public function getFrontpageAccounts(Preference $preference)
     {
         $cache = new CacheProperties();
-        $cache->addProperty($preference->data);
-        $cache->addProperty('frontPageaccounts');
+        $cache->addProperty('user-frontpage-accounts');
         if ($cache->has()) {
             return $cache->get(); // @codeCoverageIgnore
         }
@@ -158,6 +200,7 @@ class AccountRepository implements AccountRepositoryInterface
         $cache->addProperty($account->id);
         $cache->addProperty($start);
         $cache->addProperty($end);
+        $cache->addProperty('frontpage-transactions');
         if ($cache->has()) {
             return $cache->get(); // @codeCoverageIgnore
         }
@@ -172,6 +215,7 @@ class AccountRepository implements AccountRepositoryInterface
                    ->before($end)
                    ->after($start)
                    ->orderBy('transaction_journals.date', 'DESC')
+                   ->orderBy('transaction_journals.order', 'ASC')
                    ->orderBy('transaction_journals.id', 'DESC')
                    ->take(10)
                    ->get(['transaction_journals.*', 'transaction_currencies.symbol', 'transaction_types.type']);
@@ -227,14 +271,14 @@ class AccountRepository implements AccountRepositoryInterface
 
         $cache = new CacheProperties;
         $cache->addProperty($ids);
-        $cache->addProperty('piggyAccounts');
+        $cache->addProperty('user-piggy-bank-accounts');
         if ($cache->has()) {
             return $cache->get(); // @codeCoverageIgnore
         }
 
         $ids = array_unique($ids);
         if (count($ids) > 0) {
-            $accounts = Auth::user()->accounts()->whereIn('id', $ids)->get();
+            $accounts = Auth::user()->accounts()->whereIn('id', $ids)->where('accounts.active', 1)->get();
         }
         bcscale(2);
 
@@ -273,6 +317,7 @@ class AccountRepository implements AccountRepositoryInterface
         $accounts = Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->orderBy('accounts.name', 'ASC')
                         ->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id')
                         ->where('account_meta.name', 'accountRole')
+                        ->where('accounts.active', 1)
                         ->where('account_meta.data', '"savingAsset"')
                         ->get(['accounts.*']);
         $start    = clone Session::get('start', new Carbon);
@@ -319,31 +364,23 @@ class AccountRepository implements AccountRepositoryInterface
      */
     public function getTransfersInRange(Account $account, Carbon $start, Carbon $end)
     {
-        $set      = TransactionJournal::whereIn(
+        $set = TransactionJournal::whereIn(
             'id', function (Builder $q) use ($account, $start, $end) {
             $q->select('transaction_journals.id')
               ->from('transactions')
               ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
               ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
               ->where('transactions.account_id', $account->id)
+              ->where('transactions.amount', '>', 0)// this makes the filter unnecessary.
               ->where('transaction_journals.user_id', Auth::user()->id)
               ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
               ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
-              ->where('transaction_types.type', 'Transfer');
+              ->where('transaction_types.type', TransactionType::TRANSFER);
 
         }
         )->get();
-        $filtered = $set->filter(
-            function (TransactionJournal $journal) use ($account) {
-                if ($journal->destination_account->id == $account->id) {
-                    return $journal;
-                }
 
-                return null;
-            }
-        );
-
-        return $filtered;
+        return $set;
     }
 
     /**
@@ -372,11 +409,23 @@ class AccountRepository implements AccountRepositoryInterface
      */
     public function openingBalanceTransaction(Account $account)
     {
-        return TransactionJournal
+        $cache = new CacheProperties;
+        $cache->addProperty($account->id);
+        $cache->addProperty('opening-balance-journal');
+        if ($cache->has()) {
+            return $cache->get(); // @codeCoverageIgnore
+        }
+
+
+        $journal = TransactionJournal
             ::orderBy('transaction_journals.date', 'ASC')
             ->accountIs($account)
+            ->transactionTypes([TransactionType::OPENING_BALANCE])
             ->orderBy('created_at', 'ASC')
             ->first(['transaction_journals.*']);
+        $cache->store($journal);
+
+        return $journal;
     }
 
     /**
@@ -394,10 +443,9 @@ class AccountRepository implements AccountRepositoryInterface
 
         // continue with the opposing account:
         if ($data['openingBalance'] != 0) {
-            $type         = $data['openingBalance'] < 0 ? 'expense' : 'revenue';
             $opposingData = [
                 'user'           => $data['user'],
-                'accountType'    => $type,
+                'accountType'    => 'initial',
                 'virtualBalance' => 0,
                 'name'           => $data['name'] . ' initial balance',
                 'active'         => false,
@@ -548,7 +596,7 @@ class AccountRepository implements AccountRepositoryInterface
      */
     protected function storeInitialBalance(Account $account, Account $opposing, array $data)
     {
-        $transactionType = TransactionType::whereType('Opening balance')->first();
+        $transactionType = TransactionType::whereType(TransactionType::OPENING_BALANCE)->first();
         $journal         = TransactionJournal::create(
             [
                 'user_id'                 => $data['user'],
@@ -642,4 +690,16 @@ class AccountRepository implements AccountRepositoryInterface
 
         return $journal;
     }
+
+    /**
+     * @deprecated
+     *
+     * @param $accountId
+     *
+     * @return Account
+     */
+    public function find($accountId)
+    {
+        return Auth::user()->accounts()->findOrNew($accountId);
+    }
 }

app/Repositories/Account/AccountRepositoryInterface.php

@@ -24,6 +24,15 @@ interface AccountRepositoryInterface
      */
     public function countAccounts(array $types);
 
+    /**
+     * @param $accountId
+     *
+     * @deprecated
+     *
+     * @return Account
+     */
+    public function find($accountId);
+
     /**
      * @param Account $account
      * @param Account $moveTo
@@ -48,9 +57,17 @@ interface AccountRepositoryInterface
     public function getFirstTransaction(TransactionJournal $journal, Account $account);
 
     /**
+     * This method returns the users credit cards, along with some basic information about the
+     * balance they have on their CC. To be used in the JSON boxes on the front page that say
+     * how many bills there are still left to pay. The balance will be saved in field "balance".
+     *
+     * To get the balance, the field "date" is necessary.
+     *
+     * @param Carbon $date
+     *
      * @return Collection
      */
-    public function getCreditCards();
+    public function getCreditCards(Carbon $date);
 
     /**
      * Get the accounts of a user that have piggy banks connected to them.

app/Repositories/Bill/BillRepository.php

@@ -5,10 +5,13 @@ namespace FireflyIII\Repositories\Bill;
 use Auth;
 use Carbon\Carbon;
 use DB;
+use FireflyIII\Models\Account;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
+use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Collection;
+use Log;
 use Navigation;
 use Steam;
 
@@ -20,6 +23,7 @@ use Steam;
 class BillRepository implements BillRepositoryInterface
 {
     /**
+     * @deprecated
      * Returns the sum of all payments connected to this bill between the dates.
      *
      * @param Bill   $bill
@@ -82,7 +86,7 @@ class BillRepository implements BillRepositoryInterface
     public function getActiveBills()
     {
         /** @var Collection $set */
-        $set = Auth::user()->bills()->orderBy('name', 'ASC')->where('active', 1)->get()->sortBy('name');
+        $set = Auth::user()->bills()->where('active', 1)->get()->sortBy('name');
 
         return $set;
     }
@@ -97,7 +101,50 @@ class BillRepository implements BillRepositoryInterface
 
         $set = $set->sortBy(
             function (Bill $bill) {
-                return strtolower($bill->name);
+
+                $int = $bill->active == 1 ? 0 : 1;
+
+                return $int . strtolower($bill->name);
+            }
+        );
+
+        return $set;
+    }
+
+    /**
+     * @param Collection $accounts
+     *
+     * @return Collection
+     */
+    public function getBillsForAccounts(Collection $accounts)
+    {
+        /** @var Collection $set */
+        $set = Auth::user()->bills()->orderBy('name', 'ASC')->get();
+
+        $ids = [];
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $ids[] = $account->id;
+        }
+
+        $set = $set->filter(
+            function (Bill $bill) use ($ids) {
+                // get transaction journals from or to any of the mentioned accounts.
+                // if zero, return null.
+                $journals = $bill->transactionjournals()->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                 ->whereIn('transactions.account_id', $ids)->count();
+
+                return ($journals > 0);
+
+            }
+        );
+
+        $set = $set->sortBy(
+            function (Bill $bill) {
+
+                $int = $bill->active == 1 ? 0 : 1;
+
+                return $int . strtolower($bill->name);
             }
         );
 
@@ -150,7 +197,9 @@ class BillRepository implements BillRepositoryInterface
         }
         $journals = new Collection;
         if (count($ids) > 0) {
-            $journals = Auth::user()->transactionjournals()->whereIn('id', $ids)->get();
+            $journals = Auth::user()->transactionjournals()->transactionTypes([TransactionType::WITHDRAWAL])->whereIn('transaction_journals.id', $ids)->get(
+                ['transaction_journals.*']
+            );
         }
 
         return $journals;
@@ -270,10 +319,20 @@ class BillRepository implements BillRepositoryInterface
      */
     public function scan(Bill $bill, TransactionJournal $journal)
     {
+
+        /*
+         * Can only support withdrawals.
+         */
+        if (false === $journal->isWithdrawal()) {
+            return false;
+        }
+
         $matches     = explode(',', $bill->match);
         $description = strtolower($journal->description) . ' ' . strtolower($journal->destination_account->name);
         $wordMatch   = $this->doWordMatch($matches, $description);
-        $amountMatch = $this->doAmountMatch($journal->amount, $bill->amount_min, $bill->amount_max);
+        $amountMatch = $this->doAmountMatch($journal->amount_positive, $bill->amount_min, $bill->amount_max);
+        Log::debug('Journal #' . $journal->id . ' has description "' . $description . '"');
+
 
         /*
          * If both, update!
@@ -283,6 +342,8 @@ class BillRepository implements BillRepositoryInterface
             $journal->save();
 
             return true;
+        } else {
+            Log::debug('Wordmatch: ' . (($wordMatch) ? 'true' : 'false') . ' AmountMatch: ' . (($amountMatch) ? 'true' : 'false'));
         }
         if ($bill->id == $journal->bill_id) {
             // if no match, but bill used to match, remove it:
@@ -437,22 +498,21 @@ class BillRepository implements BillRepositoryInterface
     {
 
         $accounts    = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
-        $creditCards = $accounts->getCreditCards();
+        $creditCards = $accounts->getCreditCards($end);
         $paid        = $set->get('paid');
         $unpaid      = $set->get('unpaid');
 
         foreach ($creditCards as $creditCard) {
-            $balance = Steam::balance($creditCard, $end, true);
             $date    = new Carbon($creditCard->getMeta('ccMonthlyPaymentDate'));
-            if ($balance < 0) {
+            if ($creditCard->balance < 0) {
                 // unpaid! create a fake bill that matches the amount.
                 $description = $creditCard->name;
-                $amount      = $balance * -1;
+                $amount      = $creditCard->balance * -1;
                 $fakeBill    = $this->createFakeBill($description, $date, $amount);
                 unset($description, $amount);
                 $unpaid->push([$fakeBill, $date]);
             }
-            if ($balance == 0) {
+            if ($creditCard->balance == 0) {
                 // find transfer(s) TO the credit card which should account for
                 // anything paid. If not, the CC is not yet used.
                 $journals = $accounts->getTransfersInRange($creditCard, $start, $end);
@@ -465,4 +525,32 @@ class BillRepository implements BillRepositoryInterface
 
         return $set;
     }
+
+    /**
+     * This method returns all active bills which have been paid for in the given range,
+     * with the field "paid" indicating how much the bill was for.
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return Collection
+     */
+    public function billsPaidInRange(Carbon $start, Carbon $end)
+    {
+        $set = Auth::user()->bills()
+                   ->leftJoin('transaction_journals', 'transaction_journals.bill_id', '=', 'bills.id')
+                   ->leftJoin(
+                       'transactions', function (JoinClause $join) {
+                       $join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')->where('transactions.amount', '>', 0);
+                   }
+                   )
+                   ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
+                   ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
+                   ->where('bills.active', 1)
+                   ->groupBy('bills.id')->get(
+                ['bills.*', DB::Raw('SUM(`transactions`.`amount`) as `paid`')]
+            );
+
+        return $set;
+    }
 }

app/Repositories/Bill/BillRepositoryInterface.php

@@ -39,6 +39,7 @@ interface BillRepositoryInterface
     public function getBillsForChart(Carbon $start, Carbon $end);
 
     /**
+     * @deprecated
      * Returns the sum of all payments connected to this bill between the dates.
      *
      * @param Bill   $bill
@@ -49,6 +50,17 @@ interface BillRepositoryInterface
      */
     public function billPaymentsInRange(Bill $bill, Carbon $start, Carbon $end);
 
+    /**
+     * This method returns all active bills which have been paid for in the given range,
+     * with the field "paid" indicating how much the bill was for.
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return Collection
+     */
+    public function billsPaidInRange(Carbon $start, Carbon $end);
+
     /**
      * Create a fake bill to help the chart controller.
      *
@@ -77,6 +89,15 @@ interface BillRepositoryInterface
      */
     public function getBills();
 
+    /**
+     * Gets the bills which have some kind of relevance to the accounts mentioned.
+     *
+     * @param Collection $accounts
+     *
+     * @return Collection
+     */
+    public function getBillsForAccounts(Collection $accounts);
+
     /**
      * @param Bill $bill
      *

app/Repositories/Budget/BudgetRepository.php

@@ -7,6 +7,7 @@ use Carbon\Carbon;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Shared\ComponentRepository;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Database\Query\Builder as QueryBuilder;
@@ -50,12 +51,12 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
      *
      * @return float
      */
-    public function expensesOnDayCorrected(Budget $budget, Carbon $date)
+    public function expensesOnDay(Budget $budget, Carbon $date)
     {
         bcscale(2);
-        $sum = $budget->transactionjournals()->transactionTypes(['Withdrawal'])->onDate($date)->get(['transaction_journals.*'])->sum('amount');
+        $sum = $budget->transactionjournals()->transactionTypes([TransactionType::WITHDRAWAL])->onDate($date)->get(['transaction_journals.*'])->sum('amount');
 
-        return bcmul($sum, -1);
+        return $sum;
     }
 
     /**
@@ -122,20 +123,28 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
 
     /**
      * @param Budget $budget
-     * @param Carbon $date
+     * @param Carbon $start
+     * @param Carbon $end
      *
      * @return LimitRepetition|null
      */
-    public function getCurrentRepetition(Budget $budget, Carbon $date)
+    public function getCurrentRepetition(Budget $budget, Carbon $start, Carbon $end)
     {
         $cache = new CacheProperties;
         $cache->addProperty($budget->id);
-        $cache->addProperty($date);
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+
         $cache->addProperty('getCurrentRepetition');
         if ($cache->has()) {
             return $cache->get(); // @codeCoverageIgnore
         }
-        $data = $budget->limitrepetitions()->where('limit_repetitions.startdate', $date)->first(['limit_repetitions.*']);
+        $data = $budget->limitrepetitions()
+                       ->where('limit_repetitions.startdate', $start->format('Y-m-d 00:00:00'))
+                       ->where('limit_repetitions.enddate', $end->format('Y-m-d 00:00:00'))
+                       ->first(['limit_repetitions.*']);
+        //Log::debug('Looking for limit reps for budget #' . $budget->id . ' start [' . $start . '] and end [' . $end . '].');
+        //Log::debug(DB::getQueryLog())
         $cache->store($data);
 
         return $data;
@@ -220,6 +229,8 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
     }
 
     /**
+     * @deprecated
+     *
      * @param Budget $budget
      *
      * @return Carbon
@@ -235,6 +246,7 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
     }
 
     /**
+     * @deprecated
      * @param Budget $budget
      * @param Carbon $date
      *
@@ -297,25 +309,23 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
                            )
                            ->after($start)
                            ->before($end)
-                           ->transactionTypes(['Withdrawal'])
+                           ->transactionTypes([TransactionType::WITHDRAWAL])
                            ->get(['transaction_journals.*'])->sum('amount');
 
-        bcscale(2);
-
-        return bcmul($noBudgetSet, -1);
+        return $noBudgetSet;
     }
 
     /**
-     * @param Budget $budget
-     * @param Carbon $start
-     * @param Carbon $end
-     * @param bool   $shared
+     * @param Budget     $budget
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
      * @return string
      */
-    public function spentInPeriodCorrected(Budget $budget, Carbon $start, Carbon $end, $shared = true)
+    public function balanceInPeriod(Budget $budget, Carbon $start, Carbon $end, Collection $accounts)
     {
-        return $this->spentInPeriod($budget, $start, $end, $shared);
+        return $this->commonBalanceInPeriod($budget, $start, $end, $accounts);
     }
 
     /**

app/Repositories/Budget/BudgetRepositoryInterface.php

@@ -35,7 +35,7 @@ interface BudgetRepositoryInterface
      *
      * @return float
      */
-    public function expensesOnDayCorrected(Budget $budget, Carbon $date);
+    public function expensesOnDay(Budget $budget, Carbon $date);
 
     /**
      * @return Collection
@@ -65,11 +65,12 @@ interface BudgetRepositoryInterface
 
     /**
      * @param Budget $budget
-     * @param Carbon $date
+     * @param Carbon $start
+     * @param Carbon $end
      *
      * @return LimitRepetition|null
      */
-    public function getCurrentRepetition(Budget $budget, Carbon $date);
+    public function getCurrentRepetition(Budget $budget, Carbon $start, Carbon $end);
 
     /**
      * @param Budget $budget
@@ -95,6 +96,7 @@ interface BudgetRepositoryInterface
     public function getJournals(Budget $budget, LimitRepetition $repetition = null, $take = 50);
 
     /**
+     * @deprecated
      * @param Budget $budget
      *
      * @return Carbon
@@ -102,6 +104,7 @@ interface BudgetRepositoryInterface
     public function getLastBudgetLimitDate(Budget $budget);
 
     /**
+     * @deprecated
      * @param Budget $budget
      * @param Carbon $date
      *
@@ -127,16 +130,16 @@ interface BudgetRepositoryInterface
 
     /**
      *
-     * Same as ::spentInPeriod but corrects journals for their amount (tags).
+     * Same as ::spentInPeriod but corrects journals for a set of accounts
      *
-     * @param Budget  $budget
-     * @param Carbon  $start
-     * @param Carbon  $end
-     * @param boolean $shared
+     * @param Budget     $budget
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
      * @return string
      */
-    public function spentInPeriodCorrected(Budget $budget, Carbon $start, Carbon $end, $shared = true);
+    public function balanceInPeriod(Budget $budget, Carbon $start, Carbon $end, Collection $accounts);
 
     /**
      * @param array $data

app/Repositories/Category/CategoryRepository.php

@@ -5,9 +5,13 @@ namespace FireflyIII\Repositories\Category;
 use Auth;
 use Carbon\Carbon;
 use Crypt;
+use DB;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Shared\ComponentRepository;
+use FireflyIII\Support\CacheProperties;
+use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Collection;
 
 /**
@@ -46,6 +50,13 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
      */
     public function getCategories()
     {
+        $cache = new CacheProperties;
+        $cache->addProperty('category-list');
+
+        if($cache->has()) {
+            return $cache->get();
+        }
+
         /** @var Collection $set */
         $set = Auth::user()->categories()->orderBy('name', 'ASC')->get();
         $set = $set->sortBy(
@@ -54,9 +65,77 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
             }
         );
 
+        $cache->store($set);
+
         return $set;
     }
 
+    /**
+     * Returns the amount earned without category by accounts in period.
+     *
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return string
+     */
+    public function earnedNoCategoryForAccounts(Collection $accounts, Carbon $start, Carbon $end)
+    {
+
+        $accountIds = [];
+        foreach ($accounts as $account) {
+            $accountIds[] = $account->id;
+        }
+
+        // is deposit AND account_from is in the list of $accounts
+        // not from any of the accounts in the list?
+
+        return Auth::user()
+                   ->transactionjournals()
+                   ->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
+                   ->whereNull('category_transaction_journal.id')
+                   ->before($end)
+                   ->after($start)
+                   ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                   ->whereIn('transactions.account_id', $accountIds)
+                   ->transactionTypes([TransactionType::DEPOSIT])
+                   ->get(['transaction_journals.*'])->sum('amount');
+    }
+
+
+    /**
+     * Returns the amount spent without category by accounts in period.
+     *
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return string
+     */
+    public function spentNoCategoryForAccounts(Collection $accounts, Carbon $start, Carbon $end)
+    {
+
+        $accountIds = [];
+        foreach ($accounts as $account) {
+            $accountIds[] = $account->id;
+        }
+
+        // is withdrawal or transfer AND account_from is in the list of $accounts
+
+
+        return Auth::user()
+                   ->transactionjournals()
+                   ->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
+                   ->whereNull('category_transaction_journal.id')
+                   ->before($end)
+                   ->after($start)
+                   ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                   ->whereIn('transactions.account_id', $accountIds)
+                   ->transactionTypes([TransactionType::WITHDRAWAL])
+                   ->get(['transaction_journals.*'])->sum('amount');
+    }
+
+
     /**
      *
      * @param Carbon $start
@@ -64,7 +143,7 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
      *
      * @return array
      */
-    public function getCategoriesAndExpensesCorrected($start, $end)
+    public function getCategoriesAndExpenses(Carbon $start, Carbon $end)
     {
         $set = Auth::user()->transactionjournals()
                    ->leftJoin(
@@ -74,18 +153,18 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
                    ->before($end)
                    ->where('categories.user_id', Auth::user()->id)
                    ->after($start)
-                   ->transactionTypes(['Withdrawal'])
+                   ->transactionTypes([TransactionType::WITHDRAWAL])
                    ->get(['categories.id as category_id', 'categories.encrypted as category_encrypted', 'categories.name', 'transaction_journals.*']);
 
+        bcscale(2);
         $result = [];
         foreach ($set as $entry) {
             $categoryId = intval($entry->category_id);
             if (isset($result[$categoryId])) {
-                bcscale(2);
                 $result[$categoryId]['sum'] = bcadd($result[$categoryId]['sum'], $entry->amount);
             } else {
-                $isEncrypted         = intval($entry->category_encrypted) == 1 ? true : false;
-                $name                = strlen($entry->name) == 0 ? trans('firefly.no_category') : $entry->name;
+                $isEncrypted         = intval($entry->category_encrypted) === 1 ? true : false;
+                $name                = strlen($entry->name) === 0 ? trans('firefly.no_category') : $entry->name;
                 $name                = $isEncrypted ? Crypt::decrypt($name) : $name;
                 $result[$categoryId] = [
                     'name' => $name,
@@ -175,17 +254,16 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
     }
 
     /**
-     * @param Category $category
-     * @param Carbon   $start
-     * @param Carbon   $end
-     *
-     * @param bool     $shared
+     * @param Category   $category
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
      * @return string
      */
-    public function spentInPeriodCorrected(Category $category, Carbon $start, Carbon $end, $shared = false)
+    public function balanceInPeriod(Category $category, Carbon $start, Carbon $end, Collection $accounts)
     {
-        return $this->spentInPeriod($category, $start, $end, $shared);
+        return $this->commonBalanceInPeriod($category, $start, $end, $accounts);
     }
 
     /**
@@ -196,9 +274,9 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
      *
      * @return string
      */
-    public function spentOnDaySumCorrected(Category $category, Carbon $date)
+    public function spentOnDaySum(Category $category, Carbon $date)
     {
-        return $category->transactionjournals()->onDate($date)->get(['transaction_journals.*'])->sum('amount');
+        return $category->transactionjournals()->transactionTypes([TransactionType::WITHDRAWAL])->onDate($date)->get(['transaction_journals.*'])->sum('amount');
     }
 
     /**
@@ -233,4 +311,298 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
 
         return $category;
     }
+
+    /**
+     * @deprecated
+     * This method returns the sum of the journals in the category, optionally
+     * limited by a start or end date.
+     *
+     * @param Category $category
+     * @param Carbon   $start
+     * @param Carbon   $end
+     *
+     * @return string
+     */
+    public function journalsSum(Category $category, Carbon $start = null, Carbon $end = null)
+    {
+        $query = $category->transactionJournals()
+                          ->orderBy('transaction_journals.date', 'DESC')
+                          ->orderBy('transaction_journals.order', 'ASC')
+                          ->orderBy('transaction_journals.id', 'DESC');
+        if (!is_null($start)) {
+            $query->after($start);
+        }
+
+        if (!is_null($end)) {
+            $query->before($end);
+        }
+
+        return $query->get(['transaction_journals.*'])->sum('amount');
+
+    }
+
+    /**
+     * @param Category       $category
+     * @param \Carbon\Carbon $start
+     * @param \Carbon\Carbon $end
+     *
+     * @param bool           $shared
+     *
+     * @return string
+     */
+    public function spentInPeriod(Category $category, Carbon $start, Carbon $end)
+    {
+        $cache = new CacheProperties; // we must cache this.
+        $cache->addProperty($category->id);
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('spentInPeriod');
+
+        if ($cache->has()) {
+            return $cache->get(); // @codeCoverageIgnore
+        }
+
+        $sum = $category->transactionjournals()->transactionTypes([TransactionType::WITHDRAWAL])->before($end)->after($start)->get(['transaction_journals.*'])
+                        ->sum(
+                            'amount'
+                        );
+
+        $cache->store($sum);
+
+        return $sum;
+    }
+
+    /**
+     * @param Category       $category
+     * @param \Carbon\Carbon $start
+     * @param \Carbon\Carbon $end
+     *
+     * @param bool           $shared
+     *
+     * @return string
+     */
+    public function earnedInPeriod(Category $category, Carbon $start, Carbon $end)
+    {
+        $cache = new CacheProperties; // we must cache this.
+        $cache->addProperty($category->id);
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('earnedInPeriod');
+
+        if ($cache->has()) {
+            return $cache->get(); // @codeCoverageIgnore
+        }
+
+        $sum = $category->transactionjournals()->transactionTypes([TransactionType::DEPOSIT])->before($end)->after($start)->get(['transaction_journals.*'])
+                        ->sum(
+                            'amount'
+                        );
+
+        $cache->store($sum);
+
+        return $sum;
+    }
+
+    /**
+     * @param Category $category
+     * @param int      $page
+     *
+     * @return Collection
+     */
+    public function getJournalsInRange(Category $category, $page, Carbon $start, Carbon $end)
+    {
+        $offset = $page > 0 ? $page * 50 : 0;
+
+        return $category->transactionJournals()
+                        ->after($start)
+                        ->before($end)
+                        ->withRelevantData()->take(50)->offset($offset)
+                        ->orderBy('transaction_journals.date', 'DESC')
+                        ->orderBy('transaction_journals.order', 'ASC')
+                        ->orderBy('transaction_journals.id', 'DESC')
+                        ->get(
+                            ['transaction_journals.*']
+                        );
+    }
+
+    /**
+     * @param Category $category
+     *
+     * @return int
+     */
+    public function countJournalsInRange(Category $category, Carbon $start, Carbon $end)
+    {
+        return $category->transactionJournals()->before($end)->after($start)->count();
+    }
+
+    /**
+     *
+     * Corrected for tags.
+     *
+     * @param Category $category
+     * @param Carbon   $date
+     *
+     * @return float
+     */
+    public function earnedOnDaySum(Category $category, Carbon $date)
+    {
+        return $category->transactionjournals()->transactionTypes([TransactionType::DEPOSIT])->onDate($date)->get(['transaction_journals.*'])->sum('amount');
+    }
+
+    /**
+     * Calculates how much is spent in this period.
+     *
+     * @param Category   $category
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return string
+     */
+    public function spentInPeriodForAccounts(Category $category, Collection $accounts, Carbon $start, Carbon $end)
+    {
+        $accountIds = [];
+        foreach ($accounts as $account) {
+            $accountIds[] = $account->id;
+        }
+
+        $sum
+            = $category
+            ->transactionjournals()
+            ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+            ->after($start)
+            ->before($end)
+            ->whereIn('transactions.account_id', $accountIds)
+            ->transactionTypes([TransactionType::WITHDRAWAL])
+            ->get(['transaction_journals.*'])
+            ->sum('amount');
+
+        return $sum;
+
+    }
+
+    /**
+     * Calculate how much is earned in this period.
+     *
+     * @param Category   $category
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return string
+     */
+    public function earnedInPeriodForAccounts(Category $category, Collection $accounts, Carbon $start, Carbon $end)
+    {
+        $accountIds = [];
+        foreach ($accounts as $account) {
+            $accountIds[] = $account->id;
+        }
+        $sum
+            = $category
+            ->transactionjournals()
+            ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+            ->before($end)
+            ->whereIn('transactions.account_id', $accountIds)
+            ->transactionTypes([TransactionType::DEPOSIT])
+            ->after($start)
+            ->get(['transaction_journals.*'])
+            ->sum('amount');
+
+        return $sum;
+
+    }
+
+    /**
+     * Returns a collection of Categories appended with the amount of money that has been earned
+     * in these categories, based on the $accounts involved, in period X.
+     * The amount earned in category X in period X is saved in field "earned".
+     *
+     * @param $accounts
+     * @param $start
+     * @param $end
+     *
+     * @return Collection
+     */
+    public function earnedForAccounts(Collection $accounts, Carbon $start, Carbon $end)
+    {
+        $accountIds = [];
+        foreach ($accounts as $account) {
+            $accountIds[] = $account->id;
+        }
+
+
+        $collection = Auth::user()->categories()
+                          ->leftJoin('category_transaction_journal', 'category_transaction_journal.category_id', '=', 'categories.id')
+                          ->leftJoin('transaction_journals', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
+                          ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+                          ->leftJoin(
+                              'transactions AS t_src', function (JoinClause $join) {
+                              $join->on('t_src.transaction_journal_id', '=', 'transaction_journals.id')->where('t_src.amount', '<', 0);
+                          }
+                          )
+                          ->leftJoin(
+                              'transactions AS t_dest', function (JoinClause $join) {
+                              $join->on('t_dest.transaction_journal_id', '=', 'transaction_journals.id')->where('t_dest.amount', '>', 0);
+                          }
+                          )
+                          ->whereIn('t_dest.account_id', $accountIds)// to these accounts (earned)
+                          ->whereNotIn('t_src.account_id', $accountIds)//-- but not from these accounts
+                          ->whereIn(
+                'transaction_types.type', [TransactionType::DEPOSIT, TransactionType::TRANSFER, TransactionType::OPENING_BALANCE]
+            )// earned from these things.
+                          ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
+                          ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
+                          ->groupBy('categories.id')
+                          ->get(['categories.*', DB::Raw('SUM(`t_dest`.`amount`) AS `earned`')]);
+
+        return $collection;
+
+
+    }
+
+    /**
+     * Returns a collection of Categories appended with the amount of money that has been spent
+     * in these categories, based on the $accounts involved, in period X.
+     * The amount earned in category X in period X is saved in field "spent".
+     *
+     * @param $accounts
+     * @param $start
+     * @param $end
+     *
+     * @return Collection
+     */
+    public function spentForAccounts(Collection $accounts, Carbon $start, Carbon $end)
+    {
+        $accountIds = [];
+        foreach ($accounts as $account) {
+            $accountIds[] = $account->id;
+        }
+
+
+        $collection = Auth::user()->categories()
+                          ->leftJoin('category_transaction_journal', 'category_transaction_journal.category_id', '=', 'categories.id')
+                          ->leftJoin('transaction_journals', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
+                          ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+                          ->leftJoin(
+                              'transactions AS t_src', function (JoinClause $join) {
+                              $join->on('t_src.transaction_journal_id', '=', 'transaction_journals.id')->where('t_src.amount', '<', 0);
+                          }
+                          )
+                          ->leftJoin(
+                              'transactions AS t_dest', function (JoinClause $join) {
+                              $join->on('t_dest.transaction_journal_id', '=', 'transaction_journals.id')->where('t_dest.amount', '>', 0);
+                          }
+                          )
+                          ->whereIn('t_src.account_id', $accountIds)// from these accounts (spent)
+                          ->whereNotIn('t_dest.account_id', $accountIds)//-- but not from these accounts (spent internally)
+                          ->whereIn(
+                'transaction_types.type', [TransactionType::WITHDRAWAL, TransactionType::TRANSFER, TransactionType::OPENING_BALANCE]
+            )// spent on these things.
+                          ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
+                          ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
+                          ->groupBy('categories.id')
+                          ->get(['categories.*', DB::Raw('SUM(`t_dest`.`amount`) AS `spent`')]);
+
+        return $collection;
+    }
 }

app/Repositories/Category/CategoryRepositoryInterface.php

@@ -20,6 +20,13 @@ interface CategoryRepositoryInterface
      */
     public function countJournals(Category $category);
 
+    /**
+     * @param Category $category
+     *
+     * @return int
+     */
+    public function countJournalsInRange(Category $category, Carbon $start, Carbon $end);
+
     /**
      * @param Category $category
      *
@@ -27,11 +34,84 @@ interface CategoryRepositoryInterface
      */
     public function destroy(Category $category);
 
+    /**
+     * Returns a collection of Categories appended with the amount of money that has been earned
+     * in these categories, based on the $accounts involved, in period X.
+     * The amount earned in category X in period X is saved in field "earned".
+     *
+     * @param $accounts
+     * @param $start
+     * @param $end
+     *
+     * @return Collection
+     */
+    public function earnedForAccounts(Collection $accounts, Carbon $start, Carbon $end);
+
+    /**
+     * Returns a collection of Categories appended with the amount of money that has been spent
+     * in these categories, based on the $accounts involved, in period X.
+     * The amount earned in category X in period X is saved in field "spent".
+     *
+     * @param $accounts
+     * @param $start
+     * @param $end
+     *
+     * @return Collection
+     */
+    public function spentForAccounts(Collection $accounts, Carbon $start, Carbon $end);
+
     /**
      * @return Collection
      */
     public function getCategories();
 
+
+    /**
+     * Calculates how much is spent in this period.
+     *
+     * @param Category   $category
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return string
+     */
+    public function spentInPeriodForAccounts(Category $category, Collection $accounts, Carbon $start, Carbon $end);
+
+    /**
+     * Calculate how much is earned in this period.
+     *
+     * @param Category   $category
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return string
+     */
+    public function earnedInPeriodForAccounts(Category $category, Collection $accounts, Carbon $start, Carbon $end);
+
+    /**
+     * Returns the amount spent without category by accounts in period.
+     *
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return string
+     */
+    public function spentNoCategoryForAccounts(Collection $accounts, Carbon $start, Carbon $end);
+
+    /**
+     * Returns the amount earned without category by accounts in period.
+     *
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return string
+     */
+    public function earnedNoCategoryForAccounts(Collection $accounts, Carbon $start, Carbon $end);
+
     /**
      * Corrected for tags.
      *
@@ -40,7 +120,7 @@ interface CategoryRepositoryInterface
      *
      * @return array
      */
-    public function getCategoriesAndExpensesCorrected($start, $end);
+    public function getCategoriesAndExpenses(Carbon $start, Carbon $end);
 
     /**
      * @param Category $category
@@ -57,6 +137,27 @@ interface CategoryRepositoryInterface
      */
     public function getJournals(Category $category, $page);
 
+    /**
+     * @param Category $category
+     * @param int      $page
+     *
+     * @return Collection
+     */
+    public function getJournalsInRange(Category $category, $page, Carbon $start, Carbon $end);
+
+    /**
+     * @deprecated
+     * This method returns the sum of the journals in the category, optionally
+     * limited by a start or end date.
+     *
+     * @param Category $category
+     * @param Carbon   $start
+     * @param Carbon   $end
+     *
+     * @return string
+     */
+    public function journalsSum(Category $category, Carbon $start = null, Carbon $end = null);
+
     /**
      * @param Category $category
      *
@@ -73,8 +174,18 @@ interface CategoryRepositoryInterface
     public function getWithoutCategory(Carbon $start, Carbon $end);
 
     /**
-     * Corrected for tags.
+     * Corrected for tags and list of accounts.
      *
+     * @param Category       $category
+     * @param \Carbon\Carbon $start
+     * @param \Carbon\Carbon $end
+     * @param Collection     $accounts
+     *
+     * @return string
+     */
+    public function balanceInPeriod(Category $category, Carbon $start, Carbon $end, Collection $accounts);
+
+    /**
      * @param Category       $category
      * @param \Carbon\Carbon $start
      * @param \Carbon\Carbon $end
@@ -83,7 +194,18 @@ interface CategoryRepositoryInterface
      *
      * @return string
      */
-    public function spentInPeriodCorrected(Category $category, Carbon $start, Carbon $end, $shared = false);
+    public function spentInPeriod(Category $category, Carbon $start, Carbon $end);
+
+    /**
+     * @param Category       $category
+     * @param \Carbon\Carbon $start
+     * @param \Carbon\Carbon $end
+     *
+     * @param bool           $shared
+     *
+     * @return string
+     */
+    public function earnedInPeriod(Category $category, Carbon $start, Carbon $end);
 
     /**
      *
@@ -94,7 +216,18 @@ interface CategoryRepositoryInterface
      *
      * @return float
      */
-    public function spentOnDaySumCorrected(Category $category, Carbon $date);
+    public function spentOnDaySum(Category $category, Carbon $date);
+
+    /**
+     *
+     * Corrected for tags.
+     *
+     * @param Category $category
+     * @param Carbon   $date
+     *
+     * @return float
+     */
+    public function earnedOnDaySum(Category $category, Carbon $date);
 
     /**
      * @param array $data

app/Repositories/Journal/JournalRepository.php

@@ -13,6 +13,7 @@ use FireflyIII\Models\Tag;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
+use FireflyIII\Support\CacheProperties;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 use Log;
@@ -44,7 +45,16 @@ class JournalRepository implements JournalRepositoryInterface
      */
     public function first()
     {
-        return Auth::user()->transactionjournals()->orderBy('date', 'ASC')->first(['transaction_journals.*']);
+        $cache = new CacheProperties;
+        $cache->addProperty('user-first-journal');
+        if ($cache->has()) {
+            return $cache->get(); // @codeCoverageIgnore
+        }
+
+        $entry = Auth::user()->transactionjournals()->orderBy('date', 'ASC')->first(['transaction_journals.*']);
+        $cache->store($entry);
+
+        return $entry;
     }
 
     /**
@@ -164,7 +174,7 @@ class JournalRepository implements JournalRepositoryInterface
             [
                 'user_id'                 => $data['user'],
                 'transaction_type_id'     => $transactionType->id,
-                'transaction_currency_id' => $data['amount_currency_id'],
+                'transaction_currency_id' => $data['amount_currency_id_amount'],
                 'description'             => $data['description'],
                 'completed'               => 0,
                 'date'                    => $data['date'],
@@ -327,15 +337,15 @@ class JournalRepository implements JournalRepositoryInterface
         $fromAccount = null;
         $toAccount   = null;
         switch ($type->type) {
-            case 'Withdrawal':
+            case TransactionType::WITHDRAWAL:
                 list($fromAccount, $toAccount) = $this->storeWithdrawalAccounts($data);
                 break;
 
-            case 'Deposit':
+            case TransactionType::DEPOSIT:
                 list($fromAccount, $toAccount) = $this->storeDepositAccounts($data);
 
                 break;
-            case 'Transfer':
+            case TransactionType::TRANSFER:
                 $fromAccount = Account::find($data['account_from_id']);
                 $toAccount   = Account::find($data['account_to_id']);
                 break;

app/Repositories/PiggyBank/PiggybankPart.php

@@ -1,149 +0,0 @@
-<?php
-
-namespace FireflyIII\Repositories\PiggyBank;
-
-use Carbon\Carbon;
-use FireflyIII\Models\PiggyBankRepetition;
-
-/**
- * Class PiggyBankPart
- *
- * @codeCoverageIgnore
- * @package FireflyIII\Collection
- */
-class PiggyBankPart
-{
-    /** @var  float */
-    public $amountPerBar;
-    /** @var  float */
-    public $cumulativeAmount;
-    /** @var  float */
-    public $currentamount;
-
-    /** @var  PiggyBankRepetition */
-    public $repetition;
-
-    /** @var  Carbon */
-    public $startdate;
-
-    /** @var  Carbon */
-    public $targetdate;
-
-    /**
-     * @return PiggyBankRepetition
-     */
-    public function getRepetition()
-    {
-        return $this->repetition;
-    }
-
-    /**
-     * @param PiggyBankRepetition $repetition
-     */
-    public function setRepetition($repetition)
-    {
-        $this->repetition = $repetition;
-    }
-
-    /**
-     * @return Carbon
-     */
-    public function getStartdate()
-    {
-        return $this->startdate;
-    }
-
-    /**
-     * @param Carbon $startdate
-     */
-    public function setStartdate($startdate)
-    {
-        $this->startdate = $startdate;
-    }
-
-    /**
-     * @return Carbon
-     */
-    public function getTargetdate()
-    {
-        return $this->targetdate;
-    }
-
-    /**
-     * @param Carbon $targetdate
-     */
-    public function setTargetdate($targetdate)
-    {
-        $this->targetdate = $targetdate;
-    }
-
-    /**
-     * @return float|int
-     */
-    public function percentage()
-    {
-        bcscale(2);
-        if ($this->getCurrentamount() < $this->getCumulativeAmount()) {
-            $pct = 0;
-            // calculate halfway point?
-            if (bcsub($this->getCumulativeAmount(), $this->getCurrentamount()) < $this->getAmountPerBar()) {
-                $left = $this->getCurrentamount() % $this->getAmountPerBar();
-                $pct  = round($left / $this->getAmountPerBar() * 100);
-            }
-
-            return $pct;
-        } else {
-            return 100;
-        }
-    }
-
-    /**
-     * @return float
-     */
-    public function getCurrentamount()
-    {
-        return $this->currentamount;
-    }
-
-    /**
-     * @param float $currentamount
-     */
-    public function setCurrentamount($currentamount)
-    {
-        $this->currentamount = $currentamount;
-    }
-
-    /**
-     * @return float
-     */
-    public function getCumulativeAmount()
-    {
-        return $this->cumulativeAmount;
-    }
-
-    /**
-     * @param float $cumulativeAmount
-     */
-    public function setCumulativeAmount($cumulativeAmount)
-    {
-        $this->cumulativeAmount = $cumulativeAmount;
-    }
-
-    /**
-     * @return float
-     */
-    public function getAmountPerBar()
-    {
-        return $this->amountPerBar;
-    }
-
-    /**
-     * @param float $amountPerBar
-     */
-    public function setAmountPerBar($amountPerBar)
-    {
-        $this->amountPerBar = $amountPerBar;
-    }
-
-
-}

app/Repositories/Shared/ComponentRepository.php

@@ -3,8 +3,11 @@
 namespace FireflyIII\Repositories\Shared;
 
 use Carbon\Carbon;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\TransactionType;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Database\Query\JoinClause;
+use Illuminate\Support\Collection;
 
 /**
  * Class ComponentRepository
@@ -14,46 +17,42 @@ use Illuminate\Database\Query\JoinClause;
 class ComponentRepository
 {
 
-
     /**
-     * @param        $object
-     * @param Carbon $start
-     * @param Carbon $end
-     *
-     * @param bool   $shared
+     * @param            $object
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
      * @return string
      */
-    protected function spentInPeriod($object, Carbon $start, Carbon $end, $shared = false)
+    protected function commonBalanceInPeriod($object, Carbon $start, Carbon $end, Collection $accounts)
     {
         $cache = new CacheProperties; // we must cache this.
         $cache->addProperty($object->id);
         $cache->addProperty(get_class($object));
         $cache->addProperty($start);
         $cache->addProperty($end);
-        $cache->addProperty($shared);
-        $cache->addProperty('spentInPeriod');
+        $cache->addProperty($accounts);
+        $cache->addProperty('balanceInPeriodList');
+
+        $ids = [];
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $ids[] = $account->id;
+        }
 
         if ($cache->has()) {
             return $cache->get(); // @codeCoverageIgnore
         }
 
-        if ($shared === true) { // shared is true: always ignore transfers between accounts!
-            $sum = $object->transactionjournals()->transactionTypes(['Withdrawal'])->before($end)->after($start)
-                          ->get(['transaction_journals.*'])->sum('amount');
-        } else {
-            // do something else, SEE budgets.
-            // get all journals in this month where the asset account is NOT shared.
-            $sum = $object->transactionjournals()->before($end)->after($start)
-                          ->transactionTypes(['Withdrawal'])
-                          ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                          ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
-                          ->leftJoin(
-                              'account_meta', function (JoinClause $join) {
-                              $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
-                          }
-                          )->where('account_meta.data', '!=', '"sharedAsset"')->get(['transaction_journals.*'])->sum('amount');
-        }
+        $sum = $object->transactionjournals()
+                      ->transactionTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::OPENING_BALANCE])
+                      ->before($end)
+                      ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                      ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+                      ->whereIn('accounts.id', $ids)
+                      ->after($start)
+                      ->get(['transaction_journals.*'])->sum('amount');
 
         $cache->store($sum);
 

app/Repositories/Tag/TagRepository.php

@@ -9,6 +9,7 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
+use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
 
 /**
@@ -54,6 +55,7 @@ class TagRepository implements TagRepositoryInterface
     }
 
     /**
+     * @deprecated
      * This method scans the transaction journals from or to the given asset account
      * and checks if these are part of a balancing act. If so, it will sum up the amounts
      * transferred into the balancing act (if any) and return this amount.
@@ -77,7 +79,9 @@ class TagRepository implements TagRepositoryInterface
 
         /** @var Tag $tag */
         foreach ($tags as $tag) {
-            $journals = $tag->transactionjournals()->after($start)->before($end)->transactionTypes(['Transfer'])->get(['transaction_journals.*']);
+            $journals = $tag->transactionjournals()->after($start)->before($end)->transactionTypes([TransactionType::TRANSFER])->get(
+                ['transaction_journals.*']
+            );
 
             /** @var TransactionJournal $journal */
             foreach ($journals as $journal) {
@@ -108,6 +112,13 @@ class TagRepository implements TagRepositoryInterface
      */
     public function get()
     {
+        $cache = new CacheProperties;
+        $cache->addProperty('tags-list');
+
+        if ($cache->has()) {
+            return $cache->get();
+        }
+
         /** @var Collection $tags */
         $tags = Auth::user()->tags()->get();
         $tags = $tags->sortBy(
@@ -116,6 +127,8 @@ class TagRepository implements TagRepositoryInterface
             }
         );
 
+        $cache->store($tags);
+
         return $tags;
     }
 
@@ -158,7 +171,7 @@ class TagRepository implements TagRepositoryInterface
 
         if ($tag->tagMode == 'balancingAct' || $tag->tagMode == 'nothing') {
             foreach ($tag->transactionjournals as $journal) {
-                if ($journal->transactionType->type == 'Transfer') {
+                if ($journal->isTransfer()) {
                     return false;
                 }
             }
@@ -169,7 +182,7 @@ class TagRepository implements TagRepositoryInterface
          */
         $count = 0;
         foreach ($tag->transactionjournals as $journal) {
-            if ($journal->transactionType->type == 'Withdrawal') {
+            if ($journal->isWithdrawal()) {
                 $count++;
             }
         }
@@ -201,7 +214,7 @@ class TagRepository implements TagRepositoryInterface
          * If any transaction is a deposit, cannot become a balancing act.
          */
         foreach ($tag->transactionjournals as $journal) {
-            if ($journal->transactionType->type == 'Deposit') {
+            if ($journal->isDeposit()) {
                 return false;
             }
         }
@@ -239,10 +252,10 @@ class TagRepository implements TagRepositoryInterface
     protected function connectBalancingAct(TransactionJournal $journal, Tag $tag)
     {
         /** @var TransactionType $withdrawal */
-        $withdrawal  = TransactionType::whereType('Withdrawal')->first();
+        $withdrawal  = TransactionType::whereType(TransactionType::WITHDRAWAL)->first();
         $withdrawals = $tag->transactionjournals()->where('transaction_type_id', $withdrawal->id)->count();
         /** @var TransactionType $transfer */
-        $transfer  = TransactionType::whereType('Transfer')->first();
+        $transfer  = TransactionType::whereType(TransactionType::TRANSFER)->first();
         $transfers = $tag->transactionjournals()->where('transaction_type_id', $transfer->id)->count();
 
 
@@ -275,11 +288,11 @@ class TagRepository implements TagRepositoryInterface
     protected function connectAdvancePayment(TransactionJournal $journal, Tag $tag)
     {
         /** @var TransactionType $transfer */
-        $transfer = TransactionType::whereType('Transfer')->first();
+        $transfer = TransactionType::whereType(TransactionType::TRANSFER)->first();
         /** @var TransactionType $withdrawal */
-        $withdrawal = TransactionType::whereType('Withdrawal')->first();
+        $withdrawal = TransactionType::whereType(TransactionType::WITHDRAWAL)->first();
         /** @var TransactionType $deposit */
-        $deposit = TransactionType::whereType('Deposit')->first();
+        $deposit = TransactionType::whereType(TransactionType::DEPOSIT)->first();
 
         $withdrawals = $tag->transactionjournals()->where('transaction_type_id', $withdrawal->id)->count();
         $deposits    = $tag->transactionjournals()->where('transaction_type_id', $deposit->id)->count();
@@ -326,10 +339,10 @@ class TagRepository implements TagRepositoryInterface
         foreach ($tag->transactionjournals as $check) {
             // $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) {
+            if ($check->isWithdrawal() && $check->source_account->id != $journal->destination_account->id) {
                 $match = false;
             }
-            if ($check->transactionType->type == 'Deposit' && $check->destination_account->id != $journal->destination_account->id) {
+            if ($check->isDeposit() && $check->destination_account->id != $journal->destination_account->id) {
                 $match = false;
             }
 

app/Repositories/Tag/TagRepositoryInterface.php

@@ -27,6 +27,7 @@ interface TagRepositoryInterface
     public function connect(TransactionJournal $journal, Tag $tag);
 
     /**
+     * @deprecated
      * This method scans the transaction journals from or to the given asset account
      * and checks if these are part of a balancing act. If so, it will sum up the amounts
      * transferred into the balancing act (if any) and return this amount.

app/Support/Amount.php

@@ -40,7 +40,7 @@ class Amount
         if ($cache->has()) {
             return $cache->get();
         } else {
-            $currencyPreference = Prefs::get('currencyPreference', 'EUR');
+            $currencyPreference = Prefs::get('currencyPreference', env('DEFAULT_CURRENCY', 'EUR'));
             $currency           = TransactionCurrency::whereCode($currencyPreference->data)->first();
 
             $cache->store($currency->symbol);
@@ -60,7 +60,7 @@ class Amount
     {
         $amount = floatval($amount);
         $amount = round($amount, 2);
-        $string = number_format($amount, 2, ',', '.');
+        $string = money_format('%!.2n', $amount);
 
         if ($coloured === true) {
             if ($amount === 0.0) {
@@ -99,24 +99,21 @@ class Amount
         } else {
             $symbol = $journal->symbol;
         }
-        $amount = $journal->amount;
-        if ($journal->transactionType->type == 'Withdrawal') {
-            $amount = $amount * -1;
-        }
-        if ($journal->transactionType->type == 'Transfer' && $coloured) {
-            $txt = '<span class="text-info">' . $this->formatWithSymbol($symbol, $amount, false) . '</span>';
+
+        if ($journal->isTransfer() && $coloured) {
+            $txt = '<span class="text-info">' . $this->formatWithSymbol($symbol, $journal->amount_positive, false) . '</span>';
             $cache->store($txt);
 
             return $txt;
         }
-        if ($journal->transactionType->type == 'Transfer' && !$coloured) {
-            $txt = $this->formatWithSymbol($symbol, $amount, false);
+        if ($journal->isTransfer() && !$coloured) {
+            $txt = $this->formatWithSymbol($symbol, $journal->amount_positive, false);
             $cache->store($txt);
 
             return $txt;
         }
 
-        $txt = $this->formatWithSymbol($symbol, $amount, $coloured);
+        $txt = $this->formatWithSymbol($symbol, $journal->amount, $coloured);
         $cache->store($txt);
 
         return $txt;
@@ -155,7 +152,7 @@ class Amount
         if ($cache->has()) {
             return $cache->get();
         } else {
-            $currencyPreference = Prefs::get('currencyPreference', 'EUR');
+            $currencyPreference = Prefs::get('currencyPreference', env('DEFAULT_CURRENCY', 'EUR'));
 
             $currency = TransactionCurrency::whereCode($currencyPreference->data)->first();
             if ($currency) {
@@ -164,9 +161,9 @@ class Amount
 
                 return $currency->code;
             }
-            $cache->store('EUR');
+            $cache->store(env('DEFAULT_CURRENCY', 'EUR'));
 
-            return 'EUR'; // @codeCoverageIgnore
+            return env('DEFAULT_CURRENCY', 'EUR'); // @codeCoverageIgnore
         }
     }
 

app/Support/Navigation.php

@@ -106,16 +106,21 @@ class Navigation
      *
      * @return Carbon
      */
-    public function endOfX(Carbon $theCurrentEnd, $repeatFreq, Carbon $maxDate)
+    public function endOfX(Carbon $theCurrentEnd, $repeatFreq, Carbon $maxDate = null)
     {
         $functionMap = [
+            '1D'        => 'endOfDay',
             'daily'     => 'endOfDay',
+            '1W'        => 'endOfWeek',
             'week'      => 'endOfWeek',
             'weekly'    => 'endOfWeek',
             'month'     => 'endOfMonth',
+            '1M'        => 'endOfMonth',
             'monthly'   => 'endOfMonth',
+            '3M'        => 'lastOfQuarter',
             'quarter'   => 'lastOfQuarter',
             'quarterly' => 'lastOfQuarter',
+            '1Y'        => 'endOfYear',
             'year'      => 'endOfYear',
             'yearly'    => 'endOfYear',
         ];
@@ -128,7 +133,7 @@ class Navigation
 
         }
 
-        if ($currentEnd > $maxDate) {
+        if (!is_null($maxDate) && $currentEnd > $maxDate) {
             return clone $maxDate;
         }
 
@@ -145,12 +150,17 @@ class Navigation
     public function periodShow(Carbon $date, $repeatFrequency)
     {
         $formatMap = [
+            '1D'      => '%e %B %Y',
             'daily'   => '%e %B %Y',
+            '1W'      => 'Week %W, %Y',
             'week'    => 'Week %W, %Y',
             'weekly'  => 'Week %W, %Y',
+            '3M'      => '%B %Y',
             'quarter' => '%B %Y',
+            '1M'      => '%B %Y',
             'month'   => '%B %Y',
             'monthly' => '%B %Y',
+            '1Y'      => '%Y',
             'year'    => '%Y',
             'yearly'  => '%Y',
 
@@ -218,12 +228,15 @@ class Navigation
     public function subtractPeriod(Carbon $theDate, $repeatFreq, $subtract = 1)
     {
         $date = clone $theDate;
-
+        // 1D 1W 1M 3M 6M 1Y
         $functionMap = [
+            '1D'      => 'subDays',
             'daily'   => 'subDays',
             'week'    => 'subWeeks',
+            '1W'      => 'subWeeks',
             'weekly'  => 'subWeeks',
             'month'   => 'subMonths',
+            '1M'      => 'subMonths',
             'monthly' => 'subMonths',
             'year'    => 'subYears',
             'yearly'  => 'subYears',

app/Support/Steam.php

@@ -72,6 +72,54 @@ class Steam
         return round($balance, 2);
     }
 
+    /**
+     * Gets the balance for the given account during the whole range, using this format:
+     *
+     * [yyyy-mm-dd] => 123,2
+     *
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     */
+    public function balanceInRange(Account $account, Carbon $start, Carbon $end)
+    {
+        // abuse chart properties:
+        $cache = new CacheProperties;
+        $cache->addProperty($account->id);
+        $cache->addProperty('balance-in-range');
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        if ($cache->has()) {
+            return $cache->get(); // @codeCoverageIgnore
+        }
+
+        $balances = [];
+        $start->subDay();
+        $end->addDay();
+        $startBalance                      = $this->balance($account, $start);
+        $balances[$start->format('Y-m-d')] = $startBalance;
+        $start->addDay();
+
+        // query!
+        $set            = $account->transactions()
+                                  ->leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                  ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
+                                  ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
+                                  ->groupBy('transaction_journals.date')
+                                  ->get(['transaction_journals.date', DB::Raw('SUM(`transactions`.`amount`) as `modified`')]);
+        $currentBalance = $startBalance;
+        foreach ($set as $entry) {
+            $currentBalance         = bcadd($currentBalance, $entry->modified);
+            $balances[$entry->date] = $currentBalance;
+        }
+
+        $cache->store($balances);
+
+        return $balances;
+
+
+    }
+
     /**
      *
      * @param array          $ids

app/Support/Twig/Budget.php

@@ -23,10 +23,10 @@ class Budget extends Twig_Extension
     {
         $functions   = [];
         $functions[] = new Twig_SimpleFunction(
-            'spentInRepetitionCorrected', function (LimitRepetition $repetition) {
+            'spentInRepetition', function (LimitRepetition $repetition) {
             $cache = new CacheProperties;
             $cache->addProperty($repetition->id);
-            $cache->addProperty('spentInRepetitionCorrected');
+            $cache->addProperty('spentInRepetition');
             if ($cache->has()) {
                 return $cache->get(); // @codeCoverageIgnore
             }

app/Support/Twig/Journal.php

@@ -68,19 +68,17 @@ class Journal extends Twig_Extension
                 return $cache->get(); // @codeCoverageIgnore
             }
 
-            $type = $journal->transactionType->type;
-
-            switch ($type) {
-                case 'Withdrawal':
+            switch (true) {
+                case $journal->isWithdrawal():
                     $txt = '<i class="fa fa-long-arrow-left fa-fw" title="' . trans('firefly.withdrawal') . '"></i>';
                     break;
-                case 'Deposit':
+                case $journal->isDeposit():
                     $txt = '<i class="fa fa-long-arrow-right fa-fw" title="' . trans('firefly.deposit') . '"></i>';
                     break;
-                case 'Transfer':
+                case $journal->isTransfer():
                     $txt = '<i class="fa fa-fw fa-exchange" title="' . trans('firefly.transfer') . '"></i>';
                     break;
-                case 'Opening balance':
+                case $journal->isOpeningBalance():
                     $txt = '<i class="fa-fw fa fa-ban" title="' . trans('firefly.openingBalance') . '"></i>';
                     break;
                 default:
@@ -181,7 +179,7 @@ class Journal extends Twig_Extension
         if ($tag->tagMode == 'balancingAct') {
             // return tag formatted for a "balancing act", even if other
             // tags are present.
-            $amount = app('amount')->format($journal->actual_amount, false);
+            $amount = app('amount')->format($journal->amount_positive, false);
             $string = '<a href="' . route('tags.show', [$tag->id]) . '" class="label label-success" title="' . $amount
                       . '"><i class="fa fa-fw fa-refresh"></i> ' . $tag->tag . '</a>';
 
@@ -189,7 +187,7 @@ class Journal extends Twig_Extension
         }
 
         if ($tag->tagMode == 'advancePayment') {
-            if ($journal->transactionType->type == 'Deposit') {
+            if ($journal->isDeposit()) {
                 $amount = app('amount')->formatJournal($journal, false);
                 $string = '<a href="' . route('tags.show', [$tag->id]) . '" class="label label-success" title="' . $amount
                           . '"><i class="fa fa-fw fa-sort-numeric-desc"></i> ' . $tag->tag . '</a>';
@@ -201,7 +199,7 @@ class Journal extends Twig_Extension
             * AdvancePayment with a withdrawal will show the amount with a link to
             * the tag. The TransactionJournal should properly calculate the amount.
            */
-            if ($journal->transactionType->type == 'Withdrawal') {
+            if ($journal->isWithdrawal()) {
                 $amount = app('amount')->formatJournal($journal);
 
                 $string = '<a href="' . route('tags.show', [$tag->id]) . '">' . $amount . '</a>';

app/Validation/FireflyValidator.php

@@ -62,21 +62,11 @@ class FireflyValidator extends Validator
      */
     public function validateIban($attribute, $value)
     {
-        if (!is_string($value)) {
-            return false;
-        }
-        if (is_null($value)) {
-            return false;
-        }
-
-        if (strlen($value) === 0) {
+        if (!is_string($value) || is_null($value) || strlen($value) < 6) {
             return false;
         }
 
         $value = strtoupper($value);
-        if (strlen($value) < 6) {
-            return false;
-        }
 
         $search  = [' ', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'];
         $replace = ['', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31',
@@ -282,7 +272,8 @@ class FireflyValidator extends Validator
         $exclude = isset($parameters[2]) ? intval($parameters[2]) : 0;
 
         // get entries from table
-        $set = DB::table($table)->where('user_id', Auth::user()->id)->where('id', '!=', $exclude)->get([$field]);
+        $set = DB::table($table)->where('user_id', Auth::user()->id)
+                 ->where('id', '!=', $exclude)->get([$field]);
 
         foreach ($set as $entry) {
             $fieldValue = $this->tryDecrypt($entry->$field);
@@ -306,6 +297,7 @@ class FireflyValidator extends Validator
     {
         $exclude = isset($parameters[0]) ? $parameters[0] : null;
         $query   = DB::table('piggy_banks');
+        $query->whereNull('piggy_banks.deleted_at');
         $query->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id');
         $query->where('accounts.user_id', Auth::user()->id);
         if (!is_null($exclude)) {

composer.json

@@ -26,12 +26,10 @@
         "watson/validating": "~1.0",
         "doctrine/dbal": "~2.5",
         "illuminate/html": "~5.0",
-        "league/commonmark": "0.7.*",
+        "league/commonmark": "~0.7",
         "rcrowe/twigbridge": "0.7.x@dev",
         "zizaco/entrust": "dev-laravel-5",
-        "codeception/codeception": "*",
-        "league/csv": "^7.1",
-        "nesbot/carbon": "^1.20"
+        "league/csv": "^7.1"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "@stable",

config/app.php

@@ -52,7 +52,7 @@ return [
     |
     */
 
-    'locale'          => 'en',
+    'locale'          => 'en_US',
 
     /*
     |--------------------------------------------------------------------------
@@ -65,7 +65,7 @@ return [
     |
     */
 
-    'fallback_locale' => 'en',
+    'fallback_locale' => 'en_US',
 
     /*
     |--------------------------------------------------------------------------
@@ -139,8 +139,8 @@ return [
         'TwigBridge\ServiceProvider',
 
         'DaveJamesMiller\Breadcrumbs\ServiceProvider',
-        //'Barryvdh\Debugbar\ServiceProvider',
-        //'Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider',
+//        'Barryvdh\Debugbar\ServiceProvider',
+//        'Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider',
         'Zizaco\Entrust\EntrustServiceProvider',
 
         /*

config/database.php

@@ -49,7 +49,7 @@ return [
 
         'sqlite' => [
             'driver'   => 'sqlite',
-            'database' => __DIR__ . '/../storage/database/testing.db',
+            'database' => storage_path('database/testing.db'),
             'prefix'   => '',
         ],
 

config/firefly.php

@@ -1,20 +1,20 @@
 <?php
 
 return [
-    'chart'                    => 'chartjs',
-    'version'                  => '3.4.10',
-    'index_periods'            => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'],
-    'budget_periods'           => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
-    'csv_import_enabled'       => true,
-    'maxUploadSize'            => 5242880,
-    'allowedMimes'             => ['image/png', 'image/jpeg', 'application/pdf'],
-    'piggy_bank_periods'       => [
+    'chart'              => 'chartjs',
+    'version'            => '3.5.5',
+    'index_periods'      => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'],
+    'budget_periods'     => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
+    'csv_import_enabled' => true,
+    'maxUploadSize'      => 5242880,
+    'allowedMimes'       => ['image/png', 'image/jpeg', 'application/pdf'],
+    'piggy_bank_periods' => [
         'week'    => 'Week',
         'month'   => 'Month',
         'quarter' => 'Quarter',
         'year'    => 'Year'
     ],
-    'periods_to_text'          => [
+    'periods_to_text'    => [
         'weekly'    => 'A week',
         'monthly'   => 'A month',
         'quarterly' => 'A quarter',
@@ -22,7 +22,7 @@ return [
         'yearly'    => 'A year',
     ],
 
-    'accountRoles'             => [
+    'accountRoles' => [
         'defaultAsset' => 'Default asset account',
         'sharedAsset'  => 'Shared asset account',
         'savingAsset'  => 'Savings account',
@@ -85,7 +85,9 @@ return [
         [
             'asset'   => 'Asset account',
             'expense' => 'Expense account',
-            'revenue' => 'Revenue account'
+            'revenue' => 'Revenue account',
+            'opening' => 'Initial balance account',
+            'initial' => 'Initial balance account',
         ],
     'shortNamesByFullName'     =>
         [
@@ -96,13 +98,23 @@ return [
             'Revenue account'     => 'revenue',
             'Cash account'        => 'cash',
         ],
+    'languages' => [
+        'en_US' => ['name_locale' => 'English', 'name_english' => 'English', 'complete' => true],
+        'nl_NL' => ['name_locale' => 'Nederlands', 'name_english' => 'Dutch', 'complete' => true],
+        'pt_BR' => ['name_locale' => 'Português do Brasil', 'name_english' => 'Portugese (Brazil)', 'complete' => false],
+        'fr_FR' => ['name_locale' => 'Français', 'name_english' => 'French', 'complete' => false],
+    ],
     'lang'                     => [
-        'en' => 'English',
-        'nl' => 'Nederlands'
+        'en_US' => 'English',
+        'nl_NL' => 'Nederlands',
+        'fr_FR' => 'Français',
+        'pt_BR' => 'Português do Brasil',
     ],
     'locales'                  => [
-        'en' => ['en', 'English', 'en_US', 'en_US.utf8'],
-        'nl' => ['nl', 'Dutch', 'nl_NL', 'nl_NL.utf8'],
+        'en_US' => ['en', 'English', 'en_US', 'en_US.utf8'],
+        'nl_NL' => ['nl', 'Dutch', 'nl_NL', 'nl_NL.utf8'],
+        'pt_BR' => ['pt_BR', 'pt_BR.utf8'],
+        'fr_FR' => ['fr_FR', 'fr_FR.utf8'],
     ],
     'transactionTypesByWhat'   => [
         'expenses'   => ['Withdrawal'],
@@ -122,13 +134,17 @@ return [
 
     ],
 
-    'month'                    => [
-        'en' => '%B %Y',
-        'nl' => '%B %Y',
+    'month'       => [
+        'en_US' => '%B %Y',
+        'nl_NL' => '%B %Y',
+        'fr_FR' => '%B %Y',
+        'pt_BR' => '%B %Y',
     ],
-    'monthAndDay'              => [
-        'en' => '%B %e, %Y',
-        'nl' => '%e %B %Y',
+    'monthAndDay' => [
+        'en_US' => '%B %e, %Y',
+        'nl_NL' => '%e %B %Y',
+        'fr_FR' => '%B %e, %Y',
+        'pt_BR' => '%B %e, %Y',
     ],
 
 ];

config/mail.php

@@ -15,7 +15,8 @@ return [
     |
     */
 
-    'driver'     => env('EMAIL_DRIVER', 'smtp'),
+    'blocked_domains' => explode(',', env('BLOCKED_DOMAINS')),
+    'driver'          => env('EMAIL_DRIVER', 'smtp'),
 
     /*
     |--------------------------------------------------------------------------
@@ -28,7 +29,7 @@ return [
     |
     */
 
-    'host'       => env('EMAIL_SMTP', 'smtp.mailgun.org'),
+    'host' => env('EMAIL_SMTP', 'smtp.mailgun.org'),
 
     /*
     |--------------------------------------------------------------------------
@@ -41,7 +42,7 @@ return [
     |
     */
 
-    'port'       => 587,
+    'port' => 587,
 
     /*
     |--------------------------------------------------------------------------
@@ -54,7 +55,7 @@ return [
     |
     */
 
-    'from'       => ['address' => env('EMAIL_USERNAME', null), 'name' => 'Firefly III Mailer'],
+    'from' => ['address' => env('EMAIL_USERNAME', null), 'name' => 'Firefly III Mailer'],
 
     /*
     |--------------------------------------------------------------------------
@@ -80,7 +81,7 @@ return [
     |
     */
 
-    'username'   => env('EMAIL_USERNAME', null),
+    'username' => env('EMAIL_USERNAME', null),
 
     /*
     |--------------------------------------------------------------------------
@@ -93,7 +94,7 @@ return [
     |
     */
 
-    'password'   => env('EMAIL_PASSWORD', null),
+    'password' => env('EMAIL_PASSWORD', null),
 
     /*
     |--------------------------------------------------------------------------
@@ -106,7 +107,7 @@ return [
     |
     */
 
-    'sendmail'   => '/usr/sbin/sendmail -bs',
+    'sendmail' => '/usr/sbin/sendmail -bs',
 
     /*
     |--------------------------------------------------------------------------
@@ -119,6 +120,6 @@ return [
     |
     */
 
-    'pretend'    => env('EMAIL_PRETEND', false),
+    'pretend' => env('EMAIL_PRETEND', false),
 
 ];

database/seeds/TestDataSeeder.php

@@ -49,7 +49,7 @@ class TestDataSeeder extends Seeder
         $this->createPiggybanks();
 
         // dates:
-        $start = Carbon::now()->subyear()->startOfMonth();
+        $start = Carbon::now()->subYears(5)->startOfMonth();
         $end   = Carbon::now()->endOfDay();
 
 

database/seeds/TransactionTypeSeeder.php

@@ -12,10 +12,10 @@ class TransactionTypeSeeder extends Seeder
 
         DB::table('transaction_types')->delete();
 
-        TransactionType::create(['type' => 'Withdrawal']);
-        TransactionType::create(['type' => 'Deposit']);
-        TransactionType::create(['type' => 'Transfer']);
-        TransactionType::create(['type' => 'Opening balance']);
+        TransactionType::create(['type' => TransactionType::WITHDRAWAL]);
+        TransactionType::create(['type' => TransactionType::DEPOSIT]);
+        TransactionType::create(['type' => TransactionType::TRANSFER]);
+        TransactionType::create(['type' => TransactionType::OPENING_BALANCE]);
     }
 
 } 

pu.sh

@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# set testing environment
-cp .env.testing .env
-
-# test!
-if [ -z "$1" ]
-then
-    phpunit --verbose
-fi
-
-# directories to look in:
-dirs=("controllers" "database" "factories" "generators" "helpers" "models" "middleware" "repositories" "support")
-
-if [ ! -z "$1" ]
-then
-    for i in "${dirs[@]}"
-    do
-        firstFile="./tests/$i/$1.php"
-        secondFile="./tests/$i/$1Test.php"
-        if [ -f "$firstFile" ]
-        then
-            # run it!
-                phpunit --verbose $firstFile
-                exit $?
-        fi
-        if [ -f "$secondFile" ]
-        then
-            # run it!
-                phpunit --verbose $secondFile
-                exit $?
-        fi
-
-
-    done
-
-fi
-
-# restore .env file
-cp .env.local .env

public/css/daterangepicker-bs3.css

@@ -1,335 +0,0 @@
-/*!
- * Stylesheet for the Date Range Picker, for use with Bootstrap 3.x
- *
- * Copyright 2013-2015 Dan Grossman ( http://www.dangrossman.info )
- * Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
- *
- * Built for http://www.improvely.com
- */
-
-.daterangepicker.dropdown-menu {
-    max-width: none;
-    z-index: 3000;
-}
-
-.daterangepicker.opensleft .ranges, .daterangepicker.opensleft .calendar {
-    float: left;
-    margin: 4px;
-}
-
-.daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar,
-.daterangepicker.openscenter .ranges, .daterangepicker.openscenter .calendar {
-    float: right;
-    margin: 4px;
-}
-
-.daterangepicker.single .ranges, .daterangepicker.single .calendar {
-    float: none;
-}
-
-.daterangepicker .ranges {
-    width: 160px;
-    text-align: left;
-}
-
-.daterangepicker .ranges .range_inputs>div {
-    float: left;
-}
-
-.daterangepicker .ranges .range_inputs>div:nth-child(2) {
-    padding-left: 11px;
-}
-
-.daterangepicker .calendar {
-    display: none;
-    max-width: 270px;
-}
-
-.daterangepicker.show-calendar .calendar {
-    display: block;
-}
-
-.daterangepicker .calendar.single .calendar-date {
-    border: none;
-}
-
-.daterangepicker .calendar th, .daterangepicker .calendar td {
-    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-    white-space: nowrap;
-    text-align: center;
-    min-width: 32px;
-}
-
-.daterangepicker .daterangepicker_start_input label,
-.daterangepicker .daterangepicker_end_input label {
-    color: #333;
-    display: block;
-    font-size: 11px;
-    font-weight: normal;
-    height: 20px;
-    line-height: 20px;
-    margin-bottom: 2px;
-    text-shadow: #fff 1px 1px 0px;
-    text-transform: uppercase;
-    width: 74px;
-}
-
-.daterangepicker .ranges input {
-    font-size: 11px;
-}
-
-.daterangepicker .ranges .input-mini {
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    color: #555;
-    display: block;
-    font-size: 11px;
-    height: 30px;
-    line-height: 30px;
-    vertical-align: middle;
-    margin: 0 0 10px 0;
-    padding: 0 6px;
-    width: 74px;
-}
-
-.daterangepicker .ranges ul {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-}
-
-.daterangepicker .ranges li {
-    font-size: 13px;
-    background: #f5f5f5;
-    border: 1px solid #f5f5f5;
-    color: #08c;
-    padding: 3px 12px;
-    margin-bottom: 8px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    cursor: pointer;
-}
-
-.daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
-    background: #08c;
-    border: 1px solid #08c;
-    color: #fff;
-}
-
-.daterangepicker .calendar-date {
-    border: 1px solid #ddd;
-    padding: 4px;
-    border-radius: 4px;
-    background: #fff;
-}
-
-.daterangepicker .calendar-time {
-    text-align: center;
-    margin: 8px auto 0 auto;
-    line-height: 30px;
-}
-
-.daterangepicker {
-    position: absolute;
-    background: #fff;
-    top: 100px;
-    left: 20px;
-    padding: 4px;
-    margin-top: 1px;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-}
-
-.daterangepicker.opensleft:before {
-    position: absolute;
-    top: -7px;
-    right: 9px;
-    display: inline-block;
-    border-right: 7px solid transparent;
-    border-bottom: 7px solid #ccc;
-    border-left: 7px solid transparent;
-    border-bottom-color: rgba(0, 0, 0, 0.2);
-    content: '';
-}
-
-.daterangepicker.opensleft:after {
-    position: absolute;
-    top: -6px;
-    right: 10px;
-    display: inline-block;
-    border-right: 6px solid transparent;
-    border-bottom: 6px solid #fff;
-    border-left: 6px solid transparent;
-    content: '';
-}
-
-.daterangepicker.openscenter:before {
-    position: absolute;
-    top: -7px;
-    left: 0;
-    right: 0;
-    width: 0;
-    margin-left: auto;
-    margin-right: auto;
-    display: inline-block;
-    border-right: 7px solid transparent;
-    border-bottom: 7px solid #ccc;
-    border-left: 7px solid transparent;
-    border-bottom-color: rgba(0, 0, 0, 0.2);
-    content: '';
-}
-
-.daterangepicker.openscenter:after {
-    position: absolute;
-    top: -6px;
-    left: 0;
-    right: 0;
-    width: 0;
-    margin-left: auto;
-    margin-right: auto;
-    display: inline-block;
-    border-right: 6px solid transparent;
-    border-bottom: 6px solid #fff;
-    border-left: 6px solid transparent;
-    content: '';
-}
-
-.daterangepicker.opensright:before {
-    position: absolute;
-    top: -7px;
-    left: 9px;
-    display: inline-block;
-    border-right: 7px solid transparent;
-    border-bottom: 7px solid #ccc;
-    border-left: 7px solid transparent;
-    border-bottom-color: rgba(0, 0, 0, 0.2);
-    content: '';
-}
-
-.daterangepicker.opensright:after {
-    position: absolute;
-    top: -6px;
-    left: 10px;
-    display: inline-block;
-    border-right: 6px solid transparent;
-    border-bottom: 6px solid #fff;
-    border-left: 6px solid transparent;
-    content: '';
-}
-
-.daterangepicker.dropup{
-    margin-top: -5px;
-}
-.daterangepicker.dropup:before{
-    top: initial;
-    bottom:-7px;
-    border-bottom: initial;
-    border-top: 7px solid #ccc;
-}
-.daterangepicker.dropup:after{
-    top: initial;
-    bottom:-6px;
-    border-bottom: initial;
-    border-top: 6px solid #fff;
-}
-
-.daterangepicker table {
-    width: 100%;
-    margin: 0;
-}
-
-.daterangepicker td, .daterangepicker th {
-    text-align: center;
-    width: 20px;
-    height: 20px;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-    cursor: pointer;
-    white-space: nowrap;
-}
-
-.daterangepicker td.off {
-    color: #999;
-}
-
-.daterangepicker td.disabled, .daterangepicker option.disabled {
-    color: #999;
-}
-
-.daterangepicker td.available:hover, .daterangepicker th.available:hover {
-    background: #eee;
-}
-
-.daterangepicker td.in-range {
-    background: #ebf4f8;
-    -webkit-border-radius: 0;
-    -moz-border-radius: 0;
-    border-radius: 0;
-}
-
-.daterangepicker td.start-date {
-    -webkit-border-radius: 4px 0 0 4px;
-    -moz-border-radius: 4px 0 0 4px;
-    border-radius: 4px 0 0 4px;
-}
-
-.daterangepicker td.end-date {
-    -webkit-border-radius: 0 4px 4px 0;
-    -moz-border-radius: 0 4px 4px 0;
-    border-radius: 0 4px 4px 0;
-}
-
-.daterangepicker td.start-date.end-date {
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-}
-
-.daterangepicker td.active, .daterangepicker td.active:hover {
-    background-color: #357ebd;
-    border-color: #3071a9;
-    color: #fff;
-}
-
-.daterangepicker td.week, .daterangepicker th.week {
-    font-size: 80%;
-    color: #ccc;
-}
-
-.daterangepicker select.monthselect, .daterangepicker select.yearselect {
-    font-size: 12px;
-    padding: 1px;
-    height: auto;
-    margin: 0;
-    cursor: default;
-}
-
-.daterangepicker select.monthselect {
-    margin-right: 2%;
-    width: 56%;
-}
-
-.daterangepicker select.yearselect {
-    width: 40%;
-}
-
-.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect {
-    width: 50px;
-    margin-bottom: 0;
-}
-
-.daterangepicker_start_input {
-    float: left;
-}
-
-.daterangepicker_end_input {
-    float: left;
-    padding-left: 11px
-}
-
-.daterangepicker th.month {
-    width: auto;
-}

public/css/daterangepicker.css

@@ -0,0 +1,341 @@
+/**
+* A stylesheet for use with Bootstrap 3.x
+* @author: Dan Grossman http://www.dangrossman.info/
+* @copyright: Copyright (c) 2012-2015 Dan Grossman. All rights reserved.
+* @license: Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
+* @website: https://www.improvely.com/
+*/
+
+/* Container Appearance */
+
+.daterangepicker {
+  position: absolute;
+  background: #fff;
+  top: 100px;
+  left: 20px;
+  padding: 4px;
+  margin-top: 1px;
+  border-radius: 4px;
+}
+
+.daterangepicker.opensleft:before {
+  position: absolute;
+  top: -7px;
+  right: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.opensleft:after {
+  position: absolute;
+  top: -6px;
+  right: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.daterangepicker.openscenter:before {
+  position: absolute;
+  top: -7px;
+  left: 0;
+  right: 0;
+  width: 0;
+  margin-left: auto;
+  margin-right: auto;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.openscenter:after {
+  position: absolute;
+  top: -6px;
+  left: 0;
+  right: 0;
+  width: 0;
+  margin-left: auto;
+  margin-right: auto;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.daterangepicker.opensright:before {
+  position: absolute;
+  top: -7px;
+  left: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.opensright:after {
+  position: absolute;
+  top: -6px;
+  left: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.daterangepicker.dropup{
+  margin-top: -5px;
+}
+.daterangepicker.dropup:before{
+  top: initial;
+  bottom:-7px;
+  border-bottom: initial;
+  border-top: 7px solid #ccc;
+}
+.daterangepicker.dropup:after{
+  top: initial;
+  bottom:-6px;
+  border-bottom: initial;
+  border-top: 6px solid #fff;
+}
+
+.daterangepicker.dropdown-menu {
+  max-width: none;
+  z-index: 3000;
+}
+
+.daterangepicker .ranges, .daterangepicker .calendar {
+  float: left;
+}
+
+.daterangepicker.single .ranges, .daterangepicker.single .calendar {
+  float: none;
+}
+
+.daterangepicker .ranges {
+  margin: 4px;
+  text-align: left;
+}
+
+.daterangepicker .calendar {
+  display: none;
+  max-width: 270px;
+}
+
+.daterangepicker.show-calendar .calendar {
+  display: block;
+}
+
+.daterangepicker .calendar.single .calendar-table {
+  border: none;
+}
+
+/* Calendars */
+
+.daterangepicker .calendar th, .daterangepicker .calendar td {
+  white-space: nowrap;
+  text-align: center;
+  min-width: 32px;
+}
+
+.daterangepicker .calendar-table {
+  border: 1px solid #ddd;
+  padding: 4px;
+  border-radius: 4px;
+  background: #fff;
+}
+
+.daterangepicker .calendar.left .calendar-table {
+  border-right: none;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+.daterangepicker .calendar.right .calendar-table {
+  border-left: none;
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;  
+}
+
+.daterangepicker .calendar.left {
+  margin: 4px 0 4px 4px;
+}
+
+.daterangepicker .calendar.right {
+  margin: 4px 4px 4px 0;
+}
+
+.daterangepicker .calendar.left .calendar-table {
+  padding-right: 12px;
+}
+
+.daterangepicker table {
+  width: 100%;
+  margin: 0;
+}
+
+.daterangepicker td, .daterangepicker th {
+  text-align: center;
+  width: 20px;
+  height: 20px;
+  border-radius: 4px;
+  white-space: nowrap;
+  cursor: pointer;
+}
+
+.daterangepicker td.off, .daterangepicker td.off.in-range, .daterangepicker td.off.start-date, .daterangepicker td.off.end-date {
+  color: #999;
+  background: #fff;
+}
+
+.daterangepicker td.disabled, .daterangepicker option.disabled {
+  color: #999;
+}
+
+.daterangepicker td.available:hover, .daterangepicker th.available:hover {
+  background: #eee;
+}
+
+.daterangepicker td.in-range {
+  background: #ebf4f8;
+  border-radius: 0;
+}
+
+.daterangepicker td.start-date {
+  border-radius: 4px 0 0 4px;
+}
+
+.daterangepicker td.end-date {
+  border-radius: 0 4px 4px 0;
+}
+
+.daterangepicker td.start-date.end-date {
+  border-radius: 4px;
+}
+
+.daterangepicker td.active, .daterangepicker td.active:hover {
+  background-color: #357ebd;
+  border-color: #3071a9;
+  color: #fff;
+}
+
+.daterangepicker td.week, .daterangepicker th.week {
+  font-size: 80%;
+  color: #ccc;
+}
+
+.daterangepicker select.monthselect, .daterangepicker select.yearselect {
+  font-size: 12px;
+  padding: 1px;
+  height: auto;
+  margin: 0;
+  cursor: default;
+}
+
+.daterangepicker select.monthselect {
+  margin-right: 2%;
+  width: 56%;
+}
+
+.daterangepicker select.yearselect {
+  width: 40%;
+}
+
+.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect {
+  width: 50px;
+  margin-bottom: 0;
+}
+
+.daterangepicker th.month {
+  width: auto;
+}
+
+/* Text Input Above Each Calendar */
+
+.daterangepicker .input-mini {
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  color: #555;
+  display: block;
+  height: 30px;
+  line-height: 30px;
+  vertical-align: middle;
+  margin: 0 0 5px 0;
+  padding: 0 6px 0 28px;
+  width: 100%;
+}
+
+.daterangepicker .input-mini.active {
+  border: 1px solid #357ebd;
+}
+
+.daterangepicker .daterangepicker_input i {
+  position: absolute;
+  left: 8px;
+  top: 8px;
+}
+
+.daterangepicker .left .daterangepicker_input {
+  padding-right: 12px;
+}
+
+.daterangepicker .daterangepicker_input {
+  position: relative;
+}
+
+/* Time Picker */
+
+.daterangepicker .calendar-time {
+  text-align: center;
+  margin: 5px auto;
+  line-height: 30px;
+  position: relative;
+  padding-left: 28px;
+}
+
+.daterangepicker .calendar-time select.disabled {
+  color: #ccc;
+  cursor: not-allowed;
+}
+
+/* Predefined Ranges */
+
+.daterangepicker .ranges {
+  font-size: 11px;
+}
+
+.daterangepicker .ranges ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  width: 160px;
+}
+
+.daterangepicker .ranges li {
+  font-size: 13px;
+  background: #f5f5f5;
+  border: 1px solid #f5f5f5;
+  color: #08c;
+  padding: 3px 12px;
+  margin-bottom: 8px;
+  border-radius: 5px;
+  cursor: pointer;
+}
+
+.daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
+  background: #08c;
+  border: 1px solid #08c;
+  color: #fff;
+}

public/css/firefly.css

@@ -1,5 +1,5 @@
 #daterange {cursor:pointer;}
-.google-chart-error {height:30px;background:url('/images/error.png') no-repeat center center;}
+.general-chart-error {height:30px;background:url('/images/error.png') no-repeat center center;}
 .handle {cursor:move;}
 
 .ui-sortable-placeholder {

public/dist/css/skins/skin-blue-light.min.css

@@ -1 +1 @@
-.skin-blue-light .main-header .navbar{background-color:#3c8dbc}.skin-blue-light .main-header .navbar .nav>li>a{color:#fff}.skin-blue-light .main-header .navbar .nav>li>a:hover,.skin-blue-light .main-header .navbar .nav>li>a:active,.skin-blue-light .main-header .navbar .nav>li>a:focus,.skin-blue-light .main-header .navbar .nav .open>a,.skin-blue-light .main-header .navbar .nav .open>a:hover,.skin-blue-light .main-header .navbar .nav .open>a:focus{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-blue-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue-light .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-blue-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue-light .main-header .navbar .sidebar-toggle:hover{background-color:#367fa9}@media (max-width:767px){.skin-blue-light .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-blue-light .main-header .navbar .dropdown-menu li a{color:#fff}.skin-blue-light .main-header .navbar .dropdown-menu li a:hover{background:#367fa9}}.skin-blue-light .main-header .logo{background-color:#3c8dbc;color:#fff;border-bottom:0 solid transparent}.skin-blue-light .main-header .logo:hover{background-color:#3b8ab8}.skin-blue-light .main-header li.user-header{background-color:#3c8dbc}.skin-blue-light .content-header{background:transparent}.skin-blue-light .wrapper,.skin-blue-light .main-sidebar,.skin-blue-light .left-side{background-color:#f9fafc}.skin-blue-light .content-wrapper,.skin-blue-light .main-footer{border-left:1px solid #d2d6de}.skin-blue-light .user-panel>.info,.skin-blue-light .user-panel>.info>a{color:#444}.skin-blue-light .sidebar-menu>li{-webkit-transition:border-left-color .3s ease;-o-transition:border-left-color .3s ease;transition:border-left-color .3s ease}.skin-blue-light .sidebar-menu>li.header{color:#848484;background:#f9fafc}.skin-blue-light .sidebar-menu>li>a{border-left:3px solid transparent;font-weight:600}.skin-blue-light .sidebar-menu>li:hover>a,.skin-blue-light .sidebar-menu>li.active>a{color:#000;background:#f4f4f5}.skin-blue-light .sidebar-menu>li.active{border-left-color:#3c8dbc}.skin-blue-light .sidebar-menu>li.active>a{font-weight:600}.skin-blue-light .sidebar-menu>li>.treeview-menu{background:#f4f4f5}.skin-blue-light .sidebar a{color:#444}.skin-blue-light .sidebar a:hover{text-decoration:none}.skin-blue-light .treeview-menu>li>a{color:#777}.skin-blue-light .treeview-menu>li.active>a,.skin-blue-light .treeview-menu>li>a:hover{color:#000}.skin-blue-light .treeview-menu>li.active>a{font-weight:600}.skin-blue-light .sidebar-form{border-radius:3px;border:1px solid #d2d6de;margin:10px 10px}.skin-blue-light .sidebar-form input[type="text"],.skin-blue-light .sidebar-form .btn{box-shadow:none;background-color:#fff;border:1px solid transparent;height:35px;-webkit-transition:all .3s ease-in-out;-o-transition:all .3s ease-in-out;transition:all .3s ease-in-out}.skin-blue-light .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px !important;border-top-right-radius:0 !important;border-bottom-right-radius:0 !important;border-bottom-left-radius:2px !important}.skin-blue-light .sidebar-form input[type="text"]:focus,.skin-blue-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-blue-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-blue-light .sidebar-form .btn{color:#999;border-top-left-radius:0 !important;border-top-right-radius:2px !important;border-bottom-right-radius:2px !important;border-bottom-left-radius:0 !important}@media (min-width:768px){.skin-blue-light.sidebar-mini.sidebar-collapse .sidebar-menu>li>.treeview-menu{border-left:1px solid #d2d6de}}.skin-blue-light .main-footer{border-top-color:#d2d6de}.skin-blue.layout-top-nav .main-header>.logo{background-color:#3c8dbc;color:#fff;border-bottom:0 solid transparent}.skin-blue.layout-top-nav .main-header>.logo:hover{background-color:#3b8ab8}
+.skin-blue-light .main-header .navbar{background-color:#3c8dbc}.skin-blue-light .main-header .navbar .nav>li>a{color:#fff}.skin-blue-light .main-header .navbar .nav>li>a:hover,.skin-blue-light .main-header .navbar .nav>li>a:active,.skin-blue-light .main-header .navbar .nav>li>a:focus,.skin-blue-light .main-header .navbar .nav .open>a,.skin-blue-light .main-header .navbar .nav .open>a:hover,.skin-blue-light .main-header .navbar .nav .open>a:focus,.skin-blue-light .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-blue-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue-light .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-blue-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue-light .main-header .navbar .sidebar-toggle:hover{background-color:#367fa9}@media (max-width:767px){.skin-blue-light .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-blue-light .main-header .navbar .dropdown-menu li a{color:#fff}.skin-blue-light .main-header .navbar .dropdown-menu li a:hover{background:#367fa9}}.skin-blue-light .main-header .logo{background-color:#3c8dbc;color:#fff;border-bottom:0 solid transparent}.skin-blue-light .main-header .logo:hover{background-color:#3b8ab8}.skin-blue-light .main-header li.user-header{background-color:#3c8dbc}.skin-blue-light .content-header{background:transparent}.skin-blue-light .wrapper,.skin-blue-light .main-sidebar,.skin-blue-light .left-side{background-color:#f9fafc}.skin-blue-light .content-wrapper,.skin-blue-light .main-footer{border-left:1px solid #d2d6de}.skin-blue-light .user-panel>.info,.skin-blue-light .user-panel>.info>a{color:#444}.skin-blue-light .sidebar-menu>li{-webkit-transition:border-left-color .3s ease;-o-transition:border-left-color .3s ease;transition:border-left-color .3s ease}.skin-blue-light .sidebar-menu>li.header{color:#848484;background:#f9fafc}.skin-blue-light .sidebar-menu>li>a{border-left:3px solid transparent;font-weight:600}.skin-blue-light .sidebar-menu>li:hover>a,.skin-blue-light .sidebar-menu>li.active>a{color:#000;background:#f4f4f5}.skin-blue-light .sidebar-menu>li.active{border-left-color:#3c8dbc}.skin-blue-light .sidebar-menu>li.active>a{font-weight:600}.skin-blue-light .sidebar-menu>li>.treeview-menu{background:#f4f4f5}.skin-blue-light .sidebar a{color:#444}.skin-blue-light .sidebar a:hover{text-decoration:none}.skin-blue-light .treeview-menu>li>a{color:#777}.skin-blue-light .treeview-menu>li.active>a,.skin-blue-light .treeview-menu>li>a:hover{color:#000}.skin-blue-light .treeview-menu>li.active>a{font-weight:600}.skin-blue-light .sidebar-form{border-radius:3px;border:1px solid #d2d6de;margin:10px 10px}.skin-blue-light .sidebar-form input[type="text"],.skin-blue-light .sidebar-form .btn{box-shadow:none;background-color:#fff;border:1px solid transparent;height:35px;-webkit-transition:all .3s ease-in-out;-o-transition:all .3s ease-in-out;transition:all .3s ease-in-out}.skin-blue-light .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-blue-light .sidebar-form input[type="text"]:focus,.skin-blue-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-blue-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-blue-light .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}@media (min-width:768px){.skin-blue-light.sidebar-mini.sidebar-collapse .sidebar-menu>li>.treeview-menu{border-left:1px solid #d2d6de}}.skin-blue-light .main-footer{border-top-color:#d2d6de}.skin-blue.layout-top-nav .main-header>.logo{background-color:#3c8dbc;color:#fff;border-bottom:0 solid transparent}.skin-blue.layout-top-nav .main-header>.logo:hover{background-color:#3b8ab8}