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.

.coveralls.yml

@@ -1 +1 @@
-src_dir: .
+src_dir: .

.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,11 +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
+SITE_OWNER=mail@example.com
+
+SENDGRID_USERNAME=
+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
@@ -33,4 +33,4 @@ addNewLines.php
 .env.local
 
 tests/_output/*
-tests/_output/*
+tests/_output/*

.scrutinizer.yml

@@ -1,3 +1,3 @@
 # .scrutinizer.yml
 tools:
-  external_code_coverage: false
+  external_code_coverage: false

.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
 
@@ -90,6 +101,7 @@ Firefly III uses the following libraries and tools:
 
 * The AdminLTE template by [Almsaseed Studio](https://almsaeedstudio.com/)
 * The [Google charts](https://developers.google.com/chart/) library.
+* [Chart.js](http://www.chartjs.org/)
 * [Bootstrap](http://getbootstrap.com/)
 * [Laravel](http://laravel.com/)
 * [Twig](http://twig.sensiolabs.org/)

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,12 +33,12 @@ 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:
             $description          = $entry[0]->name . ' (' . $entry[1]->format('jS M Y') . ')';
-            $amount               = ($entry[0]->amount_max + $entry[0]->amount_min) / 2;
+            $amount               = bcdiv(bcadd($entry[0]->amount_max, $entry[0]->amount_min), 2);
             $unpaidDescriptions[] = $description;
             $unpaidAmount         = bcadd($unpaidAmount, $amount);
             unset($amount, $description);
@@ -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,93 +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               = ($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,
-                floatval($bill->amount_max),
-                floatval($bill->amount_min),
-                floatval($result->amount));
-        }
-
-        $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.month.' . $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
@@ -61,7 +93,38 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
 
         $data                          = [
             'count'    => 2,
-            'labels'   => [],
+            'labels'   => [trans('firefly.sum_of_year'), trans('firefly.average_of_year')],
+            '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;
+    }
+
+    /**
+     * @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'),

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/Handlers/Events/RescanJournal.php

@@ -1,6 +1,5 @@
 <?php namespace FireflyIII\Handlers\Events;
 
-use App;
 use FireflyIII\Events\JournalSaved;
 use Log;
 
@@ -36,7 +35,7 @@ class RescanJournal
         Log::debug('Triggered saved event for journal #' . $journal->id . ' (' . $journal->description . ')');
 
         /** @var \FireflyIII\Repositories\Bill\BillRepositoryInterface $repository */
-        $repository = App::make('FireflyIII\Repositories\Bill\BillRepositoryInterface');
+        $repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface');
         $list       = $journal->user->bills()->where('active', 1)->where('automatch', 1)->get();
 
         Log::debug('Found ' . $list->count() . ' bills to check.');

app/Handlers/Events/UpdateJournalConnection.php

@@ -49,10 +49,12 @@ class UpdateJournalConnection
         if (is_null($repetition)) {
             return;
         }
-        $amount = $journal->amount;
-        $diff   = $amount - $event->amount; // update current repetition
+        bcscale(2);
 
-        $repetition->currentamount += $diff;
+        $amount = $journal->amount;
+        $diff   = bcsub($amount, $event->amount); // update current repetition
+
+        $repetition->currentamount = bcadd($repetition->currentamount, $diff);
         $repetition->save();
 
 

app/Helpers/Attachments/AttachmentHelper.php

@@ -0,0 +1,222 @@
+<?php
+
+namespace FireflyIII\Helpers\Attachments;
+
+use Auth;
+use Config;
+use Crypt;
+use FireflyIII\Models\Attachment;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\MessageBag;
+use Input;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+
+/**
+ * Class AttachmentHelper
+ *
+ * @package FireflyIII\Helpers\Attachments
+ */
+class AttachmentHelper implements AttachmentHelperInterface
+{
+
+    /** @var int */
+    protected $maxUploadSize;
+    /** @var array */
+    protected $allowedMimes;
+    /** @var MessageBag */
+    public $errors;
+    /** @var MessageBag */
+    public $messages;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->maxUploadSize = Config::get('firefly.maxUploadSize');
+        $this->allowedMimes  = Config::get('firefly.allowedMimes');
+        $this->errors        = new MessageBag;
+        $this->messages      = new MessageBag;
+    }
+
+    /**
+     * @param Attachment $attachment
+     *
+     * @return string
+     */
+    public function getAttachmentLocation(Attachment $attachment)
+    {
+        $path = storage_path('upload') . DIRECTORY_SEPARATOR . 'at-' . $attachment->id . '.data';
+
+        return $path;
+    }
+
+    /**
+     * @param Model $model
+     *
+     * @return bool
+     */
+    public function saveAttachmentsForModel(Model $model)
+    {
+        $files = Input::file('attachments');
+
+        if (is_array($files)) {
+            foreach ($files as $entry) {
+                if (!is_null($entry)) {
+                    $this->processFile($entry, $model);
+                }
+            }
+        } else {
+            $this->processFile($files, $model);
+        }
+
+        return true;
+    }
+
+    /**
+     * @param UploadedFile $file
+     * @param Model        $model
+     *
+     * @return bool
+     */
+    protected function hasFile(UploadedFile $file, Model $model)
+    {
+        $md5   = md5_file($file->getRealPath());
+        $name  = $file->getClientOriginalName();
+        $class = get_class($model);
+        $count = Auth::user()->attachments()->where('md5', $md5)->where('attachable_id', $model->id)->where('attachable_type', $class)->count();
+
+        if ($count > 0) {
+            $msg = trans('validation.file_already_attached', ['name' => $name]);
+            $this->errors->add('attachments', $msg);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param UploadedFile $file
+     * @param Model        $model
+     *
+     * @return bool
+     */
+    protected function validateUpload(UploadedFile $file, Model $model)
+    {
+        if (!$this->validMime($file)) {
+            return false;
+        }
+        if (!$this->validSize($file)) {
+            return false;
+        }
+        if ($this->hasFile($file, $model)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param UploadedFile $file
+     * @param Model        $model
+     *
+     * @return bool|Attachment
+     */
+    protected function processFile(UploadedFile $file, Model $model)
+    {
+        $validation = $this->validateUpload($file, $model);
+        if ($validation === false) {
+            return false;
+        }
+
+        $attachment = new Attachment; // create Attachment object.
+        $attachment->user()->associate(Auth::user());
+        $attachment->attachable()->associate($model);
+        $attachment->md5      = md5_file($file->getRealPath());
+        $attachment->filename = $file->getClientOriginalName();
+        $attachment->mime     = $file->getMimeType();
+        $attachment->size     = $file->getSize();
+        $attachment->uploaded = 0;
+        $attachment->save();
+
+        $path      = $file->getRealPath(); // encrypt and move file to storage.
+        $content   = file_get_contents($path);
+        $encrypted = Crypt::encrypt($content);
+
+        // store it:
+        $upload = $this->getAttachmentLocation($attachment);
+        if (is_writable(dirname($upload))) {
+            file_put_contents($upload, $encrypted);
+        }
+
+        $attachment->uploaded = 1; // update attachment
+        $attachment->save();
+
+        $name = e($file->getClientOriginalName()); // add message:
+        $msg  = trans('validation.file_attached', ['name' => $name]);
+        $this->messages->add('attachments', $msg);
+
+        // return it.
+        return $attachment;
+
+
+    }
+
+    /**
+     * @param UploadedFile $file
+     *
+     * @return bool
+     */
+    protected function validMime(UploadedFile $file)
+    {
+        $mime = e($file->getMimeType());
+        $name = e($file->getClientOriginalName());
+
+        if (!in_array($mime, $this->allowedMimes)) {
+            $msg = trans('validation.file_invalid_mime', ['name' => $name, 'mime' => $mime]);
+            $this->errors->add('attachments', $msg);
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param UploadedFile $file
+     *
+     * @return bool
+     */
+    protected function validSize(UploadedFile $file)
+    {
+        $size = $file->getSize();
+        $name = e($file->getClientOriginalName());
+        if ($size > $this->maxUploadSize) {
+            $msg = trans('validation.file_too_large', ['name' => $name]);
+            $this->errors->add('attachments', $msg);
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @return MessageBag
+     */
+    public function getErrors()
+    {
+        return $this->errors;
+    }
+
+    /**
+     * @return MessageBag
+     */
+    public function getMessages()
+    {
+        return $this->messages;
+    }
+
+
+}

app/Helpers/Attachments/AttachmentHelperInterface.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace FireflyIII\Helpers\Attachments;
+
+use FireflyIII\Models\Attachment;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\MessageBag;
+
+/**
+ * Interface AttachmentHelperInterface
+ *
+ * @package FireflyIII\Helpers\Attachments
+ */
+interface AttachmentHelperInterface
+{
+
+    /**
+     * @param Model $model
+     *
+     * @return bool
+     */
+    public function saveAttachmentsForModel(Model $model);
+
+    /**
+     * @return MessageBag
+     */
+    public function getErrors();
+
+    /**
+     * @return MessageBag
+     */
+    public function getMessages();
+
+    /**
+     * @param Attachment $attachment
+     *
+     * @return mixed
+     */
+    public function getAttachmentLocation(Attachment $attachment);
+
+}

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/AccountId.php

@@ -3,6 +3,7 @@ namespace FireflyIII\Helpers\Csv\Converter;
 
 use Auth;
 use FireflyIII\Models\Account;
+use Log;
 
 /**
  * Class AccountId
@@ -19,11 +20,19 @@ class AccountId extends BasicConverter implements ConverterInterface
     {
         // is mapped? Then it's easy!
         if (isset($this->mapped[$this->index][$this->value])) {
+
+            /** @var Account $account */
             $account = Auth::user()->accounts()->find($this->mapped[$this->index][$this->value]);
         } else {
+
+            /** @var Account $account */
             $account = Auth::user()->accounts()->find($this->value);
+
+            if (!is_null($account)) {
+                Log::debug('Found ' . $account->accountType->type . ' named "******" with ID: ' . $this->value . ' (not mapped) ');
+            }
         }
 
         return $account;
     }
-}
+}

app/Helpers/Csv/Converter/Amount.php

@@ -23,4 +23,4 @@ class Amount extends BasicConverter implements ConverterInterface
 
         return 0;
     }
-}
+}

app/Helpers/Csv/Converter/AssetAccountIban.php

@@ -65,4 +65,4 @@ class AssetAccountIban extends BasicConverter implements ConverterInterface
 
         return null;
     }
-}
+}

app/Helpers/Csv/Converter/AssetAccountName.php

@@ -48,4 +48,4 @@ class AssetAccountName extends BasicConverter implements ConverterInterface
 
         return $account;
     }
-}
+}

app/Helpers/Csv/Converter/BasicConverter.php

@@ -119,4 +119,4 @@ class BasicConverter
     }
 
 
-}
+}

app/Helpers/Csv/Converter/BillId.php

@@ -27,4 +27,4 @@ class BillId extends BasicConverter implements ConverterInterface
 
         return $bill;
     }
-}
+}

app/Helpers/Csv/Converter/BillName.php

@@ -35,4 +35,4 @@ class BillName extends BasicConverter implements ConverterInterface
 
         return $bill;
     }
-}
+}

app/Helpers/Csv/Converter/BudgetId.php

@@ -26,4 +26,4 @@ class BudgetId extends BasicConverter implements ConverterInterface
 
         return $budget;
     }
-}
+}

app/Helpers/Csv/Converter/BudgetName.php

@@ -32,4 +32,4 @@ class BudgetName extends BasicConverter implements ConverterInterface
 
         return $budget;
     }
-}
+}

app/Helpers/Csv/Converter/CategoryId.php

@@ -26,4 +26,4 @@ class CategoryId extends BasicConverter implements ConverterInterface
 
         return $category;
     }
-}
+}

app/Helpers/Csv/Converter/CategoryName.php

@@ -31,4 +31,4 @@ class CategoryName extends BasicConverter implements ConverterInterface
 
         return $category;
     }
-}
+}

app/Helpers/Csv/Converter/ConverterInterface.php

@@ -46,4 +46,4 @@ interface ConverterInterface
      */
     public function setValue($value);
 
-}
+}

app/Helpers/Csv/Converter/CurrencyCode.php

@@ -25,4 +25,4 @@ class CurrencyCode extends BasicConverter implements ConverterInterface
 
         return $currency;
     }
-}
+}

app/Helpers/Csv/Converter/CurrencyId.php

@@ -25,4 +25,4 @@ class CurrencyId extends BasicConverter implements ConverterInterface
 
         return $currency;
     }
-}
+}

app/Helpers/Csv/Converter/CurrencyName.php

@@ -25,4 +25,4 @@ class CurrencyName extends BasicConverter implements ConverterInterface
 
         return $currency;
     }
-}
+}

app/Helpers/Csv/Converter/CurrencySymbol.php

@@ -25,4 +25,4 @@ class CurrencySymbol extends BasicConverter implements ConverterInterface
 
         return $currency;
     }
-}
+}

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,9 +22,17 @@ 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/Converter/Description.php

@@ -18,4 +18,4 @@ class Description extends BasicConverter implements ConverterInterface
     {
         return trim($this->data['description'] . ' ' . $this->value);
     }
-}
+}

app/Helpers/Csv/Converter/Ignore.php

@@ -19,4 +19,4 @@ class Ignore extends BasicConverter implements ConverterInterface
     {
         return null;
     }
-}
+}

app/Helpers/Csv/Converter/OpposingAccountIban.php

@@ -46,7 +46,7 @@ class OpposingAccountIban extends BasicConverter implements ConverterInterface
         /** @var Account $account */
         foreach ($set as $account) {
             if ($account->iban == $this->value) {
-                Log::debug('OpposingAccountIban::convert found an Account (#' . $account->id . ': ' . $account->name . ') with IBAN ' . $this->value);
+                Log::debug('OpposingAccountIban::convert found an Account (#' . $account->id . ': ******) with IBAN ******');
 
                 return $account;
             }
@@ -54,4 +54,4 @@ class OpposingAccountIban extends BasicConverter implements ConverterInterface
 
         return null;
     }
-}
+}

app/Helpers/Csv/Converter/OpposingAccountId.php

@@ -29,4 +29,4 @@ class OpposingAccountId extends BasicConverter implements ConverterInterface
         return $account;
 
     }
-}
+}

app/Helpers/Csv/Converter/OpposingAccountName.php

@@ -28,4 +28,4 @@ class OpposingAccountName extends BasicConverter implements ConverterInterface
             return $this->value;
         }
     }
-}
+}

app/Helpers/Csv/Converter/RabobankDebetCredit.php

@@ -23,4 +23,4 @@ class RabobankDebetCredit extends BasicConverter implements ConverterInterface
 
         return 1;
     }
-}
+}

app/Helpers/Csv/Converter/TagsComma.php

@@ -37,4 +37,4 @@ class TagsComma extends BasicConverter implements ConverterInterface
 
         return $tags;
     }
-}
+}

app/Helpers/Csv/Converter/TagsSpace.php

@@ -37,4 +37,4 @@ class TagsSpace extends BasicConverter implements ConverterInterface
 
         return $tags;
     }
-}
+}

app/Helpers/Csv/Data.php

@@ -25,16 +25,19 @@ class Data
     protected $hasHeaders;
 
     /** @var  array */
-    protected $map;
+    protected $map = [];
     /** @var  array */
-    protected $mapped;
+    protected $mapped = [];
     /** @var  Reader */
     protected $reader;
     /** @var  array */
-    protected $roles;
+    protected $roles = [];
 
     /** @var  array */
-    protected $specifix;
+    protected $specifix = [];
+
+    /** @var int */
+    protected $importAccount = 0;
 
     /**
      *
@@ -48,6 +51,7 @@ class Data
         $this->sessionRoles();
         $this->sessionMapped();
         $this->sessionSpecifix();
+        $this->sessionImportAccount();
     }
 
     protected function sessionHasHeaders()
@@ -57,6 +61,13 @@ class Data
         }
     }
 
+    protected function sessionImportAccount()
+    {
+        if (Session::has('csv-import-account')) {
+            $this->importAccount = intval(Session::get('csv-import-account'));
+        }
+    }
+
     protected function sessionDateFormat()
     {
         if (Session::has('csv-date-format')) {
@@ -116,6 +127,15 @@ class Data
         $this->dateFormat = $dateFormat;
     }
 
+    /**
+     * @param int $importAccount
+     */
+    public function setImportAccount($importAccount)
+    {
+        Session::put('csv-import-account', $importAccount);
+        $this->importAccount = $importAccount;
+    }
+
     /**
      * @return bool
      */
@@ -247,7 +267,7 @@ class Data
      */
     public function getSpecifix()
     {
-        return $this->specifix;
+        return is_array($this->specifix) ? $this->specifix : [];
     }
 
     /**
@@ -260,4 +280,4 @@ class Data
     }
 
 
-}
+}

app/Helpers/Csv/Importer.php

@@ -2,16 +2,17 @@
 
 namespace FireflyIII\Helpers\Csv;
 
-use App;
 use Auth;
 use Config;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Csv\Converter\ConverterInterface;
 use FireflyIII\Helpers\Csv\PostProcessing\PostProcessorInterface;
 use FireflyIII\Helpers\Csv\Specifix\SpecifixInterface;
+use FireflyIII\Models\Account;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
+use Illuminate\Support\Collection;
 use Illuminate\Support\MessageBag;
 use Log;
 
@@ -42,7 +43,10 @@ class Importer
     /** @var  int */
     protected $rows = 0;
     /** @var array */
-    protected $specifix;
+    protected $specifix = [];
+
+    /** @var  Collection */
+    protected $journals;
 
     /**
      * Used by CsvController.
@@ -74,6 +78,15 @@ class Importer
         return $this->rows;
     }
 
+    /**
+     * @return Collection
+     */
+    public function getJournals()
+    {
+        return $this->journals;
+    }
+
+
     /**
      * @throws FireflyException
      */
@@ -81,6 +94,7 @@ class Importer
     {
         set_time_limit(0);
 
+        $this->journals = new Collection;
         $this->map      = $this->data->getMap();
         $this->roles    = $this->data->getRoles();
         $this->mapped   = $this->data->getMapped();
@@ -88,14 +102,17 @@ class Importer
 
         foreach ($this->data->getReader() as $index => $row) {
             if ($this->parseRow($index)) {
+                Log::debug('--- Importing row ' . $index);
                 $this->rows++;
                 $result = $this->importRow($row);
-                if (!($result === true)) {
+                if (!($result instanceof TransactionJournal)) {
                     Log::error('Caught error at row #' . $index . ': ' . $result);
                     $this->errors[$index] = $result;
                 } else {
                     $this->imported++;
+                    $this->journals->push($result);
                 }
+                Log::debug('---');
             }
         }
     }
@@ -107,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());
     }
 
     /**
@@ -118,14 +135,17 @@ class Importer
      */
     protected function importRow($row)
     {
+
         $data = $this->getFiller(); // These fields are necessary to create a new transaction journal. Some are optional
         foreach ($row as $index => $value) {
             $role  = isset($this->roles[$index]) ? $this->roles[$index] : '_ignore';
             $class = Config::get('csv.roles.' . $role . '.converter');
             $field = Config::get('csv.roles.' . $role . '.field');
 
+            Log::debug('Column #' . $index . ' (role: ' . $role . ') : converter ' . $class . ' stores its data into field ' . $field . ':');
+
             /** @var ConverterInterface $converter */
-            $converter = App::make('FireflyIII\Helpers\Csv\Converter\\' . $class);
+            $converter = app('FireflyIII\Helpers\Csv\Converter\\' . $class);
             $converter->setData($data); // the complete array so far.
             $converter->setField($field);
             $converter->setIndex($index);
@@ -133,7 +153,6 @@ class Importer
             $converter->setValue($value);
             $converter->setRole($role);
             $data[$field] = $converter->convert();
-
         }
         // move to class vars.
         $this->importData = $data;
@@ -147,11 +166,8 @@ class Importer
             return $result; // return error.
         }
         $journal = $this->createTransactionJournal();
-        if ($journal instanceof TransactionJournal) {
-            return true;
-        }
 
-        return false;
+        return $journal;
     }
 
     /**
@@ -169,6 +185,7 @@ class Importer
         // some extra's:
         $filler['bill-id']                 = null;
         $filler['opposing-account-object'] = null;
+        $filler['asset-account-object']    = null;
         $filler['amount-modifier']         = '1';
 
         return $filler;
@@ -186,9 +203,10 @@ class Importer
 
         foreach ($this->getSpecifix() as $className) {
             /** @var SpecifixInterface $specifix */
-            $specifix = App::make('FireflyIII\Helpers\Csv\Specifix\\' . $className);
+            $specifix = app('FireflyIII\Helpers\Csv\Specifix\\' . $className);
             $specifix->setData($this->importData);
             $specifix->setRow($this->importRow);
+            Log::debug('Now post-process specifix named ' . $className . ':');
             $this->importData = $specifix->fix();
         }
 
@@ -196,8 +214,9 @@ class Importer
         $set = Config::get('csv.post_processors');
         foreach ($set as $className) {
             /** @var PostProcessorInterface $postProcessor */
-            $postProcessor = App::make('FireflyIII\Helpers\Csv\PostProcessing\\' . $className);
+            $postProcessor = app('FireflyIII\Helpers\Csv\PostProcessing\\' . $className);
             $postProcessor->setData($this->importData);
+            Log::debug('Now post-process processor named ' . $className . ':');
             $this->importData = $postProcessor->process();
         }
 
@@ -208,7 +227,7 @@ class Importer
      */
     public function getSpecifix()
     {
-        return $this->specifix;
+        return is_array($this->specifix) ? $this->specifix : [];
     }
 
     /**
@@ -224,6 +243,10 @@ class Importer
             return 'Opposing account is null';
         }
 
+        if (!($this->importData['asset-account-object'] instanceof Account)) {
+            return 'No asset account to import into.';
+        }
+
         return true;
     }
 
@@ -238,6 +261,8 @@ class Importer
         if (is_null($this->importData['date'])) {
             $date = $this->importData['date-rent'];
         }
+
+
         $transactionType = $this->getTransactionType(); // defaults to deposit
         $errors          = new MessageBag;
         $journal         = TransactionJournal::create(
@@ -245,10 +270,13 @@ class Importer
              'description' => $this->importData['description'], 'completed' => 0, 'date' => $date, 'bill_id' => $this->importData['bill-id'],]
         );
         if ($journal->getErrors()->count() == 0) {
-            $accountId   = $this->importData['asset-account']->id; // create first transaction:
+            // first transaction
+            $accountId   = $this->importData['asset-account-object']->id; // create first transaction:
             $amount      = $this->importData['amount'];
             $transaction = Transaction::create(['transaction_journal_id' => $journal->id, 'account_id' => $accountId, 'amount' => $amount]);
             $errors      = $transaction->getErrors();
+
+            // second transaction
             $accountId   = $this->importData['opposing-account-object']->id; // create second transaction:
             $amount      = bcmul($this->importData['amount'], -1);
             $transaction = Transaction::create(['transaction_journal_id' => $journal->id, 'account_id' => $accountId, 'amount' => $amount]);
@@ -266,6 +294,18 @@ class Importer
         $this->saveCategory($journal);
         $this->saveTags($journal);
 
+        // some debug info:
+        $journalId = $journal->id;
+        $type      = $journal->getTransactionType();
+        /** @var Account $asset */
+        $asset = $this->importData['asset-account-object'];
+        /** @var Account $opposing */
+        $opposing = $this->importData['opposing-account-object'];
+
+        Log::info('Created journal #' . $journalId . ' of type ' . $type . '!');
+        Log::info('Asset account ****** (#' . $asset->id . ') lost/gained: ' . $this->importData['amount']);
+        Log::info($opposing->accountType->type . ' ****** (#' . $opposing->id . ') lost/gained: ' . bcmul($this->importData['amount'], -1));
+
         return $journal;
     }
 
@@ -274,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;
@@ -328,4 +368,4 @@ class Importer
         $this->data = $data;
     }
 
-}
+}

app/Helpers/Csv/Mapper/AnyAccount.php

@@ -27,8 +27,8 @@ class AnyAccount implements MapperInterface
         }
         asort($list);
 
-        array_unshift($list, trans('firefly.csv_do_not_map'));
+        $list = [0 => trans('firefly.csv_do_not_map')] + $list;
 
         return $list;
     }
-}
+}

app/Helpers/Csv/Mapper/AssetAccount.php

@@ -38,8 +38,8 @@ class AssetAccount implements MapperInterface
 
         asort($list);
 
-        array_unshift($list, trans('firefly.csv_do_not_map'));
+        $list = [0 => trans('firefly.csv_do_not_map')] + $list;
 
         return $list;
     }
-}
+}

app/Helpers/Csv/Mapper/Bill.php

@@ -27,8 +27,8 @@ class Bill implements MapperInterface
         }
         asort($list);
 
-        array_unshift($list, trans('firefly.csv_do_not_map'));
+        $list = [0 => trans('firefly.csv_do_not_map')] + $list;
 
         return $list;
     }
-}
+}

app/Helpers/Csv/Mapper/Budget.php

@@ -27,8 +27,8 @@ class Budget implements MapperInterface
         }
         asort($list);
 
-        array_unshift($list, trans('firefly.csv_do_not_map'));
+        $list = [0 => trans('firefly.csv_do_not_map')] + $list;
 
         return $list;
     }
-}
+}

app/Helpers/Csv/Mapper/Category.php

@@ -27,8 +27,8 @@ class Category implements MapperInterface
         }
         asort($list);
 
-        array_unshift($list, trans('firefly.csv_do_not_map'));
+        $list = [0 => trans('firefly.csv_do_not_map')] + $list;
 
         return $list;
     }
-}
+}

app/Helpers/Csv/Mapper/MapperInterface.php

@@ -13,4 +13,4 @@ interface MapperInterface
      * @return array
      */
     public function getMap();
-}
+}

app/Helpers/Csv/Mapper/Tag.php

@@ -27,8 +27,8 @@ class Tag implements MapperInterface
         }
         asort($list);
 
-        array_unshift($list, trans('firefly.csv_do_not_map'));
+        $list = [0 => trans('firefly.csv_do_not_map')] + $list;
 
         return $list;
     }
-}
+}

app/Helpers/Csv/Mapper/TransactionCurrency.php

@@ -25,8 +25,8 @@ class TransactionCurrency implements MapperInterface
 
         asort($list);
 
-        array_unshift($list, trans('firefly.csv_do_not_map'));
+        $list = [0 => trans('firefly.csv_do_not_map')] + $list;
 
         return $list;
     }
-}
+}

app/Helpers/Csv/PostProcessing/Amount.php

@@ -32,4 +32,4 @@ class Amount implements PostProcessorInterface
     {
         $this->data = $data;
     }
-}
+}

app/Helpers/Csv/PostProcessing/AssetAccount.php

@@ -0,0 +1,185 @@
+<?php
+
+namespace FireflyIII\Helpers\Csv\PostProcessing;
+
+use Auth;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use Log;
+use Validator;
+
+/**
+ * Class AssetAccount
+ *
+ * @package FireflyIII\Helpers\Csv\PostProcessing
+ */
+class AssetAccount implements PostProcessorInterface
+{
+
+    /** @var  array */
+    protected $data;
+
+    /**
+     * @return array
+     */
+    public function process()
+    {
+        $result = $this->checkIdNameObject(); // has object in ID or Name?
+        if (!is_null($result)) {
+            return $result;
+        }
+
+        $result = $this->checkIbanString();
+        if (!is_null($result)) {
+            return $result;
+        }
+
+        $result = $this->checkNameString();
+        if (!is_null($result)) {
+            return $result;
+        }
+
+        return null;
+    }
+
+    /**
+     * @param array $data
+     */
+    public function setData(array $data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * @return array
+     */
+    protected function checkIdNameObject()
+    {
+        if ($this->data['asset-account-id'] instanceof Account) { // first priority. try to find the account based on ID, if any
+            $this->data['asset-account-object'] = $this->data['asset-account-id'];
+
+            return $this->data;
+        }
+        if ($this->data['asset-account-iban'] instanceof Account) { // second: try to find the account based on IBAN, if any.
+            $this->data['asset-account-object'] = $this->data['asset-account-iban'];
+
+            return $this->data;
+        }
+
+        return null;
+    }
+
+    /**
+     * @return array|null
+     */
+    protected function checkIbanString()
+    {
+        $rules     = ['iban' => 'iban'];
+        $check     = ['iban' => $this->data['asset-account-iban']];
+        $validator = Validator::make($check, $rules);
+        if (!$validator->fails()) {
+            $this->data['asset-account-object'] = $this->parseIbanString();
+
+            return $this->data;
+        }
+
+        return null;
+    }
+
+    /**
+     * @return Account|null
+     */
+    protected function parseIbanString()
+    {
+        // create by name and/or iban.
+        $accounts = Auth::user()->accounts()->get();
+        foreach ($accounts as $entry) {
+            if ($entry->iban == $this->data['asset-account-iban']) {
+
+                return $entry;
+            }
+        }
+        $account = $this->createAccount();
+
+        return $account;
+    }
+
+    /**
+     * @return Account|null
+     */
+    protected function createAccount()
+    {
+        $accountType = $this->getAccountType();
+
+        // create if not exists:
+        $name    = is_string($this->data['asset-account-name']) && strlen($this->data['asset-account-name']) > 0 ? $this->data['asset-account-name']
+            : $this->data['asset-account-iban'];
+        $account = Account::firstOrCreateEncrypted(
+            [
+                'user_id'         => Auth::user()->id,
+                'account_type_id' => $accountType->id,
+                'name'            => $name,
+                'iban'            => $this->data['asset-account-iban'],
+                'active'          => true,
+            ]
+        );
+
+        return $account;
+    }
+
+    /**
+     *
+     * @return AccountType
+     */
+    protected function getAccountType()
+    {
+        return AccountType::where('type', 'Asset account')->first();
+    }
+
+    /**
+     * @return array|null
+     */
+    protected function checkNameString()
+    {
+        if ($this->data['asset-account-name'] instanceof Account) { // third: try to find account based on name, if any.
+            $this->data['asset-account-object'] = $this->data['asset-account-name'];
+
+            return $this->data;
+        }
+        if (is_string($this->data['asset-account-name'])) {
+            $this->data['asset-account-object'] = $this->parseNameString();
+
+            return $this->data;
+        }
+
+        return null;
+    }
+
+    /**
+     * @return Account|null
+     */
+    protected function parseNameString()
+    {
+        $accountType = $this->getAccountType();
+        $accounts    = Auth::user()->accounts()->where('account_type_id', $accountType->id)->get();
+        foreach ($accounts as $entry) {
+            if ($entry->name == $this->data['asset-account-name']) {
+                Log::debug('Found an asset account with this name (#' . $entry->id . ': ******)');
+
+                return $entry;
+            }
+        }
+        // create if not exists:
+        $account = Account::firstOrCreateEncrypted(
+            [
+                'user_id'         => Auth::user()->id,
+                'account_type_id' => $accountType->id,
+                'name'            => $this->data['asset-account-name'],
+                'iban'            => '',
+                'active'          => true,
+            ]
+        );
+
+        return $account;
+    }
+}

app/Helpers/Csv/PostProcessing/Bill.php

@@ -34,4 +34,4 @@ class Bill implements PostProcessorInterface
     {
         $this->data = $data;
     }
-}
+}

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();
         }
 
@@ -38,4 +38,4 @@ class Currency implements PostProcessorInterface
     {
         $this->data = $data;
     }
-}
+}

app/Helpers/Csv/PostProcessing/Description.php

@@ -35,4 +35,4 @@ class Description implements PostProcessorInterface
 
         $this->data = $data;
     }
-}
+}

app/Helpers/Csv/PostProcessing/OpposingAccount.php

@@ -24,6 +24,10 @@ class OpposingAccount implements PostProcessorInterface
      */
     public function process()
     {
+        // three values:
+        // opposing-account-id, opposing-account-iban, opposing-account-name
+
+
         $result = $this->checkIdNameObject();
         if (!is_null($result)) {
             return $result;
@@ -56,11 +60,13 @@ class OpposingAccount implements PostProcessorInterface
     protected function checkIdNameObject()
     {
         if ($this->data['opposing-account-id'] instanceof Account) { // first priority. try to find the account based on ID, if any
+            Log::debug('OpposingAccountPostProcession: opposing-account-id is an Account.');
             $this->data['opposing-account-object'] = $this->data['opposing-account-id'];
 
             return $this->data;
         }
         if ($this->data['opposing-account-iban'] instanceof Account) { // second: try to find the account based on IBAN, if any.
+            Log::debug('OpposingAccountPostProcession: opposing-account-iban is an Account.');
             $this->data['opposing-account-object'] = $this->data['opposing-account-iban'];
 
             return $this->data;
@@ -75,9 +81,12 @@ class OpposingAccount implements PostProcessorInterface
     protected function checkIbanString()
     {
         $rules     = ['iban' => 'iban'];
-        $check     = ['iban' => $this->data['opposing-account-iban']];
+        $iban      = $this->data['opposing-account-iban'];
+        $check     = ['iban' => $iban];
         $validator = Validator::make($check, $rules);
-        if (!$validator->fails()) {
+        if (is_string($iban) && strlen($iban) > 0 && !$validator->fails()) {
+
+            Log::debug('OpposingAccountPostProcession: opposing-account-iban is a string (******).');
             $this->data['opposing-account-object'] = $this->parseIbanString();
 
             return $this->data;
@@ -95,12 +104,14 @@ class OpposingAccount implements PostProcessorInterface
         $accounts = Auth::user()->accounts()->get();
         foreach ($accounts as $entry) {
             if ($entry->iban == $this->data['opposing-account-iban']) {
+                Log::debug('OpposingAccountPostProcession: opposing-account-iban matches an Account.');
 
                 return $entry;
             }
         }
         $account = $this->createAccount();
 
+
         return $account;
     }
 
@@ -123,6 +134,7 @@ class OpposingAccount implements PostProcessorInterface
                 'active'          => true,
             ]
         );
+        Log::debug('OpposingAccountPostProcession: created a new account.');
 
         return $account;
     }
@@ -153,11 +165,13 @@ class OpposingAccount implements PostProcessorInterface
     protected function checkNameString()
     {
         if ($this->data['opposing-account-name'] instanceof Account) { // third: try to find account based on name, if any.
+            Log::debug('OpposingAccountPostProcession: opposing-account-name is an Account.');
             $this->data['opposing-account-object'] = $this->data['opposing-account-name'];
 
             return $this->data;
         }
         if (is_string($this->data['opposing-account-name'])) {
+
             $this->data['opposing-account-object'] = $this->parseNameString();
 
             return $this->data;
@@ -175,7 +189,7 @@ class OpposingAccount implements PostProcessorInterface
         $accounts    = Auth::user()->accounts()->where('account_type_id', $accountType->id)->get();
         foreach ($accounts as $entry) {
             if ($entry->name == $this->data['opposing-account-name']) {
-                Log::debug('Found an account with this name (#' . $entry->id . ': ' . $entry->name . ')');
+                Log::debug('Found an account with this name (#' . $entry->id . ': ******)');
 
                 return $entry;
             }
@@ -193,4 +207,4 @@ class OpposingAccount implements PostProcessorInterface
 
         return $account;
     }
-}
+}

app/Helpers/Csv/PostProcessing/PostProcessorInterface.php

@@ -26,4 +26,4 @@ interface PostProcessorInterface
      * @param array $data
      */
     public function setData(array $data);
-}
+}

app/Helpers/Csv/Specifix/Dummy.php

@@ -42,4 +42,4 @@ class Dummy
     }
 
 
-}
+}

app/Helpers/Csv/Specifix/RabobankDescription.php

@@ -2,6 +2,8 @@
 
 namespace FireflyIII\Helpers\Csv\Specifix;
 
+use Log;
+
 /**
  * Class RabobankDescription
  *
@@ -32,10 +34,16 @@ class RabobankDescription
      */
     protected function rabobankFixEmptyOpposing()
     {
-        if (strlen($this->data['opposing-account-name']) == 0) {
+        Log::debug('RaboSpecifix: Opposing account name is "******".');
+        if (is_string($this->data['opposing-account-name']) && strlen($this->data['opposing-account-name']) == 0) {
+            Log::debug('RaboSpecifix: opp-name is zero length, changed to: "******"');
             $this->data['opposing-account-name'] = $this->row[10];
+
+            Log::debug('Description was: "******".');
+            $this->data['description'] = trim(str_replace($this->row[10], '', $this->data['description']));
+            Log::debug('Description is now: "******".');
         }
-        $this->data['description'] = trim(str_replace($this->row[10], '', $this->data['description']));
+
     }
 
     /**
@@ -55,4 +63,4 @@ class RabobankDescription
     }
 
 
-}
+}

app/Helpers/Csv/Specifix/SpecifixInterface.php

@@ -22,4 +22,4 @@ interface SpecifixInterface
      * @param array $row
      */
     public function setRow($row);
-}
+}

app/Helpers/Csv/Wizard.php

@@ -1,13 +1,13 @@
 <?php
 namespace FireflyIII\Helpers\Csv;
 
-use App;
 use Auth;
 use Config;
 use Crypt;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Csv\Mapper\MapperInterface;
 use League\Csv\Reader;
+use Log;
 use ReflectionException;
 use Session;
 
@@ -45,9 +45,7 @@ class Wizard implements WizardInterface
         /*
          * Make each one unique.
          */
-        foreach ($values as $column => $found) {
-            $values[$column] = array_unique($found);
-        }
+        $values = $this->uniqueRecursive($values);
 
         return $values;
     }
@@ -112,6 +110,8 @@ class Wizard implements WizardInterface
     {
         foreach ($fields as $field) {
             if (!Session::has($field)) {
+                Log::error('Session is missing field: ' . $field);
+
                 return false;
             }
         }
@@ -137,7 +137,7 @@ class Wizard implements WizardInterface
             $class = 'FireflyIII\Helpers\Csv\Mapper\\' . $mapper;
             try {
                 /** @var MapperInterface $mapObject */
-                $mapObject = App::make($class);
+                $mapObject = app($class);
             } catch (ReflectionException $e) {
                 throw new FireflyException('Column "' . $columnRole . '" cannot be mapped because class ' . $mapper . ' does not exist.');
             }
@@ -177,4 +177,18 @@ class Wizard implements WizardInterface
     {
         return ($hasHeaders && $index > 1) || !$hasHeaders;
     }
-}
+
+    /**
+     * @param array $array
+     *
+     * @return array
+     */
+    protected function uniqueRecursive(array $array)
+    {
+        foreach ($array as $column => $found) {
+            $array[$column] = array_unique($found);
+        }
+
+        return $array;
+    }
+}

app/Helpers/Csv/WizardInterface.php

@@ -56,4 +56,4 @@ interface WizardInterface
      */
     public function storeCsvFile($path);
 
-}
+}

app/Helpers/Report/ReportHelper.php

@@ -2,7 +2,6 @@
 
 namespace FireflyIII\Helpers\Report;
 
-use App;
 use Carbon\Carbon;
 use FireflyIII\Helpers\Collection\Account as AccountCollection;
 use FireflyIII\Helpers\Collection\Balance;
@@ -20,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
@@ -44,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, ($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);
 
@@ -93,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::make('FireflyIII\Repositories\Budget\BudgetRepositoryInterface');
-        $tagRepository = App::make('FireflyIII\Repositories\Tag\TagRepositoryInterface');
+        $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);
         }
@@ -134,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:
@@ -143,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);
@@ -154,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;
@@ -165,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;
@@ -200,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::make('FireflyIII\Repositories\Bill\BillRepositoryInterface');
-        $bills      = $repository->getBills();
+        $repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface');
+        $bills      = $repository->getBillsForAccounts($accounts);
         $collection = new BillCollection;
 
         /** @var Bill $bill */
@@ -239,165 +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::make('FireflyIII\Repositories\Budget\BudgetRepositoryInterface');
-        $set        = $repository->getBudgets();
-
-        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 < floatval($repetition->amount) ? floatval($repetition->amount) - $expenses : 0;
-                $spent     = $expenses > floatval($repetition->amount) ? 0 : $expenses;
-                $overspent = $expenses > floatval($repetition->amount) ? $expenses - floatval($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::make('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,181 +20,6 @@ use Steam;
  */
 class ReportQuery implements ReportQueryInterface
 {
-    /**
-     * See ReportQueryInterface::incomeInPeriodCorrected
-     *
-     * @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
      *
@@ -205,20 +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)
     {
 
-        return floatval(
-                   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');
     }
 
     /**
@@ -234,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)
@@ -277,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

@@ -3,6 +3,7 @@
 use Auth;
 use Carbon\Carbon;
 use Config;
+use ExpandedForm;
 use FireflyIII\Http\Requests\AccountFormRequest;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -37,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');
 
@@ -57,17 +60,19 @@ class AccountController extends Controller
      *
      * @return \Illuminate\View\View
      */
-    public function delete(Account $account)
+    public function delete(AccountRepositoryInterface $repository, Account $account)
     {
-        $typeName = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type);
-        $subTitle = trans('firefly.delete_' . $typeName . '_account', ['name' => $account->name]);
+        $typeName    = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type);
+        $subTitle    = trans('firefly.delete_' . $typeName . '_account', ['name' => $account->name]);
+        $accountList = Expandedform::makeSelectList($repository->getAccounts([$account->accountType->type]), true);
+        unset($accountList[$account->id]);
 
         // put previous url in session
         Session::put('accounts.delete.url', URL::previous());
         Session::flash('gaEventCategory', 'accounts');
         Session::flash('gaEventAction', 'delete-' . $typeName);
 
-        return view('accounts.delete', compact('account', 'subTitle'));
+        return view('accounts.delete', compact('account', 'subTitle', 'accountList'));
     }
 
     /**
@@ -78,12 +83,12 @@ class AccountController extends Controller
      */
     public function destroy(AccountRepositoryInterface $repository, Account $account)
     {
-
         $type     = $account->accountType->type;
         $typeName = Config::get('firefly.shortNamesByFullName.' . $type);
         $name     = $account->name;
+        $moveTo   = Auth::user()->accounts()->find(intval(Input::get('move_account_before_delete')));
 
-        $repository->destroy($account);
+        $repository->destroy($account, $moveTo);
 
         Session::flash('success', trans('firefly.' . $typeName . '_deleted', ['name' => $name]));
         Preferences::mark();
@@ -127,7 +132,7 @@ class AccountController extends Controller
             'ccMonthlyPaymentDate' => $account->getMeta('ccMonthlyPaymentDate'),
             'openingBalanceDate'   => $openingBalance ? $openingBalance->date->format('Y-m-d') : null,
             'openingBalance'       => $openingBalanceAmount,
-            'virtualBalance'       => floatval($account->virtual_balance)
+            'virtualBalance'       => round($account->virtual_balance, 2)
         ];
         Session::flash('preFilled', $preFilled);
         Session::flash('gaEventCategory', 'accounts');
@@ -153,12 +158,24 @@ class AccountController extends Controller
          * HERE WE ARE
          */
         $start = clone Session::get('start', Carbon::now()->startOfMonth());
+        $end   = clone Session::get('end', Carbon::now()->endOfMonth());
         $start->subDay();
+
+        // start balances:
+        $ids = [];
+        foreach ($accounts as $account) {
+            $ids[] = $account->id;
+        }
+
+        $startBalances = Steam::balancesById($ids, $start);
+        $endBalances   = Steam::balancesById($ids, $end);
+        $activities    = Steam::getLastActivities($ids);
+
         $accounts->each(
-            function (Account $account) use ($start, $repository) {
-                $account->lastActivityDate = $repository->getLastActivity($account);
-                $account->startBalance     = Steam::balance($account, $start);
-                $account->endBalance       = Steam::balance($account, clone Session::get('end', Carbon::now()->endOfMonth()));
+            function (Account $account) use ($activities, $startBalances, $endBalances) {
+                $account->lastActivityDate = isset($activities[$account->id]) ? $activities[$account->id] : null;
+                $account->startBalance     = isset($startBalances[$account->id]) ? $startBalances[$account->id] : null;
+                $account->endBalance       = isset($endBalances[$account->id]) ? $endBalances[$account->id] : null;
             }
         );
 
@@ -195,14 +212,15 @@ class AccountController extends Controller
         $accountData = [
             'name'                   => $request->input('name'),
             'accountType'            => $request->input('what'),
-            'virtualBalance'         => floatval($request->input('virtualBalance')),
+            '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'         => floatval($request->input('openingBalance')),
+            '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')),
 
         ];
 
@@ -238,8 +256,8 @@ class AccountController extends Controller
             'user'                   => Auth::user()->id,
             'iban'                   => $request->input('iban'),
             'accountRole'            => $request->input('accountRole'),
-            'virtualBalance'         => floatval($request->input('virtualBalance')),
-            'openingBalance'         => floatval($request->input('openingBalance')),
+            'virtualBalance'         => round($request->input('virtualBalance'), 2),
+            'openingBalance'         => round($request->input('openingBalance'), 2),
             'openingBalanceDate'     => new Carbon((string)$request->input('openingBalanceDate')),
             'openingBalanceCurrency' => intval($request->input('balance_currency_id')),
             'ccType'                 => $request->input('ccType'),

app/Http/Controllers/AttachmentController.php

@@ -0,0 +1,173 @@
+<?php
+
+namespace FireflyIII\Http\Controllers;
+
+
+use Crypt;
+use File;
+use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
+use FireflyIII\Http\Requests\AttachmentFormRequest;
+use FireflyIII\Models\Attachment;
+use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
+use Input;
+use Preferences;
+use Response;
+use Session;
+use URL;
+use View;
+
+/**
+ * Class AttachmentController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class AttachmentController extends Controller
+{
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        View::share('mainTitleIcon', 'fa-paperclip');
+        View::share('title', trans('firefly.attachments'));
+    }
+
+
+    /**
+     * @param Attachment $attachment
+     *
+     * @return \Illuminate\View\View
+     */
+    public function edit(Attachment $attachment)
+    {
+        $subTitleIcon = 'fa-pencil';
+        $subTitle     = trans('firefly.edit_attachment', ['name' => $attachment->filename]);
+
+        // put previous url in session if not redirect from store (not "return_to_edit").
+        if (Session::get('attachments.edit.fromUpdate') !== true) {
+            Session::put('attachments.edit.url', URL::previous());
+        }
+        Session::forget('attachments.edit.fromUpdate');
+
+        return view('attachments.edit', compact('attachment', 'subTitleIcon', 'subTitle'));
+    }
+
+    /**
+     * @param Attachment $attachment
+     *
+     * @return \Illuminate\View\View
+     */
+    public function delete(Attachment $attachment)
+    {
+        $subTitle = trans('firefly.delete_attachment', ['name' => $attachment->filename]);
+
+        // put previous url in session
+        Session::put('attachments.delete.url', URL::previous());
+        Session::flash('gaEventCategory', 'attachments');
+        Session::flash('gaEventAction', 'delete-attachment');
+
+        return view('attachments.delete', compact('attachment', 'subTitle'));
+    }
+
+    /**
+     * @param AttachmentRepositoryInterface $repository
+     * @param Attachment                    $attachment
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy(AttachmentRepositoryInterface $repository, Attachment $attachment)
+    {
+        $name = $attachment->filename;
+
+        $repository->destroy($attachment);
+
+        Session::flash('success', trans('firefly.attachment_deleted', ['name' => $name]));
+        Preferences::mark();
+
+        return redirect(Session::get('attachments.delete.url'));
+    }
+
+    /**
+     * @param Attachment $attachment
+     */
+    public function download(Attachment $attachment, AttachmentHelperInterface $helper)
+    {
+
+        $file = $helper->getAttachmentLocation($attachment);
+        if (file_exists($file)) {
+
+            $quoted = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));
+
+            header('Content-Description: File Transfer');
+            header('Content-Type: application/octet-stream');
+            header('Content-Disposition: attachment; filename=' . $quoted);
+            header('Content-Transfer-Encoding: binary');
+            header('Connection: Keep-Alive');
+            header('Expires: 0');
+            header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+            header('Pragma: public');
+            header('Content-Length: ' . $attachment->size);
+
+            echo Crypt::decrypt(file_get_contents($file));
+
+        } else {
+            abort(404);
+        }
+    }
+
+    /**
+     * @param Attachment $attachment
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function preview(Attachment $attachment)
+    {
+        if ($attachment->mime == 'application/pdf') {
+            $file = public_path('images/page_white_acrobat.png');
+        } else {
+            $file = public_path('images/page_green.png');
+        }
+
+        $response = Response::make(File::get($file));
+        $response->header('Content-Type', 'image/png');
+
+        return $response;
+    }
+
+
+    /**
+     * @param AttachmentFormRequest         $request
+     * @param AttachmentRepositoryInterface $repository
+     * @param Attachment                    $attachment
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function update(AttachmentFormRequest $request, AttachmentRepositoryInterface $repository, Attachment $attachment)
+    {
+
+        $attachmentData = [
+            'title'       => $request->input('title'),
+            'description' => $request->input('description'),
+            'notes'       => $request->input('notes'),
+        ];
+
+        $repository->update($attachment, $attachmentData);
+
+        Session::flash('success', 'Attachment "' . $attachment->filename . '" updated.');
+        Preferences::mark();
+
+        if (intval(Input::get('return_to_edit')) === 1) {
+            // set value so edit routine will not overwrite URL:
+            Session::put('attachments.edit.fromUpdate', true);
+
+            return redirect(route('attachments.edit', [$attachment->id]))->withInput(['return_to_edit' => 1]);
+        }
+
+        // redirect to previous URL.
+        return redirect(Session::get('attachments.edit.url'));
+
+    }
+
+}

app/Http/Controllers/Auth/AuthController.php

@@ -1,14 +1,17 @@
 <?php namespace FireflyIII\Http\Controllers\Auth;
 
-use App;
 use Auth;
+use Config;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Role;
 use FireflyIII\User;
 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;
 use Twig;
 use Validator;
@@ -20,19 +23,96 @@ use Validator;
  */
 class AuthController extends Controller
 {
+    use AuthenticatesAndRegistersUsers, ThrottlesLogins;
 
-    /*
-    |--------------------------------------------------------------------------
-    | Registration & Login Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller handles the registration of new users, as well as the
-    | authentication of existing users. By default, this controller uses
-    | a simple trait to add these behaviors. Why don't you explore it?
-    |
-    */
+    /**
+     * 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.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function getRegister()
+    {
+        $host = Rq::getHttpHost();
+
+        return view('auth.register', compact('host'));
+    }
+
+    /**
+     * Handle a login request to the application.
+     *
+     * @param  \Illuminate\Http\Request $request
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function postLogin(Request $request)
+    {
+        $this->validate(
+            $request, [
+                        $this->loginUsername() => 'required', 'password' => 'required',
+                    ]
+        );
+
+        // If the class is using the ThrottlesLogins trait, we can automatically throttle
+        // the login attempts for this application. We'll key this by the username and
+        // the IP address of the client making these requests into this application.
+        $throttles = $this->isUsingThrottlesLoginsTrait();
+
+        if ($throttles && $this->hasTooManyLoginAttempts($request)) {
+            return $this->sendLockoutResponse($request);
+        }
+
+        $credentials            = $this->getCredentials($request);
+        $credentials['blocked'] = 0; // most not be blocked.
+
+        if (Auth::attempt($credentials, $request->has('remember'))) {
+            return $this->handleUserWasAuthenticated($request, $throttles);
+        }
+
+        // default error message:
+        $message = $this->getFailedLoginMessage();
+
+        // try to find a blocked user with this email address.
+        /** @var User $foundUser */
+        $foundUser = User::where('email', $credentials['email'])->where('blocked', 1)->first();
+        if (!is_null($foundUser)) {
+            // if it exists, show message:
+            $code = $foundUser->blocked_code;
+            if (strlen($code) == 0) {
+                $code = 'general_blocked';
+            }
+            $message = trans('firefly.' . $code . '_error', ['email' => $credentials['email']]);
+        }
+
+        // try
+
+        // If the login attempt was unsuccessful we will increment the number of attempts
+        // to login and redirect the user back to the login form. Of course, when this
+        // user surpasses their maximum number of attempts they will get locked out.
+        if ($throttles) {
+            $this->incrementLoginAttempts($request);
+        }
+
+        return redirect($this->loginPath())
+            ->withInput($request->only($this->loginUsername(), 'remember'))
+            ->withErrors(
+                [
+                    $this->loginUsername() => $message,
+                ]
+            );
+    }
 
-    use AuthenticatesAndRegistersUsers;
 
     public $redirectTo = '/';
 
@@ -44,6 +124,8 @@ class AuthController extends Controller
      */
     public function __construct()
     {
+        parent::__construct();
+
         $this->middleware('guest', ['except' => 'getLogout']);
     }
 
@@ -78,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!');
@@ -109,12 +205,41 @@ class AuthController extends Controller
             return redirect($this->redirectPath());
         }
         // @codeCoverageIgnoreStart
-        App::abort(500, 'Not a user!');
+        abort(500, 'Not a user!');
 
         return redirect('/');
         // @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
@@ -36,8 +40,43 @@ class PasswordController extends Controller
      */
     public function __construct()
     {
+        parent::__construct();
 
         $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

@@ -2,7 +2,6 @@
 
 namespace FireflyIII\Http\Controllers\Chart;
 
-use App;
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
@@ -31,55 +30,72 @@ class AccountController extends Controller
     {
         parent::__construct();
         // create chart generator:
-        $this->generator = App::make('FireflyIII\Generator\Chart\Account\AccountChartGenerator');
+        $this->generator = app('FireflyIII\Generator\Chart\Account\AccountChartGenerator');
     }
 
 
     /**
-     * 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/BillController.php

@@ -2,18 +2,14 @@
 
 namespace FireflyIII\Http\Controllers\Chart;
 
-use App;
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
-use Illuminate\Support\Collection;
 use Response;
 use Session;
-use Steam;
 
 /**
  * Class BillController
@@ -33,26 +29,21 @@ class BillController extends Controller
     {
         parent::__construct();
         // create chart generator:
-        $this->generator = App::make('FireflyIII\Generator\Chart\Bill\BillChartGenerator');
+        $this->generator = app('FireflyIII\Generator\Chart\Bill\BillChartGenerator');
     }
 
     /**
      * Shows all bills and whether or not theyve been paid this month (pie chart).
      *
-     * @param BillRepositoryInterface    $repository
-     * @param AccountRepositoryInterface $accounts
+     * @param BillRepositoryInterface $repository
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function frontpage(BillRepositoryInterface $repository, AccountRepositoryInterface $accounts)
+    public function frontpage(BillRepositoryInterface $repository)
     {
-
         $start = Session::get('start', Carbon::now()->startOfMonth());
         $end   = Session::get('end', Carbon::now()->endOfMonth());
-
-
-        // chart properties for cache:
-        $cache = new CacheProperties();
+        $cache = new CacheProperties(); // chart properties for cache:
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty('bills');
@@ -61,46 +52,13 @@ class BillController extends Controller
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
-        $bills  = $repository->getActiveBills();
-        $paid   = new Collection; // journals.
-        $unpaid = new Collection; // bills
+        $set = $repository->getBillsForChart($start, $end);
 
+        // optionally expand this set with credit card data
+        $set    = $repository->getCreditCardInfoForChart($set, $start, $end);
+        $paid   = $set->get('paid');
+        $unpaid = $set->get('unpaid');
 
-        /** @var Bill $bill */
-        foreach ($bills as $bill) {
-            $ranges = $repository->getRanges($bill, $start, $end);
-
-            foreach ($ranges as $range) {
-                // paid a bill in this range?
-                $journals = $repository->getJournalsInRange($bill, $range['start'], $range['end']);
-                if ($journals->count() == 0) {
-                    $unpaid->push([$bill, $range['start']]);
-                } else {
-                    $paid = $paid->merge($journals);
-                }
-
-            }
-        }
-
-        $creditCards = $accounts->getCreditCards();
-        foreach ($creditCards as $creditCard) {
-            $balance = Steam::balance($creditCard, $end, true);
-            $date    = new Carbon($creditCard->getMeta('ccMonthlyPaymentDate'));
-            if ($balance < 0) {
-                // unpaid! create a fake bill that matches the amount.
-                $description = $creditCard->name;
-                $amount      = $balance * -1;
-                $fakeBill    = $repository->createFakeBill($description, $date, $amount);
-                unset($description, $amount);
-                $unpaid->push([$fakeBill, $date]);
-            }
-            if ($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);
-                $paid     = $paid->merge($journals);
-            }
-        }
 
         // build chart:
         $data = $this->generator->frontpage($paid, $unpaid);

app/Http/Controllers/Chart/BudgetController.php

@@ -2,11 +2,11 @@
 
 namespace FireflyIII\Http\Controllers\Chart;
 
-use App;
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
@@ -33,7 +33,80 @@ class BudgetController extends Controller
     {
         parent::__construct();
         // create chart generator:
-        $this->generator = App::make('FireflyIII\Generator\Chart\Budget\BudgetChartGenerator');
+        $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);
+
     }
 
     /**
@@ -42,7 +115,7 @@ class BudgetController extends Controller
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function budget(BudgetRepositoryInterface $repository, Budget $budget)
+    public function budget(BudgetRepositoryInterface $repository, AccountRepositoryInterface $accountRepository, Budget $budget)
     {
 
         // dates and times
@@ -51,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();
@@ -69,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);
         }
@@ -114,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();
@@ -134,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();
@@ -157,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)
 
@@ -198,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) {
@@ -225,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

@@ -3,7 +3,6 @@
 namespace FireflyIII\Http\Controllers\Chart;
 
 
-use App;
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Category;
@@ -32,7 +31,7 @@ class CategoryController extends Controller
     {
         parent::__construct();
         // create chart generator:
-        $this->generator = App::make('FireflyIII\Generator\Chart\Category\CategoryChartGenerator');
+        $this->generator = app('FireflyIII\Generator\Chart\Category\CategoryChartGenerator');
     }
 
 
@@ -47,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;
 
 
@@ -67,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);
@@ -104,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,
@@ -113,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);
 
@@ -129,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());
@@ -140,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
         }
@@ -148,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);
@@ -166,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
@@ -195,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/PiggyBankController.php

@@ -2,7 +2,6 @@
 
 namespace FireflyIII\Http\Controllers\Chart;
 
-use App;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
@@ -29,7 +28,7 @@ class PiggyBankController extends Controller
     {
         parent::__construct();
         // create chart generator:
-        $this->generator = App::make('FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGenerator');
+        $this->generator = app('FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGenerator');
     }
 
     /**

app/Http/Controllers/Chart/ReportController.php

@@ -3,7 +3,6 @@
 namespace FireflyIII\Http\Controllers\Chart;
 
 
-use App;
 use Carbon\Carbon;
 use FireflyIII\Helpers\Report\ReportQueryInterface;
 use FireflyIII\Http\Controllers\Controller;
@@ -29,7 +28,7 @@ class ReportController extends Controller
     {
         parent::__construct();
         // create chart generator:
-        $this->generator = App::make('FireflyIII\Generator\Chart\Report\ReportChartGenerator');
+        $this->generator = app('FireflyIII\Generator\Chart\Report\ReportChartGenerator');
     }
 
 
@@ -37,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);
 
@@ -81,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

@@ -0,0 +1,74 @@
+<?php
+
+namespace FireflyIII\Http\Controllers;
+
+use FireflyIII\User;
+
+/**
+ * Class WebhookController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class CronController extends Controller
+{
+
+    /**
+     * Firefly doesn't have anything that should be in the a cron job, except maybe this one, and it's fairly exceptional.
+     *
+     * If you use SendGrid like I do, you can detect bounces and thereby check if users gave an invalid address. If they did,
+     * it's easy to block them and change their password. Optionally, you could notify yourself about it and send them a message.
+     *
+     * But thats something not supported right now.
+     */
+    public function sendgrid()
+    {
+
+        if (strlen(env('SENDGRID_USERNAME')) > 0 && strlen(env('SENDGRID_PASSWORD')) > 0) {
+
+            $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',
+
+            ];
+            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";
+                        }
+                    }
+                }
+            }
+            echo 'Done!' . "\n";
+        } else {
+            echo 'Please fill in SendGrid details.';
+        }
+
+    }
+
+}

app/Http/Controllers/CsvController.php

@@ -2,12 +2,13 @@
 
 namespace FireflyIII\Http\Controllers;
 
-use App;
 use Config;
+use ExpandedForm;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Csv\Data;
 use FireflyIII\Helpers\Csv\Importer;
 use FireflyIII\Helpers\Csv\WizardInterface;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use Illuminate\Http\Request;
 use Input;
 use Log;
@@ -41,8 +42,8 @@ class CsvController extends Controller
             throw new FireflyException('CSV Import is not enabled.');
         }
 
-        $this->wizard = App::make('FireflyIII\Helpers\Csv\WizardInterface');
-        $this->data   = App::make('FireflyIII\Helpers\Csv\Data');
+        $this->wizard = app('FireflyIII\Helpers\Csv\WizardInterface');
+        $this->data   = app('FireflyIII\Helpers\Csv\Data');
 
     }
 
@@ -56,7 +57,7 @@ class CsvController extends Controller
     public function columnRoles()
     {
 
-        $fields = ['csv-file', 'csv-date-format', 'csv-has-headers'];
+        $fields = ['csv-file', 'csv-date-format', 'csv-has-headers', 'csv-import-account'];
         if (!$this->wizard->sessionHasValues($fields)) {
             Session::flash('warning', 'Could not recover upload.');
 
@@ -103,7 +104,7 @@ class CsvController extends Controller
             return redirect(route('csv.index'));
         }
         $data = [
-            'date-format' => Session::get('date-format'),
+            'date-format' => Session::get('csv-date-format'),
             'has-headers' => Session::get('csv-has-headers')
         ];
         if (Session::has('csv-map')) {
@@ -116,6 +117,10 @@ class CsvController extends Controller
             $data['mapped'] = Session::get('csv-mapped');
         }
 
+        if (Session::has('csv-specifix')) {
+            $data['specifix'] = Session::get('csv-specifix');
+        }
+
         $result = json_encode($data, JSON_PRETTY_PRINT);
         $name   = 'csv-configuration-' . date('Y-m-d') . '.json';
 
@@ -143,13 +148,14 @@ class CsvController extends Controller
      *
      * @return \Illuminate\View\View
      */
-    public function index()
+    public function index(AccountRepositoryInterface $repository)
     {
         $subTitle = trans('firefly.csv_import');
 
         Session::forget('csv-date-format');
         Session::forget('csv-has-headers');
         Session::forget('csv-file');
+        Session::forget('csv-import-account');
         Session::forget('csv-map');
         Session::forget('csv-roles');
         Session::forget('csv-mapped');
@@ -161,11 +167,14 @@ class CsvController extends Controller
             $specifix[$entry] = trans('firefly.csv_specifix_' . $entry);
         }
 
+        // get a list of asset accounts:
+        $accounts = ExpandedForm::makeSelectList($repository->getAccounts(['Asset account', 'Default account']));
+
         // can actually upload?
         $uploadPossible = is_writable(storage_path('upload'));
         $path           = storage_path('upload');
 
-        return view('csv.index', compact('subTitle', 'uploadPossible', 'path', 'specifix'));
+        return view('csv.index', compact('subTitle', 'uploadPossible', 'path', 'specifix', 'accounts'));
     }
 
     /**
@@ -297,12 +306,13 @@ class CsvController extends Controller
         $rows     = $importer->getRows();
         $errors   = $importer->getErrors();
         $imported = $importer->getImported();
+        $journals = $importer->getJournals();
 
         Preferences::mark();
 
         $subTitle = trans('firefly.csv_process_title');
 
-        return view('csv.process', compact('rows', 'errors', 'imported', 'subTitle'));
+        return view('csv.process', compact('rows', 'errors', 'imported', 'subTitle', 'journals'));
 
     }
 
@@ -367,19 +377,17 @@ class CsvController extends Controller
             return redirect(route('csv.index'));
         }
 
-        $fullPath                = $this->wizard->storeCsvFile($request->file('csv')->getRealPath());
-        $settings                = [];
-        $settings['date-format'] = Input::get('date_format');
-        $settings['has-headers'] = intval(Input::get('has_headers')) === 1;
-        $settings['specifix']    = Input::get('specifix');
-        $settings['map']         = [];
-        $settings['mapped']      = [];
-        $settings['roles']       = [];
+        $fullPath                   = $this->wizard->storeCsvFile($request->file('csv')->getRealPath());
+        $settings                   = [];
+        $settings['date-format']    = Input::get('date_format');
+        $settings['has-headers']    = intval(Input::get('has_headers')) === 1;
+        $settings['specifix']       = Input::get('specifix');
+        $settings['import-account'] = intval(Input::get('csv_import_account'));
+        $settings['map']            = [];
+        $settings['mapped']         = [];
+        $settings['roles']          = [];
 
-        /*
-         * Process config file if present.
-         */
-        if ($request->hasFile('csv_config')) {
+        if ($request->hasFile('csv_config')) { // Process config file if present.
             $data = file_get_contents($request->file('csv_config')->getRealPath());
             $json = json_decode($data, true);
             if (is_array($json)) {
@@ -394,8 +402,9 @@ class CsvController extends Controller
         $this->data->setMapped($settings['mapped']);
         $this->data->setRoles($settings['roles']);
         $this->data->setSpecifix($settings['specifix']);
+        $this->data->setImportAccount($settings['import-account']);
 
         return redirect(route('csv.column-roles'));
 
     }
-}
+}

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

@@ -1,11 +1,13 @@
 <?php namespace FireflyIII\Http\Controllers;
 
+use Artisan;
 use Auth;
 use Carbon\Carbon;
 use Config;
 use FireflyIII\Models\Tag;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use Input;
+use Log;
 use Preferences;
 use Route;
 use Session;
@@ -57,6 +59,7 @@ class HomeController extends Controller
 
 
         Session::clear();
+        Artisan::call('cache:clear');
 
         return redirect(route('index'));
     }
@@ -72,22 +75,20 @@ class HomeController extends Controller
         $count = $repository->countAccounts($types);
         bcscale(2);
 
-
         if ($count == 0) {
             return redirect(route('new-user.index'));
         }
 
-        $title         = 'Firefly';
-        $subTitle      = trans('firefly.welcomeBack');
-        $mainTitleIcon = 'fa-fire';
-        $transactions  = [];
-        $frontPage     = Preferences::get('frontPageAccounts', []);
-        $start         = Session::get('start', Carbon::now()->startOfMonth());
-        $end           = Session::get('end', Carbon::now()->endOfMonth());
-
-        $accounts = $repository->getFrontpageAccounts($frontPage);
-        $savings  = $repository->getSavingsAccounts();
-
+        $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();
 
 
@@ -114,35 +115,9 @@ class HomeController extends Controller
             }
         }
 
-        return view('index', compact('count', 'title', 'savings', 'subTitle', 'mainTitleIcon', 'transactions', 'savingsTotal', 'piggyBankAccounts'));
+        return view(
+            'index', compact('count', 'showTour', 'title', 'savings', 'subTitle', 'mainTitleIcon', 'transactions', 'savingsTotal', 'piggyBankAccounts')
+        );
     }
 
-    /**
-     * @codeCoverageIgnore
-     * @return \Illuminate\Http\RedirectResponse|string
-     */
-    public function routes()
-    {
-        if (!Auth::user()->hasRole('owner')) {
-            Session::flash('warning', 'This page is broken.');
-
-            return redirect(route('index'));
-        }
-
-        // get all routes:
-        $routeCollection = Route::getRoutes();
-        /** @var \Illuminate\Routing\Route $value */
-        foreach ($routeCollection as $value) {
-            $name    = $value->getName();
-            $methods = $value->getMethods();
-            $isPost  = in_array('POST', $methods);
-            $index   = str_replace('.', '-', $name);
-
-            if (strlen($name) > 0 && !$isPost) {
-                echo "'" . $index . "' => '" . $name . "',<br />";
-            }
-        }
-
-        return '&nbsp;';
-    }
 }

app/Http/Controllers/JsonController.php

@@ -12,9 +12,9 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
+use Preferences;
 use Response;
 use Session;
-use Steam;
 
 /**
  * Class JsonController
@@ -24,6 +24,43 @@ use Steam;
 class JsonController extends Controller
 {
 
+    /**
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function endTour()
+    {
+        Preferences::set('tour', false);
+
+        return Response::json('true');
+    }
+
+    /**
+     *
+     */
+    public function tour()
+    {
+        $pref = Preferences::get('tour', true);
+        if (!$pref) {
+            abort(404);
+        }
+        $headers = ['main-content', 'sidebar-toggle', 'account-menu', 'budget-menu', 'report-menu', 'transaction-menu', 'option-menu', 'main-content-end'];
+        $steps   = [];
+        foreach ($headers as $header) {
+            $steps[] = [
+                'element' => '#' . $header,
+                'title'   => trans('help.' . $header . '-title'),
+                'content' => trans('help.' . $header . '-text'),
+            ];
+        }
+        $steps[0]['orphan']    = true;// orphan and backdrop for first element.
+        $steps[0]['backdrop']  = true;
+        $steps[1]['placement'] = 'left';// sidebar position left:
+        $steps[7]['orphan']    = true; // final in the center again.
+        $steps[7]['backdrop']  = true;
+        $template              = view('json.tour')->render();
+
+        return Response::json(['steps' => $steps, 'template' => $template]);
+    }
 
     /**
      * @param BillRepositoryInterface    $repository
@@ -46,28 +83,14 @@ class JsonController extends Controller
         if ($cache->has()) {
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
+        // get amount from bills
+        $amount = $repository->billsPaidInRange($start, $end)->sum('paid');
 
-        $amount = 0;
-
-
-        // these two functions are the same as the chart
-        $bills = $repository->getActiveBills();
-
-        /** @var Bill $bill */
-        foreach ($bills as $bill) {
-            $amount = bcadd($amount, $repository->billPaymentsInRange($bill, $start, $end));
-        }
-        unset($bill, $bills);
-
-        /**
-         * Find credit card accounts and possibly unpaid credit card bills.
-         */
-        $creditCards = $accountRepository->getCreditCards();
-        // if the balance is not zero, the monthly payment is still underway.
+        // 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 ($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'));
@@ -76,7 +99,6 @@ class JsonController extends Controller
         $data = ['box' => 'bills-paid', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount];
         $cache->store($data);
 
-
         return Response::json($data);
     }
 
@@ -118,22 +140,23 @@ 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]);
             }
         }
         /** @var Bill $entry */
         foreach ($unpaid as $entry) {
-            $current = ($entry[0]->amount_max + $entry[0]->amount_min) / 2;
-            $amount = bcadd($amount, $current);
+            $current = bcdiv(bcadd($entry[0]->amount_max, $entry[0]->amount_min), 2);
+            $amount  = bcadd($amount, $current);
         }
 
         $data = ['box' => 'bills-unpaid', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount];
@@ -147,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());
@@ -160,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);
@@ -174,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;
@@ -189,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);
@@ -211,7 +235,6 @@ class JsonController extends Controller
         foreach ($list as $entry) {
             $return[] = $entry->name;
         }
-        sort($return);
 
         return Response::json($return);
     }