Merge branch 'hotfix/3.7.2.3'

Quicklink fiscal year report feature. As per github issue #131.

.codeclimate.yml

@@ -3,6 +3,7 @@ languages:
   JavaScript: true
   PHP: true
 exclude_paths:
+- "gulpfile.js"
 - "public/packages/maximebf/php-debugbar/debugbar.js"
 - "public/packages/maximebf/php-debugbar/widgets.js"
 - "public/packages/maximebf/php-debugbar/openhandler.js"

.env.example

@@ -2,6 +2,7 @@ APP_ENV=production
 APP_DEBUG=false
 APP_KEY=SomeRandomStringOf32CharsExactly
 
+
 DB_CONNECTION=mysql
 DB_HOST=localhost
 DB_DATABASE=homestead
@@ -10,15 +11,27 @@ DB_PASSWORD=secret
 
 CACHE_DRIVER=file
 SESSION_DRIVER=file
+QUEUE_DRIVER=sync
+
+DEFAULT_CURRENCY=EUR
+DEFAULT_LANGUAGE=en_US
+
+REDIS_HOST=localhost
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=smtp
+MAIL_HOST=mailtrap.io
+MAIL_PORT=2525
+MAIL_FROM=enter_your_email_here
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+SHOW_INCOMPLETE_TRANSLATIONS=false
 
-EMAIL_SMTP=
-EMAIL_DRIVER=smtp
-EMAIL_USERNAME=
-EMAIL_PASSWORD=
 ANALYTICS_ID=
-EMAIL_PRETEND=false
 RUNCLEANUP=true
 SITE_OWNER=mail@example.com
 
-SENDGRID_USERNAME=
-SENDGRID_PASSWORD=
+BLOCKED_DOMAINS=

.env.testing

@@ -1,6 +1,7 @@
 APP_ENV=testing
 APP_DEBUG=true
-APP_KEY=SomeRandomString
+APP_KEY=SomeRandomStringOf32CharsExactly
+
 
 DB_CONNECTION=sqlite
 DB_HOST=localhost
@@ -10,9 +11,27 @@ DB_PASSWORD=secret
 
 CACHE_DRIVER=array
 SESSION_DRIVER=array
+QUEUE_DRIVER=array
 
-EMAIL_SMTP=
-EMAIL_USERNAME=
-EMAIL_PASSWORD=
-ANALYTICS_ID=ABC
-EMAIL_PRETEND=true
+DEFAULT_CURRENCY=EUR
+DEFAULT_LANGUAGE=en_US
+
+REDIS_HOST=localhost
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=log
+MAIL_HOST=mailtrap.io
+MAIL_PORT=2525
+MAIL_FROM=your_address_here@example.com
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+SHOW_INCOMPLETE_TRANSLATIONS=false
+
+ANALYTICS_ID=abcde
+RUNCLEANUP=false
+SITE_OWNER=your_address_here@example.com
+
+BLOCKED_DOMAINS=

.gitattributes

@@ -1 +1,3 @@
 * text=auto
+*.css linguist-vendored
+*.less linguist-vendored

.gitignore

@@ -1,36 +1,17 @@
-/bootstrap/compiled.php
 /vendor
-composer.phar
-Thumbs.db
-.idea/
-tests/_output/*
-_ide_helper.php
-/build/logs/clover.xml
-index.html*
-app/storage/firefly-export*
-.vagrant
-firefly-iii-import-*.json
-tests/_output/*
-testing.sqlite
-_ide_helper_models.php
-clean.sqlite
-tests/acceptance/AcceptanceTester.php
-tests/functional/FunctionalTester.php
-tests/unit/UnitTester.php
-pi.php
-tests/_data/db.sqlite
-tests/_data/dump.sql
-db.sqlite_snapshot
-c3.php
-db.sqlite-journal
-tests/_output/*
+/node_modules
+Homestead.yaml
+Homestead.json
 .env
-clover.xml
-node_modules/
-addNewLines.php
+_ide_helper.php
+_ide_helper_models.php
 .phpstorm.meta.php
-.env.backup
-.env.local
 
-tests/_output/*
-tests/_output/*
+storage/
+
+# Eclipse project files
+.buildpath
+.project
+.settings/
+
+.env.local

.travis.yml

@@ -3,13 +3,20 @@ sudo: false
 
 
 php:
-  - 5.5
   - 5.6
+  - 7
 
 install:
+  - composer selfupdate
+  - composer install --no-dev
   - composer update
   - php artisan env
   - mv -v .env.testing .env
+  - php artisan env
+  - touch storage/upload/at-1.data
+  - touch storage/upload/at-2.data
+  - touch storage/database/testing.db
+  - php artisan migrate --seed
 
 script:
   - phpunit

LICENSE

@@ -0,0 +1,7 @@
+Copyright (C) 2016 Sander Dorigo
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -2,115 +2,26 @@
 
 [![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable)](https://packagist.org/packages/grumpydictator/firefly-iii)
 [![Total Downloads](https://poser.pugx.org/grumpydictator/firefly-iii/downloads)](https://packagist.org/packages/grumpydictator/firefly-iii)
-
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master)
 [![Build Status](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/build.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/build-status/master)
+[![SensioLabsInsight](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102/mini.png)](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102)
+[![Code Climate](https://codeclimate.com/github/JC5/firefly-iii/badges/gpa.svg)](https://codeclimate.com/github/JC5/firefly-iii)
+[![Project Status](http://stillmaintained.com/JC5/firefly-iii.png?a=b)](http://stillmaintained.com/JC5/firefly-iii)
 
 ## About
 
 "Firefly III" is a financial manager. It can help you keep track of expenses, income, budgets and everything in between. It even supports credit cards, shared 
 household accounts and savings accounts! It's pretty fancy. You should use it to save and organise money.
- 
-_Firefly is a system you'll have install yourself on webhosting of your choosing._
 
-Personal financial management is pretty difficult, and everybody has their own approach to it. Some people
-make budgets, other people limit their cashflow by throwing away their credit cards, others try to increase
-their current cashflow. There are tons of ways to save and earn money.
+Personal financial management is pretty difficult, and everybody has their own approach to it. Some people make budgets, other people limit their cashflow by throwing away their credit cards, others try to increase 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:
+#### Some advantages of using Firefly
 
-- The screenshots below on this very page.
-- The featurelist below, also on this very page.
-- The [full description](https://github.com/JC5/firefly-iii/wiki/full-description), which will tell you how Firefly works,
-and the philosophy behind it.
+- Firefly can import any CSV file, so migrating from other systems is easy.
+- Firefly runs on your own server, so you are fully in control of your data. Remember, there is no such thing as "the cloud", it’s just somebody else’s computer!
+- Firefly has lots of features without becoming fancy or bloated.
+- If you feel you're missing something you can just ask me and I'll add it!
 
-
-#### About the name (should you care)
-
-It's III, or 3, because [version 2](https://github.com/JC5/Firefly) and version 1 (not online) preceded it. It has been growing steadily ever since.
-
-## Current features
-
-- [A double-entry bookkeeping system](https://en.wikipedia.org/wiki/Double-entry_bookkeeping_system);
-- You can store, edit and remove [withdrawals, deposits and transfers](https://en.wikipedia.org/wiki/Financial_transaction). This allows you full financial management;
-- You can manage different types of accounts;
-  - [Asset](https://en.wikipedia.org/wiki/Asset) accounts
-  - Shared [asset accounts](https://en.wikipedia.org/wiki/Asset) ([household accounts](https://en.wikipedia.org/wiki/Household))
-  - Saving accounts
-  - Credit cards
-- It's possible to create, change and manage money using _[budgets](https://en.wikipedia.org/wiki/Envelope_system)_;
-- Organize transactions using categories;
-- Save towards a goal using [piggy banks](https://en.wikipedia.org/wiki/Piggy_bank);
-- Predict and anticipate [bills](https://en.wikipedia.org/wiki/Invoice);
-- View income / expense [reports](https://en.wikipedia.org/wiki/Financial_statement);
-- Organize expenses using tags;
-- Lots of help text in case you don't get it.
-
-Everything is organised:
-
-- Clear views that should show you how you're doing;
-- Easy navigation through your records;
-- Browse back and forth to see previous months or even years;
-- Lots of charts because we all love them;
-- Financial reporting showing you how well you are doing.
-
-## Screenshots
-
-_Please note that everything in these screenshots is fictional and may not be realistic._
-
-![Index](https://i.nder.be/c6hz06d3)
-
-![Accounts](https://i.nder.be/gzxxyz6n)
-
-![Budgets](https://i.nder.be/hhu3krqk)
-
-![Reports 1](https://i.nder.be/cc3yspf6)
-
-![Reports 2](https://i.nder.be/h6fp7xkb)
-
-![Bills](https://i.nder.be/c30zkcpv)
-
-![Piggy banks](https://i.nder.be/g20k0mdq)
-
-## Running and installing
-
-If you're still interested please read [the installation guide](https://github.com/JC5/firefly-iii/wiki/Installation), 
-[the upgrade guide](https://github.com/JC5/firefly-iii/wiki/Upgrade-instructions) (if applicable) 
-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. Accounts on the demo sites will stop working after one week.
-
-## Credits
-
-Firefly III uses the following libraries and tools:
-
-* The AdminLTE template by [Almsaseed Studio](https://almsaeedstudio.com/)
-* The [Google charts](https://developers.google.com/chart/) library.
-* [Chart.js](http://www.chartjs.org/)
-* [Bootstrap](http://getbootstrap.com/)
-* [Laravel](http://laravel.com/)
-* [Twig](http://twig.sensiolabs.org/)
-* For development, some of the excellent tools made by [Barry van den Heuvel](https://github.com/barryvdh)
-* [Bootstrap sortable](https://github.com/drvic10k/bootstrap-sortable) by [Matúš Brliť](https://github.com/drvic10k).
-* [Date range picker](https://github.com/dangrossman/bootstrap-daterangepicker/) by [Dan Grossman](https://github.com/dangrossman)
-* The [real favicon generator](http://realfavicongenerator.net/)
-* Various other open source components (see [composer.json](https://github.com/JC5/firefly-iii/blob/master/composer.json))
-
-
-## Current state
-
-Firefly III is pretty much all grown up. Full test coverage (nerd alert!) is coming. Translations are a work in progress.
-
-Questions, ideas, bugs or other things to contribute? [Let me know](https://github.com/JC5/firefly-iii/issues/new)!
-
-If you like this tool, feel free to [donate me some beer money](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=2ZMV952UUSCLU&lc=NL&item_name=Development%20of%20Firefly&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted).
-
-[![SensioLabsInsight](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102/mini.png)](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102)
-[![Code Climate](https://codeclimate.com/github/JC5/firefly-iii/badges/gpa.svg)](https://codeclimate.com/github/JC5/firefly-iii)
-[![Project Status](http://stillmaintained.com/JC5/firefly-iii.png?a=b)](http://stillmaintained.com/JC5/firefly-iii)
-[![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable.svg)](https://packagist.org/packages/grumpydictator/firefly-iii)
-![GA](https://ga-beacon.appspot.com/UA-58172398-6/firefly-iii/readme)
+Firefly is pretty awesome. [You can read more about Firefly III, and its features, on the Github Pages](https://jc5.github.io/firefly-iii/).

_development/codesniffer/ruleset.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<ruleset name="JamesStandard">
+ <rule ref="Zend">
+	<exclude name="Zend.NamingConventions.ValidVariableName" />
+	<exclude name="PEAR.WhiteSpace.ScopeClosingBrace" />
+  	<!--<exclude name="PEAR.Whitespace.ScopeIndent"/>-->
+  	<exclude name="PEAR.WhiteSpace.ScopeClosingBrace"/>
+  	<exclude name="Generic.Formatting.MultipleStatementAlignment.Incorrect" />
+  	<exclude name="PEAR.Functions.FunctionCallSignature" />
+
+ </rule>
+ <!--
+    Here we change two messages from the same sniff. Note how the
+    codes are slightly different because the sniff developer has
+    defined both a MaxExceeded message and a TooLong message. In the
+    case of this sniff, one is used for warnings and one is used
+    for errors.
+ -->
+ <rule ref="Generic.Files.LineLength">
+  <properties>
+   <property name="lineLimit" value="160"/>
+   <property name="absoluteLineLimit" value="160"/>
+  </properties>
+ </rule>
+ 
+
+</ruleset>

_development/codestyle.xml

@@ -0,0 +1,322 @@
+<code_scheme name="Use This One">
+  <option name="RIGHT_MARGIN" value="160" />
+  <CoffeeScriptCodeStyleSettings>
+    <option name="SPACE_BEFORE_PROPERTY_COLON" value="true" />
+  </CoffeeScriptCodeStyleSettings>
+  <JSCodeStyleSettings>
+    <option name="ALIGN_MULTILINE_VAR_DECLARATION" value="true" />
+  </JSCodeStyleSettings>
+  <PHPCodeStyleSettings>
+    <option name="ALIGN_KEY_VALUE_PAIRS" value="true" />
+    <option name="ALIGN_PHPDOC_PARAM_NAMES" value="true" />
+    <option name="ALIGN_PHPDOC_COMMENTS" value="true" />
+    <option name="ALIGN_ASSIGNMENTS" value="true" />
+    <option name="COMMA_AFTER_LAST_ARRAY_ELEMENT" value="true" />
+    <option name="PHPDOC_BLANK_LINE_BEFORE_TAGS" value="true" />
+    <option name="PHPDOC_BLANK_LINES_AROUND_PARAMETERS" value="true" />
+    <option name="PHPDOC_WRAP_LONG_LINES" value="true" />
+    <option name="LOWER_CASE_BOOLEAN_CONST" value="true" />
+    <option name="LOWER_CASE_NULL_CONST" value="true" />
+    <option name="BLANK_LINE_BEFORE_RETURN_STATEMENT" value="true" />
+    <option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" />
+    <option name="ALIGN_CLASS_CONSTANTS" value="true" />
+    <option name="FORCE_SHORT_DECLARATION_ARRAY_STYLE" value="true" />
+  </PHPCodeStyleSettings>
+  <XML>
+    <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+  </XML>
+  <codeStyleSettings language="CoffeeScript">
+    <option name="KEEP_LINE_BREAKS" value="false" />
+    <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+  </codeStyleSettings>
+  <codeStyleSettings language="JavaScript">
+    <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+    <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+    <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+    <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+  </codeStyleSettings>
+  <codeStyleSettings language="PHP">
+    <option name="RIGHT_MARGIN" value="160" />
+    <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+    <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
+    <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+    <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+    <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+    <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+    <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+    <option name="ALIGN_GROUP_FIELD_DECLARATIONS" value="true" />
+    <option name="CALL_PARAMETERS_WRAP" value="1" />
+    <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+    <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+    <option name="METHOD_PARAMETERS_WRAP" value="1" />
+    <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+    <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+    <option name="EXTENDS_LIST_WRAP" value="1" />
+    <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+    <option name="BINARY_OPERATION_WRAP" value="1" />
+    <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+    <option name="TERNARY_OPERATION_WRAP" value="1" />
+    <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+    <option name="FOR_STATEMENT_WRAP" value="1" />
+    <option name="FOR_STATEMENT_LPAREN_ON_NEXT_LINE" value="true" />
+    <option name="FOR_STATEMENT_RPAREN_ON_NEXT_LINE" value="true" />
+    <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+    <option name="ASSIGNMENT_WRAP" value="1" />
+    <option name="PLACE_ASSIGNMENT_SIGN_ON_NEXT_LINE" value="true" />
+    <option name="IF_BRACE_FORCE" value="3" />
+    <option name="DOWHILE_BRACE_FORCE" value="3" />
+    <option name="WHILE_BRACE_FORCE" value="3" />
+    <option name="FOR_BRACE_FORCE" value="3" />
+    <arrangement>
+      <tokens>
+        <token id="modifiers" name="modifiers">
+          <rules>
+            <rule>
+              <match>
+                <AND>
+                  <PUBLIC>true</PUBLIC>
+                  <STATIC>true</STATIC>
+                </AND>
+              </match>
+            </rule>
+            <rule>
+              <match>
+                <AND>
+                  <PROTECTED>true</PROTECTED>
+                  <STATIC>true</STATIC>
+                </AND>
+              </match>
+            </rule>
+            <rule>
+              <match>
+                <AND>
+                  <PRIVATE>true</PRIVATE>
+                  <STATIC>true</STATIC>
+                </AND>
+              </match>
+            </rule>
+            <rule>
+              <match>
+                <PUBLIC>true</PUBLIC>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+            <rule>
+              <match>
+                <PROTECTED>true</PROTECTED>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+            <rule>
+              <match>
+                <PRIVATE>true</PRIVATE>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </rules>
+        </token>
+        <token id="visibility" name="visibility">
+          <rules>
+            <rule>
+              <match>
+                <PUBLIC>true</PUBLIC>
+              </match>
+            </rule>
+            <rule>
+              <match>
+                <PROTECTED>true</PROTECTED>
+              </match>
+            </rule>
+            <rule>
+              <match>
+                <PRIVATE>true</PRIVATE>
+              </match>
+            </rule>
+          </rules>
+        </token>
+      </tokens>
+      <groups>
+        <group>
+          <type>GETTERS_AND_SETTERS</type>
+          <order>KEEP</order>
+        </group>
+      </groups>
+      <rules>
+        <section>
+          <rule>
+            <match>
+              <CONST />
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD />
+                <PUBLIC />
+                <STATIC />
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD />
+                <PROTECTED />
+                <STATIC />
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD />
+                <PRIVATE />
+                <STATIC />
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD />
+                <PUBLIC />
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD />
+                <PROTECTED />
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD />
+                <PRIVATE />
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <CONSTRUCTOR />
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <METHOD />
+                <PUBLIC />
+                <STATIC />
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <METHOD />
+                <PROTECTED />
+                <STATIC />
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <METHOD />
+                <PRIVATE />
+                <STATIC />
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <METHOD />
+                <PUBLIC />
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <METHOD />
+                <PROTECTED />
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <METHOD />
+                <PRIVATE />
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <TRAIT />
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <INTERFACE />
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <CLASS />
+            </match>
+          </rule>
+        </section>
+      </rules>
+    </arrangement>
+  </codeStyleSettings>
+</code_scheme>

_development/phpmd/phpmd.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="pcsg-generated-ruleset" 
+    xmlns="http://pmd.sf.net/ruleset/1.0.0" 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
+    xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
+	<description>Created with the PHP Coding Standard Generator. http://edorian.github.com/php-coding-standard-generator/
+	</description>
+	<rule ref="rulesets/codesize.xml/CyclomaticComplexity">
+	    <properties>
+	        <property name="reportLevel" value="5"/>
+	    </properties>
+	</rule>
+	<rule ref="rulesets/codesize.xml/NPathComplexity">
+	    <properties>
+	        <property name="minimum" value="128"/>
+	    </properties>
+	</rule>
+	<rule ref="rulesets/codesize.xml/ExcessiveMethodLength">
+	    <properties>
+	        <property name="minimum" value="40"/>
+	    </properties>
+	</rule>
+	<rule ref="rulesets/codesize.xml/ExcessiveParameterList">
+	    <properties>
+	        <property name="minimum" value="5"/>
+	    </properties>
+	</rule>
+
+	<!-- Import rule set and exclude rules -->
+    <rule ref="rulesets/controversial.xml">
+        <exclude name="CamelCasePropertyName" />
+    </rule>
+
+    
+</ruleset>

_development/readme.txt

@@ -0,0 +1 @@
+These are some of the files I use for code formatting, PHPMD and PHPCS.

app/Commands/Command.php

@@ -1,12 +0,0 @@
-<?php namespace FireflyIII\Commands;
-/**
- * Class Command
- *
- * @codeCoverageIgnore
- * @package FireflyIII\Commands
- */
-abstract class Command
-{
-
-
-}

app/Console/Commands/UpgradeFireflyInstructions.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace FireflyIII\Console\Commands;
+
+use Config;
+use Illuminate\Console\Command;
+
+/**
+ * Class UpgradeFireflyInstructions
+ *
+ * @package FireflyIII\Console\Commands
+ */
+class UpgradeFireflyInstructions extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command description';
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly:upgrade-instructions';
+
+    /**
+     * Create a new command instance.
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        //
+        $version = Config::get('firefly.version');
+        $config  = Config::get('upgrade.text');
+        $text    = isset($config[$version]) ? $config[$version] : null;
+
+        $this->line('+------------------------------------------------------------------------------+');
+        $this->line('');
+
+        if (is_null($text)) {
+            $this->line('Thank you for installing Firefly III, v' . $version);
+            $this->line('If you are upgrading from a previous version,');
+            $this->info('there are no extra upgrade instructions.');
+            $this->line('Firefly III should be ready for use.');
+        } else {
+            $this->line('Thank you for installing Firefly III, v' . $version);
+            $this->line('If you are upgrading from a previous version,');
+            $this->line('please follow these upgrade instructions carefully:');
+            $this->info(wordwrap($text));
+        }
+
+        $this->line('');
+        $this->line('+------------------------------------------------------------------------------+');
+    }
+}

app/Console/Kernel.php

@@ -1,17 +1,25 @@
-<?php namespace FireflyIII\Console;
+<?php
+/**
+ * Kernel.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
 
+namespace FireflyIII\Console;
+
+use FireflyIII\Console\Commands\UpgradeFireflyInstructions;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
 /**
  * Class Kernel
  *
- * @codeCoverageIgnore
  * @package FireflyIII\Console
  */
 class Kernel extends ConsoleKernel
 {
-
     /**
      * The Artisan commands provided by your application.
      *
@@ -19,6 +27,7 @@ class Kernel extends ConsoleKernel
      */
     protected $commands
         = [
+            UpgradeFireflyInstructions::class,
         ];
 
     /**
@@ -26,12 +35,11 @@ class Kernel extends ConsoleKernel
      *
      * @param  \Illuminate\Console\Scheduling\Schedule $schedule
      *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     *
      * @return void
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameters)
      */
     protected function schedule(Schedule $schedule)
     {
     }
-
 }

app/Events/Event.php

@@ -1,14 +1,13 @@
-<?php namespace FireflyIII\Events;
+<?php
+
+namespace FireflyIII\Events;
 
 /**
  * Class Event
  *
- * @codeCoverageIgnore
  * @package FireflyIII\Events
  */
 abstract class Event
 {
-
     //
-
 }

app/Events/JournalDeleted.php

@@ -1,25 +0,0 @@
-<?php namespace FireflyIII\Events;
-
-use Illuminate\Queue\SerializesModels;
-
-/**
- * Class JournalDeleted
- *
- * @codeCoverageIgnore
- * @package FireflyIII\Events
- */
-class JournalDeleted extends Event
-{
-
-    use SerializesModels;
-
-    /**
-     * Create a new event instance.
-     *
-     */
-    public function __construct()
-    {
-        //
-    }
-
-}

app/Events/TransactionJournalStored.php

@@ -1,15 +1,24 @@
-<?php namespace FireflyIII\Events;
+<?php
+/**
+ * TransactionJournalStored.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+namespace FireflyIII\Events;
 
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Queue\SerializesModels;
 
 /**
- * Class JournalCreated
+ * Class TransactionJournalStored
  *
  * @codeCoverageIgnore
  * @package FireflyIII\Events
  */
-class JournalCreated extends Event
+class TransactionJournalStored extends Event
 {
 
     use SerializesModels;

app/Events/TransactionJournalUpdated.php

@@ -4,12 +4,12 @@ use FireflyIII\Models\TransactionJournal;
 use Illuminate\Queue\SerializesModels;
 
 /**
- * Class JournalSaved
+ * Class TransactionJournalUpdated
  *
  * @codeCoverageIgnore
  * @package FireflyIII\Events
  */
-class JournalSaved extends Event
+class TransactionJournalUpdated extends Event
 {
 
     use SerializesModels;

app/Exceptions/Handler.php

@@ -1,18 +1,20 @@
-<?php namespace FireflyIII\Exceptions;
+<?php
+
+namespace FireflyIII\Exceptions;
 
 use Exception;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 /**
  * Class Handler
  *
- * @codeCoverageIgnore
  * @package FireflyIII\Exceptions
  */
 class Handler extends ExceptionHandler
 {
-
     /**
      * A list of the exception types that should not be reported.
      *
@@ -20,40 +22,35 @@ class Handler extends ExceptionHandler
      */
     protected $dontReport
         = [
-            'Symfony\Component\HttpKernel\Exception\HttpException'
+            AuthorizationException::class,
+            HttpException::class,
+            ModelNotFoundException::class,
         ];
 
     /**
      * Render an exception into an HTTP response.
      *
      * @param  \Illuminate\Http\Request $request
-     * @param  \Exception               $e
-     * @SuppressWarnings(PHPMD.ShortVariable)
+     * @param  \Exception               $exception
      *
      * @return \Illuminate\Http\Response
      */
-    public function render($request, Exception $e)
+    public function render($request, Exception $exception)
     {
-        if ($e instanceof HttpException) {
-            return $this->renderHttpException($e);
-        } else {
-            return parent::render($request, $e);
-        }
+        return parent::render($request, $exception);
     }
 
     /**
      * Report or log an exception.
      *
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
-     * @SuppressWarnings(PHPMD.ShortVariable)
      *
-     * @param  \Exception $e
+     * @param  Exception $exception
      *
      * @return void
      */
-    public function report(Exception $e)
+    public function report(Exception $exception)
     {
-        parent::report($e);
+        parent::report($exception);
     }
-
 }

app/Generator/Chart/Account/AccountChartGeneratorInterface.php

@@ -1,4 +1,11 @@
 <?php
+/**
+ * AccountChartGeneratorInterface.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
 
 namespace FireflyIII\Generator\Chart\Account;
 
@@ -7,11 +14,11 @@ use FireflyIII\Models\Account;
 use Illuminate\Support\Collection;
 
 /**
- * Interface AccountChartGenerator
+ * Interface AccountChartGeneratorInterface
  *
  * @package FireflyIII\Generator\Chart\Account
  */
-interface AccountChartGenerator
+interface AccountChartGeneratorInterface
 {
 
     /**
@@ -21,7 +28,7 @@ interface AccountChartGenerator
      *
      * @return array
      */
-    public function all(Collection $accounts, Carbon $start, Carbon $end);
+    public function expenseAccounts(Collection $accounts, Carbon $start, Carbon $end);
 
     /**
      * @param Collection $accounts
@@ -40,13 +47,4 @@ 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;
 
 /**
@@ -14,24 +12,9 @@ use Steam;
  *
  * @package FireflyIII\Generator\Chart\Account
  */
-class ChartJsAccountChartGenerator implements AccountChartGenerator
+class ChartJsAccountChartGenerator implements AccountChartGeneratorInterface
 {
 
-
-    /**
-     * @codeCoverageIgnore
-     *
-     * @param Collection $accounts
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return array
-     */
-    public function all(Collection $accounts, Carbon $start, Carbon $end)
-    {
-        return $this->frontpage($accounts, $start, $end);
-    }
-
     /**
      * @param Collection $accounts
      * @param Carbon     $start
@@ -42,10 +25,10 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator
     public function expenseAccounts(Collection $accounts, Carbon $start, Carbon $end)
     {
         $data = [
-            'count'    => 1,
-            'labels'   => [], 'datasets' => [[
-                               'label' => trans('firefly.spent'),
-                               'data'  => []]]];
+            'count'  => 1,
+            'labels' => [], 'datasets' => [[
+                                               'label' => trans('firefly.spent'),
+                                               'data'  => []]]];
 
         bcscale(2);
         $start->subDay();
@@ -79,22 +62,6 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator
         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
@@ -105,21 +72,16 @@ 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     = [
-            'count'    => 0,
-            'labels'   => [],
-            'datasets' => [],
-        ];
-        $current  = clone $start;
+        $format  = (string)trans('config.month_and_day');
+        $data    = ['count' => 0, 'labels' => [], 'datasets' => [],];
+        $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)',
@@ -129,9 +91,15 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator
                 'pointHighlightStroke' => 'rgba(220,220,220,1)',
                 'data'                 => [],
             ];
-            $current = clone $start;
+            $current  = clone $start;
+            $range    = Steam::balanceInRange($account, $start, clone $end);
+            $previous = round(array_values($range)[0], 2);
             while ($current <= $end) {
-                $set['data'][] = Steam::balance($account, $current);
+                $format  = $current->format('Y-m-d');
+                $balance = isset($range[$format]) ? round($range[$format], 2) : $previous;
+
+                $set['data'][] = $balance;
+                $previous      = $balance;
                 $current->addDay();
             }
             $data['datasets'][] = $set;
@@ -151,25 +119,29 @@ 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 = (string)trans('config.month_and_day');
 
-        $data = [
+        $data     = [
             'count'    => 1,
             'labels'   => [],
             'datasets' => [
                 [
                     'label' => $account->name,
-                    'data'  => []
-                ]
+                    'data'  => [],
+                ],
             ],
         ];
-
-        $current = clone $start;
+        $range    = Steam::balanceInRange($account, $start, $end);
+        $current  = clone $start;
+        $previous = array_values($range)[0];
 
         while ($end >= $current) {
+            $theDate = $current->format('Y-m-d');
+            $balance = isset($range[$theDate]) ? $range[$theDate] : $previous;
+
             $data['labels'][]              = $current->formatLocalized($format);
-            $data['datasets'][0]['data'][] = Steam::balance($account, $current);
+            $data['datasets'][0]['data'][] = $balance;
+            $previous                      = $balance;
             $current->addDay();
         }
 
@@ -191,4 +163,19 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator
         return array_unique($ids);
 
     }
+
+    /**
+     * @param $array
+     * @param $entryId
+     *
+     * @return string
+     */
+    protected function isInArray($array, $entryId)
+    {
+        if (isset($array[$entryId])) {
+            return $array[$entryId];
+        }
+
+        return '0';
+    }
 }

app/Generator/Chart/Bill/BillChartGeneratorInterface.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * BillChartGeneratorInterface.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 namespace FireflyIII\Generator\Chart\Bill;
 
 
@@ -6,20 +14,20 @@ use FireflyIII\Models\Bill;
 use Illuminate\Support\Collection;
 
 /**
- * Interface BillChartGenerator
+ * Interface BillChartGeneratorInterface
  *
  * @package FireflyIII\Generator\Chart\Bill
  */
-interface BillChartGenerator
+interface BillChartGeneratorInterface
 {
 
     /**
-     * @param Collection $paid
-     * @param Collection $unpaid
+     * @param string $paid
+     * @param string $unpaid
      *
      * @return array
      */
-    public function frontpage(Collection $paid, Collection $unpaid);
+    public function frontpage($paid, $unpaid);
 
     /**
      * @param Bill       $bill

app/Generator/Chart/Bill/ChartJsBillChartGenerator.php

@@ -1,62 +1,48 @@
 <?php
+/**
+ * ChartJsBillChartGenerator.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
 
 namespace FireflyIII\Generator\Chart\Bill;
 
-use Config;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Support\Collection;
-use Preferences;
 
 /**
  * Class ChartJsBillChartGenerator
  *
  * @package FireflyIII\Generator\Chart\Bill
  */
-class ChartJsBillChartGenerator implements BillChartGenerator
+class ChartJsBillChartGenerator implements BillChartGeneratorInterface
 {
 
     /**
-     * @param Collection $paid
-     * @param Collection $unpaid
+     * @param string $paid
+     * @param string $unpaid
      *
      * @return array
      */
-    public function frontpage(Collection $paid, Collection $unpaid)
+    public function frontpage($paid, $unpaid)
     {
-        $paidDescriptions   = [];
-        $paidAmount         = 0;
-        $unpaidDescriptions = [];
-        $unpaidAmount       = 0;
         bcscale(2);
-
-        /** @var TransactionJournal $entry */
-        foreach ($paid as $entry) { // loop paid and create single entry:
-            $paidDescriptions[] = $entry->description;
-            $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               = bcdiv(bcadd($entry[0]->amount_max, $entry[0]->amount_min), 2);
-            $unpaidDescriptions[] = $description;
-            $unpaidAmount         = bcadd($unpaidAmount, $amount);
-            unset($amount, $description);
-        }
-
         $data = [
             [
-                'value'     => $unpaidAmount,
+                'value'     => round($unpaid, 2),
                 'color'     => 'rgba(53, 124, 165,0.7)',
                 'highlight' => 'rgba(53, 124, 165,0.9)',
                 'label'     => trans('firefly.unpaid'),
             ],
             [
-                'value'     => $paidAmount,
+                'value'     => round($paid * -1, 2), // paid is negative, must be positive.
                 'color'     => 'rgba(0, 141, 76, 0.7)',
                 'highlight' => 'rgba(0, 141, 76, 0.9)',
                 'label'     => trans('firefly.paid'),
-            ]
+            ],
         ];
 
         return $data;
@@ -70,28 +56,24 @@ class ChartJsBillChartGenerator implements BillChartGenerator
      */
     public function single(Bill $bill, Collection $entries)
     {
-        // language:
-        $language = Preferences::get('language', 'en')->data;
-        $format   = Config::get('firefly.month.' . $language);
-
-        $data = [
+        $format       = (string)trans('config.month');
+        $data         = [
             'count'    => 3,
             'labels'   => [],
             'datasets' => [],
         ];
-
-        // dataset: max amount
-        // dataset: min amount
-        // dataset: actual amount
-
         $minAmount    = [];
         $maxAmount    = [];
         $actualAmount = [];
+        /** @var TransactionJournal $entry */
         foreach ($entries as $entry) {
             $data['labels'][] = $entry->date->formatLocalized($format);
             $minAmount[]      = round($bill->amount_min, 2);
             $maxAmount[]      = round($bill->amount_max, 2);
-            $actualAmount[]   = round(($entry->amount * -1), 2);
+            /*
+             * journalAmount has been collected in BillRepository::getJournals
+             */
+            $actualAmount[] = round(($entry->journalAmount * -1), 2);
         }
 
         $data['datasets'][] = [

app/Generator/Chart/Budget/BudgetChartGeneratorInterface.php

@@ -1,15 +1,22 @@
 <?php
+/**
+ * BudgetChartGeneratorInterface.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
 
 namespace FireflyIII\Generator\Chart\Budget;
 
 use Illuminate\Support\Collection;
 
 /**
- * Interface BudgetChartGenerator
+ * Interface BudgetChartGeneratorInterface
  *
  * @package FireflyIII\Generator\Chart\Budget
  */
-interface BudgetChartGenerator
+interface BudgetChartGeneratorInterface
 {
     /**
      * @param Collection $entries
@@ -32,6 +39,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

@@ -12,7 +12,7 @@ use Preferences;
  *
  * @package FireflyIII\Generator\Chart\Budget
  */
-class ChartJsBudgetChartGenerator implements BudgetChartGenerator
+class ChartJsBudgetChartGenerator implements BudgetChartGeneratorInterface
 {
 
     /**
@@ -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'  => [],
-                ]
+                ],
             ],
         ];
 
@@ -68,24 +68,24 @@ class ChartJsBudgetChartGenerator implements BudgetChartGenerator
      */
     public function frontpage(Collection $entries)
     {
-        $data = [
+        $data      = [
             'count'    => 0,
             'labels'   => [],
             'datasets' => [],
         ];
-        // dataset: left
-        // dataset: spent
-        // dataset: overspent
         $left      = [];
         $spent     = [];
         $overspent = [];
-        foreach ($entries as $entry) {
-            if ($entry[1] != 0 || $entry[2] != 0 || $entry[3] != 0) {
-                $data['labels'][] = $entry[0];
-                $left[]           = round($entry[1], 2);
-                $spent[]          = round($entry[2], 2);
-                $overspent[]      = round($entry[3], 2);
+        $filtered  = $entries->filter(
+            function ($entry) {
+                return ($entry[1] != 0 || $entry[2] != 0 || $entry[3] != 0);
             }
+        );
+        foreach ($filtered as $entry) {
+            $data['labels'][] = $entry[0];
+            $left[]           = round($entry[1], 2);
+            $spent[]          = round($entry[2] * -1, 2); // spent is coming in negative, must be positive
+            $overspent[]      = round($entry[3] * -1, 2); // same
         }
 
         $data['datasets'][] = [
@@ -106,6 +106,40 @@ 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();
+        $keys  = array_keys($first['budgeted']);
+        foreach ($keys as $year) {
+            $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;
+
+    }
+
     /**
      * @param Collection $budgets
      * @param Collection $entries
@@ -115,8 +149,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 = (string)trans('config.month');
 
         $data = [
             'labels'   => [],

app/Generator/Chart/Category/CategoryChartGeneratorInterface.php

@@ -1,15 +1,22 @@
 <?php
+/**
+ * CategoryChartGeneratorInterface.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
 
 namespace FireflyIII\Generator\Chart\Category;
 
 use Illuminate\Support\Collection;
 
 /**
- * Interface CategoryChartGenerator
+ * Interface CategoryChartGeneratorInterface
  *
  * @package FireflyIII\Generator\Chart\Category
  */
-interface CategoryChartGenerator
+interface CategoryChartGeneratorInterface
 {
 
     /**
@@ -19,6 +26,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
      *
@@ -26,6 +41,13 @@ interface CategoryChartGenerator
      */
     public function frontpage(Collection $entries);
 
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function multiYear(Collection $entries);
+
     /**
      * @param Collection $entries
      *
@@ -33,20 +55,11 @@ interface CategoryChartGenerator
      */
     public function period(Collection $entries);
 
-
     /**
      * @param Collection $categories
      * @param Collection $entries
      *
      * @return array
      */
-    public function spentInYear(Collection $categories, Collection $entries);
-
-    /**
-     * @param Collection $categories
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function earnedInYear(Collection $categories, Collection $entries);
+    public function spentInPeriod(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;
 
 
 /**
@@ -12,7 +10,7 @@ use Preferences;
  *
  * @package FireflyIII\Generator\Chart\Category
  */
-class ChartJsCategoryChartGenerator implements CategoryChartGenerator
+class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
 {
 
     /**
@@ -30,12 +28,12 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
             'datasets' => [
                 [
                     'label' => trans('firefly.spent'),
-                    'data'  => []
+                    'data'  => [],
                 ],
                 [
                     'label' => trans('firefly.earned'),
-                    'data'  => []
-                ]
+                    'data'  => [],
+                ],
             ],
         ];
 
@@ -51,58 +49,17 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
         return $data;
     }
 
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function frontpage(Collection $entries)
-    {
-        $data = [
-            'count'    => 1,
-            'labels'   => [],
-            'datasets' => [
-                [
-                    'label' => trans('firefly.spent'),
-                    'data'  => []
-                ]
-            ],
-        ];
-        foreach ($entries as $entry) {
-            if ($entry['sum'] != 0) {
-                $data['labels'][]              = $entry['name'];
-                $data['datasets'][0]['data'][] = round(($entry['sum'] * -1), 2);
-            }
-        }
-
-        return $data;
-    }
-
-    /**
-     * @codeCoverageIgnore
-     *
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function period(Collection $entries)
-    {
-        return $this->all($entries);
-
-    }
-
     /**
      * @param Collection $categories
      * @param Collection $entries
      *
      * @return array
      */
-    public function spentInYear(Collection $categories, Collection $entries)
+    public function earnedInPeriod(Collection $categories, Collection $entries)
     {
 
         // language:
-        $language = Preferences::get('language', 'en')->data;
-        $format   = Config::get('firefly.month.' . $language);
+        $format = (string)trans('config.month');
 
         $data = [
             'count'    => 0,
@@ -125,18 +82,95 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
 
     }
 
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function frontpage(Collection $entries)
+    {
+        $data = [
+            'count'    => 1,
+            'labels'   => [],
+            'datasets' => [
+                [
+                    'label' => trans('firefly.spent'),
+                    'data'  => [],
+                ],
+            ],
+        ];
+        foreach ($entries as $entry) {
+            if ($entry->spent != 0) {
+                $data['labels'][]              = $entry->name;
+                $data['datasets'][0]['data'][] = round(($entry->spent * -1), 2);
+            }
+        }
+
+        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();
+        $keys  = array_keys($first['spent']);
+        foreach ($keys as $year) {
+            $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;
+
+    }
+
+    /**
+     * @codeCoverageIgnore
+     *
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function period(Collection $entries)
+    {
+        return $this->all($entries);
+
+    }
+
     /**
      * @param Collection $categories
      * @param Collection $entries
      *
      * @return array
      */
-    public function earnedInYear(Collection $categories, Collection $entries)
+    public function spentInPeriod(Collection $categories, Collection $entries)
     {
 
         // language:
-        $language = Preferences::get('language', 'en')->data;
-        $format   = Config::get('firefly.month.' . $language);
+        $format = (string)trans('config.month');
 
         $data = [
             'count'    => 0,

app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php

@@ -3,9 +3,7 @@
 namespace FireflyIII\Generator\Chart\PiggyBank;
 
 use Carbon\Carbon;
-use Config;
 use Illuminate\Support\Collection;
-use Preferences;
 
 
 /**
@@ -13,7 +11,7 @@ use Preferences;
  *
  * @package FireflyIII\Generator\Chart\PiggyBank
  */
-class ChartJsPiggyBankChartGenerator implements PiggyBankChartGenerator
+class ChartJsPiggyBankChartGenerator implements PiggyBankChartGeneratorInterface
 {
 
     /**
@@ -25,8 +23,7 @@ class ChartJsPiggyBankChartGenerator implements PiggyBankChartGenerator
     {
 
         // language:
-        $language = Preferences::get('language', 'en')->data;
-        $format   = Config::get('firefly.monthAndDay.' . $language);
+        $format = (string)trans('config.month_and_day');
 
         $data = [
             'count'    => 1,
@@ -34,8 +31,8 @@ class ChartJsPiggyBankChartGenerator implements PiggyBankChartGenerator
             'datasets' => [
                 [
                     'label' => 'Diff',
-                    'data'  => []
-                ]
+                    'data'  => [],
+                ],
             ],
         ];
         $sum  = '0';

app/Generator/Chart/PiggyBank/PiggyBankChartGenerator.php

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

app/Generator/Chart/PiggyBank/PiggyBankChartGeneratorInterface.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * PiggyBankChartGenerator.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+namespace FireflyIII\Generator\Chart\PiggyBank;
+
+use Illuminate\Support\Collection;
+
+/**
+ * Interface PiggyBankChartGeneratorInterface
+ *
+ * @package FireflyIII\Generator\Chart\PiggyBank
+ */
+interface PiggyBankChartGeneratorInterface
+{
+    /**
+     * @param Collection $set
+     *
+     * @return array
+     */
+    public function history(Collection $set);
+}

app/Generator/Chart/Report/ChartJsReportChartGenerator.php

@@ -2,18 +2,80 @@
 
 namespace FireflyIII\Generator\Chart\Report;
 
-use Config;
 use Illuminate\Support\Collection;
-use Preferences;
 
 /**
  * Class ChartJsReportChartGenerator
  *
  * @package FireflyIII\Generator\Chart\Report
  */
-class ChartJsReportChartGenerator implements ReportChartGenerator
+class ChartJsReportChartGenerator implements ReportChartGeneratorInterface
 {
 
+    /**
+     * 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
+     * @param int    $count
+     *
+     * @return array
+     */
+    public function multiYearInOutSummarized($income, $expense, $count)
+    {
+        $data                          = [
+            'count'    => 2,
+            'labels'   => [trans('firefly.sum_of_years'), trans('firefly.average_of_years')],
+            'datasets' => [
+                [
+                    'label' => trans('firefly.income'),
+                    'data'  => [],
+                ],
+                [
+                    'label' => trans('firefly.expenses'),
+                    'data'  => [],
+                ],
+            ],
+        ];
+        $data['datasets'][0]['data'][] = round($income, 2);
+        $data['datasets'][1]['data'][] = round($expense, 2);
+        $data['datasets'][0]['data'][] = round(($income / $count), 2);
+        $data['datasets'][1]['data'][] = round(($expense / $count), 2);
+
+        return $data;
+    }
+
     /**
      * @param Collection $entries
      *
@@ -22,8 +84,7 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
     public function yearInOut(Collection $entries)
     {
         // language:
-        $language = Preferences::get('language', 'en')->data;
-        $format   = Config::get('firefly.month.' . $language);
+        $format = (string)trans('config.month');
 
         $data = [
             'count'    => 2,
@@ -31,12 +92,12 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
             'datasets' => [
                 [
                     'label' => trans('firefly.income'),
-                    'data'  => []
+                    'data'  => [],
                 ],
                 [
                     'label' => trans('firefly.expenses'),
-                    'data'  => []
-                ]
+                    'data'  => [],
+                ],
             ],
         ];
 
@@ -65,18 +126,18 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
             'datasets' => [
                 [
                     'label' => trans('firefly.income'),
-                    'data'  => []
+                    'data'  => [],
                 ],
                 [
                     'label' => trans('firefly.expenses'),
-                    'data'  => []
-                ]
+                    'data'  => [],
+                ],
             ],
         ];
         $data['datasets'][0]['data'][] = round($income, 2);
-        $data['datasets'][1]['data'][] = round( $expense, 2);
+        $data['datasets'][1]['data'][] = round($expense, 2);
         $data['datasets'][0]['data'][] = round(($income / $count), 2);
-        $data['datasets'][1]['data'][] = round(( $expense / $count), 2);
+        $data['datasets'][1]['data'][] = round(($expense / $count), 2);
 
         return $data;
     }

app/Generator/Chart/Report/ReportChartGenerator.php

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

app/Generator/Chart/Report/ReportChartGeneratorInterface.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * ReportChartGenerator.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+namespace FireflyIII\Generator\Chart\Report;
+
+use Illuminate\Support\Collection;
+
+/**
+ * Interface ReportChartGeneratorInterface
+ *
+ * @package FireflyIII\Generator\Chart\Report
+ */
+interface ReportChartGeneratorInterface
+{
+
+    /**
+     * @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
+     *
+     * @return array
+     */
+    public function yearInOut(Collection $entries);
+
+    /**
+     * @param string $income
+     * @param string $expense
+     * @param int    $count
+     *
+     * @return array
+     */
+    public function yearInOutSummarized($income, $expense, $count);
+
+}

app/Handlers/Events/ConnectJournalToPiggyBank.php

@@ -1,7 +1,7 @@
 <?php namespace FireflyIII\Handlers\Events;
 
 use Auth;
-use FireflyIII\Events\JournalCreated;
+use FireflyIII\Events\TransactionJournalStored;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Models\TransactionJournal;
@@ -26,15 +26,13 @@ class ConnectJournalToPiggyBank
     }
 
     /**
-     * Handle the event when journal is saved.
+     * Connect a new transaction journal to any related piggy banks.
      *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     *
-     * @param  JournalCreated $event
+     * @param  TransactionJournalStored $event
      *
      * @return boolean
      */
-    public function handle(JournalCreated $event)
+    public function handle(TransactionJournalStored $event)
     {
         /** @var TransactionJournal $journal */
         $journal     = $event->journal;
@@ -44,12 +42,12 @@ class ConnectJournalToPiggyBank
         $piggyBank = Auth::user()->piggybanks()->where('piggy_banks.id', $piggyBankId)->first(['piggy_banks.*']);
 
         if (is_null($piggyBank)) {
-            return false;
+            return true;
         }
         // update piggy bank rep for date of transaction journal.
         $repetition = $piggyBank->piggyBankRepetitions()->relevantOnDate($journal->date)->first();
         if (is_null($repetition)) {
-            return false;
+            return true;
         }
         bcscale(2);
 

app/Handlers/Events/FireRulesForStore.php

@@ -0,0 +1,77 @@
+<?php
+/**
+ * FireRulesForStore.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+namespace FireflyIII\Handlers\Events;
+
+
+use FireflyIII\Events\TransactionJournalStored;
+use FireflyIII\Models\Rule;
+use FireflyIII\Models\RuleGroup;
+use FireflyIII\Rules\Processor;
+use FireflyIII\User;
+use Illuminate\Support\Facades\Auth;
+use Log;
+
+/**
+ * Class FireRulesForStore
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class FireRulesForStore
+{
+    /**
+     * Create the event handler.
+     *
+     * @codeCoverageIgnore
+     *
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Connect a new transaction journal to any related piggy banks.
+     *
+     * @param  TransactionJournalStored $event
+     *
+     * @return boolean
+     */
+    public function handle(TransactionJournalStored $event)
+    {
+        // get all the user's rule groups, with the rules, order by 'order'.
+        /** @var User $user */
+        $user   = Auth::user();
+        $groups = $user->ruleGroups()->where('rule_groups.active', 1)->orderBy('order', 'ASC')->get();
+        //
+        /** @var RuleGroup $group */
+        foreach ($groups as $group) {
+            Log::debug('Now processing group "' . $group->title . '".');
+            $rules = $group->rules()
+                           ->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id')
+                           ->where('rule_triggers.trigger_type', 'user_action')
+                           ->where('rule_triggers.trigger_value', 'store-journal')
+                           ->where('rules.active', 1)
+                           ->get(['rules.*']);
+            /** @var Rule $rule */
+            foreach ($rules as $rule) {
+                Log::debug('Now handling rule #' . $rule->id . ' (' . $rule->title . ')');
+                $processor = new Processor($rule, $event->journal);
+
+                // get some return out of this?
+                $processor->handle();
+
+                if ($rule->stop_processing) {
+                    break;
+                }
+
+            }
+        }
+    }
+}

app/Handlers/Events/FireRulesForUpdate.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ * FireRulesForUpdate.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+namespace FireflyIII\Handlers\Events;
+
+use Auth;
+use FireflyIII\Events\TransactionJournalUpdated;
+use FireflyIII\Models\Rule;
+use FireflyIII\Models\RuleGroup;
+use FireflyIII\Rules\Processor;
+use FireflyIII\User;
+use Log;
+
+/**
+ * Class FireRulesForUpdate
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class FireRulesForUpdate
+{
+    /**
+     * Create the event handler.
+     *
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  TransactionJournalUpdated $event
+     *
+     * @return void
+     */
+    public function handle(TransactionJournalUpdated $event)
+    {
+        // get all the user's rule groups, with the rules, order by 'order'.
+        /** @var User $user */
+        $user   = Auth::user();
+        $groups = $user->ruleGroups()->where('rule_groups.active', 1)->orderBy('order', 'ASC')->get();
+        //
+        /** @var RuleGroup $group */
+        foreach ($groups as $group) {
+            Log::debug('Now processing group "' . $group->title . '".');
+            $rules = $group->rules()
+                           ->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id')
+                           ->where('rule_triggers.trigger_type', 'user_action')
+                           ->where('rule_triggers.trigger_value', 'update-journal')
+                           ->where('rules.active', 1)
+                           ->get(['rules.*']);
+            /** @var Rule $rule */
+            foreach ($rules as $rule) {
+                Log::debug('Now handling rule #' . $rule->id . ' (' . $rule->title . ')');
+                $processor = new Processor($rule, $event->journal);
+
+                // get some return out of this?
+                $processor->handle();
+
+                if ($rule->stop_processing) {
+                    break;
+                }
+
+            }
+        }
+    }
+}

app/Handlers/Events/RescanJournal.php

@@ -1,52 +0,0 @@
-<?php namespace FireflyIII\Handlers\Events;
-
-use FireflyIII\Events\JournalSaved;
-use Log;
-
-/**
- * Class RescanJournal
- *
- * @codeCoverageIgnore
- * @package FireflyIII\Handlers\Events
- */
-class RescanJournal
-{
-
-    /**
-     * Create the event handler.
-     *
-     */
-    public function __construct()
-    {
-        //
-    }
-
-    /**
-     * Handle the event.
-     *
-     * @param  JournalSaved $event
-     *
-     * @return void
-     */
-    public function handle(JournalSaved $event)
-    {
-        $journal = $event->journal;
-
-        Log::debug('Triggered saved event for journal #' . $journal->id . ' (' . $journal->description . ')');
-
-        /** @var \FireflyIII\Repositories\Bill\BillRepositoryInterface $repository */
-        $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.');
-
-        /** @var \FireflyIII\Models\Bill $bill */
-        foreach ($list as $bill) {
-            Log::debug('Now calling bill #' . $bill->id . ' (' . $bill->name . ')');
-            $repository->scan($bill, $journal);
-        }
-
-        Log::debug('Done!');
-    }
-
-}

app/Handlers/Events/ScanForBillsAfterStore.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * RescanJournalAfterStore.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+namespace FireflyIII\Handlers\Events;
+
+use FireflyIII\Events\TransactionJournalStored;
+use FireflyIII\Support\Events\BillScanner;
+use Log;
+
+/**
+ * Class RescanJournal
+ *
+ * @codeCoverageIgnore
+ * @package FireflyIII\Handlers\Events
+ */
+class ScanForBillsAfterStore
+{
+
+    /**
+     * Create the event handler.
+     *
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Scan a transaction journal for possible links to bills, right after storing.
+     *
+     * @param  TransactionJournalStored $event
+     *
+     * @return void
+     */
+    public function handle(TransactionJournalStored $event)
+    {
+        $journal = $event->journal;
+        BillScanner::scan($journal);
+    }
+
+}

app/Handlers/Events/ScanForBillsAfterUpdate.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * ScanForBillsAfterUpdate.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+namespace FireflyIII\Handlers\Events;
+
+use FireflyIII\Events\TransactionJournalUpdated;
+use FireflyIII\Support\Events\BillScanner;
+use Log;
+
+/**
+ * Class RescanJournal
+ *
+ * @codeCoverageIgnore
+ * @package FireflyIII\Handlers\Events
+ */
+class ScanForBillsAfterUpdate
+{
+
+    /**
+     * Create the event handler.
+     *
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Scan a transaction journal for possibly related bills after it has been updated.
+     *
+     * @param  TransactionJournalUpdated $event
+     *
+     * @return void
+     */
+    public function handle(TransactionJournalUpdated $event)
+    {
+        $journal = $event->journal;
+        BillScanner::scan($journal);
+    }
+
+}

app/Handlers/Events/UpdateJournalConnection.php

@@ -1,6 +1,6 @@
 <?php namespace FireflyIII\Handlers\Events;
 
-use FireflyIII\Events\JournalSaved;
+use FireflyIII\Events\TransactionJournalUpdated;
 use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Models\PiggyBankRepetition;
 
@@ -25,11 +25,11 @@ class UpdateJournalConnection
     /**
      * Handle the event.
      *
-     * @param  JournalSaved $event
+     * @param  TransactionJournalUpdated $event
      *
      * @return void
      */
-    public function handle(JournalSaved $event)
+    public function handle(TransactionJournalUpdated $event)
     {
         $journal = $event->journal;
 

app/Helpers/Attachments/AttachmentHelper.php

@@ -19,14 +19,14 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
 class AttachmentHelper implements AttachmentHelperInterface
 {
 
-    /** @var int */
-    protected $maxUploadSize;
-    /** @var array */
-    protected $allowedMimes;
     /** @var MessageBag */
     public $errors;
     /** @var MessageBag */
     public $messages;
+    /** @var array */
+    protected $allowedMimes;
+    /** @var int */
+    protected $maxUploadSize;
 
     /**
      *
@@ -51,6 +51,22 @@ class AttachmentHelper implements AttachmentHelperInterface
         return $path;
     }
 
+    /**
+     * @return MessageBag
+     */
+    public function getErrors()
+    {
+        return $this->errors;
+    }
+
+    /**
+     * @return MessageBag
+     */
+    public function getMessages()
+    {
+        return $this->messages;
+    }
+
     /**
      * @param Model $model
      *
@@ -67,7 +83,9 @@ class AttachmentHelper implements AttachmentHelperInterface
                 }
             }
         } else {
-            $this->processFile($files, $model);
+            if (!is_null($files)) {
+                $this->processFile($files, $model);
+            }
         }
 
         return true;
@@ -87,7 +105,7 @@ class AttachmentHelper implements AttachmentHelperInterface
         $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]);
+            $msg = (string)trans('validation.file_already_attached', ['name' => $name]);
             $this->errors->add('attachments', $msg);
 
             return true;
@@ -96,27 +114,6 @@ class AttachmentHelper implements AttachmentHelperInterface
         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
@@ -154,7 +151,7 @@ class AttachmentHelper implements AttachmentHelperInterface
         $attachment->save();
 
         $name = e($file->getClientOriginalName()); // add message:
-        $msg  = trans('validation.file_attached', ['name' => $name]);
+        $msg  = (string)trans('validation.file_attached', ['name' => $name]);
         $this->messages->add('attachments', $msg);
 
         // return it.
@@ -174,7 +171,7 @@ class AttachmentHelper implements AttachmentHelperInterface
         $name = e($file->getClientOriginalName());
 
         if (!in_array($mime, $this->allowedMimes)) {
-            $msg = trans('validation.file_invalid_mime', ['name' => $name, 'mime' => $mime]);
+            $msg = (string)trans('validation.file_invalid_mime', ['name' => $name, 'mime' => $mime]);
             $this->errors->add('attachments', $msg);
 
             return false;
@@ -193,7 +190,7 @@ class AttachmentHelper implements AttachmentHelperInterface
         $size = $file->getSize();
         $name = e($file->getClientOriginalName());
         if ($size > $this->maxUploadSize) {
-            $msg = trans('validation.file_too_large', ['name' => $name]);
+            $msg = (string)trans('validation.file_too_large', ['name' => $name]);
             $this->errors->add('attachments', $msg);
 
             return false;
@@ -203,19 +200,24 @@ class AttachmentHelper implements AttachmentHelperInterface
     }
 
     /**
-     * @return MessageBag
+     * @param UploadedFile $file
+     * @param Model        $model
+     *
+     * @return bool
      */
-    public function getErrors()
+    protected function validateUpload(UploadedFile $file, Model $model)
     {
-        return $this->errors;
-    }
+        if (!$this->validMime($file)) {
+            return false;
+        }
+        if (!$this->validSize($file)) {
+            return false;
+        }
+        if ($this->hasFile($file, $model)) {
+            return false;
+        }
 
-    /**
-     * @return MessageBag
-     */
-    public function getMessages()
-    {
-        return $this->messages;
+        return true;
     }
 
 

app/Helpers/Attachments/AttachmentHelperInterface.php

@@ -15,11 +15,11 @@ interface AttachmentHelperInterface
 {
 
     /**
-     * @param Model $model
+     * @param Attachment $attachment
      *
-     * @return bool
+     * @return mixed
      */
-    public function saveAttachmentsForModel(Model $model);
+    public function getAttachmentLocation(Attachment $attachment);
 
     /**
      * @return MessageBag
@@ -32,10 +32,10 @@ interface AttachmentHelperInterface
     public function getMessages();
 
     /**
-     * @param Attachment $attachment
+     * @param Model $model
      *
-     * @return mixed
+     * @return bool
      */
-    public function getAttachmentLocation(Attachment $attachment);
+    public function saveAttachmentsForModel(Model $model);
 
 }

app/Helpers/Collection/BalanceLine.php

@@ -3,7 +3,6 @@
 namespace FireflyIII\Helpers\Collection;
 
 use FireflyIII\Models\Budget as BudgetModel;
-use FireflyIII\Models\LimitRepetition;
 use Illuminate\Support\Collection;
 
 /**
@@ -26,9 +25,6 @@ class BalanceLine
     /** @var BudgetModel */
     protected $budget;
 
-    /** @var  LimitRepetition */
-    protected $repetition;
-
     protected $role = self::ROLE_DEFAULTROLE;
 
     /**
@@ -48,24 +44,19 @@ class BalanceLine
     }
 
     /**
-     * @return string
+     * @return Collection
      */
-    public function getTitle()
+    public function getBalanceEntries()
     {
-        if ($this->getBudget() instanceof BudgetModel) {
-            return $this->getBudget()->name;
-        }
-        if ($this->getRole() == self::ROLE_DEFAULTROLE) {
-            return trans('firefly.noBudget');
-        }
-        if ($this->getRole() == self::ROLE_TAGROLE) {
-            return trans('firefly.coveredWithTags');
-        }
-        if ($this->getRole() == self::ROLE_DIFFROLE) {
-            return trans('firefly.leftUnbalanced');
-        }
+        return $this->balanceEntries;
+    }
 
-        return '';
+    /**
+     * @param Collection $balanceEntries
+     */
+    public function setBalanceEntries($balanceEntries)
+    {
+        $this->balanceEntries = $balanceEntries;
     }
 
     /**
@@ -100,6 +91,27 @@ class BalanceLine
         $this->role = $role;
     }
 
+    /**
+     * @return string
+     */
+    public function getTitle()
+    {
+        if ($this->getBudget() instanceof BudgetModel) {
+            return $this->getBudget()->name;
+        }
+        if ($this->getRole() == self::ROLE_DEFAULTROLE) {
+            return trans('firefly.noBudget');
+        }
+        if ($this->getRole() == self::ROLE_TAGROLE) {
+            return trans('firefly.coveredWithTags');
+        }
+        if ($this->getRole() == self::ROLE_DIFFROLE) {
+            return trans('firefly.leftUnbalanced');
+        }
+
+        return '';
+    }
+
     /**
      * If a BalanceLine has a budget/repetition, each BalanceEntry in this BalanceLine
      * should have a "spent" value, which is the amount of money that has been spent
@@ -110,7 +122,7 @@ class BalanceLine
      */
     public function leftOfRepetition()
     {
-        $start = $this->getRepetition() ? $this->getRepetition()->amount : 0;
+        $start = isset($this->budget->amount) ? $this->budget->amount : 0;
         /** @var BalanceEntry $balanceEntry */
         foreach ($this->getBalanceEntries() as $balanceEntry) {
             $start += $balanceEntry->getSpent();
@@ -118,56 +130,4 @@ class BalanceLine
 
         return $start;
     }
-
-    /**
-     * @return LimitRepetition
-     */
-    public function getRepetition()
-    {
-        return $this->repetition;
-    }
-
-    /**
-     * @param LimitRepetition $repetition
-     */
-    public function setRepetition($repetition)
-    {
-        $this->repetition = $repetition;
-    }
-
-    /**
-     * @return Collection
-     */
-    public function getBalanceEntries()
-    {
-        return $this->balanceEntries;
-    }
-
-    /**
-     * @param Collection $balanceEntries
-     */
-    public function setBalanceEntries($balanceEntries)
-    {
-        $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

@@ -37,6 +37,7 @@ class Category
         // spent is minus zero for an expense report:
         if ($category->spent < 0) {
             $this->categories->push($category);
+            $this->addTotal($category->spent);
         }
     }
 
@@ -55,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

@@ -2,6 +2,7 @@
 
 namespace FireflyIII\Helpers\Collection;
 
+use Crypt;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Support\Collection;
 use stdClass;
@@ -33,18 +34,24 @@ class Expense
      */
     public function addOrCreateExpense(TransactionJournal $entry)
     {
+        bcscale(2);
+
         $accountId = $entry->account_id;
+        $amount    = strval(round($entry->journalAmount, 2));
+        if (bccomp('0', $amount) === -1) {
+            $amount = bcmul($amount, '-1');
+        }
+
         if (!$this->expenses->has($accountId)) {
             $newObject         = new stdClass;
-            $newObject->amount = strval(round($entry->amount_positive, 2));
-            $newObject->name   = $entry->name;
+            $newObject->amount = $amount;
+            $newObject->name   = Crypt::decrypt($entry->account_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_positive);
+            $existing->amount = bcadd($existing->amount, $amount);
             $existing->count++;
             $this->expenses->put($accountId, $existing);
         }
@@ -55,8 +62,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);
     }
 
@@ -65,7 +82,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

@@ -2,6 +2,7 @@
 
 namespace FireflyIII\Helpers\Collection;
 
+use Crypt;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Support\Collection;
 use stdClass;
@@ -38,15 +39,15 @@ class Income
         $accountId = $entry->account_id;
         if (!$this->incomes->has($accountId)) {
             $newObject         = new stdClass;
-            $newObject->amount = strval(round($entry->amount_positive, 2));
-            $newObject->name   = $entry->name;
+            $newObject->amount = strval(round($entry->journalAmount, 2));
+            $newObject->name   = Crypt::decrypt($entry->account_name);
             $newObject->count  = 1;
             $newObject->id     = $accountId;
             $this->incomes->put($accountId, $newObject);
         } else {
             bcscale(2);
             $existing         = $this->incomes->get($accountId);
-            $existing->amount = bcadd($existing->amount, $entry->amount_positive);
+            $existing->amount = bcadd($existing->amount, $entry->journalAmount);
             $existing->count++;
             $this->incomes->put($accountId, $existing);
         }

app/Helpers/Csv/Converter/Amount.php

@@ -2,8 +2,6 @@
 
 namespace FireflyIII\Helpers\Csv\Converter;
 
-use FireflyIII\Models\Account;
-
 /**
  * Class Amount
  *
@@ -13,7 +11,7 @@ class Amount extends BasicConverter implements ConverterInterface
 {
 
     /**
-     * @return Account|null
+     * @return string|int
      */
     public function convert()
     {

app/Helpers/Csv/Converter/AmountComma.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace FireflyIII\Helpers\Csv\Converter;
+
+/**
+ * Class AmountComma
+ *
+ * Parses the input as the amount with a comma as decimal separator
+ *
+ * @package FireflyIII\Helpers\Csv\Converter
+ */
+class AmountComma extends BasicConverter implements ConverterInterface
+{
+
+    /**
+     * @return float|int
+     */
+    public function convert()
+    {
+        $value = str_replace(',', '.', $this->value);
+
+        if (is_numeric($value)) {
+            return floatval($value);
+        }
+
+        return 0;
+    }
+}

app/Helpers/Csv/Converter/BasicConverter.php

@@ -18,8 +18,6 @@ class BasicConverter
     /** @var  array */
     protected $mapped;
     /** @var string */
-    protected $role;
-    /** @var string */
     protected $value;
 
     /**
@@ -86,22 +84,6 @@ class BasicConverter
         $this->mapped = $mapped;
     }
 
-    /**
-     * @return string
-     */
-    public function getRole()
-    {
-        return $this->role;
-    }
-
-    /**
-     * @param string $role
-     */
-    public function setRole($role)
-    {
-        $this->role = $role;
-    }
-
     /**
      * @return string
      */

app/Helpers/Csv/Converter/BudgetId.php

@@ -5,7 +5,7 @@ use Auth;
 use FireflyIII\Models\Budget;
 
 /**
- * Class AccountId
+ * Class BudgetId
  *
  * @package FireflyIII\Helpers\Csv\Converter
  */

app/Helpers/Csv/Converter/CategoryName.php

@@ -24,7 +24,7 @@ class CategoryName extends BasicConverter implements ConverterInterface
             $category = Category::firstOrCreateEncrypted(
                 [
                     'name'    => $this->value,
-                    'user_id' => Auth::user()->id
+                    'user_id' => Auth::user()->id,
                 ]
             );
         }

app/Helpers/Csv/Converter/ConverterInterface.php

@@ -36,11 +36,6 @@ interface ConverterInterface
      */
     public function setMapped($mapped);
 
-    /**
-     * @param string $role
-     */
-    public function setRole($role);
-
     /**
      * @param string $value
      */

app/Helpers/Csv/Converter/CurrencyCode.php

@@ -13,7 +13,7 @@ class CurrencyCode extends BasicConverter implements ConverterInterface
 {
 
     /**
-     * @return mixed|static
+     * @return TransactionCurrency
      */
     public function convert()
     {

app/Helpers/Csv/Converter/CurrencyId.php

@@ -13,7 +13,7 @@ class CurrencyId extends BasicConverter implements ConverterInterface
 {
 
     /**
-     * @return mixed|static
+     * @return TransactionCurrency
      */
     public function convert()
     {

app/Helpers/Csv/Converter/CurrencyName.php

@@ -13,7 +13,7 @@ class CurrencyName extends BasicConverter implements ConverterInterface
 {
 
     /**
-     * @return mixed|static
+     * @return TransactionCurrency
      */
     public function convert()
     {

app/Helpers/Csv/Converter/CurrencySymbol.php

@@ -13,7 +13,7 @@ class CurrencySymbol extends BasicConverter implements ConverterInterface
 {
 
     /**
-     * @return mixed|static
+     * @return TransactionCurrency
      */
     public function convert()
     {

app/Helpers/Csv/Converter/Date.php

@@ -18,6 +18,7 @@ class Date extends BasicConverter implements ConverterInterface
 
     /**
      * @return Carbon
+     * @throws FireflyException
      */
     public function convert()
     {

app/Helpers/Csv/Converter/Description.php

@@ -12,7 +12,7 @@ class Description extends BasicConverter implements ConverterInterface
 
 
     /**
-     * @return mixed
+     * @return string
      */
     public function convert()
     {

app/Helpers/Csv/Converter/Ignore.php

@@ -2,8 +2,6 @@
 
 namespace FireflyIII\Helpers\Csv\Converter;
 
-use FireflyIII\Models\Account;
-
 /**
  * Class Amount
  *
@@ -13,7 +11,7 @@ class Ignore extends BasicConverter implements ConverterInterface
 {
 
     /**
-     * @return Account|null
+     * @return null
      */
     public function convert()
     {

app/Helpers/Csv/Converter/OpposingAccountId.php

@@ -6,7 +6,7 @@ use Auth;
 use FireflyIII\Models\Account;
 
 /**
- * Class OpposingName
+ * Class OpposingAccountId
  *
  * @package FireflyIII\Helpers\Csv\Converter
  */

app/Helpers/Csv/Converter/OpposingAccountName.php

@@ -6,7 +6,7 @@ use Auth;
 use FireflyIII\Models\Account;
 
 /**
- * Class OpposingName
+ * Class OpposingAccountName
  *
  * @package FireflyIII\Helpers\Csv\Converter
  */

app/Helpers/Csv/Converter/RabobankDebetCredit.php

@@ -13,7 +13,7 @@ class RabobankDebetCredit extends BasicConverter implements ConverterInterface
 
 
     /**
-     * @return mixed
+     * @return int
      */
     public function convert()
     {

app/Helpers/Csv/Converter/TagsComma.php

@@ -3,7 +3,6 @@
 namespace FireflyIII\Helpers\Csv\Converter;
 
 use Auth;
-use FireflyIII\Models\Bill;
 use FireflyIII\Models\Tag;
 use Illuminate\Support\Collection;
 
@@ -16,7 +15,7 @@ class TagsComma extends BasicConverter implements ConverterInterface
 {
 
     /**
-     * @return Bill
+     * @return Collection
      */
     public function convert()
     {

app/Helpers/Csv/Converter/TagsSpace.php

@@ -3,7 +3,6 @@
 namespace FireflyIII\Helpers\Csv\Converter;
 
 use Auth;
-use FireflyIII\Models\Bill;
 use FireflyIII\Models\Tag;
 use Illuminate\Support\Collection;
 
@@ -16,7 +15,7 @@ class TagsSpace extends BasicConverter implements ConverterInterface
 {
 
     /**
-     * @return Bill
+     * @return Collection
      */
     public function convert()
     {

app/Helpers/Csv/Data.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace FireflyIII\Helpers\Csv;
 
 use Crypt;
@@ -16,14 +15,16 @@ class Data
 
     /** @var string */
     protected $csvFileContent;
-
     /** @var string */
     protected $csvFileLocation;
     /** @var  string */
     protected $dateFormat;
+    /** @var  string */
+    protected $delimiter;
     /** @var  bool */
     protected $hasHeaders;
-
+    /** @var int */
+    protected $importAccount = 0;
     /** @var  array */
     protected $map = [];
     /** @var  array */
@@ -32,15 +33,10 @@ class Data
     protected $reader;
     /** @var  array */
     protected $roles = [];
-
     /** @var  array */
     protected $specifix = [];
 
-    /** @var int */
-    protected $importAccount = 0;
-
     /**
-     *
      */
     public function __construct()
     {
@@ -52,6 +48,234 @@ class Data
         $this->sessionMapped();
         $this->sessionSpecifix();
         $this->sessionImportAccount();
+        $this->sessionDelimiter();
+    }
+
+    /**
+     *
+     * @return string
+     */
+    public function getCsvFileContent()
+    {
+        return $this->csvFileContent;
+    }
+
+    /**
+     *
+     * @param string $csvFileContent
+     */
+    public function setCsvFileContent($csvFileContent)
+    {
+        $this->csvFileContent = $csvFileContent;
+    }
+
+    /**
+     *
+     * @return string
+     */
+    public function getCsvFileLocation()
+    {
+        return $this->csvFileLocation;
+    }
+
+    /**
+     *
+     * @param string $csvFileLocation
+     */
+    public function setCsvFileLocation($csvFileLocation)
+    {
+        Session::put('csv-file', $csvFileLocation);
+        $this->csvFileLocation = $csvFileLocation;
+    }
+
+    /**
+     *
+     * @return string
+     */
+    public function getDateFormat()
+    {
+        return $this->dateFormat;
+    }
+
+    /**
+     *
+     * @param mixed $dateFormat
+     */
+    public function setDateFormat($dateFormat)
+    {
+        Session::put('csv-date-format', $dateFormat);
+        $this->dateFormat = $dateFormat;
+    }
+
+    /**
+     *
+     * @return string
+     */
+    public function getDelimiter()
+    {
+        return $this->delimiter;
+    }
+
+    /**
+     *
+     * @param string $delimiter
+     */
+    public function setDelimiter($delimiter)
+    {
+        Session::put('csv-delimiter', $delimiter);
+        $this->delimiter = $delimiter;
+    }
+
+    /**
+     *
+     * @return array
+     */
+    public function getMap()
+    {
+        return $this->map;
+    }
+
+    /**
+     *
+     * @param array $map
+     */
+    public function setMap(array $map)
+    {
+        Session::put('csv-map', $map);
+        $this->map = $map;
+    }
+
+    /**
+     *
+     * @return array
+     */
+    public function getMapped()
+    {
+        return $this->mapped;
+    }
+
+    /**
+     *
+     * @param array $mapped
+     */
+    public function setMapped(array $mapped)
+    {
+        Session::put('csv-mapped', $mapped);
+        $this->mapped = $mapped;
+    }
+
+    /**
+     *
+     * @return Reader
+     */
+    public function getReader()
+    {
+        if (strlen($this->csvFileContent) === 0) {
+            $this->loadCsvFile();
+        }
+
+        if (is_null($this->reader)) {
+            $this->reader = Reader::createFromString($this->getCsvFileContent());
+            $this->reader->setDelimiter($this->delimiter);
+        }
+
+        return $this->reader;
+    }
+
+    /**
+     *
+     * @return array
+     */
+    public function getRoles()
+    {
+        return $this->roles;
+    }
+
+    /**
+     *
+     * @param array $roles
+     */
+    public function setRoles(array $roles)
+    {
+        Session::put('csv-roles', $roles);
+        $this->roles = $roles;
+    }
+
+    /**
+     *
+     * @return array
+     */
+    public function getSpecifix()
+    {
+        return is_array($this->specifix) ? $this->specifix : [];
+    }
+
+    /**
+     *
+     * @param array $specifix
+     */
+    public function setSpecifix(array $specifix)
+    {
+        Session::put('csv-specifix', $specifix);
+        $this->specifix = $specifix;
+    }
+
+    /**
+     *
+     * @return bool
+     */
+    public function hasHeaders()
+    {
+        return $this->hasHeaders;
+    }
+
+    /**
+     *
+     * @param bool $hasHeaders
+     */
+    public function setHasHeaders($hasHeaders)
+    {
+        Session::put('csv-has-headers', $hasHeaders);
+        $this->hasHeaders = $hasHeaders;
+    }
+
+    /**
+     *
+     * @param int $importAccount
+     */
+    public function setImportAccount($importAccount)
+    {
+        Session::put('csv-import-account', $importAccount);
+        $this->importAccount = $importAccount;
+    }
+
+    protected function loadCsvFile()
+    {
+        $file             = $this->getCsvFileLocation();
+        $content          = file_get_contents($file);
+        $contentDecrypted = Crypt::decrypt($content);
+        $this->setCsvFileContent($contentDecrypted);
+    }
+
+    protected function sessionCsvFileLocation()
+    {
+        if (Session::has('csv-file')) {
+            $this->csvFileLocation = (string)Session::get('csv-file');
+        }
+    }
+
+    protected function sessionDateFormat()
+    {
+        if (Session::has('csv-date-format')) {
+            $this->dateFormat = (string)Session::get('csv-date-format');
+        }
+    }
+
+    protected function sessionDelimiter()
+    {
+        if (Session::has('csv-delimiter')) {
+            $this->delimiter = Session::get('csv-delimiter');
+        }
     }
 
     protected function sessionHasHeaders()
@@ -68,20 +292,6 @@ class Data
         }
     }
 
-    protected function sessionDateFormat()
-    {
-        if (Session::has('csv-date-format')) {
-            $this->dateFormat = (string)Session::get('csv-date-format');
-        }
-    }
-
-    protected function sessionCsvFileLocation()
-    {
-        if (Session::has('csv-file')) {
-            $this->csvFileLocation = (string)Session::get('csv-file');
-        }
-    }
-
     protected function sessionMap()
     {
         if (Session::has('csv-map')) {
@@ -89,13 +299,6 @@ class Data
         }
     }
 
-    protected function sessionRoles()
-    {
-        if (Session::has('csv-roles')) {
-            $this->roles = (array)Session::get('csv-roles');
-        }
-    }
-
     protected function sessionMapped()
     {
         if (Session::has('csv-mapped')) {
@@ -103,181 +306,17 @@ class Data
         }
     }
 
+    protected function sessionRoles()
+    {
+        if (Session::has('csv-roles')) {
+            $this->roles = (array)Session::get('csv-roles');
+        }
+    }
+
     protected function sessionSpecifix()
     {
         if (Session::has('csv-specifix')) {
             $this->specifix = (array)Session::get('csv-specifix');
         }
     }
-
-    /**
-     * @return string
-     */
-    public function getDateFormat()
-    {
-        return $this->dateFormat;
-    }
-
-    /**
-     * @param mixed $dateFormat
-     */
-    public function setDateFormat($dateFormat)
-    {
-        Session::put('csv-date-format', $dateFormat);
-        $this->dateFormat = $dateFormat;
-    }
-
-    /**
-     * @param int $importAccount
-     */
-    public function setImportAccount($importAccount)
-    {
-        Session::put('csv-import-account', $importAccount);
-        $this->importAccount = $importAccount;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasHeaders()
-    {
-        return $this->hasHeaders;
-    }
-
-    /**
-     * @param bool $hasHeaders
-     */
-    public function setHasHeaders($hasHeaders)
-    {
-        Session::put('csv-has-headers', $hasHeaders);
-        $this->hasHeaders = $hasHeaders;
-    }
-
-    /**
-     * @return array
-     */
-    public function getMap()
-    {
-        return $this->map;
-    }
-
-    /**
-     * @param array $map
-     */
-    public function setMap(array $map)
-    {
-        Session::put('csv-map', $map);
-        $this->map = $map;
-    }
-
-    /**
-     * @return array
-     */
-    public function getMapped()
-    {
-        return $this->mapped;
-    }
-
-    /**
-     * @param array $mapped
-     */
-    public function setMapped(array $mapped)
-    {
-        Session::put('csv-mapped', $mapped);
-        $this->mapped = $mapped;
-    }
-
-    /**
-     * @return Reader
-     */
-    public function getReader()
-    {
-
-        if (strlen($this->csvFileContent) === 0) {
-            $this->loadCsvFile();
-        }
-
-        if (is_null($this->reader)) {
-            $this->reader = Reader::createFromString($this->getCsvFileContent());
-        }
-
-        return $this->reader;
-    }
-
-    protected function loadCsvFile()
-    {
-        $file             = $this->getCsvFileLocation();
-        $content          = file_get_contents($file);
-        $contentDecrypted = Crypt::decrypt($content);
-        $this->setCsvFileContent($contentDecrypted);
-    }
-
-    /**
-     * @return string
-     */
-    public function getCsvFileLocation()
-    {
-        return $this->csvFileLocation;
-    }
-
-    /**
-     * @param string $csvFileLocation
-     */
-    public function setCsvFileLocation($csvFileLocation)
-    {
-        Session::put('csv-file', $csvFileLocation);
-        $this->csvFileLocation = $csvFileLocation;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCsvFileContent()
-    {
-        return $this->csvFileContent;
-    }
-
-    /**
-     * @param string $csvFileContent
-     */
-    public function setCsvFileContent($csvFileContent)
-    {
-        $this->csvFileContent = $csvFileContent;
-    }
-
-    /**
-     * @return array
-     */
-    public function getRoles()
-    {
-        return $this->roles;
-    }
-
-    /**
-     * @param array $roles
-     */
-    public function setRoles(array $roles)
-    {
-        Session::put('csv-roles', $roles);
-        $this->roles = $roles;
-    }
-
-    /**
-     * @return array
-     */
-    public function getSpecifix()
-    {
-        return is_array($this->specifix) ? $this->specifix : [];
-    }
-
-    /**
-     * @param array $specifix
-     */
-    public function setSpecifix($specifix)
-    {
-        Session::put('csv-specifix', $specifix);
-        $this->specifix = $specifix;
-    }
-
-
 }

app/Helpers/Csv/Importer.php

@@ -9,9 +9,14 @@ 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\Rule;
+use FireflyIII\Models\RuleGroup;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
+use FireflyIII\Rules\Processor;
+use FireflyIII\User;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Collection;
 use Illuminate\Support\MessageBag;
 use Log;
@@ -34,6 +39,8 @@ class Importer
     protected $importRow;
     /** @var int */
     protected $imported = 0;
+    /** @var  Collection */
+    protected $journals;
     /** @var array */
     protected $map;
     /** @var  array */
@@ -45,9 +52,6 @@ class Importer
     /** @var array */
     protected $specifix = [];
 
-    /** @var  Collection */
-    protected $journals;
-
     /**
      * Used by CsvController.
      *
@@ -68,6 +72,14 @@ class Importer
         return $this->imported;
     }
 
+    /**
+     * @return Collection
+     */
+    public function getJournals()
+    {
+        return $this->journals;
+    }
+
     /**
      * Used by CsvController
      *
@@ -79,14 +91,13 @@ class Importer
     }
 
     /**
-     * @return Collection
+     * @return array
      */
-    public function getJournals()
+    public function getSpecifix()
     {
-        return $this->journals;
+        return is_array($this->specifix) ? $this->specifix : [];
     }
 
-
     /**
      * @throws FireflyException
      */
@@ -115,139 +126,19 @@ class Importer
                 Log::debug('---');
             }
         }
-    }
 
-    /**
-     * @param int $index
-     *
-     * @return bool
-     */
-    protected function parseRow($index)
-    {
-        return (($this->data->hasHeaders() && $index >= 1) || !$this->data->hasHeaders());
-    }
-
-    /**
-     * @param $row
-     *
-     * @throws FireflyException
-     * @return string|bool
-     */
-    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('FireflyIII\Helpers\Csv\Converter\\' . $class);
-            $converter->setData($data); // the complete array so far.
-            $converter->setField($field);
-            $converter->setIndex($index);
-            $converter->setMapped($this->mapped);
-            $converter->setValue($value);
-            $converter->setRole($role);
-            $data[$field] = $converter->convert();
-        }
-        // move to class vars.
-        $this->importData = $data;
-        $this->importRow  = $row;
-        unset($data, $row);
-        // post processing and validating.
-        $this->postProcess();
-        $result = $this->validateData();
-
-        if (!($result === true)) {
-            return $result; // return error.
-        }
-        $journal = $this->createTransactionJournal();
-
-        return $journal;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getFiller()
-    {
-        $filler = [];
-        foreach (Config::get('csv.roles') as $role) {
-            if (isset($role['field'])) {
-                $fieldName          = $role['field'];
-                $filler[$fieldName] = null;
-            }
-        }
-        // some extra's:
-        $filler['bill-id']                 = null;
-        $filler['opposing-account-object'] = null;
-        $filler['asset-account-object']    = null;
-        $filler['amount-modifier']         = '1';
-
-        return $filler;
+        // once all journals have been imported (or not)
+        // fire the rules.
+        $this->fireRules();
 
     }
 
     /**
-     * Row denotes the original data.
-     *
-     * @return void
+     * @param Data $data
      */
-    protected function postProcess()
+    public function setData($data)
     {
-        // do bank specific fixes (must be enabled but now all of them.
-
-        foreach ($this->getSpecifix() as $className) {
-            /** @var SpecifixInterface $specifix */
-            $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();
-        }
-
-
-        $set = Config::get('csv.post_processors');
-        foreach ($set as $className) {
-            /** @var PostProcessorInterface $postProcessor */
-            $postProcessor = app('FireflyIII\Helpers\Csv\PostProcessing\\' . $className);
-            $postProcessor->setData($this->importData);
-            Log::debug('Now post-process processor named ' . $className . ':');
-            $this->importData = $postProcessor->process();
-        }
-
-    }
-
-    /**
-     * @return array
-     */
-    public function getSpecifix()
-    {
-        return is_array($this->specifix) ? $this->specifix : [];
-    }
-
-    /**
-     *
-     * @return bool|string
-     */
-    protected function validateData()
-    {
-        if (is_null($this->importData['date']) && is_null($this->importData['date-rent'])) {
-            return 'No date value for this row.';
-        }
-        if (is_null($this->importData['opposing-account-object'])) {
-            return 'Opposing account is null';
-        }
-
-        if (!($this->importData['asset-account-object'] instanceof Account)) {
-            return 'No asset account to import into.';
-        }
-
-        return true;
+        $this->data = $data;
     }
 
     /**
@@ -296,15 +187,15 @@ class Importer
 
         // some debug info:
         $journalId = $journal->id;
-        $type      = $journal->transactionType->type;
+        $type      = $journal->getTransactionType();
         /** @var Account $asset */
         $asset = $this->importData['asset-account-object'];
         /** @var Account $opposing */
         $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));
+        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;
     }
@@ -314,18 +205,104 @@ 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;
     }
 
+    /**
+     * @param $row
+     *
+     * @throws FireflyException
+     * @return string|bool
+     */
+    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 . ':');
+
+            // here would be the place where preprocessors would fire.
+
+            /** @var ConverterInterface $converter */
+            $converter = app('FireflyIII\Helpers\Csv\Converter\\' . $class);
+            $converter->setData($data); // the complete array so far.
+            $converter->setField($field);
+            $converter->setIndex($index);
+            $converter->setMapped($this->mapped);
+            $converter->setValue($value);
+            $data[$field] = $converter->convert();
+        }
+        // move to class vars.
+        $this->importData = $data;
+        $this->importRow  = $row;
+        unset($data, $row);
+        // post processing and validating.
+        $this->postProcess();
+        $result = $this->validateData();
+
+        if (!($result === true)) {
+            return $result; // return error.
+        }
+        $journal = $this->createTransactionJournal();
+
+        return $journal;
+    }
+
+    /**
+     * @param int $index
+     *
+     * @return bool
+     */
+    protected function parseRow($index)
+    {
+        return (($this->data->hasHeaders() && $index >= 1) || !$this->data->hasHeaders());
+    }
+
+    /**
+     * Row denotes the original data.
+     *
+     * @return void
+     */
+    protected function postProcess()
+    {
+        // do bank specific fixes (must be enabled but now all of them.
+
+        foreach ($this->getSpecifix() as $className) {
+            /** @var SpecifixInterface $specifix */
+            $specifix = app('FireflyIII\Helpers\Csv\Specifix\\' . $className);
+            if ($specifix->getProcessorType() == SpecifixInterface::POST_PROCESSOR) {
+                $specifix->setData($this->importData);
+                $specifix->setRow($this->importRow);
+                Log::debug('Now post-process specifix named ' . $className . ':');
+                $this->importData = $specifix->fix();
+            }
+        }
+
+
+        $set = Config::get('csv.post_processors');
+        foreach ($set as $className) {
+            /** @var PostProcessorInterface $postProcessor */
+            $postProcessor = app('FireflyIII\Helpers\Csv\PostProcessing\\' . $className);
+            $postProcessor->setData($this->importData);
+            Log::debug('Now post-process processor named ' . $className . ':');
+            $this->importData = $postProcessor->process();
+        }
+
+    }
+
     /**
      * @param TransactionJournal $journal
      */
@@ -361,11 +338,94 @@ class Importer
     }
 
     /**
-     * @param Data $data
+     *
+     * @return bool|string
      */
-    public function setData($data)
+    protected function validateData()
     {
-        $this->data = $data;
+        if (is_null($this->importData['date']) && is_null($this->importData['date-rent'])) {
+            return 'No date value for this row.';
+        }
+        if (is_null($this->importData['opposing-account-object'])) {
+            return 'Opposing account is null';
+        }
+
+        if (!($this->importData['asset-account-object'] instanceof Account)) {
+            return 'No asset account to import into.';
+        }
+
+        return true;
+    }
+
+    /**
+     * @param Collection         $groups
+     * @param TransactionJournal $journal
+     */
+    private function fireRule(Collection $groups, TransactionJournal $journal)
+    {
+        /** @var RuleGroup $group */
+        foreach ($groups as $group) {
+
+            /** @var Rule $rule */
+            foreach ($group->rules as $rule) {
+                $processor = new Processor($rule, $journal);
+                $processor->handle();
+                if ($rule->stop_processing) {
+                    break;
+                }
+            }
+        }
+    }
+
+    private function fireRules()
+    {
+        // get all users rules.
+        /** @var User $user */
+        $user   = Auth::user();
+        $groups = $user
+            ->ruleGroups()
+            ->where('rule_groups.active', 1)
+            ->orderBy('order', 'ASC')
+            ->with(
+                [
+                    'rules' => function (HasMany $q) {
+                        $q->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id')
+                          ->where('rule_triggers.trigger_type', 'user_action')
+                          ->where('rule_triggers.trigger_value', 'store-journal')
+                          ->where('rules.active', 1)
+                          ->orderBy('rules.order', 'ASC');
+                    },
+                ]
+            )
+            ->get();
+
+        /** @var TransactionJournal $journal */
+        foreach ($this->journals as $journal) {
+            $this->fireRule($groups, $journal);
+        }
+
+    }
+
+    /**
+     * @return array
+     */
+    private function getFiller()
+    {
+        $filler = [];
+        foreach (Config::get('csv.roles') as $role) {
+            if (isset($role['field'])) {
+                $fieldName          = $role['field'];
+                $filler[$fieldName] = null;
+            }
+        }
+        // some extra's:
+        $filler['bill-id']                 = null;
+        $filler['opposing-account-object'] = null;
+        $filler['asset-account-object']    = null;
+        $filler['amount-modifier']         = '1';
+
+        return $filler;
+
     }
 
 }

app/Helpers/Csv/PostProcessing/Currency.php

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

app/Helpers/Csv/PostProcessing/PostProcessorInterface.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 05/07/15
- * Time: 19:20
- */
 
 namespace FireflyIII\Helpers\Csv\PostProcessing;
 

app/Helpers/Csv/Specifix/AbnAmroDescription.php

@@ -0,0 +1,185 @@
+<?php
+
+namespace FireflyIII\Helpers\Csv\Specifix;
+
+use Log;
+
+/**
+ * Parses the description from txt files for ABN AMRO bank accounts.
+ *
+ * Based on the logic as described in the following Gist:
+ * https://gist.github.com/vDorst/68d555a6a90f62fec004
+ *
+ * @package FireflyIII\Helpers\Csv\Specifix
+ */
+class AbnAmroDescription extends Specifix implements SpecifixInterface
+{
+    /** @var array */
+    protected $data;
+
+    /** @var array */
+    protected $row;
+
+    /**
+     * AbnAmroDescription constructor.
+     */
+    public function __construct()
+    {
+        $this->setProcessorType(self::POST_PROCESSOR);
+    }
+
+
+    /**
+     * @return array
+     */
+    public function fix()
+    {
+        // Try to parse the description in known formats.
+        $parsed = $this->parseSepaDescription() || $this->parseTRTPDescription() || $this->parseGEABEADescription() || $this->parseABNAMRODescription();
+
+        // If the description could not be parsed, specify an unknown opposing 
+        // account, as an opposing account is required
+        if (!$parsed) {
+            $this->data['opposing-account-name'] = trans('firefly.unknown');
+        }
+
+        return $this->data;
+    }
+
+    /**
+     * @param array $data
+     */
+    public function setData($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * @param array $row
+     */
+    public function setRow($row)
+    {
+        $this->row = $row;
+    }
+
+    /**
+     * Parses the current description with costs from ABN AMRO itself
+     *
+     * @return boolean true if the description is GEA/BEA-format, false otherwise
+     */
+    protected function parseABNAMRODescription()
+    {
+        // See if the current description is formatted in ABN AMRO format
+        if (preg_match('/ABN AMRO.{24} (.*)/', $this->data['description'], $matches)) {
+            Log::debug('AbnAmroSpecifix: Description is structured as costs from ABN AMRO itself.');
+
+            $this->data['opposing-account-name'] = 'ABN AMRO';
+            $this->data['description']           = $matches[1];
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Parses the current description in GEA/BEA format
+     *
+     * @return boolean true if the description is GEA/BEAformat, false otherwise
+     */
+    protected function parseGEABEADescription()
+    {
+        // See if the current description is formatted in GEA/BEA format
+        if (preg_match('/([BG]EA) +(NR:[a-zA-Z:0-9]+) +([0-9.\/]+) +([^,]*)/', $this->data['description'], $matches)) {
+            Log::debug('AbnAmroSpecifix: Description is structured as GEA or BEA format.');
+
+            // description and opposing account will be the same.
+            $this->data['opposing-account-name'] = $matches[4];
+            $this->data['description']           = $matches[4];
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Parses the current description in SEPA format
+     *
+     * @return boolean true if the description is SEPA format, false otherwise
+     */
+    protected function parseSepaDescription()
+    {
+        // See if the current description is formatted as a SEPA plain description
+        if (preg_match('/^SEPA(.{28})/', $this->data['description'], $matches)) {
+            Log::debug('AbnAmroSpecifix: Description is structured as SEPA plain description.');
+
+            // SEPA plain descriptions contain several key-value pairs, split by a colon
+            preg_match_all('/([A-Za-z]+(?=:\s)):\s([A-Za-z 0-9._#-]+(?=\s))/', $this->data['description'], $matches, PREG_SET_ORDER);
+
+            if (is_array($matches)) {
+                foreach ($matches as $match) {
+                    $key   = $match[1];
+                    $value = trim($match[2]);
+
+                    switch (strtoupper($key)) {
+                        case 'OMSCHRIJVING':
+                            $this->data['description'] = $value;
+                            break;
+                        case 'NAAM':
+                            $this->data['opposing-account-name'] = $value;
+                            break;
+                        case 'IBAN':
+                            $this->data['opposing-account-iban'] = $value;
+                            break;
+                        default:
+                            // Ignore the rest
+                    }
+                }
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Parses the current description in TRTP format
+     *
+     * @return boolean true if the description is TRTP format, false otherwise
+     */
+    protected function parseTRTPDescription()
+    {
+        // See if the current description is formatted in TRTP format
+        if (preg_match_all('!\/([A-Z]{3,4})\/([^/]*)!', $this->data['description'], $matches, PREG_SET_ORDER)) {
+            Log::debug('AbnAmroSpecifix: Description is structured as TRTP format.');
+
+            if (is_array($matches)) {
+                foreach ($matches as $match) {
+                    $key   = $match[1];
+                    $value = trim($match[2]);
+
+                    switch (strtoupper($key)) {
+                        case 'NAME':
+                            $this->data['opposing-account-name'] = $value;
+                            break;
+                        case 'REMI':
+                            $this->data['description'] = $value;
+                            break;
+                        case 'IBAN':
+                            $this->data['opposing-account-iban'] = $value;
+                            break;
+                        default:
+                            // Ignore the rest
+                    }
+                }
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+}

app/Helpers/Csv/Specifix/Dummy.php

@@ -7,7 +7,7 @@ namespace FireflyIII\Helpers\Csv\Specifix;
  *
  * @package FireflyIII\Helpers\Csv\Specifix
  */
-class Dummy
+class Dummy extends Specifix implements SpecifixInterface
 {
     /** @var array */
     protected $data;
@@ -15,6 +15,13 @@ class Dummy
     /** @var array */
     protected $row;
 
+    /**
+     * Dummy constructor.
+     */
+    public function __construct()
+    {
+        $this->setProcessorType(self::POST_PROCESSOR);
+    }
 
     /**
      * @return array

app/Helpers/Csv/Specifix/RabobankDescription.php

@@ -9,7 +9,7 @@ use Log;
  *
  * @package FireflyIII\Helpers\Csv\Specifix
  */
-class RabobankDescription
+class RabobankDescription extends Specifix implements SpecifixInterface
 {
     /** @var array */
     protected $data;
@@ -17,6 +17,14 @@ class RabobankDescription
     /** @var array */
     protected $row;
 
+    /**
+     * RabobankDescription constructor.
+     */
+    public function __construct()
+    {
+        $this->setProcessorType(self::POST_PROCESSOR);
+    }
+
 
     /**
      * @return array
@@ -29,23 +37,6 @@ class RabobankDescription
 
     }
 
-    /**
-     * Fixes Rabobank specific thing.
-     */
-    protected function rabobankFixEmptyOpposing()
-    {
-        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: "******".');
-        }
-
-    }
-
     /**
      * @param array $data
      */
@@ -62,5 +53,22 @@ class RabobankDescription
         $this->row = $row;
     }
 
+    /**
+     * Fixes Rabobank specific thing.
+     */
+    protected function rabobankFixEmptyOpposing()
+    {
+        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: "******".');
+        }
+
+    }
+
 
 }

app/Helpers/Csv/Specifix/Specifix.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * Specifix.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+namespace FireflyIII\Helpers\Csv\Specifix;
+
+/**
+ * Class Specifix
+ *
+ * @package FireflyIII\Helpers\Csv\Specifix
+ */
+class Specifix
+{
+
+    /** @var  int */
+    protected $processorType;
+
+    /**
+     * @return int
+     */
+    public function getProcessorType()
+    {
+        return $this->processorType;
+    }
+
+    /**
+     * @param $processorType
+     *
+     * @return $this
+     */
+    public function setProcessorType($processorType)
+    {
+        $this->processorType = $processorType;
+
+        return $this;
+    }
+
+
+}

app/Helpers/Csv/Specifix/SpecifixInterface.php

@@ -8,16 +8,30 @@ namespace FireflyIII\Helpers\Csv\Specifix;
  */
 interface SpecifixInterface
 {
+    const PRE_PROCESSOR  = 1;
+    const POST_PROCESSOR = 2;
     /**
      * Implement bank and locale related fixes.
      */
     public function fix();
 
+    /**
+     * @return int
+     */
+    public function getProcessorType();
+
     /**
      * @param array $data
      */
     public function setData($data);
 
+    /**
+     * @param int $processorType
+     *
+     * @return $this
+     */
+    public function setProcessorType($processorType);
+
     /**
      * @param array $row
      */

app/Helpers/Csv/Wizard.php

@@ -63,7 +63,8 @@ class Wizard implements WizardInterface
 
 
         if (is_array($map)) {
-            foreach ($map as $index => $field) {
+            $keys = array_keys($map);
+            foreach ($keys as $index) {
                 if (isset($roles[$index])) {
                     $name = $roles[$index];
                     if ($configRoles[$name]['mappable']) {
@@ -167,17 +168,6 @@ class Wizard implements WizardInterface
 
     }
 
-    /**
-     * @param bool $hasHeaders
-     * @param int  $index
-     *
-     * @return bool
-     */
-    protected function useRow($hasHeaders, $index)
-    {
-        return ($hasHeaders && $index > 1) || !$hasHeaders;
-    }
-
     /**
      * @param array $array
      *
@@ -191,4 +181,15 @@ class Wizard implements WizardInterface
 
         return $array;
     }
+
+    /**
+     * @param bool $hasHeaders
+     * @param int  $index
+     *
+     * @return bool
+     */
+    protected function useRow($hasHeaders, $index)
+    {
+        return ($hasHeaders && $index > 1) || !$hasHeaders;
+    }
 }

app/Helpers/FiscalHelper.php

@@ -0,0 +1,78 @@
+<?php
+
+namespace FireflyIII\Helpers;
+
+use Carbon\Carbon;
+use Preferences;
+
+/**
+ * Class FiscalHelper
+ *
+ * @package FireflyIII\Helpers
+ */
+class FiscalHelper implements FiscalHelperInterface
+{
+
+    /** @var bool */
+    protected $useCustomFiscalYear;
+
+    /**
+     * FiscalHelper constructor.
+     *
+     * @codeCoverageIgnore
+     *
+     */
+    public function __construct()
+    {
+        if (Preferences::get('customFiscalYear', 0)->data) {
+            $this->useCustomFiscalYear = true;
+        } else {
+            $this->useCustomFiscalYear = false;
+        }
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return Carbon date object
+     */
+    public function startOfFiscalYear(Carbon $date)
+    {
+        // get start mm-dd. Then create a start date in the year passed.
+        $startDate = clone $date;
+        if ($this->useCustomFiscalYear === true) {
+            $prefStartStr = Preferences::get('fiscalYearStart', '01-01')->data;
+            list($mth, $day) = explode('-', $prefStartStr);
+            $startDate->month(intval($mth))->day(intval($day));
+
+            // if start date is after passed date, sub 1 year.
+            if ($startDate > $date) {
+                $startDate->subYear();
+            }
+        } else {
+            $startDate->startOfYear();
+        }
+        return $startDate;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return Carbon date object
+     */
+    public function endOfFiscalYear(Carbon $date)
+    {
+        // get start of fiscal year for passed date
+        $endDate = $this->startOfFiscalYear($date);
+        if ($this->useCustomFiscalYear === true) {
+            // add 1 year and sub 1 day
+            $endDate->addYear();
+            $endDate->subDay();
+        } else {
+            $endDate->endOfYear();
+        }
+
+
+        return $endDate;
+    }
+}

app/Helpers/FiscalHelperInterface.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace FireflyIII\Helpers;
+
+use Carbon\Carbon;
+
+/**
+ * Interface FiscalHelperInterface
+ *
+ * @package FireflyIII\Helpers
+ */
+interface FiscalHelperInterface
+{
+
+    /**
+     * This method produces a clone of the Carbon date object passed, checks preferences
+     * and calculates the first day of the fiscal year.
+     *
+     * @param Carbon     $date
+     *
+     * @return Carbon date object
+     */
+    public function startOfFiscalYear(Carbon $date);
+
+    /**
+    * This method produces a clone of the Carbon date object passed, checks preferences
+    * and calculates the last day of the fiscal year.
+     *
+     * @param Carbon     $date
+     *
+     * @return Carbon date object
+     */
+    public function endOfFiscalYear(Carbon $date);
+
+}

app/Helpers/Report/AccountReportHelper.php

@@ -0,0 +1,113 @@
+<?php
+/**
+ * AccountReportHelper.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+namespace FireflyIII\Helpers\Report;
+
+use Carbon\Carbon;
+use DB;
+use FireflyIII\Helpers\Collection\Account as AccountCollection;
+use FireflyIII\Models\Account;
+use Illuminate\Support\Collection;
+
+
+/**
+ * Class AccountReportHelper
+ *
+ * @package FireflyIII\Helpers\Report
+ */
+class AccountReportHelper implements AccountReportHelperInterface
+{
+    /**
+     * This method generates a full report for the given period on all
+     * given accounts
+     *
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return AccountCollection
+     */
+    public function getAccountReport(Carbon $start, Carbon $end, Collection $accounts)
+    {
+        $startAmount = '0';
+        $endAmount   = '0';
+        $diff        = '0';
+        $ids         = $accounts->pluck('id')->toArray();
+
+        $yesterday = clone $start;
+        $yesterday->subDay();
+
+        bcscale(2);
+
+        // get balances for start.
+        $startSet = Account::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
+                           ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+                           ->whereIn('accounts.id', $ids)
+                           ->whereNull('transaction_journals.deleted_at')
+                           ->whereNull('transactions.deleted_at')
+                           ->where('transaction_journals.date', '<=', $yesterday->format('Y-m-d'))
+                           ->groupBy('accounts.id')
+                           ->get(['accounts.id', DB::Raw('SUM(`transactions`.`amount`) as `balance`')]);
+
+        // and end:
+        $endSet = Account::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
+                         ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+                         ->whereIn('accounts.id', $ids)
+                         ->whereNull('transaction_journals.deleted_at')
+                         ->whereNull('transactions.deleted_at')
+                         ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
+                         ->groupBy('accounts.id')
+                         ->get(['accounts.id', DB::Raw('SUM(`transactions`.`amount`) as `balance`')]);
+
+
+        $accounts->each(
+            function (Account $account) use ($startSet, $endSet) {
+                /**
+                 * The balance for today always incorporates transactions
+                 * made on today. So to get todays "start" balance, we sub one
+                 * day.
+                 */
+                //
+                $currentStart = $startSet->filter(
+                    function (Account $entry) use ($account) {
+                        return $account->id == $entry->id;
+                    }
+                );
+                if ($currentStart->first()) {
+                    $account->startBalance = $currentStart->first()->balance;
+                }
+
+                $currentEnd = $endSet->filter(
+                    function (Account $entry) use ($account) {
+                        return $account->id == $entry->id;
+                    }
+                );
+                if ($currentEnd->first()) {
+                    $account->endBalance = $currentEnd->first()->balance;
+                }
+            }
+        );
+
+
+        // summarize:
+        foreach ($accounts as $account) {
+            $startAmount = bcadd($startAmount, $account->startBalance);
+            $endAmount   = bcadd($endAmount, $account->endBalance);
+            $diff        = bcadd($diff, bcsub($account->endBalance, $account->startBalance));
+        }
+
+        $object = new AccountCollection;
+        $object->setStart($startAmount);
+        $object->setEnd($endAmount);
+        $object->setDifference($diff);
+        $object->setAccounts($accounts);
+
+        return $object;
+    }
+}

app/Helpers/Report/AccountReportHelperInterface.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * AccountReportHelperInterface.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+namespace FireflyIII\Helpers\Report;
+
+use Carbon\Carbon;
+use FireflyIII\Helpers\Collection\Account as AccountCollection;
+use Illuminate\Support\Collection;
+
+
+/**
+ * Interface AccountReportHelperInterface
+ *
+ * @package FireflyIII\Helpers\Report
+ */
+interface AccountReportHelperInterface
+{
+    /**
+     * This method generates a full report for the given period on all
+     * given accounts
+     *
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return AccountCollection
+     */
+    public function getAccountReport(Carbon $start, Carbon $end, Collection $accounts);
+
+}

app/Helpers/Report/BalanceReportHelper.php

@@ -0,0 +1,241 @@
+<?php
+/**
+ * BalanceReportHelper.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+namespace FireflyIII\Helpers\Report;
+
+use Carbon\Carbon;
+use FireflyIII\Helpers\Collection\Balance;
+use FireflyIII\Helpers\Collection\BalanceEntry;
+use FireflyIII\Helpers\Collection\BalanceHeader;
+use FireflyIII\Helpers\Collection\BalanceLine;
+use FireflyIII\Models\Budget as BudgetModel;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\Tag;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use Illuminate\Support\Collection;
+
+
+/**
+ * Class BalanceReportHelper
+ *
+ * @package FireflyIII\Helpers\Report
+ */
+class BalanceReportHelper implements BalanceReportHelperInterface
+{
+
+    /** @var  BudgetRepositoryInterface */
+    protected $budgetRepository;
+    /** @var  TagRepositoryInterface */
+    protected $tagRepository;
+
+    /**
+     * ReportHelper constructor.
+     *
+     * @codeCoverageIgnore
+     *
+     * @param BudgetRepositoryInterface $budgetRepository
+     * @param TagRepositoryInterface    $tagRepository
+     */
+    public function __construct(BudgetRepositoryInterface $budgetRepository, TagRepositoryInterface $tagRepository)
+    {
+        $this->budgetRepository = $budgetRepository;
+        $this->tagRepository    = $tagRepository;
+    }
+
+
+    /**
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return Balance
+     */
+    public function getBalanceReport(Carbon $start, Carbon $end, Collection $accounts)
+    {
+        $balance = new Balance;
+
+        // build a balance header:
+        $header    = new BalanceHeader;
+        $budgets   = $this->budgetRepository->getBudgetsAndLimitsInRange($start, $end);
+        $spentData = $this->budgetRepository->spentPerBudgetPerAccount($budgets, $accounts, $start, $end);
+        foreach ($accounts as $account) {
+            $header->addAccount($account);
+        }
+
+        /** @var BudgetModel $budget */
+        foreach ($budgets as $budget) {
+            $balance->addBalanceLine($this->createBalanceLine($budget, $accounts, $spentData));
+        }
+
+        $balance->addBalanceLine($this->createEmptyBalanceLine($accounts, $spentData));
+        $balance->addBalanceLine($this->createTagsBalanceLine($accounts, $start, $end));
+        $balance->addBalanceLine($this->createDifferenceBalanceLine($accounts, $spentData, $start, $end));
+
+        $balance->setBalanceHeader($header);
+
+        return $balance;
+    }
+
+
+    /**
+     * @param Budget     $budget
+     * @param Collection $accounts
+     * @param Collection $spentData
+     *
+     * @return BalanceLine
+     */
+    private function createBalanceLine(BudgetModel $budget, Collection $accounts, Collection $spentData)
+    {
+        $line = new BalanceLine;
+        $line->setBudget($budget);
+
+        // loop accounts:
+        foreach ($accounts as $account) {
+            $balanceEntry = new BalanceEntry;
+            $balanceEntry->setAccount($account);
+
+            // get spent:
+            $entry = $spentData->filter(
+                function (TransactionJournal $model) use ($budget, $account) {
+                    return $model->account_id == $account->id && $model->budget_id == $budget->id;
+                }
+            );
+            $spent = 0;
+            if (!is_null($entry->first())) {
+                $spent = $entry->first()->spent;
+            }
+            $balanceEntry->setSpent($spent);
+            $line->addBalanceEntry($balanceEntry);
+        }
+
+        return $line;
+    }
+
+    /**
+     * @param Collection $accounts
+     * @param Collection $spentData
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     *
+     * @return BalanceLine
+     */
+    private function createDifferenceBalanceLine(Collection $accounts, Collection $spentData, Carbon $start, Carbon $end)
+    {
+        $diff     = new BalanceLine;
+        $tagsLeft = $this->tagRepository->allCoveredByBalancingActs($accounts, $start, $end);
+
+        $diff->setRole(BalanceLine::ROLE_DIFFROLE);
+
+        foreach ($accounts as $account) {
+            $entry = $spentData->filter(
+                function (TransactionJournal $model) use ($account) {
+                    return $model->account_id == $account->id && is_null($model->budget_id);
+                }
+            );
+            $spent = 0;
+            if (!is_null($entry->first())) {
+                $spent = $entry->first()->spent;
+            }
+            $leftEntry = $tagsLeft->filter(
+                function (Tag $tag) use ($account) {
+                    return $tag->account_id == $account->id;
+                }
+            );
+            $left      = 0;
+            if (!is_null($leftEntry->first())) {
+                $left = $leftEntry->first()->sum;
+            }
+            bcscale(2);
+            $diffValue = bcadd($spent, $left);
+
+            // difference:
+            $diffEntry = new BalanceEntry;
+            $diffEntry->setAccount($account);
+            $diffEntry->setSpent($diffValue);
+            $diff->addBalanceEntry($diffEntry);
+
+        }
+
+        return $diff;
+    }
+
+    /**
+     * @param Collection $accounts
+     * @param Collection $spentData
+     *
+     * @return BalanceLine
+     */
+    private function createEmptyBalanceLine(Collection $accounts, Collection $spentData)
+    {
+        $empty = new BalanceLine;
+
+        foreach ($accounts as $account) {
+            $entry = $spentData->filter(
+                function (TransactionJournal $model) use ($account) {
+                    return $model->account_id == $account->id && is_null($model->budget_id);
+                }
+            );
+            $spent = 0;
+            if (!is_null($entry->first())) {
+                $spent = $entry->first()->spent;
+            }
+
+            // budget
+            $budgetEntry = new BalanceEntry;
+            $budgetEntry->setAccount($account);
+            $budgetEntry->setSpent($spent);
+            $empty->addBalanceEntry($budgetEntry);
+
+        }
+
+        return $empty;
+    }
+
+    /**
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return BalanceLine
+     */
+    private function createTagsBalanceLine(Collection $accounts, Carbon $start, Carbon $end)
+    {
+        $tags     = new BalanceLine;
+        $tagsLeft = $this->tagRepository->allCoveredByBalancingActs($accounts, $start, $end);
+
+        $tags->setRole(BalanceLine::ROLE_TAGROLE);
+
+        foreach ($accounts as $account) {
+            $leftEntry = $tagsLeft->filter(
+                function (Tag $tag) use ($account) {
+                    return $tag->account_id == $account->id;
+                }
+            );
+            $left      = 0;
+            if (!is_null($leftEntry->first())) {
+                $left = $leftEntry->first()->sum;
+            }
+            bcscale(2);
+
+            // balanced by tags
+            $tagEntry = new BalanceEntry;
+            $tagEntry->setAccount($account);
+            $tagEntry->setLeft($left);
+            $tags->addBalanceEntry($tagEntry);
+
+        }
+
+        return $tags;
+    }
+
+}

app/Helpers/Report/BalanceReportHelperInterface.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * BalanceReportHelperInterface.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+namespace FireflyIII\Helpers\Report;
+
+use Carbon\Carbon;
+use FireflyIII\Helpers\Collection\Balance;
+use Illuminate\Support\Collection;
+
+
+/**
+ * Interface BalanceReportHelperInterface
+ *
+ * @package FireflyIII\Helpers\Report
+ */
+interface BalanceReportHelperInterface
+{
+    /**
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return Balance
+     */
+    public function getBalanceReport(Carbon $start, Carbon $end, Collection $accounts);
+}

app/Helpers/Report/BudgetReportHelper.php

@@ -0,0 +1,133 @@
+<?php
+/**
+ * BudgetReportHelper.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+namespace FireflyIII\Helpers\Report;
+
+
+use Carbon\Carbon;
+use FireflyIII\Helpers\Collection\Budget as BudgetCollection;
+use FireflyIII\Helpers\Collection\BudgetLine;
+use FireflyIII\Models\LimitRepetition;
+use Illuminate\Support\Collection;
+
+/**
+ * Class BudgetReportHelper
+ *
+ * @package FireflyIII\Helpers\Report
+ */
+class BudgetReportHelper implements BudgetReportHelperInterface
+{
+
+    /**
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @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();
+        $allRepetitions = $repository->getAllBudgetLimitRepetitions($start, $end);
+        $allTotalSpent  = $repository->spentAllPerDayForAccounts($accounts, $start, $end);
+        bcscale(2);
+
+        foreach ($set as $budget) {
+
+            $repetitions = $allRepetitions->filter(
+                function (LimitRepetition $rep) use ($budget) {
+                    return $rep->budget_id == $budget->id;
+                }
+            );
+            $totalSpent  = isset($allTotalSpent[$budget->id]) ? $allTotalSpent[$budget->id] : [];
+
+            // no repetition(s) for this budget:
+            if ($repetitions->count() == 0) {
+                $spent      = array_sum($totalSpent);
+                $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 = $this->getSumOfRange($start, $end, $totalSpent);
+
+                // 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($expenses);
+                $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;
+    }
+
+    /**
+     * Take the array as returned by SingleCategoryRepositoryInterface::spentPerDay and SingleCategoryRepositoryInterface::earnedByDay
+     * and sum up everything in the array in the given range.
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     * @param array  $array
+     *
+     * @return string
+     */
+    protected function getSumOfRange(Carbon $start, Carbon $end, array $array)
+    {
+        bcscale(2);
+        $sum          = '0';
+        $currentStart = clone $start; // to not mess with the original one
+        $currentEnd   = clone $end; // to not mess with the original one
+
+        while ($currentStart <= $currentEnd) {
+            $date = $currentStart->format('Y-m-d');
+            if (isset($array[$date])) {
+                $sum = bcadd($sum, $array[$date]);
+            }
+            $currentStart->addDay();
+        }
+
+        return $sum;
+    }
+}

app/Helpers/Report/BudgetReportHelperInterface.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * BudgetReportHelperInterface.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+namespace FireflyIII\Helpers\Report;
+
+
+use Carbon\Carbon;
+use FireflyIII\Helpers\Collection\Budget as BudgetCollection;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface BudgetReportHelperInterface
+ *
+ * @package FireflyIII\Helpers\Report
+ */
+interface BudgetReportHelperInterface
+{
+    /**
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return BudgetCollection
+     */
+    public function getBudgetReport(Carbon $start, Carbon $end, Collection $accounts);
+}

app/Helpers/Report/ReportHelper.php

@@ -3,22 +3,17 @@
 namespace FireflyIII\Helpers\Report;
 
 use Carbon\Carbon;
-use FireflyIII\Helpers\Collection\Account as AccountCollection;
-use FireflyIII\Helpers\Collection\Balance;
-use FireflyIII\Helpers\Collection\BalanceEntry;
-use FireflyIII\Helpers\Collection\BalanceHeader;
-use FireflyIII\Helpers\Collection\BalanceLine;
 use FireflyIII\Helpers\Collection\Bill as BillCollection;
 use FireflyIII\Helpers\Collection\BillLine;
-use FireflyIII\Helpers\Collection\Budget as BudgetCollection;
-use FireflyIII\Helpers\Collection\BudgetLine;
 use FireflyIII\Helpers\Collection\Category as CategoryCollection;
 use FireflyIII\Helpers\Collection\Expense;
 use FireflyIII\Helpers\Collection\Income;
-use FireflyIII\Models\Account;
+use FireflyIII\Helpers\FiscalHelperInterface;
 use FireflyIII\Models\Bill;
-use FireflyIII\Models\Budget as BudgetModel;
-use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use Illuminate\Support\Collection;
 
 /**
  * Class ReportHelper
@@ -28,187 +23,47 @@ use FireflyIII\Models\LimitRepetition;
 class ReportHelper implements ReportHelperInterface
 {
 
+    /** @var  BudgetRepositoryInterface */
+    protected $budgetRepository;
     /** @var ReportQueryInterface */
     protected $query;
+    /** @var  TagRepositoryInterface */
+    protected $tagRepository;
 
     /**
+     * ReportHelper constructor.
+     *
      * @codeCoverageIgnore
      *
-     * @param ReportQueryInterface $query
-     *
+     * @param ReportQueryInterface      $query
+     * @param BudgetRepositoryInterface $budgetRepository
+     * @param TagRepositoryInterface    $tagRepository
      */
-    public function __construct(ReportQueryInterface $query)
+    public function __construct(ReportQueryInterface $query, BudgetRepositoryInterface $budgetRepository, TagRepositoryInterface $tagRepository)
     {
-        $this->query = $query;
-
-    }
-
-
-    /**
-     * This method generates a full report for the given period on all
-     * the users asset and cash accounts.
-     *
-     * @param Carbon $date
-     * @param Carbon $end
-     * @param        $shared
-     *
-     * @return AccountCollection
-     */
-    public function getAccountReport(Carbon $date, Carbon $end, $shared)
-    {
-
-
-        $accounts = $this->query->getAllAccounts($date, $end, $shared);
-        $start    = '0';
-        $end      = '0';
-        $diff     = '0';
-        bcscale(2);
-
-        // remove cash account, if any:
-        $accounts = $accounts->filter(
-            function (Account $account) {
-                if ($account->accountType->type != 'Cash account') {
-                    return $account;
-                }
-
-                return null;
-            }
-        );
-
-        // summarize:
-        foreach ($accounts as $account) {
-            $start = bcadd($start, $account->startBalance);
-            $end   = bcadd($end, $account->endBalance);
-            $diff  = bcadd($diff, bcsub($account->endBalance, $account->startBalance));
-        }
-
-        $object = new AccountCollection;
-        $object->setStart($start);
-        $object->setEnd($end);
-        $object->setDifference($diff);
-        $object->setAccounts($accounts);
-
-        return $object;
-    }
-
-    /**
-     *
-     * The balance report contains a Balance object which in turn contains:
-     *
-     * A BalanceHeader object which contains all relevant user asset accounts for the report.
-     *
-     * A number of BalanceLine objects, which hold:
-     * - A budget
-     * - A number of BalanceEntry objects.
-     *
-     * 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
-     *
-     * @param Carbon  $start
-     * @param Carbon  $end
-     * @param boolean $shared
-     *
-     * @return Balance
-     */
-    public function getBalanceReport(Carbon $start, Carbon $end, $shared)
-    {
-        $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();
-        foreach ($accounts as $account) {
-            $header->addAccount($account);
-        }
-
-        /** @var BudgetModel $budget */
-        foreach ($budgets as $budget) {
-            $line = new BalanceLine;
-            $line->setBudget($budget);
-
-            // get budget amount for current period:
-            $rep = $repository->getCurrentRepetition($budget, $start, $end);
-            $line->setRepetition($rep);
-
-            // loop accounts:
-            foreach ($accounts as $account) {
-                $balanceEntry = new BalanceEntry;
-                $balanceEntry->setAccount($account);
-
-                // get spent:
-                $spent = $this->query->spentInBudgetCorrected($account, $budget, $start, $end); // I think shared is irrelevant.
-
-                $balanceEntry->setSpent($spent);
-                $line->addBalanceEntry($balanceEntry);
-            }
-            // add line to balance:
-            $balance->addBalanceLine($line);
-        }
-
-        // then a new line for without budget.
-        // and one for the tags:
-        $empty    = new BalanceLine;
-        $tags     = new BalanceLine;
-        $diffLine = new BalanceLine;
-
-        $tags->setRole(BalanceLine::ROLE_TAGROLE);
-        $diffLine->setRole(BalanceLine::ROLE_DIFFROLE);
-
-        foreach ($accounts as $account) {
-            $spent = $this->query->spentNoBudget($account, $start, $end);
-            $left  = $tagRepository->coveredByBalancingActs($account, $start, $end);
-            bcscale(2);
-            $diff = bcsub($spent, $left);
-
-            // budget
-            $budgetEntry = new BalanceEntry;
-            $budgetEntry->setAccount($account);
-            $budgetEntry->setSpent($spent);
-            $empty->addBalanceEntry($budgetEntry);
-
-            // balanced by tags
-            $tagEntry = new BalanceEntry;
-            $tagEntry->setAccount($account);
-            $tagEntry->setLeft($left);
-            $tags->addBalanceEntry($tagEntry);
-
-            // difference:
-            $diffEntry = new BalanceEntry;
-            $diffEntry->setAccount($account);
-            $diffEntry->setSpent($diff);
-            $diffLine->addBalanceEntry($diffEntry);
-
-        }
-
-        $balance->addBalanceLine($empty);
-        $balance->addBalanceLine($tags);
-        $balance->addBalanceLine($diffLine);
-
-        $balance->setBalanceHeader($header);
-
-        return $balance;
+        $this->query            = $query;
+        $this->budgetRepository = $budgetRepository;
+        $this->tagRepository    = $tagRepository;
     }
 
     /**
      * This method generates a full report for the given period on all
      * the users bills and their payments.
      *
-     * @param Carbon $start
-     * @param Carbon $end
+     * Excludes bills which have not had a payment on the mentioned accounts.
+     *
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
      * @return BillCollection
      */
-    public function getBillReport(Carbon $start, Carbon $end)
+    public function getBillReport(Carbon $start, Carbon $end, Collection $accounts)
     {
         /** @var \FireflyIII\Repositories\Bill\BillRepositoryInterface $repository */
         $repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface');
-        $bills      = $repository->getBills();
+        $bills      = $repository->getBillsForAccounts($accounts);
+        $journals   = $repository->getAllJournalsInRange($bills, $start, $end);
         $collection = new BillCollection;
 
         /** @var Bill $bill */
@@ -221,16 +76,17 @@ class ReportHelper implements ReportHelperInterface
 
             // is hit in period?
             bcscale(2);
-            $set = $repository->getJournalsInRange($bill, $start, $end);
-            if ($set->count() == 0) {
-                $billLine->setHit(false);
-            } else {
-                $billLine->setHit(true);
-                $amount = '0';
-                foreach ($set as $entry) {
-                    $amount = bcadd($amount, $entry->amount);
+
+            $entry = $journals->filter(
+                function (TransactionJournal $journal) use ($bill) {
+                    return $journal->bill_id == $bill->id;
                 }
-                $billLine->setAmount($amount);
+            );
+            if (!is_null($entry->first())) {
+                $billLine->setAmount($entry->first()->journalAmount);
+                $billLine->setHit(true);
+            } else {
+                $billLine->setHit(false);
             }
 
             $collection->addBill($billLine);
@@ -238,120 +94,49 @@ class ReportHelper implements ReportHelperInterface
         }
 
         return $collection;
-
     }
 
     /**
-     * @param Carbon  $start
-     * @param Carbon  $end
-     * @param boolean $shared
-     *
-     * @return BudgetCollection
-     */
-    public function getBudgetReport(Carbon $start, Carbon $end, $shared)
-    {
-        $object = new BudgetCollection;
-        /** @var \FireflyIII\Repositories\Budget\BudgetRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface');
-        $set        = $repository->getBudgets();
-
-        bcscale(2);
-
-        foreach ($set as $budget) {
-
-            $repetitions = $repository->getBudgetLimitRepetitions($budget, $start, $end);
-
-            // no repetition(s) for this budget:
-            if ($repetitions->count() == 0) {
-                $spent      = $repository->balanceInPeriod($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->balanceInPeriod($budget, $repetition->startdate, $repetition->enddate, $shared);
-                $expenses = $expenses * -1;
-                $left      = $expenses < $repetition->amount ? bcsub($repetition->amount, $expenses) : 0;
-                $spent     = $expenses > $repetition->amount ? 0 : $expenses;
-                $overspent = $expenses > $repetition->amount ? bcsub($expenses, $repetition->amount) : 0;
-
-                $budgetLine->setLeft($left);
-                $budgetLine->setSpent($spent);
-                $budgetLine->setOverspent($overspent);
-                $budgetLine->setBudgeted($repetition->amount);
-
-                $object->addBudgeted($repetition->amount);
-                $object->addSpent($spent);
-                $object->addLeft($left);
-                $object->addOverspent($overspent);
-                $object->addBudgetLine($budgetLine);
-
-            }
-
-        }
-
-        // stuff outside of budgets:
-        $noBudget   = $repository->getWithoutBudgetSum($start, $end);
-        $budgetLine = new BudgetLine;
-        $budgetLine->setOverspent($noBudget);
-        $object->addOverspent($noBudget);
-        $object->addBudgetLine($budgetLine);
-
-        return $object;
-    }
-
-    /**
-     * @param Carbon  $start
-     * @param Carbon  $end
-     * @param boolean $shared
+     * @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)
     {
         $object = new CategoryCollection;
 
-
         /**
          * GET CATEGORIES:
          */
         /** @var \FireflyIII\Repositories\Category\CategoryRepositoryInterface $repository */
         $repository = app('FireflyIII\Repositories\Category\CategoryRepositoryInterface');
-        $set        = $repository->getCategories();
+
+        $set = $repository->spentForAccountsPerMonth($accounts, $start, $end);
         foreach ($set as $category) {
-            $spent = $repository->balanceInPeriod($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.
+     * 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)
     {
         $object = new Expense;
-        $set    = $this->query->expenseInPeriodCorrected($start, $end, $shared);
+        $set    = $this->query->expense($accounts, $start, $end);
+
         foreach ($set as $entry) {
-            $object->addToTotal($entry->amount_positive);
+            $object->addToTotal($entry->journalAmount); // can be positive, if it's a transfer
             $object->addOrCreateExpense($entry);
         }
 
@@ -359,20 +144,21 @@ class ReportHelper implements ReportHelperInterface
     }
 
     /**
-     * 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)
     {
         $object = new Income;
-        $set    = $this->query->incomeInPeriodCorrected($start, $end, $shared);
+        $set    = $this->query->income($accounts, $start, $end);
+
         foreach ($set as $entry) {
-            $object->addToTotal($entry->amount_positive);
+            $object->addToTotal($entry->journalAmount);
             $object->addOrCreateIncome($entry);
         }
 
@@ -386,20 +172,72 @@ class ReportHelper implements ReportHelperInterface
      */
     public function listOfMonths(Carbon $date)
     {
-
-        $start  = clone $date;
-        $end    = Carbon::now();
+        /** @var FiscalHelperInterface $fiscalHelper */
+        $fiscalHelper = app('FireflyIII\Helpers\FiscalHelperInterface');
+        $start        = clone $date;
+        $start->startOfMonth();
+        $end = Carbon::now();
+        $end->endOfMonth();
         $months = [];
+
         while ($start <= $end) {
-            $year            = $start->year;
-            $months[$year][] = [
+            // current year:
+            $year = $fiscalHelper->endOfFiscalYear($start)->year;
+
+            if (!isset($months[$year])) {
+                $months[$year] = [
+                    'fiscal_start' => $fiscalHelper->startOfFiscalYear($start)->format('Y-m-d'),
+                    'fiscal_end'   => $fiscalHelper->endOfFiscalYear($start)->format('Y-m-d'),
+                    '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();
+
+            // to make the hop to the next month properly:
+            $start = clone $currentEnd;
+            $start->addDay();
         }
 
         return $months;
     }
+
+    /**
+     * Take the array as returned by SingleCategoryRepositoryInterface::spentPerDay and SingleCategoryRepositoryInterface::earnedByDay
+     * and sum up everything in the array in the given range.
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     * @param array  $array
+     *
+     * @return string
+     */
+    protected function getSumOfRange(Carbon $start, Carbon $end, array $array)
+    {
+        bcscale(2);
+        $sum          = '0';
+        $currentStart = clone $start; // to not mess with the original one
+        $currentEnd   = clone $end; // to not mess with the original one
+
+        while ($currentStart <= $currentEnd) {
+            $date = $currentStart->format('Y-m-d');
+            if (isset($array[$date])) {
+                $sum = bcadd($sum, $array[$date]);
+            }
+            $currentStart->addDay();
+        }
+
+        return $sum;
+    }
 }

app/Helpers/Report/ReportHelperInterface.php

@@ -3,13 +3,11 @@
 namespace FireflyIII\Helpers\Report;
 
 use Carbon\Carbon;
-use FireflyIII\Helpers\Collection\Account as AccountCollection;
-use FireflyIII\Helpers\Collection\Balance;
 use FireflyIII\Helpers\Collection\Bill as BillCollection;
-use FireflyIII\Helpers\Collection\Budget as BudgetCollection;
 use FireflyIII\Helpers\Collection\Category as CategoryCollection;
 use FireflyIII\Helpers\Collection\Expense;
 use FireflyIII\Helpers\Collection\Income;
+use Illuminate\Support\Collection;
 
 /**
  * Interface ReportHelperInterface
@@ -19,77 +17,50 @@ use FireflyIII\Helpers\Collection\Income;
 interface ReportHelperInterface
 {
 
-    /**
-     * This method generates a full report for the given period on all
-     * the users asset and cash accounts.
-     *
-     * @param Carbon  $date
-     * @param Carbon  $end
-     * @param boolean $shared
-     *
-     * @return AccountCollection
-     */
-    public function getAccountReport(Carbon $date, Carbon $end, $shared);
-
     /**
      * 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
-     *
-     * @return Balance
-     */
-    public function getBalanceReport(Carbon $start, Carbon $end, $shared);
-
-    /**
-     * @param Carbon  $start
-     * @param Carbon  $end
-     * @param boolean $shared
-     *
-     * @return BudgetCollection
-     */
-    public function getBudgetReport(Carbon $start, Carbon $end, $shared);
-
-    /**
-     * @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

@@ -4,14 +4,10 @@ namespace FireflyIII\Helpers\Report;
 
 use Auth;
 use Carbon\Carbon;
-use Crypt;
-use FireflyIII\Models\Account;
-use FireflyIII\Models\Budget;
-use FireflyIII\Models\TransactionJournal;
-use Illuminate\Database\Eloquent\Builder;
+use DB;
+use FireflyIII\Models\TransactionType;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Collection;
-use Steam;
 
 /**
  * Class ReportQuery
@@ -20,260 +16,163 @@ use Steam;
  */
 class ReportQuery implements ReportQueryInterface
 {
+
     /**
-     * See ReportQueryInterface::incomeInPeriodCorrected.
+     * Returns an array of the amount of money spent in the given accounts (on withdrawals, opening balances and transfers)
+     * grouped by month like so: "2015-01" => '123.45'
      *
-     * This method's length is caused mainly by the query build stuff. Therefor:
-     *
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     *
-     * @param Carbon $start
-     * @param Carbon $end
-     * @param bool   $includeShared
-     *
-     * @return Collection
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
      *
+     * @return array
      */
-    public function expenseInPeriodCorrected(Carbon $start, Carbon $end, $includeShared = false)
+    public function earnedPerMonth(Collection $accounts, Carbon $start, Carbon $end)
     {
-        $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"');
-                            $q->where('acm_from.data', '!=', '"sharedAsset"');
-                        }
-                    );
-                }
-            );
-        } else {
-            $query->where('transaction_types.type', 'Withdrawal'); // any withdrawal is fine.
+        $ids   = $accounts->pluck('id')->toArray();
+        $query = Auth::user()->transactionjournals()
+                     ->leftJoin(
+                         'transactions AS t_from', function (JoinClause $join) {
+                         $join->on('transaction_journals.id', '=', 't_from.transaction_journal_id')->where('t_from.amount', '<', 0);
+                     }
+                     )
+                     ->leftJoin(
+                         'transactions AS t_to', function (JoinClause $join) {
+                         $join->on('transaction_journals.id', '=', 't_to.transaction_journal_id')->where('t_to.amount', '>', 0);
+                     }
+                     )
+                     ->whereIn('t_to.account_id', $ids)
+                     ->whereNotIn('t_from.account_id', $ids)
+                     ->after($start)
+                     ->before($end)
+                     ->transactionTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER, TransactionType::OPENING_BALANCE])
+                     ->groupBy('dateFormatted')
+                     ->get(
+                         [
+                             DB::Raw('DATE_FORMAT(`transaction_journals`.`date`,"%Y-%m") AS `dateFormatted`'),
+                             DB::Raw('SUM(`t_to`.`amount`) AS `sum`'),
+                         ]
+                     );
+        $array = [];
+        foreach ($query as $result) {
+            $array[$result->dateFormatted] = $result->sum;
         }
-        $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);
-                }
-            }
-        );
-
-        return $data;
+        return $array;
     }
 
     /**
-     * Get a users accounts combined with various meta-data related to the start and end date.
+     * This method returns all the "out" transaction journals for the given account and given period. The amount
+     * is stored in "journalAmount".
      *
-     * @param Carbon $start
-     * @param Carbon $end
-     * @param bool   $includeShared
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
      *
      * @return Collection
      */
-    public function getAllAccounts(Carbon $start, Carbon $end, $includeShared = false)
+    public function expense(Collection $accounts, Carbon $start, Carbon $end)
     {
-        $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);
-            }
-        );
+        $ids = $accounts->pluck('id')->toArray();
+        $set = Auth::user()->transactionjournals()
+                   ->leftJoin(
+                       'transactions as t_from', function (JoinClause $join) {
+                       $join->on('t_from.transaction_journal_id', '=', 'transaction_journals.id')->where('t_from.amount', '<', 0);
+                   }
+                   )
+                   ->leftJoin(
+                       'transactions as t_to', function (JoinClause $join) {
+                       $join->on('t_to.transaction_journal_id', '=', 'transaction_journals.id')->where('t_to.amount', '>', 0);
+                   }
+                   )
+                   ->leftJoin('accounts', 't_to.account_id', '=', 'accounts.id')
+                   ->transactionTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER, TransactionType::OPENING_BALANCE])
+                   ->before($end)
+                   ->after($start)
+                   ->whereIn('t_from.account_id', $ids)
+                   ->whereNotIn('t_to.account_id', $ids)
+                   ->get(['transaction_journals.*', 't_from.amount as journalAmount', 'accounts.id as account_id', 'accounts.name as account_name']);
 
         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 the "in" transaction journals for the given account and given period. The amount
+     * is stored in "journalAmount".
      *
-     * 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
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
      *
      * @return Collection
      */
-    public function incomeInPeriodCorrected(Carbon $start, Carbon $end, $includeShared = false)
+    public function income(Collection $accounts, Carbon $start, Carbon $end)
     {
-        $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"');
-                            $q->where('acm_to.data','!=','"sharedAsset"');
-                        }
-                    );
-                }
-            );
-        } else {
-            // any deposit is fine.
-            $query->where('transaction_types.type', 'Deposit');
+        $ids = $accounts->pluck('id')->toArray();
+        $set = Auth::user()->transactionjournals()
+                   ->leftJoin(
+                       'transactions as t_from', function (JoinClause $join) {
+                       $join->on('t_from.transaction_journal_id', '=', 'transaction_journals.id')->where('t_from.amount', '<', 0);
+                   }
+                   )
+                   ->leftJoin(
+                       'transactions as t_to', function (JoinClause $join) {
+                       $join->on('t_to.transaction_journal_id', '=', 'transaction_journals.id')->where('t_to.amount', '>', 0);
+                   }
+                   )
+                   ->leftJoin('accounts', 't_from.account_id', '=', 'accounts.id')
+                   ->transactionTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER, TransactionType::OPENING_BALANCE])
+                   ->before($end)
+                   ->after($start)
+                   ->whereIn('t_to.account_id', $ids)
+                   ->whereNotIn('t_from.account_id', $ids)
+                   ->get(['transaction_journals.*', 't_to.amount as journalAmount', 'accounts.id as account_id', 'accounts.name as account_name']);
+
+        return $set;
+    }
+
+    /**
+     * Returns an array of the amount of money spent in the given accounts (on withdrawals, opening balances and transfers)
+     * grouped by month like so: "2015-01" => '123.45'
+     *
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return array
+     */
+    public function spentPerMonth(Collection $accounts, Carbon $start, Carbon $end)
+    {
+        $ids   = $accounts->pluck('id')->toArray();
+        $query = Auth::user()->transactionjournals()
+                     ->leftJoin(
+                         'transactions AS t_from', function (JoinClause $join) {
+                         $join->on('transaction_journals.id', '=', 't_from.transaction_journal_id')->where('t_from.amount', '<', 0);
+                     }
+                     )
+                     ->leftJoin(
+                         'transactions AS t_to', function (JoinClause $join) {
+                         $join->on('transaction_journals.id', '=', 't_to.transaction_journal_id')->where('t_to.amount', '>', 0);
+                     }
+                     )
+                     ->whereIn('t_from.account_id', $ids)
+                     ->whereNotIn('t_to.account_id', $ids)
+                     ->after($start)
+                     ->before($end)
+                     ->transactionTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER, TransactionType::OPENING_BALANCE])
+                     ->groupBy('dateFormatted')
+                     ->get(
+                         [
+                             DB::Raw('DATE_FORMAT(`transaction_journals`.`date`,"%Y-%m") AS `dateFormatted`'),
+                             DB::Raw('SUM(`t_from`.`amount`) AS `sum`'),
+                         ]
+                     );
+        $array = [];
+        foreach ($query as $result) {
+            $array[$result->dateFormatted] = $result->sum;
         }
-        $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']
-        );
+        return $array;
 
-        $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
-     *
-     * @param Account $account
-     * @param Budget  $budget
-     * @param Carbon  $start
-     * @param Carbon  $end
-     *
-     * @return float
-     */
-    public function spentInBudgetCorrected(Account $account, Budget $budget, Carbon $start, Carbon $end)
-    {
-
-        bcscale(2);
-
-        return bcmul(
-            Auth::user()->transactionjournals()
-                ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
-                ->transactionTypes(['Withdrawal'])
-                ->where('transactions.account_id', $account->id)
-                ->before($end)
-                ->after($start)
-                ->where('budget_transaction_journal.budget_id', $budget->id)
-                ->get(['transaction_journals.*'])->sum('amount'), -1
-        );
-    }
-
-    /**
-     * @param Account $account
-     * @param Carbon  $start
-     * @param Carbon  $end
-     *
-     * @return string
-     */
-    public function spentNoBudget(Account $account, Carbon $start, Carbon $end)
-    {
-        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(['Withdrawal'])
-                ->where('transactions.account_id', $account->id)
-                ->before($end)
-                ->after($start)
-                ->whereNull('budget_transaction_journal.budget_id')->get(['transaction_journals.*'])->sum('amount');
-    }
-
-    /**
-     * @param Carbon $start
-     * @param Carbon $end
-     *
-     * @return Builder
-     */
-    protected function queryJournalsWithTransactions(Carbon $start, Carbon $end)
-    {
-        $query = TransactionJournal::
-        leftJoin(
-            'transactions as t_from', function (JoinClause $join) {
-            $join->on('t_from.transaction_journal_id', '=', 'transaction_journals.id')->where('t_from.amount', '<', 0);
-        }
-        )
-                                   ->leftJoin('accounts as ac_from', 't_from.account_id', '=', 'ac_from.id')
-                                   ->leftJoin(
-                                       'account_meta as acm_from', function (JoinClause $join) {
-                                       $join->on('ac_from.id', '=', 'acm_from.account_id')->where('acm_from.name', '=', 'accountRole');
-                                   }
-                                   )
-                                   ->leftJoin(
-                                       'transactions as t_to', function (JoinClause $join) {
-                                       $join->on('t_to.transaction_journal_id', '=', 'transaction_journals.id')->where('t_to.amount', '>', 0);
-                                   }
-                                   )
-                                   ->leftJoin('accounts as ac_to', 't_to.account_id', '=', 'ac_to.id')
-                                   ->leftJoin(
-                                       'account_meta as acm_to', function (JoinClause $join) {
-                                       $join->on('ac_to.id', '=', 'acm_to.account_id')->where('acm_to.name', '=', 'accountRole');
-                                   }
-                                   )
-                                   ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id');
-        $query->before($end)->after($start)->where('transaction_journals.user_id', Auth::user()->id);
-
-        return $query;
     }
 }

app/Helpers/Report/ReportQueryInterface.php

@@ -3,8 +3,6 @@
 namespace FireflyIII\Helpers\Report;
 
 use Carbon\Carbon;
-use FireflyIII\Models\Account;
-use FireflyIII\Models\Budget;
 use Illuminate\Support\Collection;
 
 /**
@@ -16,65 +14,52 @@ interface ReportQueryInterface
 {
 
     /**
-     * See ReportQueryInterface::incomeInPeriodCorrected
+     * Returns an array of the amount of money spent in the given accounts (on withdrawals, opening balances and transfers)
+     * grouped by month like so: "2015-01" => '123.45'
      *
-     * 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
-     *
-     * @return Collection
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
      *
+     * @return array
      */
-    public function expenseInPeriodCorrected(Carbon $start, Carbon $end, $includeShared = false);
+    public function earnedPerMonth(Collection $accounts, Carbon $start, Carbon $end);
 
     /**
-     * Get a users accounts combined with various meta-data related to the start and end date.
+     * This method returns all the "out" transaction journals for the given account and given period. The amount
+     * is stored in "journalAmount".
      *
-     * @param Carbon $start
-     * @param Carbon $end
-     * @param bool   $includeShared
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
      *
      * @return Collection
      */
-    public function getAllAccounts(Carbon $start, Carbon $end, $includeShared = false);
+    public function expense(Collection $accounts, Carbon $start, Carbon $end);
 
     /**
-     * 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 the "in" transaction journals for the given account and given period. The amount
+     * is stored in "journalAmount".
      *
-     * @param Carbon $start
-     * @param Carbon $end
-     * @param bool   $includeShared
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
      *
      * @return Collection
      */
-    public function incomeInPeriodCorrected(Carbon $start, Carbon $end, $includeShared = false);
+    public function income(Collection $accounts, Carbon $start, Carbon $end);
 
     /**
-     * Covers tags as well.
+     * Returns an array of the amount of money spent in the given accounts (on withdrawals, opening balances and transfers)
+     * grouped by month like so: "2015-01" => '123.45'
      *
-     * @param Account $account
-     * @param Budget  $budget
-     * @param Carbon  $start
-     * @param Carbon  $end
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
      *
-     * @return float
+     * @return array
      */
-    public function spentInBudgetCorrected(Account $account, Budget $budget, Carbon $start, Carbon $end);
-
-    /**
-     * @param Account $account
-     * @param Carbon  $start
-     * @param Carbon  $end
-     *
-     * @return string
-     */
-    public function spentNoBudget(Account $account, Carbon $start, Carbon $end);
+    public function spentPerMonth(Collection $accounts, Carbon $start, Carbon $end);
 
 
 }

app/Http/Controllers/AccountController.php

@@ -6,7 +6,7 @@ use Config;
 use ExpandedForm;
 use FireflyIII\Http\Requests\AccountFormRequest;
 use FireflyIII\Models\Account;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
 use Input;
 use Preferences;
 use Session;
@@ -38,6 +38,8 @@ class AccountController extends Controller
      */
     public function create($what = 'asset')
     {
+
+
         $subTitleIcon = Config::get('firefly.subIconsByIdentifier.' . $what);
         $subTitle     = trans('firefly.make_new_' . $what . '_account');
 
@@ -54,11 +56,12 @@ class AccountController extends Controller
     }
 
     /**
+     * @param ARI     $repository
      * @param Account $account
      *
      * @return \Illuminate\View\View
      */
-    public function delete(AccountRepositoryInterface $repository, Account $account)
+    public function delete(ARI $repository, Account $account)
     {
         $typeName    = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type);
         $subTitle    = trans('firefly.delete_' . $typeName . '_account', ['name' => $account->name]);
@@ -74,12 +77,12 @@ class AccountController extends Controller
     }
 
     /**
-     * @param AccountRepositoryInterface $repository
-     * @param Account                    $account
+     * @param ARI     $repository
+     * @param Account $account
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function destroy(AccountRepositoryInterface $repository, Account $account)
+    public function destroy(ARI $repository, Account $account)
     {
         $type     = $account->accountType->type;
         $typeName = Config::get('firefly.shortNamesByFullName.' . $type);
@@ -95,12 +98,12 @@ class AccountController extends Controller
     }
 
     /**
-     * @param AccountRepositoryInterface $repository
-     * @param Account                    $account
+     * @param ARI     $repository
+     * @param Account $account
      *
      * @return \Illuminate\View\View
      */
-    public function edit(AccountRepositoryInterface $repository, Account $account)
+    public function edit(ARI $repository, Account $account)
     {
 
         $what           = Config::get('firefly.shortNamesByFullName')[$account->accountType->type];
@@ -130,7 +133,7 @@ class AccountController extends Controller
             'ccMonthlyPaymentDate' => $account->getMeta('ccMonthlyPaymentDate'),
             'openingBalanceDate'   => $openingBalance ? $openingBalance->date->format('Y-m-d') : null,
             'openingBalance'       => $openingBalanceAmount,
-            'virtualBalance'       => round($account->virtual_balance, 2)
+            'virtualBalance'       => round($account->virtual_balance, 2),
         ];
         Session::flash('preFilled', $preFilled);
         Session::flash('gaEventCategory', 'accounts');
@@ -140,40 +143,31 @@ class AccountController extends Controller
     }
 
     /**
-     * @param AccountRepositoryInterface $repository
+     * @param ARI                        $repository
      * @param                            $what
      *
      * @return \Illuminate\View\View
      */
-    public function index(AccountRepositoryInterface $repository, $what)
+    public function index(ARI $repository, $what)
     {
         $subTitle     = trans('firefly.' . $what . '_accounts');
         $subTitleIcon = Config::get('firefly.subIconsByIdentifier.' . $what);
         $types        = Config::get('firefly.accountTypesByIdentifier.' . $what);
         $accounts     = $repository->getAccounts($types);
-        // last activity:
-        /**
-         * HERE WE ARE
-         */
-        $start = clone Session::get('start', Carbon::now()->startOfMonth());
-        $end   = clone Session::get('end', Carbon::now()->endOfMonth());
+        $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;
-        }
-
+        $ids           = $accounts->pluck('id')->toArray();
         $startBalances = Steam::balancesById($ids, $start);
         $endBalances   = Steam::balancesById($ids, $end);
         $activities    = Steam::getLastActivities($ids);
 
         $accounts->each(
             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;
+                $account->lastActivityDate = $this->isInArray($activities, $account->id);
+                $account->startBalance     = $this->isInArray($startBalances, $account->id);
+                $account->endBalance       = $this->isInArray($endBalances, $account->id);
             }
         );
 
@@ -181,12 +175,12 @@ class AccountController extends Controller
     }
 
     /**
-     * @param AccountRepositoryInterface $repository
-     * @param Account                    $account
+     * @param ARI     $repository
+     * @param Account $account
      *
      * @return \Illuminate\View\View
      */
-    public function show(AccountRepositoryInterface $repository, Account $account)
+    public function show(ARI $repository, Account $account)
     {
         $page         = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page'));
         $subTitleIcon = Config::get('firefly.subTitlesByIdentifier.' . $account->accountType->type);
@@ -200,24 +194,25 @@ class AccountController extends Controller
     }
 
     /**
-     * @param AccountFormRequest         $request
-     * @param AccountRepositoryInterface $repository
+     * @param AccountFormRequest $request
+     * @param ARI                $repository
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function store(AccountFormRequest $request, AccountRepositoryInterface $repository)
+    public function store(AccountFormRequest $request, ARI $repository)
     {
         $accountData = [
             'name'                   => $request->input('name'),
             'accountType'            => $request->input('what'),
             'virtualBalance'         => round($request->input('virtualBalance'), 2),
+            'virtualBalanceCurrency' => intval($request->input('amount_currency_id_virtualBalance')),
             'active'                 => true,
             'user'                   => Auth::user()->id,
             'iban'                   => $request->input('iban'),
             'accountRole'            => $request->input('accountRole'),
             'openingBalance'         => round($request->input('openingBalance'), 2),
             'openingBalanceDate'     => new Carbon((string)$request->input('openingBalanceDate')),
-            'openingBalanceCurrency' => intval($request->input('balance_currency_id')),
+            'openingBalanceCurrency' => intval($request->input('amount_currency_id_openingBalance')),
 
         ];
 
@@ -238,13 +233,13 @@ class AccountController extends Controller
     }
 
     /**
-     * @param AccountFormRequest         $request
-     * @param AccountRepositoryInterface $repository
-     * @param Account                    $account
+     * @param AccountFormRequest $request
+     * @param ARI                $repository
+     * @param Account            $account
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function update(AccountFormRequest $request, AccountRepositoryInterface $repository, Account $account)
+    public function update(AccountFormRequest $request, ARI $repository, Account $account)
     {
 
         $accountData = [
@@ -256,12 +251,10 @@ class AccountController extends Controller
             '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')),
+            'openingBalanceCurrency' => intval($request->input('amount_currency_id_openingBalance')),
             'ccType'                 => $request->input('ccType'),
             'ccMonthlyPaymentDate'   => $request->input('ccMonthlyPaymentDate'),
         ];
-
-
         $repository->update($account, $accountData);
 
         Session::flash('success', 'Account "' . $account->name . '" updated.');
@@ -279,4 +272,20 @@ class AccountController extends Controller
 
     }
 
+
+    /**
+     * @param array $array
+     * @param       $entryId
+     *
+     * @return null|mixed
+     */
+    protected function isInArray(array $array, $entryId)
+    {
+        if (isset($array[$entryId])) {
+            return $array[$entryId];
+        }
+
+        return null;
+    }
+
 }

app/Http/Controllers/AttachmentController.php

@@ -2,7 +2,6 @@
 
 namespace FireflyIII\Http\Controllers;
 
-
 use Crypt;
 use File;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
@@ -25,7 +24,7 @@ class AttachmentController extends Controller
 {
 
     /**
-     * @codeCoverageIgnore
+     *
      */
     public function __construct()
     {
@@ -34,26 +33,6 @@ class AttachmentController extends Controller
         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
      *
@@ -90,7 +69,10 @@ class AttachmentController extends Controller
     }
 
     /**
-     * @param Attachment $attachment
+     * @param Attachment                $attachment
+     * @param AttachmentHelperInterface $helper
+     *
+     * @return string
      */
     public function download(Attachment $attachment, AttachmentHelperInterface $helper)
     {
@@ -100,23 +82,42 @@ class AttachmentController extends Controller
 
             $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));
+            return response(Crypt::decrypt(file_get_contents($file)), 200)
+                ->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);
 
         } else {
             abort(404);
         }
     }
 
+    /**
+     * @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
      *

app/Http/Controllers/Auth/AuthController.php

@@ -1,4 +1,6 @@
-<?php namespace FireflyIII\Http\Controllers\Auth;
+<?php
+
+namespace FireflyIII\Http\Controllers\Auth;
 
 use Auth;
 use FireflyIII\Http\Controllers\Controller;
@@ -8,12 +10,14 @@ use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
 use Illuminate\Foundation\Auth\ThrottlesLogins;
 use Illuminate\Http\Request;
 use Illuminate\Mail\Message;
+use Illuminate\Support\Facades\Lang;
+use Log;
 use Mail;
 use Request as Rq;
 use Session;
-use Twig;
 use Validator;
 
+
 /**
  * Class AuthController
  *
@@ -24,15 +28,20 @@ class AuthController extends Controller
     use AuthenticatesAndRegistersUsers, ThrottlesLogins;
 
     /**
-     * Show the application registration form.
+     * Where to redirect users after login / registration.
      *
-     * @return \Illuminate\Http\Response
+     * @var string
      */
-    public function getRegister()
-    {
-        $host = Rq::getHttpHost();
+    protected $redirectTo = '/home';
 
-        return view('auth.register', compact('host'));
+    /**
+     * Create a new authentication controller instance.
+     *
+     */
+    public function __construct()
+    {
+        $this->middleware('guest', ['except' => 'logout']);
+        parent::__construct();
     }
 
     /**
@@ -42,17 +51,9 @@ class AuthController extends Controller
      *
      * @return \Illuminate\Http\Response
      */
-    public function postLogin(Request $request)
+    public function login(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.
+        $this->validate($request, [$this->loginUsername() => 'required', 'password' => 'required',]);
         $throttles = $this->isUsingThrottlesLoginsTrait();
 
         if ($throttles && $this->hasTooManyLoginAttempts($request)) {
@@ -62,76 +63,40 @@ class AuthController extends Controller
         $credentials            = $this->getCredentials($request);
         $credentials['blocked'] = 0; // most not be blocked.
 
-        if (Auth::attempt($credentials, $request->has('remember'))) {
+        if (Auth::guard($this->getGuard())->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.
+        // check if user is blocked:
+        $message = '';
         /** @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;
+            $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,
-                ]
-            );
-    }
-
-
-    public $redirectTo = '/';
-
-    /**
-     * Create a new authentication controller instance.
-     *
-     * @codeCoverageIgnore
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->middleware('guest', ['except' => 'getLogout']);
-    }
-
-    /**
-     * Show the application login form.
-     *
-     * @codeCoverageIgnore
-     * @return \Illuminate\Http\Response
-     *
-     */
-    public function getLogin()
-    {
-        return Twig::render('auth.login');
+        return $this->sendFailedLoginResponse($request, $message);
     }
 
     /**
      * Handle a registration request for the application.
      *
-     * @param  Request $request
+     * @param  \Illuminate\Http\Request $request
      *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\Response
      */
-    public function postRegister(Request $request)
+    public function register(Request $request)
     {
         $validator = $this->validator($request->all());
 
@@ -139,25 +104,37 @@ class AuthController extends Controller
             $this->throwValidationException(
                 $request, $validator
             );
-            // @codeCoverageIgnoreStart
         }
-        // @codeCoverageIgnoreEnd
 
         $data             = $request->all();
         $data['password'] = bcrypt($data['password']);
 
-        Auth::login($this->create($data));
+        // is user email domain blocked?
+        if ($this->isBlockedDomain($data['email'])) {
+            $validator->getMessageBag()->add('email', (string)trans('validation.invalid_domain'));
+            $this->throwValidationException(
+                $request, $validator
+            );
+        }
+
+
+        Auth::login($this->create($request->all()));
 
         // 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!');
@@ -176,25 +153,20 @@ class AuthController extends Controller
         // @codeCoverageIgnoreStart
         abort(500, 'Not a user!');
 
-        return redirect('/');
-        // @codeCoverageIgnoreEnd
+
+        return redirect($this->redirectPath());
     }
 
     /**
-     * Get a validator for an incoming registration request.
+     * Show the application registration form.
      *
-     * @param  array $data
-     *
-     * @return \Illuminate\Contracts\Validation\Validator
+     * @return \Illuminate\Http\Response
      */
-    public function validator(array $data)
+    public function showRegistrationForm()
     {
-        return Validator::make(
-            $data, [
-                     'email'    => 'required|email|max:255|unique:users',
-                     'password' => 'required|confirmed|min:6',
-                 ]
-        );
+        $host = Rq::getHttpHost();
+
+        return view('auth.register', compact('host'));
     }
 
     /**
@@ -204,13 +176,102 @@ class AuthController extends Controller
      *
      * @return User
      */
-    public function create(array $data)
+    protected function create(array $data)
     {
         return User::create(
             [
                 'email'    => $data['email'],
-                'password' => $data['password'],
+                'password' => bcrypt($data['password']),
             ]
         );
     }
+
+    /**
+     * @return array
+     */
+    protected function getBlockedDomains()
+    {
+        $set     = explode(',', env('BLOCKED_DOMAINS', ''));
+        $domains = [];
+        foreach ($set as $entry) {
+            $domain = trim($entry);
+            if (strlen($domain) > 0) {
+                $domains[] = $domain;
+            }
+        }
+
+        return $domains;
+    }
+
+    /**
+     * Get the failed login message.
+     *
+     * @param $message
+     *
+     * @return string
+     */
+    protected function getFailedLoginMessage($message)
+    {
+        if (strlen($message) > 0) {
+            return $message;
+        }
+
+        return Lang::has('auth.failed')
+            ? Lang::get('auth.failed')
+            : 'These credentials do not match our records.';
+    }
+
+    /**
+     * @param $email
+     *
+     * @return bool
+     */
+    protected function isBlockedDomain($email)
+    {
+        $parts   = explode('@', $email);
+        $blocked = $this->getBlockedDomains();
+
+        if (isset($parts[1]) && in_array($parts[1], $blocked)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the failed login response instance.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @param                          $message
+     *
+     * @return \Illuminate\Http\Response
+     */
+    protected function sendFailedLoginResponse(Request $request, $message)
+    {
+        return redirect()->back()
+                         ->withInput($request->only($this->loginUsername(), 'remember'))
+                         ->withErrors(
+                             [
+                                 $this->loginUsername() => $this->getFailedLoginMessage($message),
+                             ]
+                         );
+    }
+
+    /**
+     * Get a validator for an incoming registration request.
+     *
+     * @param  array $data
+     *
+     * @return \Illuminate\Contracts\Validation\Validator
+     */
+    protected function validator(array $data)
+    {
+        return Validator::make(
+            $data, [
+                     'email'    => 'required|email|max:255|unique:users',
+                     'password' => 'required|confirmed|min:6',
+                 ]
+        );
+    }
 }

app/Http/Controllers/Auth/PasswordController.php

@@ -1,17 +1,22 @@
-<?php namespace FireflyIII\Http\Controllers\Auth;
+<?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
  *
- * @codeCoverageIgnore
  * @package FireflyIII\Http\Controllers\Auth
  */
 class PasswordController extends Controller
 {
-
     /*
     |--------------------------------------------------------------------------
     | Password Reset Controller
@@ -25,14 +30,9 @@ class PasswordController extends Controller
 
     use ResetsPasswords;
 
-
-    protected $redirectPath = '/';
-
     /**
      * Create a new password controller instance.
      *
-     * @codeCoverageIgnore
-     *
      */
     public function __construct()
     {
@@ -41,4 +41,38 @@ class PasswordController extends Controller
         $this->middleware('guest');
     }
 
+    /**
+     * Send a reset link to the given user.
+     *
+     * @param  \Illuminate\Http\Request $request
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function sendResetLinkEmail(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 $this->getSendResetLinkEmailSuccessResponse($response);
+
+            case Password::INVALID_USER:
+            case 'passwords.blocked':
+            default:
+                return $this->getSendResetLinkEmailFailureResponse($response);
+        }
+    }
+
 }

app/Http/Controllers/BudgetController.php

@@ -6,7 +6,9 @@ use Carbon\Carbon;
 use FireflyIII\Http\Requests\BudgetFormRequest;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use Illuminate\Support\Collection;
 use Input;
 use Navigation;
 use Preferences;
@@ -19,7 +21,6 @@ use View;
  * Class BudgetController
  *
  * @package FireflyIII\Http\Controllers
- * @SuppressWarnings(PHPMD.TooManyMethods)
  */
 class BudgetController extends Controller
 {
@@ -67,7 +68,7 @@ class BudgetController extends Controller
         Session::forget('budgets.create.fromStore');
         Session::flash('gaEventCategory', 'budgets');
         Session::flash('gaEventAction', 'create');
-        $subTitle = trans('firefly.create_new_budget');
+        $subTitle = (string)trans('firefly.create_new_budget');
 
         return view('budgets.create', compact('subTitle'));
     }
@@ -133,9 +134,11 @@ class BudgetController extends Controller
     /**
      * @param BudgetRepositoryInterface $repository
      *
+     * @param ARI                       $accountRepository
+     *
      * @return \Illuminate\View\View
      */
-    public function index(BudgetRepositoryInterface $repository)
+    public function index(BudgetRepositoryInterface $repository, ARI $accountRepository)
     {
         $budgets           = $repository->getActiveBudgets();
         $inactive          = $repository->getInactiveBudgets();
@@ -147,6 +150,8 @@ class BudgetController extends Controller
         $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:
@@ -156,7 +161,7 @@ class BudgetController extends Controller
         // loop the budgets:
         /** @var Budget $budget */
         foreach ($budgets as $budget) {
-            $budget->spent      = $repository->balanceInPeriod($budget, $start, $end);
+            $budget->spent      = $repository->balanceInPeriod($budget, $start, $end, $accounts);
             $budget->currentRep = $repository->getCurrentRepetition($budget, $start, $end);
             if ($budget->currentRep) {
                 $budgeted = bcadd($budgeted, $budget->currentRep->amount);
@@ -170,7 +175,7 @@ class BudgetController extends Controller
         $defaultCurrency = Amount::getDefaultCurrency();
 
         return view(
-            'budgets.index', compact('budgetMaximum','period', 'range', 'budgetIncomeTotal', 'defaultCurrency', 'inactive', 'budgets', 'spent', 'budgeted')
+            'budgets.index', compact('budgetMaximum', 'period', 'range', 'budgetIncomeTotal', 'defaultCurrency', 'inactive', 'budgets', 'spent', 'budgeted')
         );
     }
 
@@ -227,13 +232,26 @@ class BudgetController extends Controller
         $journals = $repository->getJournals($budget, $repetition);
 
         if (is_null($repetition->id)) {
-            $limits   = $repository->getBudgetLimits($budget);
+            $start    = $repository->firstActivity($budget);
+            $end      = new Carbon;
+            $set      = $budget->limitrepetitions()->orderBy('startdate', 'DESC')->get();
             $subTitle = e($budget->name);
         } else {
-            $limits   = [$repetition->budgetLimit];
+            $start    = $repetition->startdate;
+            $end      = $repetition->enddate;
+            $set      = new Collection([$repetition]);
             $subTitle = trans('firefly.budget_in_month', ['name' => $budget->name, 'month' => $repetition->startdate->formatLocalized($this->monthFormat)]);
         }
 
+        $spentArray = $repository->spentPerDay($budget, $start, $end);
+        $limits     = new Collection();
+
+        /** @var LimitRepetition $entry */
+        foreach ($set as $entry) {
+            $entry->spent = $this->getSumOfRange($entry->startdate, $entry->enddate, $spentArray);
+            $limits->push($entry);
+        }
+
         $journals->setPath('/budgets/show/' . $budget->id);
 
         return view('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle'));
@@ -279,7 +297,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);

app/Http/Controllers/CategoryController.php

@@ -4,7 +4,8 @@ use Auth;
 use Carbon\Carbon;
 use FireflyIII\Http\Requests\CategoryFormRequest;
 use FireflyIII\Models\Category;
-use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface as CRI;
+use FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface as SCRI;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
@@ -68,12 +69,12 @@ class CategoryController extends Controller
     }
 
     /**
-     * @param CategoryRepositoryInterface $repository
-     * @param Category                    $category
+     * @param SCRI     $repository
+     * @param Category $category
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function destroy(CategoryRepositoryInterface $repository, Category $category)
+    public function destroy(SCRI $repository, Category $category)
     {
 
         $name = $category->name;
@@ -107,17 +108,18 @@ class CategoryController extends Controller
     }
 
     /**
-     * @param CategoryRepositoryInterface $repository
+     * @param CRI  $repository
+     * @param SCRI $singleRepository
      *
      * @return \Illuminate\View\View
      */
-    public function index(CategoryRepositoryInterface $repository)
+    public function index(CRI $repository, SCRI $singleRepository)
     {
-        $categories = $repository->getCategories();
+        $categories = $repository->listCategories();
 
         $categories->each(
-            function (Category $category) use ($repository) {
-                $category->lastActivity = $repository->getLatestActivity($category);
+            function (Category $category) use ($singleRepository) {
+                $category->lastActivity = $singleRepository->getLatestActivity($category);
             }
         );
 
@@ -125,15 +127,15 @@ class CategoryController extends Controller
     }
 
     /**
-     * @param CategoryRepositoryInterface $repository
+     * @param CRI $repository
      *
      * @return \Illuminate\View\View
      */
-    public function noCategory(CategoryRepositoryInterface $repository)
+    public function noCategory(CRI $repository)
     {
         $start    = Session::get('start', Carbon::now()->startOfMonth());
         $end      = Session::get('end', Carbon::now()->startOfMonth());
-        $list     = $repository->getWithoutCategory($start, $end);
+        $list     = $repository->listNoCategory($start, $end);
         $subTitle = trans(
             'firefly.without_category_between',
             ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
@@ -143,37 +145,12 @@ class CategoryController extends Controller
     }
 
     /**
-     * @param CategoryRepositoryInterface $repository
-     * @param Category                    $category
+     * @param SCRI     $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
-     *
-     * @return \Illuminate\View\View
-     */
-    public function show(CategoryRepositoryInterface $repository, Category $category)
+    public function show(SCRI $repository, Category $category)
     {
         $hideCategory = true; // used in list.
         $page         = intval(Input::get('page'));
@@ -198,6 +175,12 @@ class CategoryController extends Controller
         $cache->addProperty($end);
         $cache->addProperty('category-show');
         $cache->addProperty($category->id);
+
+        // get all spent and earned data:
+        // get amount earned in period, grouped by day.
+        $spentArray  = $repository->spentPerDay($category, $start, $end);
+        $earnedArray = $repository->earnedPerDay($category, $start, $end);
+
         if ($cache->has()) {
             $entries = $cache->get();
         } else {
@@ -206,9 +189,9 @@ class CategoryController extends Controller
                 $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);
+                // get data from spentArray:
+                $spent    = $this->getSumOfRange($end, $currentEnd, $spentArray);
+                $earned   = $this->getSumOfRange($end, $currentEnd, $earnedArray);
                 $dateStr  = $end->format('Y-m-d');
                 $dateName = Navigation::periodShow($end, $range);
                 $entries->push([$dateStr, $dateName, $spent, $earned]);
@@ -223,12 +206,39 @@ class CategoryController extends Controller
     }
 
     /**
-     * @param CategoryFormRequest         $request
-     * @param CategoryRepositoryInterface $repository
+     * @param SCRI                              $repository
+     * @param Category                          $category
+     *
+     * @param                                   $date
+     *
+     * @return \Illuminate\View\View
+     */
+    public function showWithDate(SCRI $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 CategoryFormRequest $request
+     * @param SCRI                $repository
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function store(CategoryFormRequest $request, CategoryRepositoryInterface $repository)
+    public function store(CategoryFormRequest $request, SCRI $repository)
     {
         $categoryData = [
             'name' => $request->input('name'),
@@ -250,13 +260,13 @@ class CategoryController extends Controller
 
 
     /**
-     * @param CategoryFormRequest         $request
-     * @param CategoryRepositoryInterface $repository
-     * @param Category                    $category
+     * @param CategoryFormRequest $request
+     * @param SCRI                $repository
+     * @param Category            $category
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function update(CategoryFormRequest $request, CategoryRepositoryInterface $repository, Category $category)
+    public function update(CategoryFormRequest $request, SCRI $repository, Category $category)
     {
         $categoryData = [
             'name' => $request->input('name'),

app/Http/Controllers/Chart/AccountController.php

@@ -5,7 +5,7 @@ namespace FireflyIII\Http\Controllers\Chart;
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
 use Preferences;
@@ -20,7 +20,7 @@ use Session;
 class AccountController extends Controller
 {
 
-    /** @var  \FireflyIII\Generator\Chart\Account\AccountChartGenerator */
+    /** @var  \FireflyIII\Generator\Chart\Account\AccountChartGeneratorInterface */
     protected $generator;
 
     /**
@@ -30,50 +30,37 @@ class AccountController extends Controller
     {
         parent::__construct();
         // create chart generator:
-        $this->generator = app('FireflyIII\Generator\Chart\Account\AccountChartGenerator');
+        $this->generator = app('FireflyIII\Generator\Chart\Account\AccountChartGeneratorInterface');
     }
 
 
     /**
-     * Shows the balances for all the user's accounts.
+     * Shows the balances for a given set of dates and accounts.
      *
-     * @param AccountRepositoryInterface $repository
+     * @param            $reportType
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
-     * @param                            $year
-     * @param                            $month
-     * @param bool                       $shared
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @return \Illuminate\Http\JsonResponse
      */
-    public function all(AccountRepositoryInterface $repository, $year, $month, $shared = false)
+    public function report($reportType, 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($reportType);
+        $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);
@@ -82,11 +69,11 @@ class AccountController extends Controller
     /**
      * Shows the balances for all the user's expense accounts.
      *
-     * @param AccountRepositoryInterface $repository
+     * @param ARI $repository
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function expenseAccounts(AccountRepositoryInterface $repository)
+    public function expenseAccounts(ARI $repository)
     {
         $start    = clone Session::get('start', Carbon::now()->startOfMonth());
         $end      = clone Session::get('end', Carbon::now()->endOfMonth());
@@ -112,11 +99,11 @@ class AccountController extends Controller
     /**
      * Shows the balances for all the user's frontpage accounts.
      *
-     * @param AccountRepositoryInterface $repository
+     * @param ARI $repository
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function frontpage(AccountRepositoryInterface $repository)
+    public function frontpage(ARI $repository)
     {
         $frontPage = Preferences::get('frontPageAccounts', []);
         $start     = clone Session::get('start', Carbon::now()->startOfMonth());

app/Http/Controllers/Chart/BillController.php

@@ -19,7 +19,7 @@ use Session;
 class BillController extends Controller
 {
 
-    /** @var  \FireflyIII\Generator\Chart\Bill\BillChartGenerator */
+    /** @var  \FireflyIII\Generator\Chart\Bill\BillChartGeneratorInterface */
     protected $generator;
 
     /**
@@ -29,11 +29,11 @@ class BillController extends Controller
     {
         parent::__construct();
         // create chart generator:
-        $this->generator = app('FireflyIII\Generator\Chart\Bill\BillChartGenerator');
+        $this->generator = app('FireflyIII\Generator\Chart\Bill\BillChartGeneratorInterface');
     }
 
     /**
-     * Shows all bills and whether or not theyve been paid this month (pie chart).
+     * Shows all bills and whether or not they've been paid this month (pie chart).
      *
      * @param BillRepositoryInterface $repository
      *
@@ -41,28 +41,24 @@ class BillController extends Controller
      */
     public function frontpage(BillRepositoryInterface $repository)
     {
-        $start = Session::get('start', Carbon::now()->startOfMonth());
-        $end   = Session::get('end', Carbon::now()->endOfMonth());
-        $cache = new CacheProperties(); // chart properties for cache:
-        $cache->addProperty($start);
-        $cache->addProperty($end);
-        $cache->addProperty('bills');
-        $cache->addProperty('frontpage');
-        if ($cache->has()) {
-            return Response::json($cache->get()); // @codeCoverageIgnore
+        $start         = Session::get('start', Carbon::now()->startOfMonth());
+        $end           = Session::get('end', Carbon::now()->endOfMonth());
+        $paid          = $repository->getBillsPaidInRange($start, $end); // will be a negative amount.
+        $unpaid        = $repository->getBillsUnpaidInRange($start, $end); // will be a positive amount.
+        $creditCardDue = $repository->getCreditCardBill($start, $end);
+
+        if ($creditCardDue < 0) {
+            // expenses are negative (bill not yet paid),
+            $creditCardDue = bcmul($creditCardDue, '-1');
+            $unpaid        = bcadd($unpaid, $creditCardDue);
+        } else {
+            // if more than zero, the bill has been paid: (transfer = positive).
+            // amount must be negative to be added to $paid:
+            $paid = bcadd($paid, $creditCardDue);
         }
 
-        $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');
-
-
         // build chart:
         $data = $this->generator->frontpage($paid, $unpaid);
-        $cache->store($data);
 
         return Response::json($data);
     }

app/Http/Controllers/Chart/BudgetController.php

@@ -6,6 +6,7 @@ use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
@@ -22,7 +23,7 @@ use Session;
 class BudgetController extends Controller
 {
 
-    /** @var  \FireflyIII\Generator\Chart\Budget\BudgetChartGenerator */
+    /** @var  \FireflyIII\Generator\Chart\Budget\BudgetChartGeneratorInterface */
     protected $generator;
 
     /**
@@ -32,7 +33,88 @@ class BudgetController extends Controller
     {
         parent::__construct();
         // create chart generator:
-        $this->generator = app('FireflyIII\Generator\Chart\Budget\BudgetChartGenerator');
+        $this->generator = app('FireflyIII\Generator\Chart\Budget\BudgetChartGeneratorInterface');
+    }
+
+    /**
+     *
+     * @param BudgetRepositoryInterface $repository
+     * @param                           $reportType
+     * @param Carbon                    $start
+     * @param Carbon                    $end
+     * @param Collection                $accounts
+     * @param Collection                $budgets
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList) // need all parameters
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function multiYear(BudgetRepositoryInterface $repository, $reportType, Carbon $start, Carbon $end, Collection $accounts, Collection $budgets)
+    {
+        // chart properties for cache:
+        $cache = new CacheProperties();
+        $cache->addProperty($reportType);
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty($accounts);
+        $cache->addProperty($budgets);
+        $cache->addProperty('multiYearBudget');
+
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
+        /*
+         * Get the budgeted amounts for each budgets in each year.
+         */
+        $budgetedSet   = $repository->getBudgetedPerYear($budgets, $start, $end);
+        $budgetedArray = [];
+        /** @var Budget $entry */
+        foreach ($budgetedSet as $entry) {
+            $budgetedArray[$entry->id][$entry->dateFormatted] = $entry->budgeted;
+        }
+
+        $set     = $repository->getBudgetsAndExpensesPerYear($budgets, $accounts, $start, $end);
+        $entries = new Collection;
+        // go by budget, not by year.
+        /** @var Budget $budget */
+        foreach ($budgets as $budget) {
+            $entry        = ['name' => '', 'spent' => [], 'budgeted' => []];
+            $id           = $budget->id;
+            $currentStart = clone $start;
+            while ($currentStart < $end) {
+                // fix the date:
+                $currentEnd = clone $currentStart;
+                $currentEnd->endOfYear();
+
+                // save to array:
+                $year          = $currentStart->year;
+                $entry['name'] = $budget->name;
+                $spent         = 0;
+                $budgeted      = 0;
+                if (isset($set[$id]['entries'][$year])) {
+                    $spent = $set[$id]['entries'][$year] * -1;
+                }
+
+                if (isset($budgetedArray[$id][$year])) {
+                    $budgeted = round($budgetedArray[$id][$year], 2);
+                }
+
+                $entry['spent'][$year]    = $spent;
+                $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);
+        $cache->store($data);
+
+        return Response::json($data);
+
     }
 
     /**
@@ -48,9 +130,6 @@ class BudgetController extends Controller
         $first = $repository->getFirstBudgetLimitDate($budget);
         $range = Preferences::get('viewRange', '1M')->data;
         $last  = Session::get('end', new Carbon);
-        $final = clone $last;
-        $final->addYears(2);
-        $last = Navigation::endOfX($last, $range, $final);
 
         // chart properties for cache:
         $cache = new CacheProperties();
@@ -58,18 +137,29 @@ class BudgetController extends Controller
         $cache->addProperty($last);
         $cache->addProperty('budget');
         if ($cache->has()) {
+
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
+        $final = clone $last;
+        $final->addYears(2);
+        $last    = Navigation::endOfX($last, $range, $final);
         $entries = new Collection;
+        // get all expenses:
+        $set = $repository->getExpensesPerMonth($budget, $first, $last);
 
         while ($first < $last) {
-            $end = Navigation::addPeriod($first, $range, 0);
-            $end->subDay();
-            $chartDate = clone $end;
-            $chartDate->startOfMonth();
-            $spent = $repository->balanceInPeriod($budget, $first, $end) * -1;
-            $entries->push([$chartDate, $spent]);
+            $monthFormatted = $first->format('Y-m');
+
+            $filtered = $set->filter(
+                function (Budget $obj) use ($monthFormatted) {
+                    return $obj->dateFormatted == $monthFormatted;
+                }
+            );
+            $spent    = is_null($filtered->first()) ? '0' : $filtered->first()->monthlyAmount;
+
+            $entries->push([$first, round(($spent * -1), 2)]);
+
             $first = Navigation::addPeriod($first, $range, 0);
         }
 
@@ -106,15 +196,24 @@ class BudgetController extends Controller
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
+        $set     = $repository->getExpensesPerDay($budget, $start, $end);
         $entries = new Collection;
         $amount  = $repetition->amount;
 
+        // get sum (har har)!
         while ($start <= $end) {
+            $formatted = $start->format('Y-m-d');
+            $filtered  = $set->filter(
+                function (Budget $obj) use ($formatted) {
+                    return $obj->date == $formatted;
+                }
+            );
+            $sum       = is_null($filtered->first()) ? '0' : $filtered->first()->dailyAmount;
+
             /*
              * Sum of expenses on this day:
              */
-            $sum    = $repository->expensesOnDayCorrected($budget, $start);
-            $amount = bcadd($amount, $sum);
+            $amount = round(bcadd($amount, $sum), 2);
             $entries->push([clone $start, $amount]);
             $start->addDay();
         }
@@ -131,14 +230,14 @@ class BudgetController extends Controller
      *
      * @param BudgetRepositoryInterface $repository
      *
+     * @param ARI                       $accountRepository
+     *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function frontpage(BudgetRepositoryInterface $repository)
+    public function frontpage(BudgetRepositoryInterface $repository, ARI $accountRepository)
     {
-        $budgets    = $repository->getBudgets();
-        $start      = Session::get('start', Carbon::now()->startOfMonth());
-        $end        = Session::get('end', Carbon::now()->endOfMonth());
-        $allEntries = new Collection;
+        $start = Session::get('start', Carbon::now()->startOfMonth());
+        $end   = Session::get('end', Carbon::now()->endOfMonth());
 
         // chart properties for cache:
         $cache = new CacheProperties();
@@ -150,98 +249,103 @@ class BudgetController extends Controller
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
+        $budgets    = $repository->getBudgetsAndLimitsInRange($start, $end);
+        $allEntries = new Collection;
+        $accounts   = $accountRepository->getAccounts(['Default account', 'Asset account', 'Cash account']);
+
+
         bcscale(2);
 
         /** @var Budget $budget */
         foreach ($budgets as $budget) {
-            $repetitions = $repository->getBudgetLimitRepetitions($budget, $start, $end);
-            if ($repetitions->count() == 0) {
-                $expenses = $repository->balanceInPeriod($budget, $start, $end, true) * -1;
-                $allEntries->push([$budget->name, 0, 0, $expenses, 0, 0]);
-                continue;
+            // we already have amount, startdate and enddate.
+            // if this "is" a limit repetition (as opposed to a budget without one entirely)
+            // depends on whether startdate and enddate are null.
+            $name = $budget->name;
+            if (is_null($budget->startdate) && is_null($budget->enddate)) {
+                $currentStart = clone $start;
+                $currentEnd   = clone $end;
+                $expenses     = $repository->balanceInPeriod($budget, $currentStart, $currentEnd, $accounts);
+                $amount       = 0;
+                $left         = 0;
+                $spent        = $expenses;
+                $overspent    = 0;
+            } else {
+                $currentStart = clone $budget->startdate;
+                $currentEnd   = clone $budget->enddate;
+                $expenses     = $repository->balanceInPeriod($budget, $currentStart, $currentEnd, $accounts);
+                $amount       = $budget->amount;
+                // smaller than 1 means spent MORE than budget allows.
+                $left      = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? 0 : bcadd($budget->amount, $expenses);
+                $spent     = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? ($amount * -1) : $expenses;
+                $overspent = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? bcadd($budget->amount, $expenses) : 0;
             }
-            /** @var LimitRepetition $repetition */
-            foreach ($repetitions as $repetition) {
-                $expenses = $repository->balanceInPeriod($budget, $repetition->startdate, $repetition->enddate, true) * -1;
-                // $left can be less than zero.
-                // $overspent can be more than zero ( = overspending)
 
-                $left      = max(bcsub($repetition->amount, $expenses), 0); // limited at zero.
-                $overspent = max(bcsub($expenses, $repetition->amount), 0); // limited at zero.
-                $name      = $budget->name;
-
-                // $spent is maxed to the repetition amount:
-                $spent = $expenses > $repetition->amount ? $repetition->amount : $expenses;
-
-
-                $allEntries->push([$name, $left, $spent, $overspent, $repetition->amount, $expenses]);
-            }
+            $allEntries->push([$name, $left, $spent, $overspent, $amount, $expenses]);
         }
 
-        $noBudgetExpenses = $repository->getWithoutBudgetSum($start, $end) * -1;
+        $noBudgetExpenses = $repository->getWithoutBudgetSum($start, $end);
         $allEntries->push([trans('firefly.noBudget'), 0, 0, $noBudgetExpenses, 0, 0]);
-
         $data = $this->generator->frontpage($allEntries);
         $cache->store($data);
 
         return Response::json($data);
-
     }
 
     /**
-     * Show a yearly overview for a budget.
      *
      * @param BudgetRepositoryInterface $repository
-     * @param                           $year
-     * @param bool                      $shared
+     * @param                           $reportType
+     * @param Carbon                    $start
+     * @param Carbon                    $end
+     * @param Collection                $accounts
      *
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @return \Illuminate\Http\JsonResponse
      */
-    public function year(BudgetRepositoryInterface $repository, $year, $shared = false)
+    public function year(BudgetRepositoryInterface $repository, $reportType, Carbon $start, Carbon $end, Collection $accounts)
     {
-        $start      = new Carbon($year . '-01-01');
-        $end        = new Carbon($year . '-12-31');
-        $shared     = $shared == 'shared' ? true : false;
-        $allBudgets = $repository->getBudgets();
-        $budgets    = new Collection;
-
         // chart properties for cache:
         $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
+        $cache->addProperty($reportType);
+        $cache->addProperty($accounts);
         $cache->addProperty('budget');
         $cache->addProperty('year');
         if ($cache->has()) {
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
-        // filter empty budgets:
+        $budgetInformation = $repository->getBudgetsAndExpensesPerMonth($accounts, $start, $end);
+        $budgets           = new Collection;
+        $entries           = new Collection;
 
-        foreach ($allBudgets as $budget) {
-            $spent = $repository->balanceInPeriod($budget, $start, $end, $shared);
-            if ($spent != 0) {
-                $budgets->push($budget);
-            }
+        /** @var array $row */
+        foreach ($budgetInformation as $row) {
+            $budgets->push($row['budget']);
         }
 
-        $entries = new Collection;
-
         while ($start < $end) {
             // month is the current end of the period:
             $month = clone $start;
             $month->endOfMonth();
-            $row = [clone $start];
+            $row           = [clone $start];
+            $dateFormatted = $start->format('Y-m');
 
-            // each budget, fill the row:
-            foreach ($budgets as $budget) {
-                $spent = $repository->balanceInPeriod($budget, $start, $month, $shared);
-                $row[] = $spent * -1;
+            // each budget, check if there is an entry for this month:
+            /** @var array $row */
+            foreach ($budgetInformation as $budgetRow) {
+                $spent = 0; // nothing spent.
+                if (isset($budgetRow['entries'][$dateFormatted])) {
+                    $spent = $budgetRow['entries'][$dateFormatted] * -1; // to fit array
+                }
+                $row[] = $spent;
             }
             $entries->push($row);
             $start->endOfMonth()->addDay();
         }
 
-        $data = $this->generator->year($allBudgets, $entries);
+        $data = $this->generator->year($budgets, $entries);
         $cache->store($data);
 
         return Response::json($data);

app/Http/Controllers/Chart/CategoryController.php

@@ -6,13 +6,15 @@ namespace FireflyIII\Http\Controllers\Chart;
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Category;
-use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface as CRI;
+use FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface as SCRI;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
 use Navigation;
 use Preferences;
 use Response;
 use Session;
+use stdClass;
 
 /**
  * Class CategoryController
@@ -21,7 +23,7 @@ use Session;
  */
 class CategoryController extends Controller
 {
-    /** @var  \FireflyIII\Generator\Chart\Category\CategoryChartGenerator */
+    /** @var  \FireflyIII\Generator\Chart\Category\CategoryChartGeneratorInterface */
     protected $generator;
 
     /**
@@ -31,19 +33,21 @@ class CategoryController extends Controller
     {
         parent::__construct();
         // create chart generator:
-        $this->generator = app('FireflyIII\Generator\Chart\Category\CategoryChartGenerator');
+        $this->generator = app('FireflyIII\Generator\Chart\Category\CategoryChartGeneratorInterface');
     }
 
 
     /**
      * Show an overview for a category for all time, per month/week/year.
      *
-     * @param CategoryRepositoryInterface $repository
-     * @param Category                    $category
+     * @param SCRI     $repository
+     * @param Category $category
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function all(CategoryRepositoryInterface $repository, Category $category)
+    public function all(SCRI $repository, Category $category)
     {
         // oldest transaction in category:
         $start   = $repository->getFirstActivityDate($category);
@@ -51,8 +55,6 @@ class CategoryController extends Controller
         $start   = Navigation::startOfPeriod($start, $range);
         $end     = new Carbon;
         $entries = new Collection;
-
-
         // chart properties for cache:
         $cache = new CacheProperties();
         $cache->addProperty($start);
@@ -62,36 +64,116 @@ class CategoryController extends Controller
         if ($cache->has()) {
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
+        $spentArray  = $repository->spentPerDay($category, $start, $end);
+        $earnedArray = $repository->earnedPerDay($category, $start, $end);
 
         while ($start <= $end) {
             $currentEnd = Navigation::endOfPeriod($start, $range);
-            $spent      = $repository->spentInPeriod($category, $start, $currentEnd);
-            $earned     = $repository->earnedInPeriod($category, $start, $currentEnd);
+            $spent      = $this->getSumOfRange($start, $currentEnd, $spentArray);
+            $earned     = $this->getSumOfRange($start, $currentEnd, $earnedArray);
             $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);
+        $data    = $this->generator->all($entries);
         $cache->store($data);
 
         return Response::json($data);
+    }
 
+    /**
+     * @param SCRI     $repository
+     * @param Category $category
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function currentPeriod(SCRI $repository, Category $category)
+    {
+        $start = clone Session::get('start', Carbon::now()->startOfMonth());
+        $end   = Session::get('end', Carbon::now()->endOfMonth());
+        $data  = $this->makePeriodChart($repository, $category, $start, $end);
+
+        return Response::json($data);
+    }
+
+    /**
+     * Returns a chart of what has been earned in this period in each category
+     * grouped by month.
+     *
+     * @param CRI                         $repository
+     * @param                             $reportType
+     * @param Carbon                      $start
+     * @param Carbon                      $end
+     * @param Collection                  $accounts
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList) // cant avoid it.
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly 5.
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // it's long but ok.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function earnedInPeriod(CRI $repository, $reportType, Carbon $start, Carbon $end, Collection $accounts)
+    {
+        $cache = new CacheProperties; // chart properties for cache:
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty($reportType);
+        $cache->addProperty($accounts);
+        $cache->addProperty('category');
+        $cache->addProperty('earned-in-period');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
+        $set        = $repository->earnedForAccountsPerMonth($accounts, $start, $end);
+        $categories = $set->unique('id')->sortBy(
+            function (Category $category) {
+                return $category->name;
+            }
+        );
+        $entries    = new Collection;
+
+        while ($start < $end) { // filter the set:
+            $row        = [clone $start];
+            $currentSet = $set->filter( // get possibly relevant entries from the big $set
+                function (Category $category) use ($start) {
+                    return $category->dateFormatted == $start->format('Y-m');
+                }
+            );
+            /** @var Category $category */
+            foreach ($categories as $category) { // check for each category if its in the current set.
+                $entry = $currentSet->filter( // if its in there, use the value.
+                    function (Category $cat) use ($category) {
+                        return ($cat->id == $category->id);
+                    }
+                )->first();
+                if (!is_null($entry)) {
+                    $row[] = round($entry->earned, 2);
+                } else {
+                    $row[] = 0;
+                }
+            }
+            $entries->push($row);
+            $start->addMonth();
+        }
+        $data = $this->generator->earnedInPeriod($categories, $entries);
+        $cache->store($data);
+
+        return $data;
 
     }
 
     /**
      * Show this month's category overview.
      *
-     * @param CategoryRepositoryInterface $repository
+     * @param CRI $repository
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function frontpage(CategoryRepositoryInterface $repository)
+    public function frontpage(CRI $repository)
     {
 
         $start = Session::get('start', Carbon::now()->startOfMonth());
@@ -107,52 +189,225 @@ class CategoryController extends Controller
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
-        $array = $repository->getCategoriesAndExpensesCorrected($start, $end);
-        // sort by callback:
-        uasort(
-            $array,
-            function ($left, $right) {
-                if ($left['sum'] == $right['sum']) {
-                    return 0;
-                }
+        // get data for categories (and "no category"):
+        $set     = $repository->spentForAccountsPerMonth(new Collection, $start, $end);
+        $outside = $repository->sumSpentNoCategory(new Collection, $start, $end);
 
-                return ($left['sum'] < $right['sum']) ? -1 : 1;
-            }
-        );
-        $set  = new Collection($array);
+        // this is a "fake" entry for the "no category" entry.
+        $entry        = new stdClass();
+        $entry->name  = trans('firefly.no_category');
+        $entry->spent = $outside;
+        $set->push($entry);
+
+        $set  = $set->sortBy('spent');
         $data = $this->generator->frontpage($set);
+        $cache->store($data);
 
         return Response::json($data);
 
     }
 
     /**
-     * @param CategoryRepositoryInterface $repository
+     * @param                             $reportType
+     * @param Carbon                      $start
+     * @param Carbon                      $end
+     * @param Collection                  $accounts
+     * @param Collection                  $categories
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function multiYear($reportType, Carbon $start, Carbon $end, Collection $accounts, Collection $categories)
+    {
+        /** @var CRI $repository */
+        $repository = app('FireflyIII\Repositories\Category\CategoryRepositoryInterface');
+
+        // chart properties for cache:
+        $cache = new CacheProperties();
+        $cache->addProperty($reportType);
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty($accounts);
+        $cache->addProperty($categories);
+        $cache->addProperty('multiYearCategory');
+
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
+        $entries = new Collection;
+        $set     = $repository->listMultiYear($categories, $accounts, $start, $end);
+
+        /** @var Category $category */
+        foreach ($categories as $category) {
+            $entry = ['name' => '', 'spent' => [], 'earned' => []];
+
+            $currentStart = clone $start;
+            while ($currentStart < $end) {
+                // fix the date:
+                $year       = $currentStart->year;
+                $currentEnd = clone $currentStart;
+                $currentEnd->endOfYear();
+
+
+                // get data:
+                if (is_null($category->id)) {
+                    $name   = trans('firefly.noCategory');
+                    $spent  = $repository->sumSpentNoCategory($accounts, $currentStart, $currentEnd);
+                    $earned = $repository->sumEarnedNoCategory($accounts, $currentStart, $currentEnd);
+                } else {
+                    // get from set:
+                    $entrySpent  = $set->filter(
+                        function (Category $cat) use ($year, $category) {
+                            return ($cat->type == 'Withdrawal' && $cat->dateFormatted == $year && $cat->id == $category->id);
+                        }
+                    )->first();
+                    $entryEarned = $set->filter(
+                        function (Category $cat) use ($year, $category) {
+                            return ($cat->type == 'Deposit' && $cat->dateFormatted == $year && $cat->id == $category->id);
+                        }
+                    )->first();
+
+                    $name   = $category->name;
+                    $spent  = !is_null($entrySpent) ? $entrySpent->sum : 0;
+                    $earned = !is_null($entryEarned) ? $entryEarned->sum : 0;
+                }
+
+                // save to array:
+                $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);
+
+    }
+
+    /**
+     * @param SCRI                        $repository
      * @param Category                    $category
      *
+     * @param                             $date
+     *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function currentPeriod(CategoryRepositoryInterface $repository, Category $category)
+    public function specificPeriod(SCRI $repository, Category $category, $date)
     {
-        $start = clone Session::get('start', Carbon::now()->startOfMonth());
-        $end   = Session::get('end', Carbon::now()->endOfMonth());
+        $carbon = new Carbon($date);
+        $range  = Preferences::get('viewRange', '1M')->data;
+        $start  = Navigation::startOfPeriod($carbon, $range);
+        $end    = Navigation::endOfPeriod($carbon, $range);
+        $data   = $this->makePeriodChart($repository, $category, $start, $end);
 
+        return Response::json($data);
+
+
+    }
+
+    /**
+     * Returns a chart of what has been spent in this period in each category
+     * grouped by month.
+     *
+     * @param CRI                         $repository
+     * @param                             $reportType
+     * @param Carbon                      $start
+     * @param Carbon                      $end
+     * @param Collection                  $accounts
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList) // need all parameters
+     * @SuppressWarnings(PHPMD.ExcessuveMethodLength) // need the length
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function spentInPeriod(CRI $repository, $reportType, Carbon $start, Carbon $end, Collection $accounts)
+    {
+        $cache = new CacheProperties; // chart properties for cache:
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty($reportType);
+        $cache->addProperty($accounts);
+        $cache->addProperty('category');
+        $cache->addProperty('spent-in-period');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
+        $set        = $repository->spentForAccountsPerMonth($accounts, $start, $end);
+        $categories = $set->unique('id')->sortBy(
+            function (Category $category) {
+                return $category->name;
+            }
+        );
+        $entries    = new Collection;
+
+        while ($start < $end) { // filter the set:
+            $row        = [clone $start];
+            $currentSet = $set->filter(// get possibly relevant entries from the big $set
+                function (Category $category) use ($start) {
+                    return $category->dateFormatted == $start->format('Y-m');
+                }
+            );
+            /** @var Category $category */
+            foreach ($categories as $category) {// check for each category if its in the current set.
+                $entry = $currentSet->filter(// if its in there, use the value.
+                    function (Category $cat) use ($category) {
+                        return ($cat->id == $category->id);
+                    }
+                )->first();
+                if (!is_null($entry)) {
+                    $row[] = round(($entry->spent * -1), 2);
+                } else {
+                    $row[] = 0;
+                }
+            }
+
+            $entries->push($row);
+            $start->addMonth();
+        }
+        $data = $this->generator->spentInPeriod($categories, $entries);
+        $cache->store($data);
+
+        return $data;
+    }
+
+    /**
+     * @param SCRI     $repository
+     * @param Category $category
+     * @param Carbon   $start
+     * @param Carbon   $end
+     *
+     * @return array
+     */
+    private function makePeriodChart(SCRI $repository, Category $category, Carbon $start, Carbon $end)
+    {
         // chart properties for cache:
         $cache = new CacheProperties;
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty($category->id);
-        $cache->addProperty('category');
-        $cache->addProperty('currentPeriod');
+        $cache->addProperty('specific-period');
         if ($cache->has()) {
-            return Response::json($cache->get()); // @codeCoverageIgnore
+            return $cache->get(); // @codeCoverageIgnore
         }
         $entries = new Collection;
 
+        // get amount earned in period, grouped by day.
+        // get amount spent in period, grouped by day.
+        $spentArray  = $repository->spentPerDay($category, $start, $end);
+        $earnedArray = $repository->earnedPerDay($category, $start, $end);
 
         while ($start <= $end) {
-            $spent  = $repository->spentOnDaySumCorrected($category, $start);
-            $earned = $repository->earnedOnDaySumCorrected($category, $start);
+            $str    = $start->format('Y-m-d');
+            $spent  = isset($spentArray[$str]) ? $spentArray[$str] : 0;
+            $earned = isset($earnedArray[$str]) ? $earnedArray[$str] : 0;
             $date   = Navigation::periodShow($start, '1D');
             $entries->push([clone $start, $date, $spent, $earned]);
             $start->addDay();
@@ -161,169 +416,8 @@ class CategoryController extends Controller
         $data = $this->generator->period($entries);
         $cache->store($data);
 
-        return Response::json($data);
-
-
+        return $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->spentOnDaySumCorrected($category, $start);
-            $earned  = $repository->earnedOnDaySumCorrected($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);
-
-
-    }
-
-    /**
-     * This chart will only show expenses.
-     *
-     * @param CategoryRepositoryInterface $repository
-     * @param                             $year
-     * @param bool                        $shared
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function spentInYear(CategoryRepositoryInterface $repository, $year, $shared = false)
-    {
-        $start = new Carbon($year . '-01-01');
-        $end   = new Carbon($year . '-12-31');
-
-        $cache = new CacheProperties; // chart properties for cache:
-        $cache->addProperty($start);
-        $cache->addProperty($end);
-        $cache->addProperty('category');
-        $cache->addProperty('spent-in-year');
-        if ($cache->has()) {
-            return Response::json($cache->get()); // @codeCoverageIgnore
-        }
-
-        $shared        = $shared == 'shared' ? true : false;
-        $allCategories = $repository->getCategories();
-        $entries       = new Collection;
-        $categories    = $allCategories->filter(
-            function (Category $category) use ($repository, $start, $end, $shared) {
-                $spent = $repository->balanceInPeriod($category, $start, $end, $shared);
-                if ($spent < 0) {
-                    return $category;
-                }
-
-                return null;
-            }
-        );
-
-        while ($start < $end) {
-            $month = clone $start; // month is the current end of the period
-            $month->endOfMonth();
-            $row = [clone $start]; // make a row:
-
-            foreach ($categories as $category) { // each budget, fill the row
-                $spent = $repository->balanceInPeriod($category, $start, $month, $shared);
-                if ($spent < 0) {
-                    $row[] = $spent * -1;
-                } else {
-                    $row[] = 0;
-                }
-            }
-            $entries->push($row);
-            $start->addMonth();
-        }
-        $data = $this->generator->spentInYear($categories, $entries);
-        $cache->store($data);
-
-        return Response::json($data);
-    }
-
-    /**
-     * This chart will only show income.
-     *
-     * @param CategoryRepositoryInterface $repository
-     * @param                             $year
-     * @param bool                        $shared
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function earnedInYear(CategoryRepositoryInterface $repository, $year, $shared = false)
-    {
-        $start = new Carbon($year . '-01-01');
-        $end   = new Carbon($year . '-12-31');
-
-        $cache = new CacheProperties; // chart properties for cache:
-        $cache->addProperty($start);
-        $cache->addProperty($end);
-        $cache->addProperty('category');
-        $cache->addProperty('earned-in-year');
-        if ($cache->has()) {
-            return Response::json($cache->get()); // @codeCoverageIgnore
-        }
-
-        $shared        = $shared == 'shared' ? true : false;
-        $allCategories = $repository->getCategories();
-        $allEntries    = new Collection;
-        $categories    = $allCategories->filter(
-            function (Category $category) use ($repository, $start, $end, $shared) {
-                $spent = $repository->balanceInPeriod($category, $start, $end, $shared);
-                if ($spent > 0) {
-                    return $category;
-                }
-
-                return null;
-            }
-        );
-
-        while ($start < $end) {
-            $month = clone $start; // month is the current end of the period
-            $month->endOfMonth();
-            $row = [clone $start]; // make a row:
-
-            foreach ($categories as $category) { // each budget, fill the row
-                $spent = $repository->balanceInPeriod($category, $start, $month, $shared);
-                if ($spent > 0) {
-                    $row[] = $spent;
-                } else {
-                    $row[] = 0;
-                }
-            }
-            $allEntries->push($row);
-            $start->addMonth();
-        }
-        $data = $this->generator->earnedInYear($categories, $allEntries);
-        $cache->store($data);
-
-        return Response::json($data);
-    }
 }

app/Http/Controllers/Chart/PiggyBankController.php

@@ -18,7 +18,7 @@ use Response;
 class PiggyBankController extends Controller
 {
 
-    /** @var  \FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGenerator */
+    /** @var  \FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGeneratorInterface */
     protected $generator;
 
     /**
@@ -28,7 +28,7 @@ class PiggyBankController extends Controller
     {
         parent::__construct();
         // create chart generator:
-        $this->generator = app('FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGenerator');
+        $this->generator = app('FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGeneratorInterface');
     }
 
     /**

app/Http/Controllers/Chart/ReportController.php

@@ -9,7 +9,6 @@ use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
 use Response;
-use Log;
 
 /**
  * Class ReportController
@@ -19,7 +18,7 @@ use Log;
 class ReportController extends Controller
 {
 
-    /** @var  \FireflyIII\Generator\Chart\Report\ReportChartGenerator */
+    /** @var  \FireflyIII\Generator\Chart\Report\ReportChartGeneratorInterface */
     protected $generator;
 
     /**
@@ -29,7 +28,7 @@ class ReportController extends Controller
     {
         parent::__construct();
         // create chart generator:
-        $this->generator = app('FireflyIII\Generator\Chart\Report\ReportChartGenerator');
+        $this->generator = app('FireflyIII\Generator\Chart\Report\ReportChartGeneratorInterface');
     }
 
 
@@ -37,40 +36,41 @@ class ReportController extends Controller
      * Summarizes all income and expenses, per month, for a given year.
      *
      * @param ReportQueryInterface $query
-     * @param                      $year
-     * @param bool                 $shared
+     * @param                      $reportType
+     * @param Carbon               $start
+     * @param Carbon               $end
+     * @param Collection           $accounts
      *
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList) // cant avoid it.
+     *
+     * @return \Illuminate\Http\JsonResponse
      */
-    public function yearInOut(ReportQueryInterface $query, $year, $shared = false)
+    public function yearInOut(ReportQueryInterface $query, $reportType, 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($reportType);
+        $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_positive');
-            $expenseSum = $query->expenseInPeriodCorrected($start, $month, $shared)->sum('amount_positive');
+        // spent per month, and earned per month. For a specific set of accounts
+        // grouped by month
+        $spentArray  = $query->spentPerMonth($accounts, $start, $end);
+        $earnedArray = $query->earnedPerMonth($accounts, $start, $end);
 
-            $entries->push([clone $start, $incomeSum, $expenseSum]);
-            $start->addMonth();
+        if ($start->diffInMonths($end) > 12) {
+            // data = method X
+            $data = $this->multiYearInOut($earnedArray, $spentArray, $start, $end);
+        } else {
+            // data = method Y
+            $data = $this->singleYearInOut($earnedArray, $spentArray, $start, $end);
         }
 
-        $data = $this->generator->yearInOut($entries);
         $cache->store($data);
 
         return Response::json($data);
@@ -81,56 +81,170 @@ 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                      $reportType
+     * @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, $reportType, 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($reportType);
+        $cache->addProperty($accounts);
         if ($cache->has()) {
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
+        // spent per month, and earned per month. For a specific set of accounts
+        // grouped by month
+        $spentArray  = $query->spentPerMonth($accounts, $start, $end);
+        $earnedArray = $query->earnedPerMonth($accounts, $start, $end);
+        if ($start->diffInMonths($end) > 12) {
+            // per year
+            $data = $this->multiYearInOutSummarized($earnedArray, $spentArray, $start, $end);
+        } else {
+            // per month!
+            $data = $this->singleYearInOutSummarized($earnedArray, $spentArray, $start, $end);
+        }
+        $cache->store($data);
 
-        $start   = new Carbon($year . '-01-01');
-        $end     = new Carbon($year . '-12-31');
-        $shared  = $shared == 'shared' ? true : false;
+        return Response::json($data);
+    }
+
+    /**
+     * @param array  $earned
+     * @param array  $spent
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return array
+     */
+    protected function singleYearInOutSummarized(array $earned, array $spent, Carbon $start, Carbon $end)
+    {
         $income  = '0';
         $expense = '0';
         $count   = 0;
-
-        bcscale(2);
-
         while ($start < $end) {
-            $month = clone $start;
-            $month->endOfMonth();
-            // total income and total expenses:
-            $currentIncome = $query->incomeInPeriodCorrected($start, $month, $shared)->sum('amount_positive');
-            $currentExpense = $query->expenseInPeriodCorrected($start, $month, $shared)->sum('amount_positive');
-            
-            Log::debug('Date ['.$month->format('M Y').']: income = ['.$income.' + '.$currentIncome.'], out = ['.$expense.' + '.$currentExpense.']');
-            
-            $income  = bcadd($income, $currentIncome);
-            $expense = bcadd($expense, $currentExpense);
-            
-            
-            
-            
-            
+            $date           = $start->format('Y-m');
+            $currentIncome  = isset($earned[$date]) ? $earned[$date] : 0;
+            $currentExpense = isset($spent[$date]) ? ($spent[$date] * -1) : 0;
+            $income         = bcadd($income, $currentIncome);
+            $expense        = bcadd($expense, $currentExpense);
+
             $count++;
             $start->addMonth();
         }
 
         $data = $this->generator->yearInOutSummarized($income, $expense, $count);
-        $cache->store($data);
 
-        return Response::json($data);
+        return $data;
+    }
+
+    /**
+     * @param array  $earned
+     * @param array  $spent
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return array
+     */
+    protected function multiYearInOutSummarized(array $earned, array $spent, Carbon $start, Carbon $end)
+    {
+        $income  = '0';
+        $expense = '0';
+        $count   = 0;
+        while ($start < $end) {
+
+            $currentIncome  = $this->pluckFromArray($start->year, $earned);
+            $currentExpense = $this->pluckFromArray($start->year, $spent) * -1;
+            $income         = bcadd($income, $currentIncome);
+            $expense        = bcadd($expense, $currentExpense);
+
+            $count++;
+            $start->addYear();
+        }
+
+        $data = $this->generator->multiYearInOutSummarized($income, $expense, $count);
+
+        return $data;
+    }
+
+    /**
+     * @param array  $earned
+     * @param array  $spent
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return array
+     */
+    protected function multiYearInOut(array $earned, array $spent, Carbon $start, Carbon $end)
+    {
+        $entries = new Collection;
+        while ($start < $end) {
+
+            $incomeSum  = $this->pluckFromArray($start->year, $earned);
+            $expenseSum = $this->pluckFromArray($start->year, $spent) * -1;
+
+            $entries->push([clone $start, $incomeSum, $expenseSum]);
+            $start->addYear();
+        }
+
+        $data = $this->generator->multiYearInOut($entries);
+
+        return $data;
+    }
+
+    /**
+     * @param array  $earned
+     * @param array  $spent
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return array
+     */
+    protected function singleYearInOut(array $earned, array $spent, Carbon $start, Carbon $end)
+    {
+        // per month? simply use each month.
+
+        $entries = new Collection;
+        while ($start < $end) {
+            // total income and total expenses:
+            $date       = $start->format('Y-m');
+            $incomeSum  = isset($earned[$date]) ? $earned[$date] : 0;
+            $expenseSum = isset($spent[$date]) ? ($spent[$date] * -1) : 0;
+
+            $entries->push([clone $start, $incomeSum, $expenseSum]);
+            $start->addMonth();
+        }
+
+        $data = $this->generator->yearInOut($entries);
+
+        return $data;
+    }
+
+    /**
+     * @param int   $year
+     * @param array $set
+     *
+     * @return string
+     */
+    protected function pluckFromArray($year, array $set)
+    {
+        bcscale(2);
+        $sum = '0';
+        foreach ($set as $date => $amount) {
+            if (substr($date, 0, 4) == $year) {
+                $sum = bcadd($sum, $amount);
+            }
+        }
+
+        return $sum;
 
     }
 }

app/Http/Controllers/Controller.php

@@ -1,10 +1,15 @@
-<?php namespace FireflyIII\Http\Controllers;
+<?php
 
+namespace FireflyIII\Http\Controllers;
+
+use App;
 use Auth;
-use Config;
+use Carbon\Carbon;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
+use NumberFormatter;
 use Preferences;
 use View;
 
@@ -13,10 +18,9 @@ use View;
  *
  * @package FireflyIII\Http\Controllers
  */
-abstract class Controller extends BaseController
+class Controller extends BaseController
 {
-
-    use DispatchesJobs, ValidatesRequests;
+    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
 
     /** @var string */
     protected $monthAndDayFormat;
@@ -24,7 +28,7 @@ abstract class Controller extends BaseController
     protected $monthFormat;
 
     /**
-     * @codeCoverageIgnore
+     * Controller constructor.
      */
     public function __construct()
     {
@@ -34,14 +38,60 @@ 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       = (string)trans('config.month');
+            $this->monthAndDayFormat = (string)trans('config.month_and_day');
 
+            App::setLocale($lang);
+            Carbon::setLocale(substr($lang, 0, 2));
+            $locale = explode(',', trans('config.locale'));
+            $locale = array_map('trim', $locale);
+
+            setlocale(LC_TIME, $locale);
+            setlocale(LC_MONETARY, $locale);
+
+            // change localeconv to a new array:
+            $numberFormatter = numfmt_create($lang, NumberFormatter::CURRENCY);
+            $localeconv      = [
+                'mon_decimal_point' => $numberFormatter->getSymbol($numberFormatter->getAttribute(NumberFormatter::DECIMAL_SEPARATOR_SYMBOL)),
+                'mon_thousands_sep' => $numberFormatter->getSymbol($numberFormatter->getAttribute(NumberFormatter::MONETARY_GROUPING_SEPARATOR_SYMBOL)),
+                'frac_digits'       => $numberFormatter->getAttribute(NumberFormatter::MAX_FRACTION_DIGITS),
+            ];
             View::share('monthFormat', $this->monthFormat);
             View::share('monthAndDayFormat', $this->monthAndDayFormat);
             View::share('language', $lang);
+            View::share('localeconv', $localeconv);
         }
     }
+
+    /**
+     * Take the array as returned by SingleCategoryRepositoryInterface::spentPerDay and SingleCategoryRepositoryInterface::earnedByDay
+     * and sum up everything in the array in the given range.
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     * @param array  $array
+     *
+     * @return string
+     */
+    protected function getSumOfRange(Carbon $start, Carbon $end, array $array)
+    {
+        bcscale(2);
+        $sum          = '0';
+        $currentStart = clone $start; // to not mess with the original one
+        $currentEnd   = clone $end; // to not mess with the original one
+
+        while ($currentStart <= $currentEnd) {
+            $date = $currentStart->format('Y-m-d');
+            if (isset($array[$date])) {
+                $sum = bcadd($sum, $array[$date]);
+            }
+            $currentStart->addDay();
+        }
+
+        return $sum;
+    }
+
+
 }