Merge branch 'release/4.3.2'

New Crowdin translations

.coveralls.yml

@@ -1,2 +0,0 @@
-src_dir: .
-coverage_clover: tests/_output/coverage.xml

.env.example

@@ -0,0 +1,53 @@
+APP_ENV=production
+APP_DEBUG=false
+APP_FORCE_SSL=false
+APP_FORCE_ROOT=
+APP_KEY=SomeRandomStringOf32CharsExactly
+APP_LOG_LEVEL=warning
+APP_URL=http://localhost
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=homestead
+DB_USERNAME=homestead
+DB_PASSWORD=secret
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+QUEUE_DRIVER=sync
+
+COOKIE_PATH="/"
+COOKIE_DOMAIN=
+COOKIE_SECURE=false
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=smtp
+MAIL_HOST=mailtrap.io
+MAIL_PORT=2525
+MAIL_FROM=changeme@example.com
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+SEND_REGISTRATION_MAIL=true
+SEND_ERROR_MESSAGE=true
+SHOW_INCOMPLETE_TRANSLATIONS=false
+
+CACHE_PREFIX=firefly
+
+GOOGLE_MAPS_API_KEY=
+ANALYTICS_ID=
+SITE_OWNER=mail@example.com
+
+PUSHER_KEY=
+PUSHER_SECRET=
+PUSHER_APP_ID=
+
+DEMO_USERNAME=
+DEMO_PASSWORD=
+

.env.testing

@@ -0,0 +1,45 @@
+APP_ENV=testing
+APP_DEBUG=true
+APP_FORCE_SSL=false
+APP_FORCE_ROOT=
+APP_KEY=TestTestTestTestTestTestTestTest
+APP_LOG_LEVEL=debug
+APP_URL=http://localhost
+
+DB_CONNECTION=sqlite
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_USERNAME=homestead
+DB_PASSWORD=secret
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+QUEUE_DRIVER=sync
+
+COOKIE_PATH="/"
+COOKIE_DOMAIN=
+COOKIE_SECURE=false
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=smtp
+MAIL_HOST=mailtrap.io
+MAIL_PORT=2525
+MAIL_FROM=changeme@example.com
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+SEND_REGISTRATION_MAIL=true
+SEND_ERROR_MESSAGE=true
+SHOW_INCOMPLETE_TRANSLATIONS=false
+
+ANALYTICS_ID=
+SITE_OWNER=mail@example.com
+
+PUSHER_KEY=
+PUSHER_SECRET=
+PUSHER_APP_ID=

.gitattributes

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

.github/CONTRIBUTING

@@ -0,0 +1 @@
+If you are requesting a new feature, please check out the list of [often requested features](https://firefly-iii.github.io/requested-features/) first. Thanks!

.gitignore

@@ -1,20 +1,14 @@
-/bootstrap/compiled.php
+/node_modules
+/public/storage
 /vendor
-composer.phar
-composer.lock
-.env.*.php
-.env.php
-.DS_Store
-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
-c3.php
+/.idea
+Homestead.json
+Homestead.yaml
+.env
+_development
+.env.local
+result.html
+test-import.sh
+test-import-report.txt
+public/google*.html
+.env.backup

.scrutinizer.yml

@@ -0,0 +1,51 @@
+# .scrutinizer.yml
+tools:
+  external_code_coverage: false
+filter:
+  paths:
+    - app/*
+    - public/js/ff/*
+  excluded_paths:
+    - "database/migrations/*"
+    - "bootstrap/*"
+    - "config/*"
+    - "docker/*"
+    - "public/js/lib/*"
+    - "public/lib/adminlte/js/*"
+    - "public/lib/bootstrap/js/*"
+    - "resources/*"
+    - "routes/*"
+    - "storage/*"
+checks:
+    php:
+        use_self_instead_of_fqcn: true
+        uppercase_constants: true
+        return_doc_comments: true
+        return_doc_comment_if_not_inferrable: true
+        remove_extra_empty_lines: true
+        parameter_doc_comments: true
+        optional_parameters_at_the_end: true
+        no_short_variable_names:
+            minimum: '3'
+        no_short_method_names:
+            minimum: '3'
+        no_long_variable_names:
+            maximum: '20'
+        no_goto: true
+        newline_at_end_of_file: true
+        encourage_single_quotes: true
+        avoid_todo_comments: true
+        avoid_perl_style_comments: true
+        avoid_fixme_comments: true
+        avoid_multiple_statements_on_same_line: true
+        align_assignments: true
+        duplication: false
+    javascript: true
+
+coding_style:
+    php:
+        spaces:
+            around_operators:
+                concatenation: true
+            other:
+                after_type_cast: false

.travis.yml

@@ -1,15 +1,17 @@
 language: php
-
+sudo: false
 php:
-  - 5.5
-  - 5.6
-  - hhvm
+  - '7.0'
 
 install:
-  - composer install
+  - phpenv config-rm xdebug.ini
+  - rm composer.lock
+  - composer update --no-scripts
+  - php artisan clear-compiled
+  - php artisan optimize
+  - php artisan env
+  - cp .env.testing .env
+  - mv storage/database/databasecopy.sqlite storage/database/database.sqlite
 
 script:
-  - php vendor/bin/codecept run
-
-after_script:
-  - php vendor/bin/coveralls
+  - phpunit

CHANGELOG.md

@@ -0,0 +1,495 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+
+## [4.3.2] - 2017-01-09
+
+An intermediate release because something in the Twig and Twigbridge libraries is broken and I have to make sure it doesn't affect you guys. But some cool features were on their way so there's that oo.
+
+### Added
+- Some code for issue #475, consistent overviews.
+- Better currency display. Make sure you have locale packages installed.
+
+### Changed
+- Uses a new version of Laravel.
+
+### Fixed
+- The password reset routine was broken.
+- Issue #522, thanks to @xpfgsyb
+- Issue #524, thanks to @worldworm
+- Issue #526, thanks to @worldworm
+- Issue #528, thanks to @skibbipl
+- Various other fixes.
+
+## [4.3.1] - 2017-01-04
+### Added
+- Support for Russian and Polish. 
+- Support for a proper demo website.
+- Support for custom decimal places in currencies (#506, suggested by @xpfgsyb).
+- Most amounts are now right-aligned (#511, suggested by @xpfgsyb).
+- German is now a "complete" language, more than 75% translated!
+
+### Changed
+- **[New Github repository!](github.com/firefly-iii/firefly-iii)**
+- Better category overview.
+- #502, thanks to @zjean
+
+### Removed
+- Removed a lot of administration functions.
+- Removed ability to activate users.
+
+### Fixed
+- #501, thanks to @zjean
+- #513, thanks to @skibbipl 
+
+### Security
+- #519, thanks to @xpfgsyb
+
+## [4.3.0] - 2015-12-26
+### Added
+- New method of keeping track of available budget, see issue #489
+- Support for Spanish
+- Firefly III now has an extended demo mode. Will expand further in the future.
+ 
+
+### Changed
+- New favicon
+- Import routine no longer gives transactions a description #483
+
+
+### Removed
+- All test data generation code.
+
+### Fixed
+- Removed import accounts from search results #478
+- Redirect after delete will no longer go back to deleted item #477
+- Cannot math #482
+- Fixed bug in virtual balance field #479
+
+## [4.2.2] - 2016-12-18
+### Added
+- New budget report (still a bit of a beta)
+- Can now edit user
+
+### Changed
+- New config for specific events. Still need to build Notifications.
+
+### Fixed
+- Various bugs
+- Issue #472 thanks to @zjean
+
+## [4.2.1] - 2016-12-09
+### Added
+- BIC support (see #430)
+- New category report section and chart (see the general financial report)
+
+
+### Changed
+- Date range picker now also available on mobile devices (see #435)
+- Extended range of amounts for issue #439
+- Rewrote all routes. Old bookmarks may break.
+
+## [4.2.0] - 2016-11-27
+### Added
+- Lots of (empty) tests
+- Expanded transaction lists (#377)
+- New charts at account view
+- First code for #305
+
+
+### Changed
+- Updated all email messages.
+- Made some fonts local
+
+
+### Deprecated
+- Initial release.
+
+### Removed
+- Initial release.
+
+### Fixed
+- Issue #408
+- Various issues with split journals
+- Issue #414, thx @zjean
+- Issue #419, thx @schwalberich 
+- Issue #422, thx @xzaz
+- Various import bugs, such as #416 (@zjean)
+
+
+### Security
+- Initial release.
+
+
+## [4.1.7] - 2016-11-19
+### Added
+- Check for database table presence in console commands.
+- Category report
+- Reinstated old test routines.
+
+
+### Changed
+- Confirm account setting is no longer in `.env` file.
+- Titles are now in reverse (current page > parent > firefly iii)
+- Easier update of language files thanks to Github implementation.
+- Uniform colours for charts.
+
+### Fixed
+- Made all pages more mobile friendly.
+- Fixed #395 found by @marcoveeneman.
+- Fixed #398 found by @marcoveeneman.
+- Fixed #401 found by @marcoveeneman.
+- Many optimizations.
+- Updated many libraries.
+- Various bugs found by myself.
+
+
+## [4.1.6] - 2016-11-06
+### Added
+- New budget table for multi year report.
+
+### Changed
+- Greatly expanded help pages and their function.
+- Built a new transaction collector, which I think was the idea of @roberthorlings originally.
+- Rebuilt seach engine.
+
+### Fixed
+- #375, thanks to @schoentoon which made it impossible to resurrect currencies.
+- #370 thanks to @ksmolder
+- #378, thanks to @HomelessAvatar
+
+## [4.1.5] - 2016-11-01
+### Changed
+- Report parts are loaded using AJAX, making a lot of code more simple.
+- Help content will fall back to English.
+- Help content is translated through Crowdin.
+
+### Fixed
+- Issue #370
+
+## [4.1.4] - 2016-10-30
+### Added
+- New Dockerfile thanks to @schoentoon
+- Added changing the destination account as rule action.
+- Added changing the source account as rule action.
+- Can convert transactions into different types.
+
+### Changed
+- Changed the export routine to be more future-proof.
+- Improved help routine.
+- Integrated CrowdIn translations.
+- Simplified reports
+- Change error message to refer to solution.
+
+### Fixed
+- #367 thanks to @HungryFeline
+- #366 thanks to @3mz3t
+- #362 and #341 thanks to @bnw
+- #355 thanks to @roberthorlings
+
+## [4.1.3] - 2016-10-22
+### Fixed
+- Some event handlers called the wrong method.
+
+## [4.1.2] - 2016-10-22
+
+### Fixed
+- A bug is fixed in the journal event handler that prevented Firefly III from actually storing journals.
+
+## [4.1.1] - 2016-10-22
+
+### Added
+- Option to show deposit accounts on the front page.
+- Script to upgrade split transactions
+- Can now save notes on piggy banks.
+- Extend user admin options.
+- Run import jobs from the command line
+
+
+### Changed
+- New preferences screen layout.
+
+### Deprecated
+- ``firefly:import`` is now ``firefly:start-import``
+
+### Removed
+- Lots of old code
+
+### Fixed
+- #357, where non utf-8 files would break Firefly.
+- Tab delimiter is not properly loaded from import configuration (@roberthorlings)
+- System response to yearly bills
+
+## [4.0.2] - 2016-10-14
+### Added
+- Added ``intl`` dependency to composer file to ease installation (thanks @telyn)
+- Added support for Croatian.
+
+### Changed
+- Updated all copyright notices to refer to the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/)
+- Fixed #344
+- Fixed #346, thanks to @SanderKleykens
+- #351
+- Did some internal remodelling.
+
+### Fixed
+- PostgreSQL compatibility thanks to @SanderKleykens
+- @RobertHorlings fixed a bug in the ABN Amro import specific.
+
+
+## [4.0.1] - 2016-10-04
+### Added
+- New ING import specific by @tomwerf
+- New Presidents Choice specific to fix #307
+- Added some trimming (#335)
+
+### Changed
+- Initial release.
+
+### Deprecated
+- Initial release.
+
+### Removed
+- Initial release.
+
+### Fixed
+- Fixed a bug where incoming transactions would not be properly filtered in several reports.
+- #334 by @cyberkov
+- #337
+- #336
+- #338 found by @roberthorlings
+
+### Security
+- Initial release.
+
+
+
+
+## [4.0.0] - 2015-09-26
+### Added
+- Upgraded to Laravel 5.3, most other libraries upgraded as well.
+- Added GBP as currency, thanks to @Mortalife
+
+### Changed
+- Jump to version 4.0.0.
+- Firefly III is now subject to a [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/) license. Previous versions of this software are still MIT licensed.
+
+### Fixed
+- Support for specific decimal places, thanks to @Mortalife
+- Various CSS fixes
+- Various bugs, thanks to @fuf, @sandermulders and @vissert
+- Various queries optimized for MySQL 5.7
+
+## [3.10.4] - 2015-09-14
+### Fixed
+- Migration fix by @sandermulders
+- Tricky import bug fix thanks to @vissert
+- Currency preference will be correctly pulled from user settings, thanks to @fuf
+- Simplified code for upgrade instructions.
+
+
+## [3.10.3] - 2016-08-29
+### Added
+- More fields for mass-edit, thanks to @Vissert (#282)
+- First start of German translation
+
+### Changed
+- More optional fields for transactions and the ability to filter them.
+
+### Removed
+- Preference for budget maximum.
+
+### Fixed
+- A bug in the translation routine broke the import.
+- It was possible to destroy your Firefly installation by removing all currencies. Thanks @mondjef
+- Translation bugs.
+- Import bug.
+
+### Security
+- Firefly will not accept registrations beyond the first one, by default.
+
+
+## [3.10.2] - 2016-08-29
+### Added
+- New Chinese translations. Set Firefly III to show incomplete translations to follow the progress. Want to translate Firefly III in Chinese, or in any other language? Then check out [the Crowdin project](https://crowdin.com/project/firefly-iii).
+- Added more admin pages. They do nothing yet.
+
+### Changed
+- Import routine will now also apply user rules.
+- Various code cleanup.
+- Some small HTML changes.
+
+### Fixed
+- Bug in the mass edit routines.
+- Firefly III over a proxy will now work (see [issue #290](https://github.com/firefly-iii/firefly-iii/issues/290)), thanks @dfiel for reporting.
+- Sneaky bug in the import routine, fixed by @Bonno 
+
+## [3.10.1] - 2016-08-25
+### Added
+- More feedback in the import procedure.
+- Extended model for import job.
+- Web bases import procedure.
+
+
+### Changed
+- Scrutinizer configuration
+- Various code clean up.
+
+### Removed
+- Code climate YAML file.
+
+### Fixed
+- Fixed a bug where a migration would check an empty table name.
+- Fixed various bugs in the import routine.
+- Fixed various bugs in the piggy banks pages.
+- Fixed a bug in the `firefly:verify` routine
+
+## [3.10] - 2015-05-25
+### Added
+- New charts in year report
+- Can add / remove money from piggy bank on mobile device.
+- Bill overview shows some useful things.
+- Firefly will track registration / activation IP addresses.
+
+
+### Changed
+- Rewrote the import routine.
+- The date picker now supports more ranges and periods.
+- Rewrote all migrations. #272
+
+### Fixed
+- Issue #264
+- Issue #265
+- Fixed amount calculation problems, #266, thanks @xzaz
+- Issue #271
+- Issue #278, #273, thanks @StevenReitsma and @rubella
+- Bug in attachment download routine would report the wrong size to the user's browser.
+- Various NULL errors fixed.
+- Various strict typing errors fixed.
+- Fixed pagination problems, #276, thanks @xzaz
+- Fixed a bug where an expense would be assigned to a piggy bank if you created a transfer first.
+- Bulk update problems, #280, thanks @stickgrinder
+- Fixed various problems with amount reporting of split transactions.
+
+## [3.9.1]
+### Fixed
+- Fixed a bug where removing money from a piggy bank would not work. See issue #265 and #269
+
+## [3.9.0]
+### Added
+- @zjean has added code that allows you to force "https://"-URL's.
+- @tonicospinelli has added Portuguese (Brazil) translations.
+- Firefly III supports the *splitting* of transactions:
+  - A withdrawal (expense) can be split into multiple sub-transactions (with multiple destinations)
+  - Likewise for deposits (incomes). You can set multiple sources.
+  - Likewise for transfers.
+
+### Changed
+- Update a lot of libraries.
+- Big improvement to test data generation.
+- Cleaned up many repositories.
+
+### Removed
+- Front page boxes will no longer respond to credit card bills.
+
+### Fixed
+- Many bugs
+
+## [3.8.4] - 2016-04-24
+### Added
+- Lots of new translations.
+- Can now set page size.
+- Can now mass edit transactions.
+- Can now mass delete transactions.
+- Firefly will now attempt to verify the integrity of your database when updating.
+
+### Changed
+- New version of Charts library.
+
+### Fixed
+- Several CSV related bugs.
+- Several other bugs.
+- Bugs fixed by @Bonno.
+
+## [3.8.3] - 2016-04-17
+### Added
+- New audit report to see what happened.
+
+### Changed
+- New Chart JS release used.
+- Help function is more reliable.
+
+### Fixed
+- Expected bill amount is now correct.
+- Upgrade will now invalidate cache.
+- Search was broken.
+- Queries run better
+
+## [3.8.2] - 2016-04-03
+### Added
+- Small user administration at /admin.
+- Informational popups are working in reports.
+
+### Changed
+- User activation emails are better
+
+### Fixed
+- Some bugs related to accounts and rules.
+
+
+## [3.8.1] - 2016-03-29
+### Added
+- More translations
+- Extended cookie control.
+- User accounts can now be activated (disabled by default).
+- Bills can now take the source and destination account name into account.
+
+### Changed
+- The pages related to rules have new URL's.
+
+### Fixed
+- Spelling errors.
+- Problems related to the "account repository".
+- Some views showed empty (0.0) amounts.
+
+## [3.8.0] - 2016-03-20
+### Added
+- Two factor authentication, thanks to the excellent work of [zjean](https://github.com/zjean).
+- A new chart showing your net worth in year and multi-year reports.
+- You can now see if your current or future rules actually match any transactions, thanks to the excellent work of @roberthorlings.
+- New date fields for transactions. They are not used yet in reports or anything, but they can be filled in.
+- New routine to export your data.
+- Firefly III will mail the site owner when blocked users try to login, or when blocked domains are used in registrations.
+
+
+### Changed
+- Firefly III now requires PHP 7.0 minimum.
+
+
+### Fixed
+- HTML fixes, thanks to [roberthorlings](https://github.com/roberthorlings) and [zjean](https://github.com/zjean)..
+- A bug fix in the ABN Amro importer, thanks to [roberthorlings](https://github.com/roberthorlings)
+- It was not possible to change the opening balance, once it had been set. Thanks to [xnyhps](https://github.com/xnyhps) and [marcoveeneman](https://github.com/marcoveeneman) for spotting this.
+- Various other bug fixes.
+
+
+
+## [3.4.2] - 2015-05-25
+### Added
+- Initial release.
+
+### Changed
+- Initial release.
+
+### Deprecated
+- Initial release.
+
+### Removed
+- Initial release.
+
+### Fixed
+- Initial release.
+
+### Security
+- Initial release.

Dockerfile

@@ -0,0 +1,42 @@
+FROM php:7-apache
+
+RUN apt-get update -y && \
+    apt-get install -y --no-install-recommends libcurl4-openssl-dev \
+                                               zlib1g-dev \
+                                               libjpeg62-turbo-dev \
+                                               libpng12-dev \
+                                               libicu-dev \
+                                               libmcrypt-dev \
+                                               libedit-dev \
+                                               libtidy-dev \
+                                               libxml2-dev \
+                                               libsqlite3-dev \
+                                               libbz2-dev && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN docker-php-ext-install -j$(nproc) curl gd intl json mcrypt readline tidy zip bcmath xml mbstring pdo_sqlite pdo_mysql bz2
+
+# Enable apache mod rewrite..
+RUN a2enmod rewrite
+
+# Setup the Composer installer
+RUN curl -o /tmp/composer-setup.php https://getcomposer.org/installer && \
+  curl -o /tmp/composer-setup.sig https://composer.github.io/installer.sig && \
+  php -r "if (hash('SHA384', file_get_contents('/tmp/composer-setup.php')) !== trim(file_get_contents('/tmp/composer-setup.sig'))) { unlink('/tmp/composer-setup.php'); echo 'Invalid installer' . PHP_EOL; exit(1); }" && \
+  chmod +x /tmp/composer-setup.php && \
+  php /tmp/composer-setup.php && \
+  mv composer.phar /usr/local/bin/composer && \
+  rm -f /tmp/composer-setup.{php,sig}
+
+ADD . /var/www/firefly-iii
+RUN chown -R www-data:www-data /var/www/
+ADD docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf
+
+USER www-data
+
+WORKDIR /var/www/firefly-iii
+
+RUN composer install --no-scripts --no-dev
+
+USER root

LICENSE

@@ -0,0 +1,7 @@
+Copyright (C) 2016 thegrumpydictator@gmail.com
+
+This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License.
+
+https://creativecommons.org/licenses/by-sa/4.0/
+
+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

@@ -1,76 +1,36 @@
-Firefly III
-===========
+# Firefly III: A personal finances manager 
 
-[![Build Status](https://travis-ci.org/JC5/firefly-iii.svg?branch=master)](https://travis-ci.org/JC5/firefly-iii)
-![Still maintained?](http://stillmaintained.com/JC5/firefly-iii.png)
+[![Requires PHP7](https://img.shields.io/badge/php-7.0-red.svg)](https://secure.php.net/downloads.php#v7.0.4) [![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable)](https://packagist.org/packages/grumpydictator/firefly-iii) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/firefly-iii/firefly-iii/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/firefly-iii/firefly-iii/?branch=master) [![Build Status](https://travis-ci.org/firefly-iii/firefly-iii.svg?branch=master)](https://travis-ci.org/firefly-iii/firefly-iii) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=44UKUT455HUFA) 
 
-[![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable.svg)](https://packagist.org/packages/grumpydictator/firefly-iii)
-[![Total Downloads](https://poser.pugx.org/grumpydictator/firefly-iii/downloads.svg)](https://packagist.org/packages/grumpydictator/firefly-iii)
-[![Latest Unstable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/unstable.svg)](https://packagist.org/packages/grumpydictator/firefly-iii)
-[![License](https://poser.pugx.org/grumpydictator/firefly-iii/license.svg)](https://packagist.org/packages/grumpydictator/firefly-iii)
+[![The index of Firefly III](https://i.nder.be/hurdhgyg/400)](https://i.nder.be/h2b37243) [![The account overview of Firefly III](https://i.nder.be/hnkfkdpr/400)](https://i.nder.be/hv70pbwc)
 
-Firefly II is a tool to help you manage your finances. Please read the full description [in the wiki](https://github.com/JC5/firefly-iii/wiki/full-description).
+[![The useful financial reports of Firefly III](https://i.nder.be/h7sk6nb7/400)](https://i.nder.be/ccn0u2mp) [![Even more useful reports in Firefly III](https://i.nder.be/g237hr35/400)](https://i.nder.be/gm8hbh7z)
 
-Firefly Mark III is a new version of Firefly built upon best practices and lessons learned
-from building [Firefly](https://github.com/JC5/Firefly). It's Mark III since the original Firefly never made it outside of my
-laptop and [Firefly II](https://github.com/JC5/Firefly) is live.
+"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.
 
-## Current features
+## Try it out!
 
-- [A double-entry bookkeeping system](http://en.wikipedia.org/wiki/Double-entry_bookkeeping_system).
-- You can store, edit and remove withdrawals, deposits and transfers. This allows you full financial management;
-- It's possible to create, change and manage money using _budgets_;
-- Organize transactions using categories;
-- Save towards a goal using piggy banks;
-- Predict and anticipate large expenses using "repeated expenses" (ie. yearly taxes);
-- Predict and anticipate bills using "recurring transactions" (rent for example).
+Try out Firefly III on the [demo site](https://firefly-iii.nder.be/).
 
-Everything is organised:
+## Installation
 
-- 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.
+To install Firefly III, you'll need a web server (preferrably on Linux) and access to the command line. Then, please read the [installation guide](https://firefly-iii.github.io/installation-guide/).
 
-## Changes
+## More about Firefly III
 
-Firefly III will feature, but does not feature yet:
+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.
 
-- Financial reporting showing you how well you are doing;
-- Lots of help text in case you don't get it;
-- More control over other resources outside of personal finance
-  - Accounts shared with a partner (household accounts)
-  - Debts
-  - Credit cards
-- More test-coverage (aka: actual test coverage);
-- Firefly will be able to split transactions; a single purchase can be split in multiple entries, for more fine-grained control.
-- Firefly will be able to join transactions.
-- Transfers and transactions are combined into one internal datatype which is more consistent with what you're actually doing: moving money from A to B. The fact that A or B or both are yours should not matter.
-- Any other features I might not have thought of.
+Firefly works on the principle that if you know where you're money is going, you can stop it from going there.
 
-Some stuff has been removed:
+#### Some advantages of using Firefly
 
-- The nesting of budgets, categories and beneficiaries is removed because it was pretty pointless.
-- Firefly will not encrypt the content of the (MySQL) tables. Old versions of Firefly had this capability but it sucks when searching, sorting and organizing entries.
+- 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!
 
-## Screenshots
+Firefly is pretty awesome. [You can read more about Firefly III, and its features, on the Github Pages](https://firefly-iii.github.io/).
 
-![Index](http://i.imgur.com/TkZNIer.png)
+If you like Firefly and if it helps you save lots of money, why not send me [a dime for every dollar saved](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=44UKUT455HUFA) (this is a joke, although the Paypal form works just fine, try it!)
 
-![Accounts](http://i.imgur.com/YE8WavP.png)
-
-![Budgets](http://i.imgur.com/Go0M6Nd.png)
-
-![Reports](http://i.imgur.com/EnEIyQI.png)
-
-## Current state
-I have the basics up and running. Test coverage is currently non-existent.
-
-Although I have not checked extensively, some forms and views have CSRF vulnerabilities. This is because not all
-views escape all characters by default. Will be fixed.
-
-The current layout / look & feel is a pretty basic Bootstrap3 template. I am currently working on a more consistent,
-expanded layout which will feature shiny AJAX things and data tables and all the Web 3.0 goodies you've come to expect
-from social media sites.
-
-Questions, ideas or other things to contribute? [Let me know](https://github.com/JC5/firefly-iii/issues/new)!
+If you want to contact me, please open an issue or [email me](mailto:thegrumpydictator@gmail.com).

app/Bootstrap/ConfigureLogging.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * ConfigureLogging.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Bootstrap;
+
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Foundation\Bootstrap\ConfigureLogging as IlluminateConfigureLogging;
+use Illuminate\Log\Writer;
+
+/**
+ * Class ConfigureLogging
+ *
+ * @package FireflyIII\Bootstrap
+ */
+class ConfigureLogging extends IlluminateConfigureLogging
+{
+
+    /**
+     * Configure the Monolog handlers for the application.
+     *
+     * @param  \Illuminate\Contracts\Foundation\Application $app
+     * @param  \Illuminate\Log\Writer                       $log
+     *
+     * @return void
+     */
+    protected function configureDailyHandler(Application $app, Writer $log)
+    {
+        $config = $app->make('config');
+
+        $maxFiles = $config->get('app.log_max_files');
+
+        $log->useDailyFiles(
+            $app->storagePath() . '/logs/firefly-iii.log', is_null($maxFiles) ? 5 : $maxFiles,
+            $config->get('app.log_level', 'debug')
+        );
+    }
+
+    /**
+     * Configure the Monolog handlers for the application.
+     *
+     * @param  \Illuminate\Contracts\Foundation\Application $app
+     * @param  \Illuminate\Log\Writer                       $log
+     *
+     * @return void
+     */
+    protected function configureSingleHandler(Application $app, Writer $log)
+    {
+        $log->useFiles(
+            $app->storagePath() . '/logs/firefly-iii.log',
+            $app->make('config')->get('app.log_level', 'debug')
+        );
+    }
+}

app/Console/Commands/CreateImport.php

@@ -0,0 +1,144 @@
+<?php
+/**
+ * CreateImport.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Console\Commands;
+
+use Artisan;
+use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
+use Illuminate\Console\Command;
+use Log;
+
+/**
+ * Class CreateImport
+ *
+ * @package FireflyIII\Console\Commands
+ */
+class CreateImport extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Use this command to create a new import. Your user ID can be found on the /profile page.';
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly:create-import {file} {configuration} {--user=1} {--type=csv} {--start}';
+
+    /**
+     * Create a new command instance.
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // cannot be helped
+     */
+    public function handle()
+    {
+        /** @var UserRepositoryInterface $userRepository */
+        $userRepository = app(UserRepositoryInterface::class);
+        $file           = $this->argument('file');
+        $configuration  = $this->argument('configuration');
+        $user           = $userRepository->find(intval($this->option('user')));
+        $cwd            = getcwd();
+        $type           = strtolower($this->option('type'));
+
+        if (!$this->validArguments()) {
+            return;
+        }
+
+        $configurationData = json_decode(file_get_contents($configuration));
+        if (is_null($configurationData)) {
+            $this->error(sprintf('Firefly III cannot read the contents of configuration file "%s" (working directory: "%s").', $configuration, $cwd));
+
+            return;
+        }
+
+        $this->info(sprintf('Going to create a job to import file: %s', $file));
+        $this->info(sprintf('Using configuration file: %s', $configuration));
+        $this->info(sprintf('Import into user: #%d (%s)', $user->id, $user->email));
+        $this->info(sprintf('Type of import: %s', $type));
+
+        /** @var ImportJobRepositoryInterface $jobRepository */
+        $jobRepository = app(ImportJobRepositoryInterface::class, [$user]);
+        $job           = $jobRepository->create($type);
+        $this->line(sprintf('Created job "%s"...', $job->key));
+
+        Artisan::call('firefly:encrypt', ['file' => $file, 'key' => $job->key]);
+        $this->line('Stored import data...');
+
+        $job->configuration = $configurationData;
+        $job->status        = 'settings_complete';
+        $job->save();
+        $this->line('Stored configuration...');
+
+        if ($this->option('start') === true) {
+            $this->line('The import will start in a moment. This process is not visible...');
+            Log::debug('Go for import!');
+            Artisan::call('firefly:start-import', ['key' => $job->key]);
+            $this->line('Done!');
+        }
+
+        return;
+    }
+
+    /**
+     * @return bool
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five exactly.
+     */
+    private function validArguments(): bool
+    {
+        /** @var UserRepositoryInterface $userRepository */
+        $userRepository = app(UserRepositoryInterface::class);
+        $file           = $this->argument('file');
+        $configuration  = $this->argument('configuration');
+        $user           = $userRepository->find(intval($this->option('user')));
+        $cwd            = getcwd();
+        $validTypes     = array_keys(config('firefly.import_formats'));
+        $type           = strtolower($this->option('type'));
+
+        if (is_null($user->id)) {
+            $this->error(sprintf('There is no user with ID %d.', $this->option('user')));
+
+            return false;
+        }
+        if (!in_array($type, $validTypes)) {
+            $this->error(sprintf('Cannot import file of type "%s"', $type));
+
+            return false;
+        }
+
+        if (!file_exists($file)) {
+            $this->error(sprintf('Firefly III cannot find file "%s" (working directory: "%s").', $file, $cwd));
+
+            return false;
+        }
+
+        if (!file_exists($configuration)) {
+            $this->error(sprintf('Firefly III cannot find configuration file "%s" (working directory: "%s").', $configuration, $cwd));
+
+            return false;
+        }
+
+        return true;
+    }
+}

app/Console/Commands/EncryptFile.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * EncryptFile.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Console\Commands;
+
+use Crypt;
+use Illuminate\Console\Command;
+
+/**
+ * Class EncryptFile
+ *
+ * @package FireflyIII\Console\Commands
+ */
+class EncryptFile extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Encrypts a file and places it in the storage/upload directory.';
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly:encrypt {file} {key}';
+
+    /**
+     * Create a new command instance.
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $file = e(strval($this->argument('file')));
+        if (!file_exists($file)) {
+            $this->error(sprintf('File "%s" does not seem to exist.', $file));
+
+            return;
+        }
+        $content = file_get_contents($file);
+        $content = Crypt::encrypt($content);
+        $newName = e(strval($this->argument('key'))) . '.upload';
+
+        $path = storage_path('upload') . '/' . $newName;
+        file_put_contents($path, $content);
+        $this->line(sprintf('Encrypted "%s" and put it in "%s"', $file, $path));
+    }
+}

app/Console/Commands/Import.php

@@ -0,0 +1,139 @@
+<?php
+/**
+ * Import.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Console\Commands;
+
+use FireflyIII\Import\ImportProcedure;
+use FireflyIII\Import\Logging\CommandHandler;
+use FireflyIII\Models\ImportJob;
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Console\Command;
+use Illuminate\Support\Collection;
+use Log;
+
+/**
+ * Class Import
+ *
+ * @package FireflyIII\Console\Commands
+ */
+class Import extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This will start a new import.';
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly:start-import {key}';
+
+    /**
+     * Create a new command instance.
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     *
+     */
+    public function handle()
+    {
+        Log::debug('Start start-import command');
+        $jobKey = $this->argument('key');
+        $job    = ImportJob::whereKey($jobKey)->first();
+        if (!$this->isValid($job)) {
+            Log::error('Job is not valid for some reason. Exit.');
+
+            return;
+        }
+
+        $this->line(sprintf('Going to import job with key "%s" of type "%s"', $job->key, $job->file_type));
+
+        $monolog = Log::getMonolog();
+        $handler = new CommandHandler($this);
+        $monolog->pushHandler($handler);
+        $importProcedure = new ImportProcedure;
+        $result          = $importProcedure->runImport($job);
+
+        // display result to user:
+        $this->presentResults($result);
+        $this->line('The import has completed.');
+
+        // get any errors from the importer:
+        $this->presentErrors($job);
+
+        return;
+    }
+
+    /**
+     * @param ImportJob $job
+     *
+     * @return bool
+     */
+    private function isValid(ImportJob $job): bool
+    {
+        if (is_null($job)) {
+            $this->error('This job does not seem to exist.');
+
+            return false;
+        }
+
+        if ($job->status != 'settings_complete') {
+            $this->error('This job is not ready to be imported.');
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param ImportJob $job
+     */
+    private function presentErrors(ImportJob $job)
+    {
+        $extendedStatus = $job->extended_status;
+        if (isset($extendedStatus['errors']) && count($extendedStatus['errors']) > 0) {
+            $this->line(sprintf('The following %d error(s) occured during the import:', count($extendedStatus['errors'])));
+            foreach ($extendedStatus['errors'] as $error) {
+                $this->error($error);
+            }
+        }
+    }
+
+    /**
+     * @param Collection $result
+     */
+    private function presentResults(Collection $result)
+    {
+        /**
+         * @var int                $index
+         * @var TransactionJournal $journal
+         */
+        foreach ($result as $index => $journal) {
+            if (!is_null($journal->id)) {
+                $this->line(sprintf('Line #%d has been imported as transaction #%d.', $index, $journal->id));
+                continue;
+            }
+            $this->error(sprintf('Could not store line #%d', $index));
+        }
+    }
+}

app/Console/Commands/ScanAttachments.php

@@ -0,0 +1,85 @@
+<?php
+/**
+ * ScanAttachments.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Console\Commands;
+
+use Crypt;
+use FireflyIII\Models\Attachment;
+use Illuminate\Console\Command;
+use Illuminate\Contracts\Encryption\DecryptException;
+use Illuminate\Contracts\Filesystem\FileNotFoundException;
+use Storage;
+
+/**
+ * Class ScanAttachments
+ *
+ * @package FireflyIII\Console\Commands
+ */
+class ScanAttachments extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Rescan all attachments and re-set the MD5 hash and mime.';
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly:scan-attachments';
+
+    /**
+     * Create a new command instance.
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $attachments = Attachment::get();
+        $disk        = Storage::disk('upload');
+        /** @var Attachment $attachment */
+        foreach ($attachments as $attachment) {
+            $fileName = $attachment->fileName();
+            try {
+                $content = $disk->get($fileName);
+            } catch (FileNotFoundException $e) {
+                $this->error(sprintf('Could not find data for attachment #%d', $attachment->id));
+                continue;
+            }
+            try {
+                $decrypted = Crypt::decrypt($content);
+            } catch (DecryptException $e) {
+                $this->error(sprintf('Could not decrypt data of attachment #%d', $attachment->id));
+                continue;
+            }
+            $tmpfname = tempnam(sys_get_temp_dir(), 'FireflyIII');
+            file_put_contents($tmpfname, $decrypted);
+            $md5              = md5_file($tmpfname);
+            $mime             = mime_content_type($tmpfname);
+            $attachment->md5  = $md5;
+            $attachment->mime = $mime;
+            $attachment->save();
+            $this->line(sprintf('Fixed attachment #%d', $attachment->id));
+        }
+    }
+}

app/Console/Commands/UpgradeDatabase.php

@@ -0,0 +1,159 @@
+<?php
+/**
+ * UpgradeDatabase.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Console\Commands;
+
+
+use DB;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Console\Command;
+use Illuminate\Database\QueryException;
+use Log;
+use Schema;
+
+/**
+ * Class UpgradeDatabase
+ *
+ * @package FireflyIII\Console\Commands
+ */
+class UpgradeDatabase extends Command
+{
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Will run various commands to update database records.';
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly:upgrade-database';
+
+    /**
+     * Create a new command instance.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $this->setTransactionIdentifier();
+        $this->migrateRepetitions();
+    }
+
+    private function migrateRepetitions()
+    {
+        if (!Schema::hasTable('budget_limits')) {
+            return;
+        }
+        // get all budget limits with end_date NULL
+        $set = BudgetLimit::whereNull('end_date')->get();
+        $this->line(sprintf('Found %d budget limit(s) to update', $set->count()));
+        /** @var BudgetLimit $budgetLimit */
+        foreach ($set as $budgetLimit) {
+            // get limit repetition (should be just one):
+            /** @var LimitRepetition $repetition */
+            $repetition = $budgetLimit->limitrepetitions()->first();
+            if (!is_null($repetition)) {
+                $budgetLimit->end_date = $repetition->enddate;
+                $budgetLimit->save();
+                $this->line(sprintf('Updated budget limit #%d', $budgetLimit->id));
+                $repetition->delete();
+            }
+        }
+    }
+
+    /**
+     * This is strangely complex, because the HAVING modifier is a no-no. And subqueries in Laravel are weird.
+     */
+    private function setTransactionIdentifier()
+    {
+        // if table does not exist, return false
+        if (!Schema::hasTable('transaction_journals')) {
+            return;
+        }
+
+
+        $subQuery = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                      ->whereNull('transaction_journals.deleted_at')
+                                      ->whereNull('transactions.deleted_at')
+                                      ->groupBy(['transaction_journals.id'])
+                                      ->select(['transaction_journals.id', DB::raw('COUNT(transactions.id) AS t_count')]);
+
+        $result     = DB::table(DB::raw('(' . $subQuery->toSql() . ') AS derived'))
+                        ->mergeBindings($subQuery->getQuery())
+                        ->where('t_count', '>', 2)
+                        ->select(['id', 't_count']);
+        $journalIds = array_unique($result->pluck('id')->toArray());
+
+        foreach ($journalIds as $journalId) {
+            $this->updateJournal(intval($journalId));
+        }
+    }
+
+    /**
+     * grab all positive transactiosn from this journal that are not deleted. for each one, grab the negative opposing one
+     * which has 0 as an identifier and give it the same identifier.
+     *
+     * @param int $journalId
+     */
+    private function updateJournal(int $journalId)
+    {
+        $identifier   = 0;
+        $processed    = [];
+        $transactions = Transaction::where('transaction_journal_id', $journalId)->where('amount', '>', 0)->get();
+        /** @var Transaction $transaction */
+        foreach ($transactions as $transaction) {
+            // find opposing:
+            $amount = bcmul(strval($transaction->amount), '-1');
+
+            try {
+                /** @var Transaction $opposing */
+                $opposing = Transaction::where('transaction_journal_id', $journalId)
+                                       ->where('amount', $amount)->where('identifier', '=', 0)
+                                       ->whereNotIn('id', $processed)
+                                       ->first();
+            } catch (QueryException $e) {
+                Log::error($e->getMessage());
+                $this->error('Firefly III could not find the "identifier" field in the "transactions" table.');
+                $this->error(sprintf('This field is required for Firefly III version %s to run.', config('firefly.version')));
+                $this->error('Please run "php artisan migrate" to add this field to the table.');
+                $this->info('Then, run "php artisan firefly:upgrade-database" to try again.');
+
+                return;
+            }
+            if (!is_null($opposing)) {
+                // give both a new identifier:
+                $transaction->identifier = $identifier;
+                $transaction->save();
+                $opposing->identifier = $identifier;
+                $opposing->save();
+                $processed[] = $transaction->id;
+                $processed[] = $opposing->id;
+                $this->line(sprintf('Database upgrade for journal #%d, transactions #%d and #%d', $journalId, $transaction->id, $opposing->id));
+            }
+            $identifier++;
+        }
+    }
+}

app/Console/Commands/UpgradeFireflyInstructions.php

@@ -0,0 +1,83 @@
+<?php
+/**
+ * UpgradeFireflyInstructions.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Console\Commands;
+
+use Illuminate\Console\Command;
+
+/**
+ * Class UpgradeFireflyInstructions
+ *
+ * @package FireflyIII\Console\Commands
+ */
+class UpgradeFireflyInstructions extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Instructions in case of upgrade trouble.';
+    /**
+     * 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.
+     */
+    public function handle()
+    {
+        //
+        /** @var string $version */
+        $version = config('firefly.version');
+        $config  = config('upgrade.text');
+        $text    = null;
+        foreach (array_keys($config) as $compare) {
+            // if string starts with:
+            $len = strlen($compare);
+            if (substr($version, 0, $len) === $compare) {
+                $text = $config[$compare];
+            }
+
+        }
+
+        if (is_null($text)) {
+            $this->line(sprintf('Thank you for installing Firefly III, v%s', $version));
+            $this->info('There are no extra upgrade instructions.');
+            $this->line('Firefly III should be ready for use.');
+
+            return;
+        }
+
+        $this->line('+------------------------------------------------------------------------------+');
+        $this->line('');
+        $this->line(sprintf('Thank you for installing Firefly III, v%s', $version));
+        $this->info(wordwrap($text));
+        $this->line('');
+        $this->line('+------------------------------------------------------------------------------+');
+
+
+    }
+}

app/Console/Commands/VerifyDatabase.php

@@ -0,0 +1,348 @@
+<?php
+/**
+ * VerifyDatabase.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Console\Commands;
+
+use Crypt;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Console\Command;
+use Illuminate\Contracts\Encryption\DecryptException;
+use Illuminate\Database\Eloquent\Builder;
+use Schema;
+use stdClass;
+
+/**
+ * Class VerifyDatabase
+ *
+ * @package FireflyIII\Console\Commands
+ */
+class VerifyDatabase extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Will verify your database.';
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly:verify';
+
+    /**
+     * Create a new command instance.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        // if table does not exist, return false
+        if (!Schema::hasTable('users')) {
+            return;
+        }
+
+        $this->reportObject('budget');
+        $this->reportObject('category');
+        $this->reportObject('tag');
+
+        // accounts with no transactions.
+        $this->reportAccounts();
+        // budgets with no limits
+        $this->reportBudgetLimits();
+        // budgets with no transactions
+
+        // sum of transactions is not zero.
+        $this->reportSum();
+        //  any deleted transaction journals that have transactions that are NOT deleted:
+        $this->reportJournals();
+        // deleted transactions that are connected to a not deleted journal.
+        $this->reportTransactions();
+        // deleted accounts that still have not deleted transactions or journals attached to them.
+        $this->reportDeletedAccounts();
+
+        // report on journals with no transactions at all.
+        $this->reportNoTransactions();
+
+        // transfers with budgets.
+        $this->reportTransfersBudgets();
+
+        // report on journals with the wrong types of accounts.
+        $this->reportIncorrectJournals();
+    }
+
+    /**
+     * Reports on accounts with no transactions.
+     */
+    private function reportAccounts()
+    {
+        $set = Account::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
+                      ->leftJoin('users', 'accounts.user_id', '=', 'users.id')
+                      ->groupBy(['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email'])
+                      ->whereNull('transactions.account_id')
+                      ->get(
+                          ['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email']
+                      );
+
+        /** @var stdClass $entry */
+        foreach ($set as $entry) {
+            $name = $entry->name;
+            $line = 'User #%d (%s) has account #%d ("%s") which has no transactions.';
+            $line = sprintf($line, $entry->user_id, $entry->email, $entry->id, $name);
+            $this->line($line);
+        }
+    }
+
+    /**
+     * Reports on budgets with no budget limits (which makes them pointless).
+     */
+    private function reportBudgetLimits()
+    {
+        $set = Budget::leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budgets.id')
+                     ->leftJoin('users', 'budgets.user_id', '=', 'users.id')
+                     ->groupBy(['budgets.id', 'budgets.name', 'budgets.encrypted', 'budgets.user_id', 'users.email'])
+                     ->whereNull('budget_limits.id')
+                     ->get(['budgets.id', 'budgets.name', 'budgets.user_id', 'budgets.encrypted', 'users.email']);
+
+        /** @var Budget $entry */
+        foreach ($set as $entry) {
+            $line = sprintf(
+                'Notice: User #%d (%s) has budget #%d ("%s") which has no budget limits.',
+                $entry->user_id, $entry->email, $entry->id, $entry->name
+            );
+            $this->line($line);
+        }
+    }
+
+    /**
+     * Reports on deleted accounts that still have not deleted transactions or journals attached to them.
+     */
+    private function reportDeletedAccounts()
+    {
+        $set = Account::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
+                      ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+                      ->whereNotNull('accounts.deleted_at')
+                      ->whereNotNull('transactions.id')
+                      ->where(
+                          function (Builder $q) {
+                              $q->whereNull('transactions.deleted_at');
+                              $q->orWhereNull('transaction_journals.deleted_at');
+                          }
+                      )
+                      ->get(
+                          ['accounts.id as account_id', 'accounts.deleted_at as account_deleted_at', 'transactions.id as transaction_id',
+                           'transactions.deleted_at as transaction_deleted_at', 'transaction_journals.id as journal_id',
+                           'transaction_journals.deleted_at as journal_deleted_at']
+                      );
+        /** @var stdClass $entry */
+        foreach ($set as $entry) {
+            $date = is_null($entry->transaction_deleted_at) ? $entry->journal_deleted_at : $entry->transaction_deleted_at;
+            $this->error(
+                'Error: Account #' . $entry->account_id . ' should have been deleted, but has not.' .
+                ' Find it in the table called "accounts" and change the "deleted_at" field to: "' . $date . '"'
+            );
+        }
+    }
+
+    private function reportIncorrectJournals()
+    {
+        $configuration = [
+            // a withdrawal can not have revenue account:
+            TransactionType::WITHDRAWAL => [AccountType::REVENUE],
+            // deposit cannot have an expense account:
+            TransactionType::DEPOSIT    => [AccountType::EXPENSE],
+            // transfer cannot have either:
+            TransactionType::TRANSFER   => [AccountType::EXPENSE, AccountType::REVENUE],
+        ];
+        foreach ($configuration as $transactionType => $accountTypes) {
+            $set = TransactionJournal::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+                                     ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                     ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+                                     ->leftJoin('account_types', 'account_types.id', 'accounts.account_type_id')
+                                     ->leftJoin('users', 'users.id', '=', 'transaction_journals.user_id')
+                                     ->where('transaction_types.type', $transactionType)
+                                     ->whereIn('account_types.type', $accountTypes)
+                                     ->whereNull('transaction_journals.deleted_at')
+                                     ->get(
+                                         ['transaction_journals.id', 'transaction_journals.user_id', 'users.email', 'account_types.type as a_type',
+                                          'transaction_types.type']
+                                     );
+            foreach ($set as $entry) {
+                $this->error(
+                    sprintf(
+                        'Transaction journal #%d (user #%d, %s) is of type "%s" but ' .
+                        'is linked to a "%s". The transaction journal should be recreated.',
+                        $entry->id,
+                        $entry->user_id,
+                        $entry->email,
+                        $entry->type,
+                        $entry->a_type
+                    )
+                );
+            }
+        }
+    }
+
+    /**
+     * Any deleted transaction journals that have transactions that are NOT deleted:
+     */
+    private function reportJournals()
+    {
+        $set = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                 ->whereNotNull('transaction_journals.deleted_at')// USE THIS
+                                 ->whereNull('transactions.deleted_at')
+                                 ->whereNotNull('transactions.id')
+                                 ->get(
+                                     [
+                                         'transaction_journals.id as journal_id',
+                                         'transaction_journals.description',
+                                         'transaction_journals.deleted_at as journal_deleted',
+                                         'transactions.id as transaction_id',
+                                         'transactions.deleted_at as transaction_deleted_at']
+                                 );
+        /** @var stdClass $entry */
+        foreach ($set as $entry) {
+            $this->error(
+                'Error: Transaction #' . $entry->transaction_id . ' should have been deleted, but has not.' .
+                ' Find it in the table called "transactions" and change the "deleted_at" field to: "' . $entry->journal_deleted . '"'
+            );
+        }
+    }
+
+    /**
+     *
+     */
+    private function reportNoTransactions()
+    {
+        $set = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                 ->groupBy('transaction_journals.id')
+                                 ->whereNull('transactions.transaction_journal_id')
+                                 ->get(['transaction_journals.id']);
+
+        foreach ($set as $entry) {
+            $this->error(
+                'Error: Journal #' . $entry->id . ' has zero transactions. Open table "transaction_journals" and delete the entry with id #' . $entry->id
+            );
+        }
+
+    }
+
+    /**
+     * @param string $name
+     */
+    private function reportObject(string $name)
+    {
+        $plural = str_plural($name);
+        $class  = sprintf('FireflyIII\Models\%s', ucfirst($name));
+        $field  = $name == 'tag' ? 'tag' : 'name';
+        $set    = $class::leftJoin($name . '_transaction_journal', $plural . '.id', '=', $name . '_transaction_journal.' . $name . '_id')
+                        ->leftJoin('users', $plural . '.user_id', '=', 'users.id')
+                        ->distinct()
+                        ->whereNull($name . '_transaction_journal.' . $name . '_id')
+                        ->whereNull($plural . '.deleted_at')
+                        ->get([$plural . '.id', $plural . '.' . $field . ' as name', $plural . '.user_id', 'users.email']);
+
+        /** @var stdClass $entry */
+        foreach ($set as $entry) {
+
+            $objName = $entry->name;
+            try {
+                $objName = Crypt::decrypt($objName);
+            } catch (DecryptException $e) {
+                // it probably was not encrypted.
+            }
+
+            $line = sprintf(
+                'Notice: User #%d (%s) has %s #%d ("%s") which has no transactions.',
+                $entry->user_id, $entry->email, $name, $entry->id, $objName
+            );
+            $this->line($line);
+        }
+    }
+
+    /**
+     * Reports for each user when the sum of their transactions is not zero.
+     */
+    private function reportSum()
+    {
+        /** @var UserRepositoryInterface $userRepository */
+        $userRepository = app(UserRepositoryInterface::class);
+
+        /** @var User $user */
+        foreach ($userRepository->all() as $user) {
+            $sum = strval($user->transactions()->sum('amount'));
+            if (bccomp($sum, '0') !== 0) {
+                $this->error('Error: Transactions for user #' . $user->id . ' (' . $user->email . ') are off by ' . $sum . '!');
+            }
+        }
+    }
+
+    /**
+     * Reports on deleted transactions that are connected to a not deleted journal.
+     */
+    private function reportTransactions()
+    {
+        $set = Transaction::leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                          ->whereNotNull('transactions.deleted_at')
+                          ->whereNull('transaction_journals.deleted_at')
+                          ->get(
+                              ['transactions.id as transaction_id', 'transactions.deleted_at as transaction_deleted', 'transaction_journals.id as journal_id',
+                               'transaction_journals.deleted_at']
+                          );
+        /** @var stdClass $entry */
+        foreach ($set as $entry) {
+            $this->error(
+                'Error: Transaction journal #' . $entry->journal_id . ' should have been deleted, but has not.' .
+                ' Find it in the table called "transaction_journals" and change the "deleted_at" field to: "' . $entry->transaction_deleted . '"'
+            );
+        }
+    }
+
+    /**
+     *
+     */
+    private function reportTransfersBudgets()
+    {
+        $set = TransactionJournal::distinct()
+                                 ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+                                 ->leftJoin('budget_transaction_journal', 'transaction_journals.id', '=', 'budget_transaction_journal.transaction_journal_id')
+                                 ->where('transaction_types.type', TransactionType::TRANSFER)
+                                 ->whereNotNull('budget_transaction_journal.budget_id')->get(['transaction_journals.id']);
+
+        /** @var TransactionJournal $entry */
+        foreach ($set as $entry) {
+            $this->error(
+                sprintf(
+                    'Error: Transaction journal #%d is a transfer, but has a budget. Edit it without changing anything, so the budget will be removed.',
+                    $entry->id
+                )
+            );
+        }
+
+
+    }
+}

app/Console/Kernel.php

@@ -0,0 +1,77 @@
+<?php
+/**
+ * Kernel.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Console;
+
+use FireflyIII\Console\Commands\CreateImport;
+use FireflyIII\Console\Commands\EncryptFile;
+use FireflyIII\Console\Commands\Import;
+use FireflyIII\Console\Commands\MoveRepository;
+use FireflyIII\Console\Commands\ScanAttachments;
+use FireflyIII\Console\Commands\UpgradeDatabase;
+use FireflyIII\Console\Commands\UpgradeFireflyInstructions;
+use FireflyIII\Console\Commands\VerifyDatabase;
+use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+
+/**
+ * Class Kernel
+ *
+ * @package FireflyIII\Console
+ */
+class Kernel extends ConsoleKernel
+{
+    /**
+     * The bootstrap classes for the application.
+     *
+     * Next upgrade verify these are the same.
+     *
+     * @var array
+     */
+    protected $bootstrappers
+        = [
+            'Illuminate\Foundation\Bootstrap\DetectEnvironment',
+            'Illuminate\Foundation\Bootstrap\LoadConfiguration',
+            'FireflyIII\Bootstrap\ConfigureLogging',
+            'Illuminate\Foundation\Bootstrap\HandleExceptions',
+            'Illuminate\Foundation\Bootstrap\RegisterFacades',
+            'Illuminate\Foundation\Bootstrap\SetRequestForConsole',
+            'Illuminate\Foundation\Bootstrap\RegisterProviders',
+            'Illuminate\Foundation\Bootstrap\BootProviders',
+        ];
+
+    /**
+     * The Artisan commands provided by your application.
+     *
+     * @var array
+     */
+    protected $commands
+        = [
+            UpgradeFireflyInstructions::class,
+            VerifyDatabase::class,
+            Import::class,
+            CreateImport::class,
+            EncryptFile::class,
+            ScanAttachments::class,
+            UpgradeDatabase::class,
+        ];
+
+    /**
+     * Register the Closure based commands for the application.
+     *
+     * @return void
+     */
+    protected function commands()
+    {
+        require base_path('routes/console.php');
+    }
+}

app/Events/Event.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * Event.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Events;
+
+/**
+ * Class Event
+ *
+ * @package FireflyIII\Events
+ */
+abstract class Event
+{
+    //
+}

app/Events/RegisteredUser.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * RegisteredUser.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Events;
+
+use FireflyIII\User;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class RegisteredUser
+ *
+ * @package FireflyIII\Events
+ */
+class RegisteredUser extends Event
+{
+    use SerializesModels;
+
+    public $ipAddress;
+    public $user;
+
+    /**
+     * Create a new event instance. This event is triggered when a new user registers.
+     *
+     * @param  User  $user
+     * @param string $ipAddress
+     */
+    public function __construct(User $user, string $ipAddress)
+    {
+        $this->user      = $user;
+        $this->ipAddress = $ipAddress;
+    }
+}

app/Events/RequestedNewPassword.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * RequestedNewPassword.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Events;
+
+use FireflyIII\User;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class RequestedNewPassword
+ *
+ * @package FireflyIII\Events
+ */
+class RequestedNewPassword extends Event
+{
+    use SerializesModels;
+
+    public $ipAddress;
+    public $token;
+    public $user;
+
+    /**
+     * Create a new event instance. This event is triggered when a users tries to reset his or her password.
+     *
+     * @param  User  $user
+     * @param string $token
+     * @param string $ipAddress
+     */
+    public function __construct(User $user, string $token, string $ipAddress)
+    {
+        $this->user      = $user;
+        $this->token     = $token;
+        $this->ipAddress = $ipAddress;
+    }
+
+}

app/Events/StoredTransactionJournal.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * StoredTransactionJournal.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Events;
+
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class StoredTransactionJournal
+ *
+ * @package FireflyIII\Events
+ */
+class StoredTransactionJournal extends Event
+{
+
+    use SerializesModels;
+
+    public $journal;
+    public $piggyBankId;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param TransactionJournal $journal
+     * @param int                $piggyBankId
+     */
+    public function __construct(TransactionJournal $journal, int $piggyBankId)
+    {
+        //
+        $this->journal     = $journal;
+        $this->piggyBankId = $piggyBankId;
+
+    }
+
+}

app/Events/UpdatedTransactionJournal.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * UpdatedTransactionJournal.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Events;
+
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class UpdatedTransactionJournal
+ *
+ * @package FireflyIII\Events
+ */
+class UpdatedTransactionJournal extends Event
+{
+
+    use SerializesModels;
+
+    public $journal;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param TransactionJournal $journal
+     */
+    public function __construct(TransactionJournal $journal)
+    {
+        //
+        $this->journal = $journal;
+    }
+
+}

app/Exceptions/FireflyException.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * FireflyException.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Exceptions;
+
+
+/**
+ * Class FireflyException
+ *
+ * @package FireflyIII\Exceptions
+ */
+class FireflyException extends \Exception
+{
+
+} 

app/Exceptions/Handler.php

@@ -0,0 +1,126 @@
+<?php
+/**
+ * Handler.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Exceptions;
+
+use ErrorException;
+use Exception;
+use FireflyIII\Jobs\MailError;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Auth\AuthenticationException;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Session\TokenMismatchException;
+use Illuminate\Validation\ValidationException as ValException;
+use Request;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+
+/**
+ * Class Handler
+ *
+ * @package FireflyIII\Exceptions
+ */
+class Handler extends ExceptionHandler
+{
+    /**
+     * A list of the exception types that should not be reported.
+     *
+     * @var array
+     */
+    protected $dontReport
+        = [
+            AuthenticationException::class,
+            AuthorizationException::class,
+            HttpException::class,
+            ModelNotFoundException::class,
+            TokenMismatchException::class,
+            ValException::class,
+        ];
+
+    /**
+     * Render an exception into an HTTP response.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Exception               $exception
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function render($request, Exception $exception)
+    {
+        if ($exception instanceof FireflyException || $exception instanceof ErrorException) {
+
+            $isDebug = env('APP_DEBUG', false);
+
+            return response()->view('errors.FireflyException', ['exception' => $exception, 'debug' => $isDebug], 500);
+        }
+
+        return parent::render($request, $exception);
+    }
+
+
+    /**
+     * Report or log an exception.
+     *
+     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
+     *
+     * @param  Exception $exception
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly five.
+     *
+     * @return void
+     */
+    public function report(Exception $exception)
+    {
+        $doMailError = env('SEND_ERROR_MESSAGE', true);
+        if (($exception instanceof FireflyException || $exception instanceof ErrorException) && $doMailError) {
+            $userData = [
+                'id'    => 0,
+                'email' => 'unknown@example.com',
+            ];
+            if (auth()->check()) {
+                $userData['id']    = auth()->user()->id;
+                $userData['email'] = auth()->user()->email;
+            }
+            $data = [
+                'class'        => get_class($exception),
+                'errorMessage' => $exception->getMessage(),
+                'time'         => date('r'),
+                'stackTrace'   => $exception->getTraceAsString(),
+                'file'         => $exception->getFile(),
+                'line'         => $exception->getLine(),
+                'code'         => $exception->getCode(),
+            ];
+
+            // create job that will mail.
+            $ipAddress = Request::ip() ?? '0.0.0.0';
+            $job       = new MailError($userData, env('SITE_OWNER', ''), $ipAddress, $data);
+            dispatch($job);
+        }
+
+        parent::report($exception);
+    }
+
+    /**
+     * Convert an authentication exception into an unauthenticated response.
+     *
+     * @param  \Illuminate\Http\Request $request
+     *
+     * @return \Illuminate\Http\Response
+     */
+    protected function unauthenticated($request)
+    {
+        if ($request->expectsJson()) {
+            return response()->json(['error' => 'Unauthenticated.'], 401);
+        }
+
+        return redirect()->guest('login');
+    }
+}

app/Exceptions/NotImplementedException.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * NotImplementedException.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Exceptions;
+
+
+/**
+ * Class NotImplementedException
+ *
+ * @package FireflyIII\Exceptions
+ */
+class NotImplementedException extends \Exception
+{
+
+} 

app/Exceptions/ValidationException.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * ValidationException.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Exceptions;
+
+/**
+ * Class ValidationExceptions
+ *
+ * @package FireflyIII\Exception
+ */
+class ValidationException extends \Exception
+{
+
+} 

app/Export/Collector/AttachmentCollector.php

@@ -0,0 +1,132 @@
+<?php
+/**
+ * AttachmentCollector.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Collector;
+
+use Carbon\Carbon;
+use Crypt;
+use FireflyIII\Models\Attachment;
+use FireflyIII\Models\ExportJob;
+use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
+use Illuminate\Contracts\Encryption\DecryptException;
+use Illuminate\Support\Collection;
+use Log;
+use Storage;
+
+/**
+ * Class AttachmentCollector
+ *
+ * @package FireflyIII\Export\Collector
+ */
+class AttachmentCollector extends BasicCollector implements CollectorInterface
+{
+    /** @var  Carbon */
+    private $end;
+    /** @var \Illuminate\Contracts\Filesystem\Filesystem */
+    private $exportDisk;
+    /** @var  AttachmentRepositoryInterface */
+    private $repository;
+    /** @var  Carbon */
+    private $start;
+    /** @var \Illuminate\Contracts\Filesystem\Filesystem */
+    private $uploadDisk;
+
+    /**
+     * AttachmentCollector constructor.
+     *
+     * @param ExportJob $job
+     */
+    public function __construct(ExportJob $job)
+    {
+        /** @var AttachmentRepositoryInterface repository */
+        $this->repository = app(AttachmentRepositoryInterface::class);
+        // make storage:
+        $this->uploadDisk = Storage::disk('upload');
+        $this->exportDisk = Storage::disk('export');
+
+        parent::__construct($job);
+    }
+
+    /**
+     * @return bool
+     */
+    public function run(): bool
+    {
+        // grab all the users attachments:
+        $attachments = $this->getAttachments();
+
+        /** @var Attachment $attachment */
+        foreach ($attachments as $attachment) {
+            $this->exportAttachment($attachment);
+        }
+
+        return true;
+    }
+
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     */
+    public function setDates(Carbon $start, Carbon $end)
+    {
+        $this->start = $start;
+        $this->end   = $end;
+    }
+
+    /**
+     * @param Attachment $attachment
+     *
+     * @return bool
+     */
+    private function exportAttachment(Attachment $attachment): bool
+    {
+        $file = $attachment->fileName();
+        if ($this->uploadDisk->exists($file)) {
+            try {
+                $decrypted  = Crypt::decrypt($this->uploadDisk->get($file));
+                $exportFile = $this->exportFileName($attachment);
+                $this->exportDisk->put($exportFile, $decrypted);
+                $this->getEntries()->push($exportFile);
+
+            } catch (DecryptException $e) {
+                Log::error('Catchable error: could not decrypt attachment #' . $attachment->id . ' because: ' . $e->getMessage());
+            }
+
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns the new file name for the export file.
+     *
+     * @param $attachment
+     *
+     * @return string
+     */
+    private function exportFileName($attachment): string
+    {
+
+        return sprintf('%s-Attachment nr. %s - %s', $this->job->key, strval($attachment->id), $attachment->filename);
+    }
+
+    /**
+     * @return Collection
+     */
+    private function getAttachments(): Collection
+    {
+        $attachments = $this->repository->getBetween($this->start, $this->end);
+
+        return $attachments;
+    }
+}

app/Export/Collector/BasicCollector.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * BasicCollector.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Collector;
+
+
+use FireflyIII\Models\ExportJob;
+use Illuminate\Support\Collection;
+
+/**
+ * Class BasicCollector
+ *
+ * @package FireflyIII\Export\Collector
+ */
+class BasicCollector
+{
+    /** @var ExportJob */
+    protected $job;
+    /** @var Collection */
+    private $entries;
+
+    /**
+     * BasicCollector constructor.
+     *
+     * @param ExportJob $job
+     */
+    public function __construct(ExportJob $job)
+    {
+        $this->entries = new Collection;
+        $this->job     = $job;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getEntries(): Collection
+    {
+        return $this->entries;
+    }
+
+    /**
+     * @param Collection $entries
+     */
+    public function setEntries(Collection $entries)
+    {
+        $this->entries = $entries;
+    }
+
+
+}

app/Export/Collector/CollectorInterface.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * CollectorInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Collector;
+
+use Illuminate\Support\Collection;
+
+/**
+ * Interface CollectorInterface
+ *
+ * @package FireflyIII\Export\Collector
+ */
+interface CollectorInterface
+{
+    /**
+     * @return Collection
+     */
+    public function getEntries(): Collection;
+
+    /**
+     * @return bool
+     */
+    public function run(): bool;
+
+    /**
+     * @param Collection $entries
+     *
+     * @return void
+     *
+     */
+    public function setEntries(Collection $entries);
+
+}

app/Export/Collector/JournalExportCollector.php

@@ -0,0 +1,347 @@
+<?php
+/**
+ * JournalExportCollector.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Collector;
+
+use Carbon\Carbon;
+use Crypt;
+use DB;
+use FireflyIII\Models\Transaction;
+use Illuminate\Database\Query\JoinClause;
+use Illuminate\Support\Collection;
+
+/**
+ * Class JournalExportCollector
+ *
+ * @package FireflyIII\Export\Collector
+ */
+class JournalExportCollector extends BasicCollector implements CollectorInterface
+{
+    /** @var  Collection */
+    private $accounts;
+    /** @var  Carbon */
+    private $end;
+    /** @var  Carbon */
+    private $start;
+
+    /** @var  Collection */
+    private $workSet;
+
+    /**
+     * @return bool
+     */
+    public function run(): bool
+    {
+        /*
+         * Instead of collecting journals we collect transactions for the given accounts.
+         * We left join the OPPOSING transaction AND some journal data.
+         * After that we complement this info with budgets, categories, etc.
+         *
+         * This is way more efficient and will also work on split journals.
+         */
+        $this->getWorkSet();
+
+        /*
+         * Extract:
+         * possible budget ids for journals
+         * possible category ids journals
+         * possible budget ids for transactions
+         * possible category ids for transactions
+         *
+         * possible IBAN and account numbers?
+         *
+         */
+        $journals     = $this->extractJournalIds();
+        $transactions = $this->extractTransactionIds();
+
+
+        // extend work set with category data from journals:
+        $this->categoryDataForJournals($journals);
+
+        // extend work set with category cate from transactions (overrules journals):
+        $this->categoryDataForTransactions($transactions);
+
+        // same for budgets:
+        $this->budgetDataForJournals($journals);
+        $this->budgetDataForTransactions($transactions);
+
+        $this->setEntries($this->workSet);
+
+        return true;
+    }
+
+    /**
+     * @param Collection $accounts
+     */
+    public function setAccounts(Collection $accounts)
+    {
+        $this->accounts = $accounts;
+    }
+
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     */
+    public function setDates(Carbon $start, Carbon $end)
+    {
+        $this->start = $start;
+        $this->end   = $end;
+    }
+
+    /**
+     * @param array $journals
+     *
+     * @return bool
+     */
+    private function budgetDataForJournals(array $journals): bool
+    {
+        $set = DB::table('budget_transaction_journal')
+                 ->leftJoin('budgets', 'budgets.id', '=', 'budget_transaction_journal.budget_id')
+                 ->whereIn('budget_transaction_journal.transaction_journal_id', $journals)
+                 ->get(
+                     [
+                         'budget_transaction_journal.budget_id',
+                         'budget_transaction_journal.transaction_journal_id',
+                         'budgets.name',
+                         'budgets.encrypted',
+                     ]
+                 );
+        $set->each(
+            function ($obj) {
+                $obj->name = $obj->encrypted === 1 ? Crypt::decrypt($obj->name) : $obj->name;
+            }
+        );
+        $array = [];
+        foreach ($set as $obj) {
+            $array[$obj->transaction_journal_id] = ['id' => $obj->budget_id, 'name' => $obj->name];
+        }
+
+        $this->workSet->each(
+            function ($obj) use ($array) {
+                if (isset($array[$obj->transaction_journal_id])) {
+                    $obj->budget_id   = $array[$obj->transaction_journal_id]['id'];
+                    $obj->budget_name = $array[$obj->transaction_journal_id]['name'];
+                }
+            }
+        );
+
+        return true;
+
+    }
+
+    /**
+     * @param array $transactions
+     *
+     * @return bool
+     */
+    private function budgetDataForTransactions(array $transactions): bool
+    {
+        $set = DB::table('budget_transaction')
+                 ->leftJoin('budgets', 'budgets.id', '=', 'budget_transaction.budget_id')
+                 ->whereIn('budget_transaction.transaction_id', $transactions)
+                 ->get(
+                     [
+                         'budget_transaction.budget_id',
+                         'budget_transaction.transaction_id',
+                         'budgets.name',
+                         'budgets.encrypted',
+                     ]
+                 );
+        $set->each(
+            function ($obj) {
+                $obj->name = $obj->encrypted === 1 ? Crypt::decrypt($obj->name) : $obj->name;
+            }
+        );
+        $array = [];
+        foreach ($set as $obj) {
+            $array[$obj->transaction_id] = ['id' => $obj->budget_id, 'name' => $obj->name];
+        }
+
+        $this->workSet->each(
+            function ($obj) use ($array) {
+
+                // first transaction
+                if (isset($array[$obj->id])) {
+                    $obj->budget_id   = $array[$obj->id]['id'];
+                    $obj->budget_name = $array[$obj->id]['name'];
+                }
+            }
+        );
+
+        return true;
+
+    }
+
+    /**
+     * @param array $journals
+     *
+     * @return bool
+     */
+    private function categoryDataForJournals(array $journals): bool
+    {
+        $set = DB::table('category_transaction_journal')
+                 ->leftJoin('categories', 'categories.id', '=', 'category_transaction_journal.category_id')
+                 ->whereIn('category_transaction_journal.transaction_journal_id', $journals)
+                 ->get(
+                     [
+                         'category_transaction_journal.category_id',
+                         'category_transaction_journal.transaction_journal_id',
+                         'categories.name',
+                         'categories.encrypted',
+                     ]
+                 );
+        $set->each(
+            function ($obj) {
+                $obj->name = $obj->encrypted === 1 ? Crypt::decrypt($obj->name) : $obj->name;
+            }
+        );
+        $array = [];
+        foreach ($set as $obj) {
+            $array[$obj->transaction_journal_id] = ['id' => $obj->category_id, 'name' => $obj->name];
+        }
+
+        $this->workSet->each(
+            function ($obj) use ($array) {
+                if (isset($array[$obj->transaction_journal_id])) {
+                    $obj->category_id   = $array[$obj->transaction_journal_id]['id'];
+                    $obj->category_name = $array[$obj->transaction_journal_id]['name'];
+                }
+            }
+        );
+
+        return true;
+
+    }
+
+    /**
+     * @param array $transactions
+     *
+     * @return bool
+     */
+    private function categoryDataForTransactions(array $transactions): bool
+    {
+        $set = DB::table('category_transaction')
+                 ->leftJoin('categories', 'categories.id', '=', 'category_transaction.category_id')
+                 ->whereIn('category_transaction.transaction_id', $transactions)
+                 ->get(
+                     [
+                         'category_transaction.category_id',
+                         'category_transaction.transaction_id',
+                         'categories.name',
+                         'categories.encrypted',
+                     ]
+                 );
+        $set->each(
+            function ($obj) {
+                $obj->name = $obj->encrypted === 1 ? Crypt::decrypt($obj->name) : $obj->name;
+            }
+        );
+        $array = [];
+        foreach ($set as $obj) {
+            $array[$obj->transaction_id] = ['id' => $obj->category_id, 'name' => $obj->name];
+        }
+
+        $this->workSet->each(
+            function ($obj) use ($array) {
+
+                // first transaction
+                if (isset($array[$obj->id])) {
+                    $obj->category_id   = $array[$obj->id]['id'];
+                    $obj->category_name = $array[$obj->id]['name'];
+                }
+            }
+        );
+
+        return true;
+
+    }
+
+    /**
+     * @return array
+     */
+    private function extractJournalIds(): array
+    {
+        return $this->workSet->pluck('transaction_journal_id')->toArray();
+    }
+
+    /**
+     * @return array
+     */
+    private function extractTransactionIds()
+    {
+        $set      = $this->workSet->pluck('id')->toArray();
+        $opposing = $this->workSet->pluck('opposing_id')->toArray();
+        $complete = $set + $opposing;
+
+        return array_unique($complete);
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    private function getWorkSet()
+    {
+        $accountIds    = $this->accounts->pluck('id')->toArray();
+        $this->workSet = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+                                    ->leftJoin(
+                                        'transactions AS opposing', function (JoinClause $join) {
+                                        $join->on('opposing.transaction_journal_id', '=', 'transactions.transaction_journal_id')
+                                             ->where('opposing.amount', '=', DB::raw('transactions.amount * -1'))
+                                             ->where('transactions.identifier', '=', DB::raw('opposing.identifier'));
+                                    }
+                                    )
+                                    ->leftJoin('accounts', 'transactions.account_id', '=', 'accounts.id')
+                                    ->leftJoin('accounts AS opposing_accounts', 'opposing.account_id', '=', 'opposing_accounts.id')
+                                    ->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', 'transaction_types.id')
+                                    ->leftJoin('transaction_currencies', 'transaction_journals.transaction_currency_id', '=', 'transaction_currencies.id')
+                                    ->whereIn('transactions.account_id', $accountIds)
+                                    ->where('transaction_journals.user_id', $this->job->user_id)
+                                    ->where('transaction_journals.date', '>=', $this->start->format('Y-m-d'))
+                                    ->where('transaction_journals.date', '<=', $this->end->format('Y-m-d'))
+                                    ->where('transaction_journals.completed', 1)
+                                    ->whereNull('transaction_journals.deleted_at')
+                                    ->whereNull('transactions.deleted_at')
+                                    ->whereNull('opposing.deleted_at')
+                                    ->orderBy('transaction_journals.date', 'DESC')
+                                    ->orderBy('transactions.identifier', 'ASC')
+                                    ->get(
+                                        [
+                                            'transactions.id',
+                                            'transactions.amount',
+                                            'transactions.description',
+                                            'transactions.account_id',
+                                            'accounts.name as account_name',
+                                            'accounts.encrypted as account_name_encrypted',
+                                            'transactions.identifier',
+
+                                            'opposing.id as opposing_id',
+                                            'opposing.amount AS opposing_amount',
+                                            'opposing.description as opposing_description',
+                                            'opposing.account_id as opposing_account_id',
+                                            'opposing_accounts.name as opposing_account_name',
+                                            'opposing_accounts.encrypted as opposing_account_encrypted',
+                                            'opposing.identifier as opposing_identifier',
+
+                                            'transaction_journals.id as transaction_journal_id',
+                                            'transaction_journals.date',
+                                            'transaction_journals.description as journal_description',
+                                            'transaction_journals.encrypted as journal_encrypted',
+                                            'transaction_journals.transaction_type_id',
+                                            'transaction_types.type as transaction_type',
+                                            'transaction_journals.transaction_currency_id',
+                                            'transaction_currencies.code AS transaction_currency_code',
+
+                                        ]
+                                    );
+    }
+}

app/Export/Collector/UploadCollector.php

@@ -0,0 +1,220 @@
+<?php
+/**
+ * UploadCollector.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Collector;
+
+use Crypt;
+use FireflyIII\Models\ExportJob;
+use Illuminate\Contracts\Encryption\DecryptException;
+use Log;
+use Storage;
+
+/**
+ * Class UploadCollector
+ *
+ * @package FireflyIII\Export\Collector
+ */
+class UploadCollector extends BasicCollector implements CollectorInterface
+{
+    /** @var \Illuminate\Contracts\Filesystem\Filesystem */
+    private $exportDisk;
+    /** @var \Illuminate\Contracts\Filesystem\Filesystem */
+    private $uploadDisk;
+    /** @var string */
+    private $vintageFormat;
+
+    /**
+     * AttachmentCollector constructor.
+     *
+     * @param ExportJob $job
+     */
+    public function __construct(ExportJob $job)
+    {
+        parent::__construct($job);
+
+        Log::debug('Going to collect attachments', ['key' => $job->key]);
+
+        // make storage:
+        $this->uploadDisk = Storage::disk('upload');
+        $this->exportDisk = Storage::disk('export');
+
+        // file names associated with the old import routine.
+        $this->vintageFormat = sprintf('csv-upload-%d-', auth()->user()->id);
+
+    }
+
+    /**
+     * Is called from the outside to actually start the export.
+     *
+     * @return bool
+     */
+    public function run(): bool
+    {
+        // collect old upload files (names beginning with "csv-upload".
+        $this->collectVintageUploads();
+
+        // then collect current upload files:
+        $this->collectModernUploads();
+
+        return true;
+    }
+
+    /**
+     * This method collects all the uploads that are uploaded using the new importer. So after the summer of 2016.
+     *
+     * @return bool
+     */
+    private function collectModernUploads(): bool
+    {
+        $set  = $this->job->user->importJobs()->where('status', 'import_complete')->get(['import_jobs.*']);
+        $keys = [];
+        if ($set->count() > 0) {
+            $keys = $set->pluck('key')->toArray();
+        }
+
+        foreach ($keys as $key) {
+            $this->processModernUpload($key);
+        }
+
+        return true;
+    }
+
+    /**
+     * This method collects all the uploads that are uploaded using the "old" importer. So from before the summer of 2016.
+     *
+     * @return bool
+     */
+    private function collectVintageUploads(): bool
+    {
+        // grab upload directory.
+        $files = $this->uploadDisk->files();
+
+        foreach ($files as $entry) {
+            $this->processVintageUpload($entry);
+        }
+
+        return true;
+    }
+
+    /**
+     * This method tells you when the vintage upload file was actually uploaded.
+     *
+     * @param string $entry
+     *
+     * @return string
+     */
+    private function getVintageUploadDate(string $entry): string
+    {
+        // this is an original upload.
+        $parts          = explode('-', str_replace(['.csv.encrypted', $this->vintageFormat], '', $entry));
+        $originalUpload = intval($parts[1]);
+        $date           = date('Y-m-d \a\t H-i-s', $originalUpload);
+
+        return $date;
+    }
+
+    /**
+     * Tells you if a file name is a vintage upload.
+     *
+     * @param string $entry
+     *
+     * @return bool
+     */
+    private function isVintageImport(string $entry): bool
+    {
+        $len = strlen($this->vintageFormat);
+        // file is part of the old import routine:
+        if (substr($entry, 0, $len) === $this->vintageFormat) {
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $key
+     *
+     * @return bool
+     */
+    private function processModernUpload(string $key): bool
+    {
+        // find job associated with import file:
+        $job = $this->job->user->importJobs()->where('key', $key)->first();
+        if (is_null($job)) {
+            return false;
+        }
+
+        // find the file for this import:
+        $content = '';
+        try {
+            $content = Crypt::decrypt($this->uploadDisk->get(sprintf('%s.upload', $key)));
+        } catch (DecryptException $e) {
+            Log::error(sprintf('Could not decrypt old import file "%s". Skipped because: %s', $key, $e->getMessage()));
+        }
+
+        if (strlen($content) > 0) {
+            // add to export disk.
+            $date = $job->created_at->format('Y-m-d');
+            $file = sprintf('%s-Old %s import dated %s.%s', $this->job->key, strtoupper($job->file_type), $date, $job->file_type);
+            $this->exportDisk->put($file, $content);
+            $this->getEntries()->push($file);
+        }
+
+        return true;
+    }
+
+    /**
+     * If the file is a vintage upload, process it.
+     *
+     * @param string $entry
+     *
+     * @return bool
+     */
+    private function processVintageUpload(string $entry): bool
+    {
+        if ($this->isVintageImport($entry)) {
+            $this->saveVintageImportFile($entry);
+
+            return true;
+        }
+
+        return false;
+    }
+
+
+    /**
+     * This will store the content of the old vintage upload somewhere.
+     *
+     * @param string $entry
+     */
+    private function saveVintageImportFile(string $entry)
+    {
+        $content = '';
+        try {
+            $content = Crypt::decrypt($this->uploadDisk->get($entry));
+        } catch (DecryptException $e) {
+            Log::error('Could not decrypt old CSV import file ' . $entry . '. Skipped because ' . $e->getMessage());
+        }
+
+        if (strlen($content) > 0) {
+            // add to export disk.
+            $date = $this->getVintageUploadDate($entry);
+            $file = $this->job->key . '-Old import dated ' . $date . '.csv';
+            $this->exportDisk->put($file, $content);
+            $this->getEntries()->push($file);
+        }
+    }
+
+
+}

app/Export/Entry/Entry.php

@@ -0,0 +1,114 @@
+<?php
+/**
+ * Entry.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Entry;
+
+use Crypt;
+
+/**
+ * To extend the exported object, in case of new features in Firefly III for example,
+ * do the following:
+ *
+ * - Add the field(s) to this class. If you add more than one related field, add a new object.
+ * - Make sure the "fromJournal"-routine fills these fields.
+ * - Add them to the static function that returns its type (key=value. Remember that the only
+ *   valid types can be found in config/csv.php (under "roles").
+ *
+ * These new entries should be should be strings and numbers as much as possible.
+ *
+ *
+ *
+ * Class Entry
+ * @SuppressWarnings(PHPMD.LongVariable)
+ *
+ * @package FireflyIII\Export\Entry
+ */
+final class Entry
+{
+    // @formatter:off
+    public $journal_id;
+    public $date;
+    public $description;
+
+    public $currency_code;
+    public $amount;
+
+    public $transaction_type;
+
+    public $source_account_id;
+    public $source_account_name;
+
+    public $destination_account_id;
+    public $destination_account_name;
+
+
+    public $budget_id;
+    public $budget_name;
+    public $category_id;
+    public $category_name;
+    // @formatter:on
+
+    /**
+     * Entry constructor.
+     */
+    private function __construct()
+    {
+    }
+
+    /**
+     * @param $object
+     *
+     * @return Entry
+     */
+    public static function fromObject($object): Entry
+    {
+        $entry                           = new self;
+        $entry->journal_id               = $object->transaction_journal_id;
+        $entry->description              = self::decrypt($object->journal_encrypted, $object->journal_description);
+        $entry->amount                   = $object->amount;
+        $entry->date                     = $object->date;
+        $entry->transaction_type         = $object->transaction_type;
+        $entry->currency_code            = $object->transaction_currency_code;
+        $entry->source_account_id        = $object->account_id;
+        $entry->source_account_name      = self::decrypt($object->account_name_encrypted, $object->account_name);
+        $entry->destination_account_id   = $object->opposing_account_id;
+        $entry->destination_account_name = self::decrypt($object->opposing_account_encrypted, $object->opposing_account_name);
+        $entry->category_id              = $object->category_id ?? '';
+        $entry->category_name            = $object->category_name ?? '';
+        $entry->budget_id                = $object->budget_id ?? '';
+        $entry->budget_name              = $object->budget_name ?? '';
+
+        // update description when transaction description is different:
+        if (!is_null($object->description) && $object->description != $entry->description) {
+            $entry->description = $entry->description . ' (' . $object->description . ')';
+        }
+
+        return $entry;
+    }
+
+    /**
+     * @param int $isEncrypted
+     * @param     $value
+     *
+     * @return string
+     */
+    protected static function decrypt(int $isEncrypted, $value)
+    {
+        if ($isEncrypted === 1) {
+            return Crypt::decrypt($value);
+        }
+
+        return $value;
+    }
+
+}

app/Export/Exporter/BasicExporter.php

@@ -0,0 +1,59 @@
+<?php
+/**
+ * BasicExporter.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Exporter;
+
+
+use FireflyIII\Models\ExportJob;
+use Illuminate\Support\Collection;
+
+/**
+ * Class BasicExporter
+ *
+ * @package FireflyIII\Export\Exporter
+ */
+class BasicExporter
+{
+    /** @var  ExportJob */
+    protected $job;
+    private   $entries;
+
+    /**
+     * BasicExporter constructor.
+     *
+     * @param ExportJob $job
+     */
+    public function __construct(ExportJob $job)
+    {
+        $this->entries = new Collection;
+        $this->job     = $job;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getEntries(): Collection
+    {
+        return $this->entries;
+    }
+
+    /**
+     * @param Collection $entries
+     */
+    public function setEntries(Collection $entries)
+    {
+        $this->entries = $entries;
+    }
+
+
+}

app/Export/Exporter/CsvExporter.php

@@ -0,0 +1,86 @@
+<?php
+/**
+ * CsvExporter.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Exporter;
+
+use FireflyIII\Export\Entry\Entry;
+use FireflyIII\Models\ExportJob;
+use League\Csv\Writer;
+use SplFileObject;
+
+/**
+ * Class CsvExporter
+ *
+ * @package FireflyIII\Export\Exporter
+ */
+class CsvExporter extends BasicExporter implements ExporterInterface
+{
+    /** @var  string */
+    private $fileName;
+
+    /**
+     * CsvExporter constructor.
+     *
+     * @param ExportJob $job
+     */
+    public function __construct(ExportJob $job)
+    {
+        parent::__construct($job);
+
+    }
+
+    /**
+     * @return string
+     */
+    public function getFileName(): string
+    {
+        return $this->fileName;
+    }
+
+    /**
+     * @return bool
+     */
+    public function run(): bool
+    {
+        // create temporary file:
+        $this->tempFile();
+
+        // necessary for CSV writer:
+        $fullPath = storage_path('export') . DIRECTORY_SEPARATOR . $this->fileName;
+        $writer   = Writer::createFromPath(new SplFileObject($fullPath, 'a+'), 'w');
+        $rows     = [];
+
+        // get field names for header row:
+        $first   = $this->getEntries()->first();
+        $headers = array_keys(get_object_vars($first));
+        $rows[]  = $headers;
+
+        /** @var Entry $entry */
+        foreach ($this->getEntries() as $entry) {
+            $line = [];
+            foreach ($headers as $header) {
+                $line[] = $entry->$header;
+            }
+            $rows[] = $line;
+        }
+        $writer->insertAll($rows);
+
+        return true;
+    }
+
+
+    private function tempFile()
+    {
+        $this->fileName = $this->job->key . '-records.csv';
+    }
+}

app/Export/Exporter/ExporterInterface.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * ExporterInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Exporter;
+
+use Illuminate\Support\Collection;
+
+/**
+ * Interface ExporterInterface
+ *
+ * @package FireflyIII\Export\Exporter
+ */
+interface ExporterInterface
+{
+    /**
+     * @return Collection
+     */
+    public function getEntries(): Collection;
+
+    /**
+     * @return string
+     */
+    public function getFileName(): string;
+
+    /**
+     * @return bool
+     */
+    public function run(): bool;
+
+    /**
+     * @param Collection $entries
+     *
+     * @return void
+     *
+     */
+    public function setEntries(Collection $entries);
+
+}

app/Export/Processor.php

@@ -0,0 +1,195 @@
+<?php
+/**
+ * Processor.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export;
+
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Export\Collector\AttachmentCollector;
+use FireflyIII\Export\Collector\JournalExportCollector;
+use FireflyIII\Export\Collector\UploadCollector;
+use FireflyIII\Export\Entry\Entry;
+use FireflyIII\Models\ExportJob;
+use Illuminate\Filesystem\FilesystemAdapter;
+use Illuminate\Support\Collection;
+use Log;
+use Storage;
+use ZipArchive;
+
+/**
+ * Class Processor
+ *
+ * @package FireflyIII\Export
+ */
+class Processor implements ProcessorInterface
+{
+
+    /** @var Collection */
+    public $accounts;
+    /** @var  string */
+    public $exportFormat;
+    /** @var  bool */
+    public $includeAttachments;
+    /** @var  bool */
+    public $includeOldUploads;
+    /** @var  ExportJob */
+    public $job;
+    /** @var array */
+    public $settings;
+    /** @var  Collection */
+    private $exportEntries;
+    /** @var  Collection */
+    private $files;
+    /** @var  Collection */
+    private $journals;
+
+    /**
+     * Processor constructor.
+     *
+     * @param array $settings
+     */
+    public function __construct(array $settings)
+    {
+        // save settings
+        $this->settings           = $settings;
+        $this->accounts           = $settings['accounts'];
+        $this->exportFormat       = $settings['exportFormat'];
+        $this->includeAttachments = $settings['includeAttachments'];
+        $this->includeOldUploads  = $settings['includeOldUploads'];
+        $this->job                = $settings['job'];
+        $this->journals           = new Collection;
+        $this->exportEntries      = new Collection;
+        $this->files              = new Collection;
+
+    }
+
+    /**
+     * @return bool
+     */
+    public function collectAttachments(): bool
+    {
+        /** @var AttachmentCollector $attachmentCollector */
+        $attachmentCollector = app(AttachmentCollector::class, [$this->job]);
+        $attachmentCollector->setDates($this->settings['startDate'], $this->settings['endDate']);
+        $attachmentCollector->run();
+        $this->files = $this->files->merge($attachmentCollector->getEntries());
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function collectJournals(): bool
+    {
+        /** @var JournalExportCollector $collector */
+        $collector = app(JournalExportCollector::class, [$this->job]);
+        $collector->setDates($this->settings['startDate'], $this->settings['endDate']);
+        $collector->setAccounts($this->settings['accounts']);
+        $collector->run();
+        $this->journals = $collector->getEntries();
+        Log::debug(sprintf('Count %d journals in collectJournals() ', $this->journals->count()));
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function collectOldUploads(): bool
+    {
+        /** @var UploadCollector $uploadCollector */
+        $uploadCollector = app(UploadCollector::class, [$this->job]);
+        $uploadCollector->run();
+
+        $this->files = $this->files->merge($uploadCollector->getEntries());
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function convertJournals(): bool
+    {
+        $count = 0;
+        foreach ($this->journals as $object) {
+            $this->exportEntries->push(Entry::fromObject($object));
+            $count++;
+        }
+        Log::debug(sprintf('Count %d entries in exportEntries (convertJournals)', $this->exportEntries->count()));
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     * @throws FireflyException
+     */
+    public function createZipFile(): bool
+    {
+        $zip      = new ZipArchive;
+        $file     = $this->job->key . '.zip';
+        $fullPath = storage_path('export') . '/' . $file;
+
+        if ($zip->open($fullPath, ZipArchive::CREATE) !== true) {
+            throw new FireflyException('Cannot store zip file.');
+        }
+        // for each file in the collection, add it to the zip file.
+        $disk = Storage::disk('export');
+        foreach ($this->getFiles() as $entry) {
+            // is part of this job?
+            $zipFileName = str_replace($this->job->key . '-', '', $entry);
+            $zip->addFromString($zipFileName, $disk->get($entry));
+        }
+
+        $zip->close();
+
+        // delete the files:
+        $this->deleteFiles();
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function exportJournals(): bool
+    {
+        $exporterClass = config('firefly.export_formats.' . $this->exportFormat);
+        $exporter      = app($exporterClass, [$this->job]);
+        $exporter->setEntries($this->exportEntries);
+        $exporter->run();
+        $this->files->push($exporter->getFileName());
+
+        return true;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getFiles(): Collection
+    {
+        return $this->files;
+    }
+
+    /**
+     *
+     */
+    private function deleteFiles()
+    {
+        $disk = Storage::disk('export');
+        foreach ($this->getFiles() as $file) {
+            $disk->delete($file);
+        }
+    }
+}

app/Export/ProcessorInterface.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * ProcessorInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export;
+
+use Illuminate\Support\Collection;
+
+/**
+ * Interface ProcessorInterface
+ *
+ * @package FireflyIII\Export
+ */
+interface ProcessorInterface
+{
+
+    /**
+     * Processor constructor.
+     *
+     * @param array $settings
+     *
+     */
+    public function __construct(array $settings);
+
+    /**
+     * @return bool
+     */
+    public function collectAttachments(): bool;
+
+    /**
+     * @return bool
+     */
+    public function collectJournals(): bool;
+
+    /**
+     * @return bool
+     */
+    public function collectOldUploads(): bool;
+
+    /**
+     * @return bool
+     */
+    public function convertJournals(): bool;
+
+    /**
+     * @return bool
+     */
+    public function createZipFile(): bool;
+
+    /**
+     * @return bool
+     */
+    public function exportJournals(): bool;
+
+    /**
+     * @return Collection
+     */
+    public function getFiles(): Collection;
+}

app/Generator/Chart/Basic/ChartJsGenerator.php

@@ -0,0 +1,150 @@
+<?php
+/**
+ * ChartJsGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Chart\Basic;
+
+use FireflyIII\Support\ChartColour;
+
+/**
+ * Class ChartJsGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Basic
+ */
+class ChartJsGenerator implements GeneratorInterface
+{
+
+    /**
+     * Will generate a Chart JS compatible array from the given input. Expects this format
+     *
+     * Will take labels for all from first set.
+     *
+     * 0: [
+     *    'label' => 'label of set',
+     *    'type' => bar or line, optional
+     *    'yAxisID' => ID of yAxis, optional, will not be included when unused.
+     *    'fill' => if to fill a line? optional, will not be included when unused.
+     *    'entries' =>
+     *        [
+     *         'label-of-entry' => 'value'
+     *        ]
+     *    ]
+     * 1: [
+     *    'label' => 'label of another set',
+     *    'type' => bar or line, optional
+     *    'yAxisID' => ID of yAxis, optional, will not be included when unused.
+     *    'fill' => if to fill a line? optional, will not be included when unused.
+     *    'entries' =>
+     *        [
+     *         'label-of-entry' => 'value'
+     *        ]
+     *    ]
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five.
+     *
+     * @param array $data
+     *
+     * @return array
+     */
+    public function multiSet(array $data): array
+    {
+        reset($data);
+        $first  = current($data);
+        $labels = is_array($first['entries']) ? array_keys($first['entries']) : [];
+
+        $chartData = [
+            'count'    => count($data),
+            'labels'   => $labels, // take ALL labels from the first set.
+            'datasets' => [],
+        ];
+        unset($first, $labels);
+
+        foreach ($data as $set) {
+            $currentSet = [
+                'label' => $set['label'],
+                'type'  => $set['type'] ?? 'line',
+                'data'  => array_values($set['entries']),
+            ];
+            if (isset($set['yAxisID'])) {
+                $currentSet['yAxisID'] = $set['yAxisID'];
+            }
+            if (isset($set['fill'])) {
+                $currentSet['fill'] = $set['fill'];
+            }
+
+            $chartData['datasets'][] = $currentSet;
+        }
+
+        return $chartData;
+    }
+
+    /**
+     * Expects data as:
+     *
+     * key => value
+     *
+     * @param array $data
+     *
+     * @return array
+     */
+    public function pieChart(array $data): array
+    {
+        $chartData = [
+            'datasets' => [
+                0 => [],
+            ],
+            'labels'   => [],
+        ];
+        $index     = 0;
+        foreach ($data as $key => $value) {
+
+            // make larger than 0
+            if (bccomp($value, '0') === -1) {
+                $value = bcmul($value, '-1');
+            }
+
+            $chartData['datasets'][0]['data'][]            = $value;
+            $chartData['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
+            $chartData['labels'][]                         = $key;
+            $index++;
+        }
+
+        return $chartData;
+    }
+
+    /**
+     * Will generate a (ChartJS) compatible array from the given input. Expects this format:
+     *
+     * 'label-of-entry' => value
+     * 'label-of-entry' => value
+     *
+     * @param string $setLabel
+     * @param array  $data
+     *
+     * @return array
+     */
+    public function singleSet(string $setLabel, array $data): array
+    {
+        $chartData = [
+            'count'    => 1,
+            'labels'   => array_keys($data), // take ALL labels from the first set.
+            'datasets' => [
+                [
+                    'label' => $setLabel,
+                    'data'  => array_values($data),
+                ],
+            ],
+        ];
+
+        return $chartData;
+    }
+}

app/Generator/Chart/Basic/GeneratorInterface.php

@@ -0,0 +1,73 @@
+<?php
+/**
+ * GeneratorInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Chart\Basic;
+
+/**
+ * Interface GeneratorInterface
+ *
+ * @package FireflyIII\Generator\Chart\Basic
+ */
+interface GeneratorInterface
+{
+
+    /**
+     * Will generate a (ChartJS) compatible array from the given input. Expects this format:
+     *
+     * 0: [
+     *    'label' => 'label of set',
+     *    'entries' =>
+     *        [
+     *         'label-of-entry' => 'value'
+     *        ]
+     *    ]
+     * 1: [
+     *    'label' => 'label of another set',
+     *    'entries' =>
+     *        [
+     *         'label-of-entry' => 'value'
+     *        ]
+     *    ]
+     *
+     *
+     * @param array $data
+     *
+     * @return array
+     */
+    public function multiSet(array $data): array;
+
+    /**
+     * Expects data as:
+     *
+     * key => value
+     *
+     * @param array $data
+     *
+     * @return array
+     */
+    public function pieChart(array $data): array;
+
+    /**
+     * Will generate a (ChartJS) compatible array from the given input. Expects this format:
+     *
+     * 'label-of-entry' => value
+     * 'label-of-entry' => value
+     *
+     * @param string $setLabel
+     * @param array  $data
+     *
+     * @return array
+     */
+    public function singleSet(string $setLabel, array $data): array;
+
+}

app/Generator/Report/Audit/MonthReportGenerator.php

@@ -0,0 +1,173 @@
+<?php
+/**
+ * MonthReportGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Report\Audit;
+
+
+use Carbon\Carbon;
+use FireflyIII\Generator\Report\ReportGeneratorInterface;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\Transaction;
+use Illuminate\Support\Collection;
+use Steam;
+
+/**
+ * Class MonthReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Audit
+ */
+class MonthReportGenerator implements ReportGeneratorInterface
+{
+    /** @var  Collection */
+    private $accounts;
+    /** @var  Carbon */
+    private $end;
+    /** @var  Carbon */
+    private $start;
+
+    /**
+     * @return string
+     */
+    public function generate(): string
+    {
+
+
+        $auditData = [];
+        $dayBefore = clone $this->start;
+        $dayBefore->subDay();
+        /** @var Account $account */
+        foreach ($this->accounts as $account) {
+            // balance the day before:
+            $id             = $account->id;
+            $auditData[$id] = $this->getAuditReport($account, $dayBefore);
+        }
+
+        $defaultShow = ['icon', 'description', 'balance_before', 'amount', 'balance_after', 'date', 'to'];
+        $reportType  = 'audit';
+        $accountIds  = join(',', $this->accounts->pluck('id')->toArray());
+        $hideable    = ['buttons', 'icon', 'description', 'balance_before', 'amount', 'balance_after', 'date',
+                        'interest_date', 'book_date', 'process_date',
+                        // three new optional fields.
+                        'due_date', 'payment_date', 'invoice_date',
+                        'from', 'to', 'budget', 'category', 'bill',
+                        // more new optional fields
+                        'internal_reference', 'notes',
+                        'create_date', 'update_date',
+        ];
+
+
+        return view('reports.audit.report', compact('reportType', 'accountIds', 'auditData', 'hideable', 'defaultShow'))
+            ->with('start', $this->start)->with('end', $this->end)->with('accounts', $this->accounts)
+            ->render();
+
+    }
+
+    /**
+     * @param Collection $accounts
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setAccounts(Collection $accounts): ReportGeneratorInterface
+    {
+        $this->accounts = $accounts;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $budgets
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setBudgets(Collection $budgets): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * @param Collection $categories
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setCategories(Collection $categories): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setEndDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->end = $date;
+
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setStartDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->start = $date;
+
+        return $this;
+    }
+
+    /**
+     * @param Account $account
+     * @param Carbon  $date
+     *
+     * @return array
+     */
+    private function getAuditReport(Account $account, Carbon $date): array
+    {
+
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class, [auth()->user()]);
+        $collector->setAccounts(new Collection([$account]))->setRange($this->start, $this->end);
+        $journals         = $collector->getJournals();
+        $journals         = $journals->reverse();
+        $dayBeforeBalance = Steam::balance($account, $date);
+        $startBalance     = $dayBeforeBalance;
+
+
+        /** @var Transaction $journal */
+        foreach ($journals as $transaction) {
+            $transaction->before = $startBalance;
+            $transactionAmount   = $transaction->transaction_amount;
+            $newBalance          = bcadd($startBalance, $transactionAmount);
+            $transaction->after  = $newBalance;
+            $startBalance        = $newBalance;
+        }
+
+        /*
+         * Reverse set again.
+         */
+        $return = [
+            'journals'         => $journals->reverse(),
+            'exists'           => $journals->count() > 0,
+            'end'              => $this->end->formatLocalized(strval(trans('config.month_and_day'))),
+            'endBalance'       => Steam::balance($account, $this->end),
+            'dayBefore'        => $date->formatLocalized(strval(trans('config.month_and_day'))),
+            'dayBeforeBalance' => $dayBeforeBalance,
+        ];
+
+        return $return;
+    }
+}

app/Generator/Report/Audit/MultiYearReportGenerator.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * MultiYearReportGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Report\Audit;
+
+
+/**
+ * Class MultiYearReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Audit
+ */
+class MultiYearReportGenerator extends MonthReportGenerator
+{
+    /**
+     * Doesn't do anything different.
+     */
+}

app/Generator/Report/Audit/YearReportGenerator.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * YearReportGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Report\Audit;
+
+
+/**
+ * Class YearReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Audit
+ */
+class YearReportGenerator extends MonthReportGenerator
+{
+
+    /**
+     * Doesn't do anything different.
+     */
+}

app/Generator/Report/Budget/MonthReportGenerator.php

@@ -0,0 +1,248 @@
+<?php
+/**
+ * MonthReportGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Report\Budget;
+
+
+use Carbon\Carbon;
+use FireflyIII\Generator\Report\ReportGeneratorInterface;
+use FireflyIII\Generator\Report\Support;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionType;
+use Illuminate\Support\Collection;
+use Log;
+
+/**
+ * Class MonthReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Budget
+ */
+class MonthReportGenerator extends Support implements ReportGeneratorInterface
+{
+    /** @var  Collection */
+    private $accounts;
+    /** @var  Collection */
+    private $budgets;
+    /** @var  Carbon */
+    private $end;
+    /** @var Collection */
+    private $expenses;
+    /** @var Collection */
+    private $income;
+    /** @var  Carbon */
+    private $start;
+
+    /**
+     * MonthReportGenerator constructor.
+     */
+    public function __construct()
+    {
+        $this->income   = new Collection;
+        $this->expenses = new Collection;
+    }
+
+    /**
+     * @return string
+     */
+    public function generate(): string
+    {
+        $accountIds      = join(',', $this->accounts->pluck('id')->toArray());
+        $budgetIds       = join(',', $this->budgets->pluck('id')->toArray());
+        $expenses        = $this->getExpenses();
+        $accountSummary  = $this->summarizeByAccount($expenses);
+        $budgetSummary   = $this->summarizeByBudget($expenses);
+        $averageExpenses = $this->getAverages($expenses, SORT_ASC);
+        $topExpenses     = $this->getTopExpenses();
+
+        // render!
+        return view('reports.budget.month', compact('accountIds', 'budgetIds', 'accountSummary', 'budgetSummary', 'averageExpenses', 'topExpenses'))
+            ->with('start', $this->start)->with('end', $this->end)
+            ->with('budgets', $this->budgets)
+            ->with('accounts', $this->accounts)
+            ->render();
+    }
+
+    /**
+     * @param Collection $accounts
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setAccounts(Collection $accounts): ReportGeneratorInterface
+    {
+        $this->accounts = $accounts;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $budgets
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setBudgets(Collection $budgets): ReportGeneratorInterface
+    {
+        $this->budgets = $budgets;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $categories
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setCategories(Collection $categories): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setEndDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->end = $date;
+
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setStartDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->start = $date;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $collection
+     * @param int        $sortFlag
+     *
+     * @return array
+     */
+    private function getAverages(Collection $collection, int $sortFlag): array
+    {
+        $result = [];
+        /** @var Transaction $transaction */
+        foreach ($collection as $transaction) {
+            // opposing name and ID:
+            $opposingId = $transaction->opposing_account_id;
+
+            // is not set?
+            if (!isset($result[$opposingId])) {
+                $name                = $transaction->opposing_account_name;
+                $result[$opposingId] = [
+                    'name'    => $name,
+                    'count'   => 1,
+                    'id'      => $opposingId,
+                    'average' => $transaction->transaction_amount,
+                    'sum'     => $transaction->transaction_amount,
+                ];
+                continue;
+            }
+            $result[$opposingId]['count']++;
+            $result[$opposingId]['sum']     = bcadd($result[$opposingId]['sum'], $transaction->transaction_amount);
+            $result[$opposingId]['average'] = bcdiv($result[$opposingId]['sum'], strval($result[$opposingId]['count']));
+        }
+
+        // sort result by average:
+        $average = [];
+        foreach ($result as $key => $row) {
+            $average[$key] = floatval($row['average']);
+        }
+
+        array_multisort($average, $sortFlag, $result);
+
+        return $result;
+    }
+
+    /**
+     * @return Collection
+     */
+    private function getExpenses(): Collection
+    {
+        if ($this->expenses->count() > 0) {
+            Log::debug('Return previous set of expenses.');
+
+            return $this->expenses;
+        }
+
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class, [auth()->user()]);
+        $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
+                  ->setTypes([TransactionType::WITHDRAWAL])
+                  ->setBudgets($this->budgets)->withOpposingAccount()->disableFilter();
+
+        $accountIds     = $this->accounts->pluck('id')->toArray();
+        $transactions   = $collector->getJournals();
+        $transactions   = self::filterExpenses($transactions, $accountIds);
+        $this->expenses = $transactions;
+
+        return $transactions;
+    }
+
+    /**
+     * @return Collection
+     */
+    private function getTopExpenses(): Collection
+    {
+        $transactions = $this->getExpenses()->sortBy('transaction_amount');
+
+        return $transactions;
+    }
+
+    /**
+     * @param Collection $collection
+     *
+     * @return array
+     */
+    private function summarizeByAccount(Collection $collection): array
+    {
+        $result = [];
+        /** @var Transaction $transaction */
+        foreach ($collection as $transaction) {
+            $accountId          = $transaction->account_id;
+            $result[$accountId] = $result[$accountId] ?? '0';
+            $result[$accountId] = bcadd($transaction->transaction_amount, $result[$accountId]);
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param Collection $collection
+     *
+     * @return array
+     */
+    private function summarizeByBudget(Collection $collection): array
+    {
+        $result = [];
+        /** @var Transaction $transaction */
+        foreach ($collection as $transaction) {
+            $jrnlBudId         = intval($transaction->transaction_journal_budget_id);
+            $transBudId        = intval($transaction->transaction_budget_id);
+            $budgetId          = max($jrnlBudId, $transBudId);
+            $result[$budgetId] = $result[$budgetId] ?? '0';
+            $result[$budgetId] = bcadd($transaction->transaction_amount, $result[$budgetId]);
+        }
+
+        return $result;
+    }
+}

app/Generator/Report/Budget/MultiYearReportGenerator.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * MultiYearReportGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Report\Budget;
+
+
+/**
+ * Class MultiYearReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Budget
+ */
+class MultiYearReportGenerator extends MonthReportGenerator
+{
+    /**
+     * Doesn't do anything different.
+     */
+}

app/Generator/Report/Budget/YearReportGenerator.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * YearReportGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Report\Budget;
+
+
+/**
+ * Class YearReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Budget
+ */
+class YearReportGenerator extends MonthReportGenerator
+{
+
+    /**
+     * Doesn't do anything different.
+     */
+}

app/Generator/Report/Category/MonthReportGenerator.php

@@ -0,0 +1,331 @@
+<?php
+/**
+ * MonthReportGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Report\Category;
+
+
+use Carbon\Carbon;
+use FireflyIII\Generator\Report\ReportGeneratorInterface;
+use FireflyIII\Generator\Report\Support;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionType;
+use Illuminate\Support\Collection;
+use Log;
+
+/**
+ * Class MonthReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Category
+ */
+class MonthReportGenerator extends Support implements ReportGeneratorInterface
+{
+    /** @var  Collection */
+    private $accounts;
+    /** @var  Collection */
+    private $categories;
+    /** @var  Carbon */
+    private $end;
+    /** @var Collection */
+    private $expenses;
+    /** @var Collection */
+    private $income;
+    /** @var  Carbon */
+    private $start;
+
+    /**
+     * MonthReportGenerator constructor.
+     */
+    public function __construct()
+    {
+        $this->income   = new Collection;
+        $this->expenses = new Collection;
+    }
+
+    /**
+     * @return string
+     */
+    public function generate(): string
+    {
+        $accountIds      = join(',', $this->accounts->pluck('id')->toArray());
+        $categoryIds     = join(',', $this->categories->pluck('id')->toArray());
+        $reportType      = 'category';
+        $expenses        = $this->getExpenses();
+        $income          = $this->getIncome();
+        $accountSummary  = $this->getObjectSummary($this->summarizeByAccount($expenses), $this->summarizeByAccount($income));
+        $categorySummary = $this->getObjectSummary($this->summarizeByCategory($expenses), $this->summarizeByCategory($income));
+        $averageExpenses = $this->getAverages($expenses, SORT_ASC);
+        $averageIncome   = $this->getAverages($income, SORT_DESC);
+        $topExpenses     = $this->getTopExpenses();
+        $topIncome       = $this->getTopIncome();
+
+
+        // render!
+        return view(
+            'reports.category.month',
+            compact(
+                'accountIds', 'categoryIds', 'topIncome', 'reportType', 'accountSummary', 'categorySummary', 'averageExpenses', 'averageIncome', 'topExpenses'
+            )
+        )
+            ->with('start', $this->start)->with('end', $this->end)
+            ->with('categories', $this->categories)
+            ->with('accounts', $this->accounts)
+            ->render();
+    }
+
+    /**
+     * @param Collection $accounts
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setAccounts(Collection $accounts): ReportGeneratorInterface
+    {
+        $this->accounts = $accounts;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $budgets
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setBudgets(Collection $budgets): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * @param Collection $categories
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setCategories(Collection $categories): ReportGeneratorInterface
+    {
+        $this->categories = $categories;
+
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setEndDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->end = $date;
+
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setStartDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->start = $date;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $collection
+     * @param int        $sortFlag
+     *
+     * @return array
+     */
+    private function getAverages(Collection $collection, int $sortFlag): array
+    {
+        $result = [];
+        /** @var Transaction $transaction */
+        foreach ($collection as $transaction) {
+            // opposing name and ID:
+            $opposingId = $transaction->opposing_account_id;
+
+            // is not set?
+            if (!isset($result[$opposingId])) {
+                $name                = $transaction->opposing_account_name;
+                $result[$opposingId] = [
+                    'name'    => $name,
+                    'count'   => 1,
+                    'id'      => $opposingId,
+                    'average' => $transaction->transaction_amount,
+                    'sum'     => $transaction->transaction_amount,
+                ];
+                continue;
+            }
+            $result[$opposingId]['count']++;
+            $result[$opposingId]['sum']     = bcadd($result[$opposingId]['sum'], $transaction->transaction_amount);
+            $result[$opposingId]['average'] = bcdiv($result[$opposingId]['sum'], strval($result[$opposingId]['count']));
+        }
+
+        // sort result by average:
+        $average = [];
+        foreach ($result as $key => $row) {
+            $average[$key] = floatval($row['average']);
+        }
+
+        array_multisort($average, $sortFlag, $result);
+
+        return $result;
+    }
+
+    /**
+     * @return Collection
+     */
+    private function getExpenses(): Collection
+    {
+        if ($this->expenses->count() > 0) {
+            Log::debug('Return previous set of expenses.');
+
+            return $this->expenses;
+        }
+
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class, [auth()->user()]);
+        $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
+                  ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
+                  ->setCategories($this->categories)->withOpposingAccount()->disableFilter();
+
+        $accountIds     = $this->accounts->pluck('id')->toArray();
+        $transactions   = $collector->getJournals();
+        $transactions   = self::filterExpenses($transactions, $accountIds);
+        $this->expenses = $transactions;
+
+        return $transactions;
+    }
+
+    /**
+     * @return Collection
+     */
+    private function getIncome(): Collection
+    {
+        if ($this->income->count() > 0) {
+            return $this->income;
+        }
+
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class, [auth()->user()]);
+        $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
+                  ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])
+                  ->setCategories($this->categories)->withOpposingAccount();
+        $accountIds   = $this->accounts->pluck('id')->toArray();
+        $transactions = $collector->getJournals();
+        $transactions = self::filterIncome($transactions, $accountIds);
+        $this->income = $transactions;
+
+        return $transactions;
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly five.
+     * @param array $spent
+     * @param array $earned
+     *
+     * @return array
+     */
+    private function getObjectSummary(array $spent, array $earned): array
+    {
+        $return = [];
+
+        /**
+         * @var int    $accountId
+         * @var string $entry
+         */
+        foreach ($spent as $objectId => $entry) {
+            if (!isset($return[$objectId])) {
+                $return[$objectId] = ['spent' => 0, 'earned' => 0];
+            }
+
+            $return[$objectId]['spent'] = $entry;
+        }
+        unset($entry);
+
+        /**
+         * @var int    $accountId
+         * @var string $entry
+         */
+        foreach ($earned as $objectId => $entry) {
+            if (!isset($return[$objectId])) {
+                $return[$objectId] = ['spent' => 0, 'earned' => 0];
+            }
+
+            $return[$objectId]['earned'] = $entry;
+        }
+
+
+        return $return;
+    }
+
+
+    /**
+     * @return Collection
+     */
+    private function getTopExpenses(): Collection
+    {
+        $transactions = $this->getExpenses()->sortBy('transaction_amount');
+
+        return $transactions;
+    }
+
+    /**
+     * @return Collection
+     */
+    private function getTopIncome(): Collection
+    {
+        $transactions = $this->getIncome()->sortByDesc('transaction_amount');
+
+        return $transactions;
+    }
+
+    /**
+     * @param Collection $collection
+     *
+     * @return array
+     */
+    private function summarizeByAccount(Collection $collection): array
+    {
+        $result = [];
+        /** @var Transaction $transaction */
+        foreach ($collection as $transaction) {
+            $accountId          = $transaction->account_id;
+            $result[$accountId] = $result[$accountId] ?? '0';
+            $result[$accountId] = bcadd($transaction->transaction_amount, $result[$accountId]);
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param Collection $collection
+     *
+     * @return array
+     */
+    private function summarizeByCategory(Collection $collection): array
+    {
+        $result = [];
+        /** @var Transaction $transaction */
+        foreach ($collection as $transaction) {
+            $jrnlCatId           = intval($transaction->transaction_journal_category_id);
+            $transCatId          = intval($transaction->transaction_category_id);
+            $categoryId          = max($jrnlCatId, $transCatId);
+            $result[$categoryId] = $result[$categoryId] ?? '0';
+            $result[$categoryId] = bcadd($transaction->transaction_amount, $result[$categoryId]);
+        }
+
+        return $result;
+    }
+}

app/Generator/Report/Category/MultiYearReportGenerator.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * MultiYearReportGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Report\Category;
+
+
+/**
+ * Class MultiYearReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Audit
+ */
+class MultiYearReportGenerator extends MonthReportGenerator
+{
+    /**
+     * Doesn't do anything different.
+     */
+}

app/Generator/Report/Category/YearReportGenerator.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * YearReportGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Report\Category;
+
+
+/**
+ * Class YearReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Audit
+ */
+class YearReportGenerator extends MonthReportGenerator
+{
+
+    /**
+     * Doesn't do anything different.
+     */
+}

app/Generator/Report/ReportGeneratorFactory.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * ReportGeneratorFactory.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Report;
+
+use Carbon\Carbon;
+use FireflyIII\Exceptions\FireflyException;
+
+/**
+ * Class ReportGeneratorFactory
+ *
+ * @package FireflyIII\Generator\Report
+ */
+class ReportGeneratorFactory
+{
+
+    /**
+     * @param string $type
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return ReportGeneratorInterface
+     * @throws FireflyException
+     */
+    public static function reportGenerator(string $type, Carbon $start, Carbon $end): ReportGeneratorInterface
+    {
+        $period = 'Month';
+        // more than two months date difference means year report.
+        if ($start->diffInMonths($end) > 1) {
+            $period = 'Year';
+        }
+
+        // more than one year date difference means multi year report.
+        if ($start->diffInMonths($end) > 12) {
+            $period = 'MultiYear';
+        }
+
+
+        $class = sprintf('FireflyIII\Generator\Report\%s\%sReportGenerator', $type, $period);
+        if (class_exists($class)) {
+            /** @var ReportGeneratorInterface $obj */
+            $obj = new $class;
+            $obj->setStartDate($start);
+            $obj->setEndDate($end);
+
+            return $obj;
+        }
+        throw new FireflyException(sprintf('Cannot generate report. There is no "%s"-report for period "%s".', $type, $period));
+    }
+}

app/Generator/Report/ReportGeneratorInterface.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * ReportGeneratorInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Report;
+
+
+use Carbon\Carbon;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface ReportGeneratorInterface
+ *
+ * @package FireflyIII\Generator\Report
+ */
+interface ReportGeneratorInterface
+{
+    /**
+     * @return string
+     */
+    public function generate(): string;
+
+    /**
+     * @param Collection $accounts
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setAccounts(Collection $accounts): ReportGeneratorInterface;
+
+    /**
+     * @param Collection $budgets
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setBudgets(Collection $budgets): ReportGeneratorInterface;
+
+    /**
+     * @param Collection $categories
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setCategories(Collection $categories): ReportGeneratorInterface;
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setEndDate(Carbon $date): ReportGeneratorInterface;
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setStartDate(Carbon $date): ReportGeneratorInterface;
+
+}

app/Generator/Report/Standard/MonthReportGenerator.php

@@ -0,0 +1,109 @@
+<?php
+/**
+ * MonthReportGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Report\Standard;
+
+
+use Carbon\Carbon;
+use FireflyIII\Generator\Report\ReportGeneratorInterface;
+use FireflyIII\Helpers\Report\ReportHelperInterface;
+use Illuminate\Support\Collection;
+
+/**
+ * Class MonthReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Standard
+ */
+class MonthReportGenerator implements ReportGeneratorInterface
+{
+    /** @var  Collection */
+    private $accounts;
+    /** @var  Carbon */
+    private $end;
+    /** @var  Carbon */
+    private $start;
+
+    /**
+     * @return string
+     */
+    public function generate(): string
+    {
+        /** @var ReportHelperInterface $helper */
+        $helper     = app(ReportHelperInterface::class);
+        $bills      = $helper->getBillReport($this->start, $this->end, $this->accounts);
+        $accountIds = join(',', $this->accounts->pluck('id')->toArray());
+        $reportType = 'default';
+
+        // continue!
+        return view(
+            'reports.default.month',
+            compact('bills', 'accountIds', 'reportType')
+        )->with('start', $this->start)->with('end', $this->end)->render();
+    }
+
+    /**
+     * @param Collection $accounts
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setAccounts(Collection $accounts): ReportGeneratorInterface
+    {
+        $this->accounts = $accounts;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $budgets
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setBudgets(Collection $budgets): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * @param Collection $categories
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setCategories(Collection $categories): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setEndDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->end = $date;
+
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setStartDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->start = $date;
+
+        return $this;
+    }
+}

app/Generator/Report/Standard/MultiYearReportGenerator.php

@@ -0,0 +1,106 @@
+<?php
+/**
+ * MultiYearReportGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Report\Standard;
+
+
+use Carbon\Carbon;
+use FireflyIII\Generator\Report\ReportGeneratorInterface;
+use Illuminate\Support\Collection;
+
+/**
+ * Class MonthReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Standard
+ */
+class MultiYearReportGenerator implements ReportGeneratorInterface
+{
+    /** @var  Collection */
+    private $accounts;
+    /** @var  Carbon */
+    private $end;
+    /** @var  Carbon */
+    private $start;
+
+    /**
+     * @return string
+     */
+    public function generate(): string
+    {
+        // and some id's, joined:
+        $accountIds = join(',', $this->accounts->pluck('id')->toArray());
+        $reportType = 'default';
+
+        // continue!
+        return view(
+            'reports.default.multi-year',
+            compact('accountIds', 'reportType')
+        )->with('start', $this->start)->with('end', $this->end)->render();
+    }
+
+    /**
+     * @param Collection $accounts
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setAccounts(Collection $accounts): ReportGeneratorInterface
+    {
+        $this->accounts = $accounts;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $budgets
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setBudgets(Collection $budgets): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * @param Collection $categories
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setCategories(Collection $categories): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setEndDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->end = $date;
+
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setStartDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->start = $date;
+
+        return $this;
+    }
+}

app/Generator/Report/Standard/YearReportGenerator.php

@@ -0,0 +1,106 @@
+<?php
+/**
+ * YearReportGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Report\Standard;
+
+
+use Carbon\Carbon;
+use FireflyIII\Generator\Report\ReportGeneratorInterface;
+use Illuminate\Support\Collection;
+
+/**
+ * Class MonthReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Standard
+ */
+class YearReportGenerator implements ReportGeneratorInterface
+{
+    /** @var  Collection */
+    private $accounts;
+    /** @var  Carbon */
+    private $end;
+    /** @var  Carbon */
+    private $start;
+
+    /**
+     * @return string
+     */
+    public function generate(): string
+    {
+        // and some id's, joined:
+        $accountIds = join(',', $this->accounts->pluck('id')->toArray());
+        $reportType = 'default';
+
+        // continue!
+        return view(
+            'reports.default.year',
+            compact('accountIds', 'reportType')
+        )->with('start', $this->start)->with('end', $this->end)->render();
+    }
+
+    /**
+     * @param Collection $accounts
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setAccounts(Collection $accounts): ReportGeneratorInterface
+    {
+        $this->accounts = $accounts;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $budgets
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setBudgets(Collection $budgets): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * @param Collection $categories
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setCategories(Collection $categories): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setEndDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->end = $date;
+
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setStartDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->start = $date;
+
+        return $this;
+    }
+}

app/Generator/Report/Support.php

@@ -0,0 +1,83 @@
+<?php
+/**
+ * Support.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Report;
+
+use FireflyIII\Models\Transaction;
+use Illuminate\Support\Collection;
+use Log;
+
+
+/**
+ * Class Support
+ *
+ * @package FireflyIII\Generator\Report\Category
+ */
+class Support
+{
+
+    /**
+     * @param Collection $collection
+     * @param array      $accounts
+     *
+     * @return Collection
+     */
+    public static function filterExpenses(Collection $collection, array $accounts): Collection
+    {
+        return self::filterTransactions($collection, $accounts, 1);
+    }
+
+    /**
+     * @param Collection $collection
+     * @param array      $accounts
+     *
+     * @return Collection
+     */
+    public static function filterIncome(Collection $collection, array $accounts): Collection
+    {
+        return self::filterTransactions($collection, $accounts, -1);
+    }
+
+    /**
+     * @param Collection $collection
+     * @param array      $accounts
+     * @param int        $modifier
+     *
+     * @return Collection
+     */
+    public static function filterTransactions(Collection $collection, array $accounts, int $modifier): Collection
+    {
+        $result = $collection->filter(
+            function (Transaction $transaction) use ($accounts, $modifier) {
+                $opposing = $transaction->opposing_account_id;
+                // remove internal transfer
+                if (in_array($opposing, $accounts)) {
+                    Log::debug(sprintf('Filtered #%d because its opposite is in accounts.', $transaction->id));
+
+                    return null;
+                }
+                // remove positive amount
+                if (bccomp($transaction->transaction_amount, '0') === $modifier) {
+                    Log::debug(sprintf('Filtered #%d because amount is %f.', $transaction->id, $transaction->transaction_amount));
+
+                    return null;
+                }
+
+                return $transaction;
+            }
+        );
+
+        return $result;
+    }
+
+}

app/Handlers/Events/StoredJournalEventHandler.php

@@ -0,0 +1,203 @@
+<?php
+/**
+ * StoredJournalEventHandler.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Handlers\Events;
+
+use FireflyIII\Events\StoredTransactionJournal;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\PiggyBankEvent;
+use FireflyIII\Models\PiggyBankRepetition;
+use FireflyIII\Models\Rule;
+use FireflyIII\Models\RuleGroup;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Rules\Processor;
+use FireflyIII\Support\Events\BillScanner;
+use Log;
+
+/**
+ * Class StoredJournalEventHandler
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class StoredJournalEventHandler
+{
+    /**
+     * This method connects a new transfer to a piggy bank.
+     *
+     * @param StoredTransactionJournal $event
+     *
+     * @return bool
+     */
+    public function connectToPiggyBank(StoredTransactionJournal $event): bool
+    {
+        /** @var TransactionJournal $journal */
+        $journal     = $event->journal;
+        $piggyBankId = $event->piggyBankId;
+        Log::debug(sprintf('Trying to connect journal %d to piggy bank %d.', $journal->id, $piggyBankId));
+
+        /*
+         * Verify existence of piggy bank:
+         */
+        if (!$this->verifyExistence($event)) {
+            Log::error(sprintf('No such piggy bank or no repetition on %s', $journal->date->format('Y-m-d')));
+
+            return true;
+        }
+
+        /*
+         * Get relevant data:
+         */
+        $piggyBank                 = $journal->user->piggyBanks()->where('piggy_banks.id', $piggyBankId)->first(['piggy_banks.*']);
+        $repetition                = $piggyBank->piggyBankRepetitions()->relevantOnDate($journal->date)->first();
+        $amount                    = $this->getExactAmount($journal, $piggyBank, $repetition);
+        $repetition->currentamount = bcadd($repetition->currentamount, $amount);
+        $repetition->save();
+
+        /** @var PiggyBankEvent $event */
+        $event = PiggyBankEvent::create(
+            ['piggy_bank_id' => $piggyBank->id, 'transaction_journal_id' => $journal->id, 'date' => $journal->date, 'amount' => $amount]
+        );
+        Log::debug(sprintf('Created piggy bank event #%d', $event->id));
+
+        return true;
+    }
+
+    /**
+     * This method grabs all the users rules and processes them.
+     *
+     * @param StoredTransactionJournal $storedJournalEvent
+     *
+     * @return bool
+     */
+    public function processRules(StoredTransactionJournal $storedJournalEvent): bool
+    {
+        // get all the user's rule groups, with the rules, order by 'order'.
+        $journal = $storedJournalEvent->journal;
+        $groups  = $journal->user->ruleGroups()->where('rule_groups.active', 1)->orderBy('order', 'ASC')->get();
+        //
+        /** @var RuleGroup $group */
+        foreach ($groups as $group) {
+            $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) {
+
+                $processor = Processor::make($rule);
+                $processor->handleTransactionJournal($journal);
+
+                if ($rule->stop_processing) {
+                    return true;
+                }
+
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * This method calls a special bill scanner that will check if the stored journal is part of a bill.
+     *
+     * @param StoredTransactionJournal $storedJournalEvent
+     *
+     * @return bool
+     */
+    public function scanBills(StoredTransactionJournal $storedJournalEvent): bool
+    {
+        $journal = $storedJournalEvent->journal;
+        BillScanner::scan($journal);
+
+        return true;
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's 6 but I can live with it.
+     * @param TransactionJournal  $journal
+     * @param PiggyBank           $piggyBank
+     * @param PiggyBankRepetition $repetition
+     *
+     * @return string
+     */
+    private function getExactAmount(TransactionJournal $journal, PiggyBank $piggyBank, PiggyBankRepetition $repetition): string
+    {
+        $amount  = TransactionJournal::amountPositive($journal);
+        $sources = TransactionJournal::sourceAccountList($journal)->pluck('id')->toArray();
+        $room    = bcsub(strval($piggyBank->targetamount), strval($repetition->currentamount));
+        $compare = bcmul($repetition->currentamount, '-1');
+
+        Log::debug(sprintf('Will add/remove %f to piggy bank #%d ("%s")', $amount, $piggyBank->id, $piggyBank->name));
+
+        // if piggy account matches source account, the amount is positive
+        if (in_array($piggyBank->account_id, $sources)) {
+            $amount = bcmul($amount, '-1');
+            Log::debug(sprintf('Account #%d is the source, so will remove amount from piggy bank.', $piggyBank->account_id));
+        }
+
+
+        // if the amount is positive, make sure it fits in piggy bank:
+        if (bccomp($amount, '0') === 1 && bccomp($room, $amount) === -1) {
+            // amount is positive and $room is smaller than $amount
+            Log::debug(sprintf('Room in piggy bank for extra money is %f', $room));
+            Log::debug(sprintf('There is NO room to add %f to piggy bank #%d ("%s")', $amount, $piggyBank->id, $piggyBank->name));
+            Log::debug(sprintf('New amount is %f', $room));
+
+            return $room;
+        }
+
+        // amount is negative and $currentamount is smaller than $amount
+        if (bccomp($amount, '0') === -1 && bccomp($compare, $amount) === 1) {
+            Log::debug(sprintf('Max amount to remove is %f', $repetition->currentamount));
+            Log::debug(sprintf('Cannot remove %f from piggy bank #%d ("%s")', $amount, $piggyBank->id, $piggyBank->name));
+            Log::debug(sprintf('New amount is %f', $compare));
+
+            return $compare;
+        }
+
+        return $amount;
+    }
+
+    /**
+     * @param StoredTransactionJournal $event
+     *
+     * @return bool
+     */
+    private function verifyExistence(StoredTransactionJournal $event): bool
+    {
+        /** @var TransactionJournal $journal */
+        $journal     = $event->journal;
+        $piggyBankId = $event->piggyBankId;
+
+        /** @var PiggyBank $piggyBank */
+        $piggyBank = $journal->user->piggyBanks()->where('piggy_banks.id', $piggyBankId)->first(['piggy_banks.*']);
+
+        if (is_null($piggyBank)) {
+            Log::error('No such piggy bank!');
+
+            return false;
+        }
+        Log::debug(sprintf('Found piggy bank #%d: "%s"', $piggyBank->id, $piggyBank->name));
+        // update piggy bank rep for date of transaction journal.
+        $repetition = $piggyBank->piggyBankRepetitions()->relevantOnDate($journal->date)->first();
+        if (is_null($repetition)) {
+            Log::error(sprintf('No piggy bank repetition on %s!', $journal->date->format('Y-m-d')));
+
+            return false;
+        }
+
+        return true;
+    }
+}

app/Handlers/Events/UpdatedJournalEventHandler.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * UpdatedJournalEventHandler.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Handlers\Events;
+
+
+use FireflyIII\Events\UpdatedTransactionJournal;
+use FireflyIII\Models\Rule;
+use FireflyIII\Models\RuleGroup;
+use FireflyIII\Rules\Processor;
+use FireflyIII\Support\Events\BillScanner;
+
+/**
+ * Class UpdatedJournalEventHandler
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class UpdatedJournalEventHandler
+{
+
+    /**
+     * This method will check all the rules when a journal is updated.
+     *
+     * @param UpdatedTransactionJournal $updatedJournalEvent
+     *
+     * @return bool
+     */
+    public function processRules(UpdatedTransactionJournal $updatedJournalEvent): bool
+    {
+        // get all the user's rule groups, with the rules, order by 'order'.
+        $journal = $updatedJournalEvent->journal;
+        $groups  = $journal->user->ruleGroups()->where('rule_groups.active', 1)->orderBy('order', 'ASC')->get();
+        //
+        /** @var RuleGroup $group */
+        foreach ($groups as $group) {
+            $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) {
+                $processor = Processor::make($rule);
+                $processor->handleTransactionJournal($journal);
+
+                if ($rule->stop_processing) {
+                    break;
+                }
+
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * This method calls a special bill scanner that will check if the updated journal is part of a bill.
+     *
+     * @param UpdatedTransactionJournal $updatedJournalEvent
+     *
+     * @return bool
+     */
+    public function scanBills(UpdatedTransactionJournal $updatedJournalEvent): bool
+    {
+        $journal = $updatedJournalEvent->journal;
+        BillScanner::scan($journal);
+
+        return true;
+    }
+}

app/Handlers/Events/UserEventHandler.php

@@ -0,0 +1,130 @@
+<?php
+/**
+ * UserEventHandler.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Handlers\Events;
+
+use FireflyIII\Events\RegisteredUser;
+use FireflyIII\Events\RequestedNewPassword;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
+use Illuminate\Mail\Message;
+use Log;
+use Mail;
+use Session;
+use Swift_TransportException;
+
+/**
+ * Class UserEventHandler
+ *
+ * This class responds to any events that have anything to do with the User object.
+ *
+ * The method name reflects what is being done. This is in the present tense.
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class UserEventHandler
+{
+
+    /**
+     * This method will bestow upon a user the "owner" role if he is the first user in the system.
+     *
+     * @param RegisteredUser $event
+     *
+     * @return bool
+     */
+    public function attachUserRole(RegisteredUser $event): bool
+    {
+        /** @var UserRepositoryInterface $repository */
+        $repository = app(UserRepositoryInterface::class);
+
+        // first user ever?
+        if ($repository->count() === 1) {
+            $repository->attachRole($event->user, 'owner');
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle user logout events.
+     *
+     * @return bool
+     */
+    public function logoutUser(): bool
+    {
+        // dump stuff from the session:
+        Session::forget('twofactor-authenticated');
+        Session::forget('twofactor-authenticated-date');
+
+        return true;
+    }
+
+    /**
+     * @param RequestedNewPassword $event
+     *
+     * @return bool
+     */
+    public function sendNewPassword(RequestedNewPassword $event): bool
+    {
+        $email     = $event->user->email;
+        $ipAddress = $event->ipAddress;
+        $token     = $event->token;
+
+        $url = route('password.reset', [$token]);
+
+        // send email.
+        try {
+            Mail::send(
+                ['emails.password-html', 'emails.password-text'], ['url' => $url, 'ip' => $ipAddress], function (Message $message) use ($email) {
+                $message->to($email, $email)->subject('Your password reset request');
+            }
+            );
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * This method will send the user a registration mail, welcoming him or her to Firefly III.
+     * This message is only sent when the configuration of Firefly III says so.
+     *
+     * @param RegisteredUser $event
+     *
+     * @return bool
+     */
+    public function sendRegistrationMail(RegisteredUser $event)
+    {
+
+        $sendMail = env('SEND_REGISTRATION_MAIL', true);
+        if (!$sendMail) {
+            return true;
+        }
+        // get the email address
+        $email     = $event->user->email;
+        $address   = route('index');
+        $ipAddress = $event->ipAddress;
+        // send email.
+        try {
+            Mail::send(
+                ['emails.registered-html', 'emails.registered-text'], ['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());
+        }
+
+        return true;
+    }
+}

app/Helpers/Attachments/AttachmentHelper.php

@@ -0,0 +1,228 @@
+<?php
+/**
+ * AttachmentHelper.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Helpers\Attachments;
+
+use Crypt;
+use FireflyIII\Models\Attachment;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\MessageBag;
+use Storage;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+
+/**
+ * Class AttachmentHelper
+ *
+ * @package FireflyIII\Helpers\Attachments
+ */
+class AttachmentHelper implements AttachmentHelperInterface
+{
+
+    /** @var MessageBag */
+    public $errors;
+    /** @var MessageBag */
+    public $messages;
+    /** @var array */
+    protected $allowedMimes;
+    /** @var int */
+    protected $maxUploadSize;
+
+    /** @var \Illuminate\Contracts\Filesystem\Filesystem */
+    protected $uploadDisk;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->maxUploadSize = config('firefly.maxUploadSize');
+        $this->allowedMimes  = config('firefly.allowedMimes');
+        $this->errors        = new MessageBag;
+        $this->messages      = new MessageBag;
+        $this->uploadDisk    = Storage::disk('upload');
+    }
+
+    /**
+     * @param Attachment $attachment
+     *
+     * @return string
+     */
+    public function getAttachmentLocation(Attachment $attachment): string
+    {
+        $path = sprintf('%s%sat-%d.data', storage_path('upload'), DIRECTORY_SEPARATOR, intval($attachment->id));
+
+        return $path;
+    }
+
+    /**
+     * @return MessageBag
+     */
+    public function getErrors(): MessageBag
+    {
+        return $this->errors;
+    }
+
+    /**
+     * @return MessageBag
+     */
+    public function getMessages(): MessageBag
+    {
+        return $this->messages;
+    }
+
+    /**
+     * @param Model      $model
+     * @param array|null $files
+     *
+     * @return bool
+     */
+    public function saveAttachmentsForModel(Model $model, array $files = null): bool
+    {
+        if (is_array($files)) {
+            foreach ($files as $entry) {
+                if (!is_null($entry)) {
+                    $this->processFile($entry, $model);
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * @param UploadedFile $file
+     * @param Model        $model
+     *
+     * @return bool
+     */
+    protected function hasFile(UploadedFile $file, Model $model): bool
+    {
+        $md5   = md5_file($file->getRealPath());
+        $name  = $file->getClientOriginalName();
+        $class = get_class($model);
+        $count = auth()->user()->attachments()->where('md5', $md5)->where('attachable_id', $model->id)->where('attachable_type', $class)->count();
+
+        if ($count > 0) {
+            $msg = (string)trans('validation.file_already_attached', ['name' => $name]);
+            $this->errors->add('attachments', $msg);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     *
+     * @param UploadedFile $file
+     * @param Model        $model
+     *
+     * @return Attachment
+     */
+    protected function processFile(UploadedFile $file, Model $model): Attachment
+    {
+        $validation = $this->validateUpload($file, $model);
+        if ($validation === false) {
+            return new Attachment;
+        }
+
+        $attachment = new Attachment; // create Attachment object.
+        $attachment->user()->associate(auth()->user());
+        $attachment->attachable()->associate($model);
+        $attachment->md5      = md5_file($file->getRealPath());
+        $attachment->filename = $file->getClientOriginalName();
+        $attachment->mime     = $file->getMimeType();
+        $attachment->size     = $file->getSize();
+        $attachment->uploaded = 0;
+        $attachment->save();
+
+        $fileObject = $file->openFile('r');
+        $fileObject->rewind();
+        $content   = $fileObject->fread($file->getSize());
+        $encrypted = Crypt::encrypt($content);
+
+        // store it:
+        $this->uploadDisk->put($attachment->fileName(), $encrypted);
+
+        $attachment->uploaded = 1; // update attachment
+        $attachment->save();
+
+        $name = e($file->getClientOriginalName()); // add message:
+        $msg  = (string)trans('validation.file_attached', ['name' => $name]);
+        $this->messages->add('attachments', $msg);
+
+        // return it.
+        return $attachment;
+
+
+    }
+
+    /**
+     * @param UploadedFile $file
+     *
+     * @return bool
+     */
+    protected function validMime(UploadedFile $file): bool
+    {
+        $mime = e($file->getMimeType());
+        $name = e($file->getClientOriginalName());
+
+        if (!in_array($mime, $this->allowedMimes)) {
+            $msg = (string)trans('validation.file_invalid_mime', ['name' => $name, 'mime' => $mime]);
+            $this->errors->add('attachments', $msg);
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param UploadedFile $file
+     *
+     * @return bool
+     */
+    protected function validSize(UploadedFile $file): bool
+    {
+        $size = $file->getSize();
+        $name = e($file->getClientOriginalName());
+        if ($size > $this->maxUploadSize) {
+            $msg = (string)trans('validation.file_too_large', ['name' => $name]);
+            $this->errors->add('attachments', $msg);
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param UploadedFile $file
+     * @param Model        $model
+     *
+     * @return bool
+     */
+    protected function validateUpload(UploadedFile $file, Model $model): bool
+    {
+        if (!$this->validMime($file)) {
+            return false;
+        }
+        if (!$this->validSize($file)) {
+            return false;
+        }
+        if ($this->hasFile($file, $model)) {
+            return false;
+        }
+
+        return true;
+    }
+}

app/Helpers/Attachments/AttachmentHelperInterface.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * AttachmentHelperInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Helpers\Attachments;
+
+use FireflyIII\Models\Attachment;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\MessageBag;
+
+/**
+ * Interface AttachmentHelperInterface
+ *
+ * @package FireflyIII\Helpers\Attachments
+ */
+interface AttachmentHelperInterface
+{
+
+    /**
+     * @param Attachment $attachment
+     *
+     * @return string
+     */
+    public function getAttachmentLocation(Attachment $attachment): string;
+
+    /**
+     * @return MessageBag
+     */
+    public function getErrors(): MessageBag;
+
+    /**
+     * @return MessageBag
+     */
+    public function getMessages(): MessageBag;
+
+    /**
+     * @param Model $model
+     *
+     * @return bool
+     */
+    public function saveAttachmentsForModel(Model $model, array $files = null): bool;
+
+}

app/Helpers/Chart/MetaPieChart.php

@@ -0,0 +1,278 @@
+<?php
+/**
+ * MetaPieChart.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Helpers\Chart;
+
+use Carbon\Carbon;
+use FireflyIII\Generator\Report\Support;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Support\Collection;
+
+/**
+ * Class MetaPieChart
+ *
+ * @package FireflyIII\Helpers\Chart
+ */
+class MetaPieChart implements MetaPieChartInterface
+{
+    /** @var  Collection */
+    protected $accounts;
+    /** @var  Collection */
+    protected $budgets;
+    /** @var  Collection */
+    protected $categories;
+    /** @var bool */
+    protected $collectOtherObjects = false;
+    /** @var  Carbon */
+    protected $end;
+    /** @var array */
+    protected $grouping
+        = [
+            'account'  => ['opposing_account_id'],
+            'budget'   => ['transaction_journal_budget_id', 'transaction_budget_id'],
+            'category' => ['transaction_journal_category_id', 'transaction_category_id'],
+        ];
+
+    /** @var array */
+    protected $repositories
+        = [
+            'account'  => AccountRepositoryInterface::class,
+            'budget'   => BudgetRepositoryInterface::class,
+            'category' => CategoryRepositoryInterface::class,
+        ];
+
+
+    /** @var  Carbon */
+    protected $start;
+    /** @var  string */
+    protected $total = '0';
+    /** @var  User */
+    protected $user;
+
+    public function __construct()
+    {
+        $this->accounts   = new Collection;
+        $this->budgets    = new Collection;
+        $this->categories = new Collection;
+    }
+
+    /**
+     * @param string $direction
+     * @param string $group
+     *
+     * @return array
+     */
+    public function generate(string $direction, string $group): array
+    {
+        $transactions = $this->getTransactions($direction);
+        $grouped      = $this->groupByFields($transactions, $this->grouping[$group]);
+        $chartData    = $this->organizeByType($group, $grouped);
+
+        // also collect all other transactions
+        if ($this->collectOtherObjects && $direction === 'expense') {
+            /** @var JournalCollectorInterface $collector */
+            $collector = app(JournalCollectorInterface::class, [$this->user]);
+            $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)->setTypes([TransactionType::WITHDRAWAL]);
+            $journals                                            = $collector->getJournals();
+            $sum                                                 = strval($journals->sum('transaction_amount'));
+            $sum                                                 = bcmul($sum, '-1');
+            $sum                                                 = bcsub($sum, $this->total);
+            $chartData[strval(trans('firefly.everything_else'))] = $sum;
+        }
+
+        if ($this->collectOtherObjects && $direction === 'income') {
+            /** @var JournalCollectorInterface $collector */
+            $collector = app(JournalCollectorInterface::class, [auth()->user()]);
+            $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)->setTypes([TransactionType::DEPOSIT]);
+            $journals                                            = $collector->getJournals();
+            $sum                                                 = strval($journals->sum('transaction_amount'));
+            $sum                                                 = bcsub($sum, $this->total);
+            $chartData[strval(trans('firefly.everything_else'))] = $sum;
+        }
+
+        return $chartData;
+
+    }
+
+    /**
+     * @param Collection $accounts
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setAccounts(Collection $accounts): MetaPieChartInterface
+    {
+        $this->accounts = $accounts;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $budgets
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setBudgets(Collection $budgets): MetaPieChartInterface
+    {
+        $this->budgets = $budgets;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $categories
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setCategories(Collection $categories): MetaPieChartInterface
+    {
+        $this->categories = $categories;
+
+        return $this;
+    }
+
+    /**
+     * @param bool $collectOtherObjects
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setCollectOtherObjects(bool $collectOtherObjects): MetaPieChartInterface
+    {
+        $this->collectOtherObjects = $collectOtherObjects;
+
+        return $this;
+    }
+
+    /**
+     * @param Carbon $end
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setEnd(Carbon $end): MetaPieChartInterface
+    {
+        $this->end = $end;
+
+        return $this;
+    }
+
+    /**
+     * @param Carbon $start
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setStart(Carbon $start): MetaPieChartInterface
+    {
+        $this->start = $start;
+
+        return $this;
+    }
+
+    /**
+     * @param User $user
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setUser(User $user): MetaPieChartInterface
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+
+    protected function getTransactions(string $direction)
+    {
+        $types    = [TransactionType::DEPOSIT, TransactionType::TRANSFER];
+        $modifier = -1;
+        if ($direction === 'expense') {
+            $types    = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER];
+            $modifier = 1;
+        }
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class, [auth()->user()]);
+        $collector->setAccounts($this->accounts);
+        $collector->setRange($this->start, $this->end);
+        $collector->setTypes($types);
+        $collector->withOpposingAccount();
+
+        if ($direction === 'income') {
+            $collector->disableFilter();
+        }
+
+        if ($this->budgets->count() > 0) {
+            $collector->setBudgets($this->budgets);
+        }
+        if ($this->categories->count() > 0) {
+            $collector->setCategories($this->categories);
+        }
+
+        $accountIds   = $this->accounts->pluck('id')->toArray();
+        $transactions = $collector->getJournals();
+        $set          = Support::filterTransactions($transactions, $accountIds, $modifier);
+
+        return $set;
+    }
+
+    /**
+     * @param Collection $set
+     * @param array      $fields
+     *
+     * @return array
+     */
+    protected function groupByFields(Collection $set, array $fields)
+    {
+        $grouped = [];
+        /** @var Transaction $transaction */
+        foreach ($set as $transaction) {
+            $values = [];
+            foreach ($fields as $field) {
+                $values[] = intval($transaction->$field);
+            }
+            $value           = max($values);
+            $grouped[$value] = $grouped[$value] ?? '0';
+            $grouped[$value] = bcadd($transaction->transaction_amount, $grouped[$value]);
+        }
+
+        return $grouped;
+    }
+
+    /**
+     * @param string $type
+     * @param array  $array
+     *
+     * @return array
+     */
+    protected function organizeByType(string $type, array $array): array
+    {
+        $chartData  = [];
+        $names      = [];
+        $repository = app($this->repositories[$type], [$this->user]);
+        foreach ($array as $objectId => $amount) {
+            if (!isset($names[$objectId])) {
+                $object           = $repository->find(intval($objectId));
+                $names[$objectId] = $object->name;
+            }
+            if (bccomp($amount, '0') === -1) {
+                $amount = bcmul($amount, '-1');
+            }
+
+            $this->total                  = bcadd($this->total, $amount);
+            $chartData[$names[$objectId]] = $amount;
+        }
+
+        return $chartData;
+
+    }
+}

app/Helpers/Chart/MetaPieChartInterface.php

@@ -0,0 +1,82 @@
+<?php
+/**
+ * MetaPieChartInterface.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Helpers\Chart;
+
+use Carbon\Carbon;
+use FireflyIII\User;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface MetaPieChartInterface
+ *
+ * @package FireflyIII\Helpers\Chart
+ */
+interface MetaPieChartInterface
+{
+    /**
+     * @param string $direction
+     * @param string $group
+     *
+     * @return array
+     */
+    public function generate(string $direction, string $group): array;
+
+    /**
+     * @param Collection $accounts
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setAccounts(Collection $accounts): MetaPieChartInterface;
+
+    /**
+     * @param Collection $budgets
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setBudgets(Collection $budgets): MetaPieChartInterface;
+
+    /**
+     * @param Collection $categories
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setCategories(Collection $categories): MetaPieChartInterface;
+
+    /**
+     * @param bool $collectOtherObjects
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setCollectOtherObjects(bool $collectOtherObjects): MetaPieChartInterface;
+
+    /**
+     * @param Carbon $end
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setEnd(Carbon $end): MetaPieChartInterface;
+
+    /**
+     * @param Carbon $start
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setStart(Carbon $start): MetaPieChartInterface;
+
+    /**
+     * @param User $user
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setUser(User $user): MetaPieChartInterface;
+
+}

app/Helpers/Collection/Account.php

@@ -0,0 +1,107 @@
+<?php
+/**
+ * Account.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Helpers\Collection;
+
+use Illuminate\Support\Collection;
+
+/**
+ * Class Account
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class Account
+{
+
+    /** @var Collection */
+    protected $accounts;
+    /** @var string */
+    protected $difference = '';
+    /** @var string */
+    protected $end = '';
+    /** @var string */
+    protected $start = '';
+
+    /**
+     * Account constructor.
+     */
+    public function __construct()
+    {
+        $this->accounts = new Collection;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getAccounts(): Collection
+    {
+        return $this->accounts;
+    }
+
+    /**
+     * @param Collection $accounts
+     */
+    public function setAccounts(Collection $accounts)
+    {
+        $this->accounts = $accounts;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDifference(): string
+    {
+        return $this->difference;
+    }
+
+    /**
+     * @param string $difference
+     */
+    public function setDifference(string $difference)
+    {
+        $this->difference = $difference;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEnd(): string
+    {
+        return $this->end;
+    }
+
+    /**
+     * @param string $end
+     */
+    public function setEnd(string $end)
+    {
+        $this->end = $end;
+    }
+
+    /**
+     * @return string
+     */
+    public function getStart(): string
+    {
+        return $this->start;
+    }
+
+    /**
+     * @param string $start
+     */
+    public function setStart(string $start)
+    {
+        $this->start = $start;
+    }
+
+
+}

app/Helpers/Collection/Balance.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * Balance.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Helpers\Collection;
+
+use Illuminate\Support\Collection;
+
+/**
+ *
+ * Class Balance
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class Balance
+{
+
+    /** @var  BalanceHeader */
+    protected $balanceHeader;
+
+    /** @var  Collection */
+    protected $balanceLines;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->balanceLines = new Collection;
+    }
+
+    /**
+     * @param BalanceLine $line
+     */
+    public function addBalanceLine(BalanceLine $line)
+    {
+        $this->balanceLines->push($line);
+    }
+
+    /**
+     * @return BalanceHeader
+     */
+    public function getBalanceHeader(): BalanceHeader
+    {
+        return $this->balanceHeader ?? new BalanceHeader;
+    }
+
+    /**
+     * @param BalanceHeader $balanceHeader
+     */
+    public function setBalanceHeader(BalanceHeader $balanceHeader)
+    {
+        $this->balanceHeader = $balanceHeader;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getBalanceLines(): Collection
+    {
+        return $this->balanceLines;
+    }
+
+    /**
+     * @param Collection $balanceLines
+     */
+    public function setBalanceLines(Collection $balanceLines)
+    {
+        $this->balanceLines = $balanceLines;
+    }
+
+
+}

app/Helpers/Collection/BalanceEntry.php

@@ -0,0 +1,83 @@
+<?php
+/**
+ * BalanceEntry.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Helpers\Collection;
+
+use FireflyIII\Models\Account as AccountModel;
+
+/**
+ *
+ * Class BalanceEntry
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class BalanceEntry
+{
+
+
+    /** @var  AccountModel */
+    protected $account;
+    /** @var string */
+    protected $left = '0';
+    /** @var string */
+    protected $spent = '0';
+
+    /**
+     * @return AccountModel
+     */
+    public function getAccount(): AccountModel
+    {
+        return $this->account;
+    }
+
+    /**
+     * @param AccountModel $account
+     */
+    public function setAccount(AccountModel $account)
+    {
+        $this->account = $account;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLeft(): string
+    {
+        return $this->left;
+    }
+
+    /**
+     * @param string $left
+     */
+    public function setLeft(string $left)
+    {
+        $this->left = $left;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSpent(): string
+    {
+        return $this->spent;
+    }
+
+    /**
+     * @param string $spent
+     */
+    public function setSpent(string $spent)
+    {
+        $this->spent = $spent;
+    }
+
+
+}

app/Helpers/Collection/BalanceHeader.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * BalanceHeader.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Helpers\Collection;
+
+use FireflyIII\Models\Account as AccountModel;
+use Illuminate\Support\Collection;
+
+/**
+ *
+ * Class BalanceHeader
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class BalanceHeader
+{
+
+    /** @var  Collection */
+    protected $accounts;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->accounts = new Collection;
+    }
+
+    /**
+     * @param AccountModel $account
+     */
+    public function addAccount(AccountModel $account)
+    {
+        $this->accounts->push($account);
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getAccounts(): Collection
+    {
+        return $this->accounts;
+    }
+
+
+}

app/Helpers/Collection/BalanceLine.php

@@ -0,0 +1,180 @@
+<?php
+/**
+ * BalanceLine.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Helpers\Collection;
+
+use Carbon\Carbon;
+use FireflyIII\Models\Budget as BudgetModel;
+use FireflyIII\Models\BudgetLimit;
+use Illuminate\Support\Collection;
+
+/**
+ *
+ * Class BalanceLine
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class BalanceLine
+{
+
+    const ROLE_DEFAULTROLE = 1;
+    const ROLE_TAGROLE     = 2;
+    const ROLE_DIFFROLE    = 3;
+
+    /** @var  Collection */
+    protected $balanceEntries;
+
+    /** @var BudgetModel */
+    protected $budget;
+    /** @var  BudgetLimit */
+    protected $budgetLimit;
+    /** @var int */
+    protected $role = self::ROLE_DEFAULTROLE;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->balanceEntries = new Collection;
+
+    }
+
+    /**
+     * @param BalanceEntry $balanceEntry
+     */
+    public function addBalanceEntry(BalanceEntry $balanceEntry)
+    {
+        $this->balanceEntries->push($balanceEntry);
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getBalanceEntries(): Collection
+    {
+        return $this->balanceEntries;
+    }
+
+    /**
+     * @param Collection $balanceEntries
+     */
+    public function setBalanceEntries(Collection $balanceEntries)
+    {
+        $this->balanceEntries = $balanceEntries;
+    }
+
+    /**
+     * @return BudgetModel
+     */
+    public function getBudget(): BudgetModel
+    {
+        return $this->budget ?? new BudgetModel;
+    }
+
+    /**
+     * @param BudgetModel $budget
+     */
+    public function setBudget(BudgetModel $budget)
+    {
+        $this->budget = $budget;
+    }
+
+    /**
+     * @return BudgetLimit
+     */
+    public function getBudgetLimit(): BudgetLimit
+    {
+        return $this->budgetLimit;
+    }
+
+    /**
+     * @param BudgetLimit $budgetLimit
+     */
+    public function setBudgetLimit(BudgetLimit $budgetLimit)
+    {
+        $this->budgetLimit = $budgetLimit;
+    }
+
+    /**
+     * @return Carbon
+     */
+    public function getEndDate()
+    {
+        return $this->budgetLimit->end_date ?? new Carbon;
+    }
+
+    /**
+     * @return int
+     */
+    public function getRole(): int
+    {
+        return $this->role;
+    }
+
+    /**
+     * @param int $role
+     */
+    public function setRole(int $role)
+    {
+        $this->role = $role;
+    }
+
+    /**
+     * @return Carbon
+     */
+    public function getStartDate()
+    {
+        return $this->budgetLimit->start_date ?? new Carbon;
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @return string
+     */
+    public function getTitle(): string
+    {
+        if ($this->getBudget() instanceof BudgetModel && !is_null($this->getBudget()->id)) {
+            return $this->getBudget()->name;
+        }
+        if ($this->getRole() == self::ROLE_DEFAULTROLE) {
+            return strval(trans('firefly.no_budget'));
+        }
+        if ($this->getRole() == self::ROLE_TAGROLE) {
+            return strval(trans('firefly.coveredWithTags'));
+        }
+        if ($this->getRole() == self::ROLE_DIFFROLE) {
+            return strval(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
+     * on the given budget/repetition. If you subtract all those amounts from the budget/repetition's
+     * total amount, this is returned:
+     *
+     * @return string
+     */
+    public function leftOfRepetition(): string
+    {
+        $start = $this->budgetLimit->amount ?? '0';
+        /** @var BalanceEntry $balanceEntry */
+        foreach ($this->getBalanceEntries() as $balanceEntry) {
+            $start = bcadd($balanceEntry->getSpent(), $start);
+        }
+
+        return $start;
+    }
+}

app/Helpers/Collection/Bill.php

@@ -0,0 +1,125 @@
+<?php
+/**
+ * Bill.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Helpers\Collection;
+
+
+use Carbon\Carbon;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use Illuminate\Support\Collection;
+use Log;
+
+/**
+ * Class Bill
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class Bill
+{
+
+    /**
+     * @var Collection
+     */
+    private $bills;
+    /** @var  Carbon */
+    private $endDate;
+    /** @var  Carbon */
+    private $startDate;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->bills = new Collection;
+    }
+
+    /**
+     * @param BillLine $bill
+     */
+    public function addBill(BillLine $bill)
+    {
+        $this->bills->push($bill);
+    }
+
+    /**
+     *
+     */
+    public function filterBills()
+    {
+        Log::debug('Now in filterBills()');
+        /** @var BillRepositoryInterface $repository */
+        $repository  = app(BillRepositoryInterface::class);
+        $start       = $this->startDate;
+        $end         = $this->endDate;
+        $lines       = $this->bills->filter(
+            function (BillLine $line) use ($repository, $start, $end) {
+                // next expected match?
+                $date = $start;
+                Log::debug(sprintf('Now at bill line for bill "%s"', $line->getBill()->name));
+                Log::debug(sprintf('Default date to use is start date: %s', $date->format('Y-m-d')));
+                if ($line->isHit()) {
+                    $date = $line->getLastHitDate();
+                    Log::debug(sprintf('Line was hit, see date: %s. Always include it.', $date->format('Y-m-d')));
+
+                    return $line;
+                }
+                $expected = $repository->nextExpectedMatch($line->getBill(), $date);
+                Log::debug(sprintf('Next expected match is %s', $expected->format('Y-m-d')));
+                if ($expected <= $end && $expected >= $start) {
+                    Log::debug('This date is inside report limits');
+
+                    return $line;
+                }
+                Log::debug('This date is OUTSIDE report limits');
+
+                return false;
+            }
+        );
+        $this->bills = $lines;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getBills(): Collection
+    {
+        $set = $this->bills->sortBy(
+            function (BillLine $bill) {
+                $active = intval($bill->getBill()->active) == 0 ? 1 : 0;
+                $name   = $bill->getBill()->name;
+
+                return $active . $name;
+            }
+        );
+
+
+        return $set;
+    }
+
+    /**
+     * @param Carbon $endDate
+     */
+    public function setEndDate(Carbon $endDate)
+    {
+        $this->endDate = $endDate;
+    }
+
+    /**
+     * @param Carbon $startDate
+     */
+    public function setStartDate(Carbon $startDate)
+    {
+        $this->startDate = $startDate;
+    }
+
+}

app/Helpers/Collection/BillLine.php

@@ -0,0 +1,171 @@
+<?php
+/**
+ * BillLine.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Helpers\Collection;
+
+use Carbon\Carbon;
+use FireflyIII\Models\Bill as BillModel;
+
+/**
+ *
+ * Class BillLine
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class BillLine
+{
+
+    /** @var  string */
+    protected $amount;
+    /** @var  BillModel */
+    protected $bill;
+    /** @var  bool */
+    protected $hit;
+    /** @var  string */
+    protected $max;
+    /** @var  string */
+    protected $min;
+    /** @var  Carbon */
+    private $lastHitDate;
+    /** @var  int */
+    private $transactionJournalId;
+
+    /**
+     * BillLine constructor.
+     */
+    public function __construct()
+    {
+        $this->lastHitDate = new Carbon;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAmount(): string
+    {
+        return $this->amount ?? '0';
+    }
+
+    /**
+     * @param string $amount
+     */
+    public function setAmount(string $amount)
+    {
+        $this->amount = $amount;
+    }
+
+    /**
+     * @return BillModel
+     */
+    public function getBill(): BillModel
+    {
+        return $this->bill;
+    }
+
+    /**
+     * @param BillModel $bill
+     */
+    public function setBill(BillModel $bill)
+    {
+        $this->bill = $bill;
+    }
+
+    /**
+     * @return Carbon
+     */
+    public function getLastHitDate(): Carbon
+    {
+        return $this->lastHitDate;
+    }
+
+    /**
+     * @param Carbon $lastHitDate
+     */
+    public function setLastHitDate(Carbon $lastHitDate)
+    {
+        $this->lastHitDate = $lastHitDate;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMax(): string
+    {
+        return $this->max;
+    }
+
+    /**
+     * @param string $max
+     */
+    public function setMax(string $max)
+    {
+        $this->max = $max;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMin(): string
+    {
+        return $this->min;
+    }
+
+    /**
+     * @param string $min
+     */
+    public function setMin(string $min)
+    {
+        $this->min = $min;
+    }
+
+    /**
+     * @return int
+     */
+    public function getTransactionJournalId(): int
+    {
+        return $this->transactionJournalId ?? 0;
+    }
+
+    /**
+     * @param int $transactionJournalId
+     */
+    public function setTransactionJournalId(int $transactionJournalId)
+    {
+        $this->transactionJournalId = $transactionJournalId;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isActive(): bool
+    {
+        return intval($this->bill->active) === 1;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isHit(): bool
+    {
+        return $this->hit;
+    }
+
+    /**
+     * @param bool $hit
+     */
+    public function setHit(bool $hit)
+    {
+        $this->hit = $hit;
+    }
+
+
+}

app/Helpers/Collection/Budget.php

@@ -0,0 +1,193 @@
+<?php
+/**
+ * Budget.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Helpers\Collection;
+
+use Illuminate\Support\Collection;
+
+/**
+ *
+ * Class Budget
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class Budget
+{
+    /** @var  Collection */
+    protected $budgetLines;
+    /** @var string */
+    protected $budgeted = '0';
+    /** @var string */
+    protected $left = '0';
+    /** @var string */
+    protected $overspent = '0';
+    /** @var string */
+    protected $spent = '0';
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->budgetLines = new Collection;
+    }
+
+    /**
+     * @param BudgetLine $budgetLine
+     *
+     * @return Budget
+     */
+    public function addBudgetLine(BudgetLine $budgetLine): Budget
+    {
+        $this->budgetLines->push($budgetLine);
+
+        return $this;
+    }
+
+    /**
+     * @param string $add
+     *
+     * @return Budget
+     */
+    public function addBudgeted(string $add): Budget
+    {
+        $this->budgeted = bcadd($this->budgeted, $add);
+
+        return $this;
+    }
+
+    /**
+     * @param string $add
+     *
+     * @return Budget
+     */
+    public function addLeft(string $add): Budget
+    {
+        $this->left = bcadd($this->left, $add);
+
+        return $this;
+    }
+
+    /**
+     * @param string $add
+     *
+     * @return Budget
+     */
+    public function addOverspent(string $add): Budget
+    {
+        $this->overspent = bcadd($this->overspent, $add);
+
+        return $this;
+    }
+
+    /**
+     * @param string $add
+     *
+     * @return Budget
+     */
+    public function addSpent(string $add): Budget
+    {
+        $this->spent = bcadd($this->spent, $add);
+
+        return $this;
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection
+     */
+    public function getBudgetLines(): Collection
+    {
+        return $this->budgetLines;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBudgeted(): string
+    {
+        return $this->budgeted;
+    }
+
+    /**
+     * @param string $budgeted
+     *
+     * @return Budget
+     */
+    public function setBudgeted(string $budgeted): Budget
+    {
+        $this->budgeted = $budgeted;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLeft(): string
+    {
+        return $this->left;
+    }
+
+    /**
+     * @param string $left
+     *
+     * @return Budget
+     */
+    public function setLeft(string $left): Budget
+    {
+        $this->left = $left;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOverspent(): string
+    {
+        return $this->overspent;
+    }
+
+    /**
+     * @param string $overspent
+     *
+     * @return Budget
+     */
+    public function setOverspent(string $overspent): Budget
+    {
+        $this->overspent = $overspent;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSpent(): string
+    {
+        return $this->spent;
+    }
+
+    /**
+     * @param string $spent
+     *
+     * @return Budget
+     */
+    public function setSpent(string $spent): Budget
+    {
+        $this->spent = $spent;
+
+        return $this;
+    }
+
+
+}

app/Helpers/Collection/BudgetLine.php

@@ -0,0 +1,161 @@
+<?php
+/**
+ * BudgetLine.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Helpers\Collection;
+
+use FireflyIII\Models\Budget as BudgetModel;
+use FireflyIII\Models\BudgetLimit;
+
+/**
+ *
+ * Class BudgetLine
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class BudgetLine
+{
+
+    /** @var  BudgetModel */
+    protected $budget;
+    /** @var  BudgetLimit */
+    protected $budgetLimit;
+    /** @var string */
+    protected $budgeted = '0';
+    /** @var string */
+    protected $left = '0';
+    /** @var string */
+    protected $overspent = '0';
+    /** @var string */
+    protected $spent = '0';
+
+    /**
+     * @return BudgetModel
+     */
+    public function getBudget(): BudgetModel
+    {
+        return $this->budget ?? new BudgetModel;
+    }
+
+    /**
+     * @param BudgetModel $budget
+     *
+     * @return BudgetLine
+     */
+    public function setBudget(BudgetModel $budget): BudgetLine
+    {
+        $this->budget = $budget;
+
+        return $this;
+    }
+
+    /**
+     * @return BudgetLimit
+     */
+    public function getBudgetLimit(): BudgetLimit
+    {
+        return $this->budgetLimit ?? new BudgetLimit;
+    }
+
+    /**
+     * @param BudgetLimit $budgetLimit
+     *
+     * @return BudgetLimit
+     */
+    public function setBudgetLimit(BudgetLimit $budgetLimit): BudgetLine
+    {
+        $this->budgetLimit = $budgetLimit;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBudgeted(): string
+    {
+        return $this->budgeted;
+    }
+
+    /**
+     * @param string $budgeted
+     *
+     * @return BudgetLine
+     */
+    public function setBudgeted(string $budgeted): BudgetLine
+    {
+        $this->budgeted = $budgeted;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLeft(): string
+    {
+        return $this->left;
+    }
+
+    /**
+     * @param string $left
+     *
+     * @return BudgetLine
+     */
+    public function setLeft(string $left): BudgetLine
+    {
+        $this->left = $left;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOverspent(): string
+    {
+        return $this->overspent;
+    }
+
+    /**
+     * @param string $overspent
+     *
+     * @return BudgetLine
+     */
+    public function setOverspent(string $overspent): BudgetLine
+    {
+        $this->overspent = $overspent;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSpent(): string
+    {
+        return $this->spent;
+    }
+
+    /**
+     * @param string $spent
+     *
+     * @return BudgetLine
+     */
+    public function setSpent(string $spent): BudgetLine
+    {
+        $this->spent = $spent;
+
+        return $this;
+    }
+
+
+}

app/Helpers/Collection/Category.php

@@ -0,0 +1,85 @@
+<?php
+/**
+ * Category.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Helpers\Collection;
+
+use FireflyIII\Models\Category as CategoryModel;
+use Illuminate\Support\Collection;
+
+
+/**
+ *
+ * Class Category
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class Category
+{
+
+    /** @var  Collection */
+    protected $categories;
+    /** @var string */
+    protected $total = '0';
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->categories = new Collection;
+    }
+
+    /**
+     * @param CategoryModel $category
+     */
+    public function addCategory(CategoryModel $category)
+    {
+        // spent is minus zero for an expense report:
+        if ($category->spent < 0) {
+            $this->categories->push($category);
+            $this->addTotal($category->spent);
+        }
+    }
+
+    /**
+     * @param string $add
+     */
+    public function addTotal(string $add)
+    {
+        $this->total = bcadd($this->total, $add);
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getCategories(): Collection
+    {
+        $set = $this->categories->sortBy(
+            function (CategoryModel $category) {
+                return $category->spent;
+            }
+        );
+
+
+        return $set;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTotal(): string
+    {
+        return $this->total;
+    }
+
+
+}

app/Helpers/Collector/JournalCollector.php

@@ -0,0 +1,754 @@
+<?php
+/**
+ * JournalCollector.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Helpers\Collector;
+
+
+use Carbon\Carbon;
+use Crypt;
+use DB;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\Category;
+use FireflyIII\Models\Tag;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Contracts\Encryption\DecryptException;
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Illuminate\Database\Query\JoinClause;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
+use Log;
+
+/**
+ * Maybe this is a good idea after all...
+ *
+ * Class JournalCollector
+ *
+ * @package FireflyIII\Helpers\Collector
+ */
+class JournalCollector implements JournalCollectorInterface
+{
+
+    /** @var array */
+    private $accountIds = [];
+    /** @var  int */
+    private $count = 0;
+    /** @var array */
+    private $fields
+        = [
+            'transaction_journals.id as journal_id',
+            'transaction_journals.description',
+            'transaction_journals.date',
+            'transaction_journals.encrypted',
+            //'transaction_journals.transaction_currency_id',
+            'transaction_currencies.code as transaction_currency_code',
+            //'transaction_currencies.symbol as transaction_currency_symbol',
+            'transaction_types.type as transaction_type_type',
+            'transaction_journals.bill_id',
+            'bills.name as bill_name',
+            'bills.name_encrypted as bill_name_encrypted',
+            'transactions.id as id',
+            'transactions.amount as transaction_amount',
+            'transactions.description as transaction_description',
+            'transactions.account_id',
+            'transactions.identifier',
+            'transactions.transaction_journal_id',
+            'accounts.name as account_name',
+            'accounts.encrypted as account_encrypted',
+            'account_types.type as account_type',
+        ];
+    /** @var  bool */
+    private $filterInternalTransfers;
+    /** @var  bool */
+    private $filterTransfers = false;
+    /** @var  bool */
+    private $joinedBudget = false;
+    /** @var  bool */
+    private $joinedCategory = false;
+    /** @var bool */
+    private $joinedOpposing = false;
+    /** @var bool */
+    private $joinedTag = false;
+    /** @var  int */
+    private $limit;
+    /** @var  int */
+    private $offset;
+    /** @var int */
+    private $page = 1;
+    /** @var EloquentBuilder */
+    private $query;
+    /** @var bool */
+    private $run = false;
+    /** @var User */
+    private $user;
+
+    /**
+     * JournalCollector constructor.
+     *
+     * @param User $user
+     */
+    public function __construct(User $user)
+    {
+        $this->user  = $user;
+        $this->query = $this->startQuery();
+    }
+
+    /**
+     * @return int
+     * @throws FireflyException
+     */
+    public function count(): int
+    {
+        if ($this->run === true) {
+            throw new FireflyException('Cannot count after run in JournalCollector.');
+        }
+
+        $countQuery = clone $this->query;
+
+        // dont need some fields:
+        $countQuery->getQuery()->limit      = null;
+        $countQuery->getQuery()->offset     = null;
+        $countQuery->getQuery()->unionLimit = null;
+        $countQuery->getQuery()->groups     = null;
+        $countQuery->getQuery()->orders     = null;
+        $countQuery->groupBy('accounts.user_id');
+        $this->count = $countQuery->count();
+
+        return $this->count;
+    }
+
+    /**
+     * @return JournalCollectorInterface
+     */
+    public function disableFilter(): JournalCollectorInterface
+    {
+        $this->filterTransfers = false;
+
+        return $this;
+    }
+
+    /**
+     * @return JournalCollectorInterface
+     */
+    public function disableInternalFilter(): JournalCollectorInterface
+    {
+        $this->filterInternalTransfers = false;
+
+        return $this;
+    }
+
+    /**
+     * @return JournalCollectorInterface
+     */
+    public function enableInternalFilter(): JournalCollectorInterface
+    {
+        $this->filterInternalTransfers = true;
+
+        return $this;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getJournals(): Collection
+    {
+        $this->run = true;
+        $set       = $this->query->get(array_values($this->fields));
+        Log::debug(sprintf('Count of set is %d', $set->count()));
+        $set = $this->filterTransfers($set);
+        Log::debug(sprintf('Count of set after filterTransfers() is %d', $set->count()));
+
+        // possibly filter "internal" transfers:
+        $set = $this->filterInternalTransfers($set);
+        Log::debug(sprintf('Count of set after filterInternalTransfers() is %d', $set->count()));
+
+
+        // loop for decryption.
+        $set->each(
+            function (Transaction $transaction) {
+                $transaction->date        = new Carbon($transaction->date);
+                $transaction->description = $transaction->encrypted ? Crypt::decrypt($transaction->description) : $transaction->description;
+
+                if (!is_null($transaction->bill_name)) {
+                    $transaction->bill_name = $transaction->bill_name_encrypted ? Crypt::decrypt($transaction->bill_name) : $transaction->bill_name;
+                }
+
+                try {
+                    $transaction->opposing_account_name = Crypt::decrypt($transaction->opposing_account_name);
+                } catch (DecryptException $e) {
+                    // if this fails its already decrypted.
+                }
+
+            }
+        );
+
+        return $set;
+    }
+
+    /**
+     * @return LengthAwarePaginator
+     * @throws FireflyException
+     */
+    public function getPaginatedJournals(): LengthAwarePaginator
+    {
+        if ($this->run === true) {
+            throw new FireflyException('Cannot getPaginatedJournals after run in JournalCollector.');
+        }
+        $this->count();
+        $set      = $this->getJournals();
+        $journals = new LengthAwarePaginator($set, $this->count, $this->limit, $this->page);
+
+        return $journals;
+    }
+
+    /**
+     * @param Collection $accounts
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setAccounts(Collection $accounts): JournalCollectorInterface
+    {
+        if ($accounts->count() > 0) {
+            $accountIds = $accounts->pluck('id')->toArray();
+            $this->query->whereIn('transactions.account_id', $accountIds);
+            Log::debug(sprintf('setAccounts: %s', join(', ', $accountIds)));
+            $this->accountIds = $accountIds;
+        }
+
+        if ($accounts->count() > 1) {
+            $this->filterTransfers = true;
+        }
+
+
+        return $this;
+    }
+
+    /**
+     * @return JournalCollectorInterface
+     */
+    public function setAllAssetAccounts(): JournalCollectorInterface
+    {
+        /** @var AccountRepositoryInterface $repository */
+        $repository = app(AccountRepositoryInterface::class, [$this->user]);
+        $accounts   = $repository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT]);
+        if ($accounts->count() > 0) {
+            $accountIds = $accounts->pluck('id')->toArray();
+            $this->query->whereIn('transactions.account_id', $accountIds);
+            $this->accountIds = $accountIds;
+        }
+
+        if ($accounts->count() > 1) {
+            $this->filterTransfers = true;
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $bills
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setBills(Collection $bills): JournalCollectorInterface
+    {
+        if ($bills->count() > 0) {
+            $billIds = $bills->pluck('id')->toArray();
+            $this->query->whereIn('transaction_journals.bill_id', $billIds);
+        }
+
+        return $this;
+
+    }
+
+    /**
+     * @param Budget $budget
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setBudget(Budget $budget): JournalCollectorInterface
+    {
+        $this->joinBudgetTables();
+
+        $this->query->where(
+            function (EloquentBuilder $q) use ($budget) {
+                $q->where('budget_transaction.budget_id', $budget->id);
+                $q->orWhere('budget_transaction_journal.budget_id', $budget->id);
+            }
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $budgets
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setBudgets(Collection $budgets): JournalCollectorInterface
+    {
+        $budgetIds = $budgets->pluck('id')->toArray();
+        if (count($budgetIds) === 0) {
+            return $this;
+        }
+        $this->joinBudgetTables();
+
+        $this->query->where(
+            function (EloquentBuilder $q) use ($budgetIds) {
+                $q->whereIn('budget_transaction.budget_id', $budgetIds);
+                $q->orWhereIn('budget_transaction_journal.budget_id', $budgetIds);
+            }
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $categories
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setCategories(Collection $categories): JournalCollectorInterface
+    {
+        $categoryIds = $categories->pluck('id')->toArray();
+        if (count($categoryIds) === 0) {
+            return $this;
+        }
+        $this->joinCategoryTables();
+
+        $this->query->where(
+            function (EloquentBuilder $q) use ($categoryIds) {
+                $q->whereIn('category_transaction.category_id', $categoryIds);
+                $q->orWhereIn('category_transaction_journal.category_id', $categoryIds);
+            }
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param Category $category
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setCategory(Category $category): JournalCollectorInterface
+    {
+        $this->joinCategoryTables();
+
+        $this->query->where(
+            function (EloquentBuilder $q) use ($category) {
+                $q->where('category_transaction.category_id', $category->id);
+                $q->orWhere('category_transaction_journal.category_id', $category->id);
+            }
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param int $limit
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setLimit(int $limit): JournalCollectorInterface
+    {
+        $this->limit = $limit;
+        $this->query->limit($limit);
+        Log::debug(sprintf('Set limit to %d', $limit));
+
+        return $this;
+    }
+
+    /**
+     * @param int $offset
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setOffset(int $offset): JournalCollectorInterface
+    {
+        $this->offset = $offset;
+
+        return $this;
+    }
+
+    /**
+     * @param int $page
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setPage(int $page): JournalCollectorInterface
+    {
+        $this->page = $page;
+
+        if ($page > 0) {
+            $page--;
+        }
+        Log::debug(sprintf('Page is %d', $page));
+
+        if (!is_null($this->limit)) {
+            $offset       = ($this->limit * $page);
+            $this->offset = $offset;
+            $this->query->skip($offset);
+            Log::debug(sprintf('Changed offset to %d', $offset));
+        }
+        if (is_null($this->limit)) {
+            Log::debug('The limit is zero, cannot set the page.');
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setRange(Carbon $start, Carbon $end): JournalCollectorInterface
+    {
+        if ($start <= $end) {
+            $this->query->where('transaction_journals.date', '>=', $start->format('Y-m-d'));
+            $this->query->where('transaction_journals.date', '<=', $end->format('Y-m-d'));
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param Tag $tag
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setTag(Tag $tag): JournalCollectorInterface
+    {
+        $this->joinTagTables();
+        $this->query->where('tag_transaction_journal.tag_id', $tag->id);
+
+        return $this;
+    }
+
+    /**
+     * @param array $types
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setTypes(array $types): JournalCollectorInterface
+    {
+        if (count($types) > 0) {
+            Log::debug('Set query collector types', $types);
+            $this->query->whereIn('transaction_types.type', $types);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @return JournalCollectorInterface
+     */
+    public function withBudgetInformation(): JournalCollectorInterface
+    {
+        $this->joinBudgetTables();
+
+        return $this;
+    }
+
+    /**
+     * @return JournalCollectorInterface
+     */
+    public function withCategoryInformation(): JournalCollectorInterface
+    {
+
+        $this->joinCategoryTables();
+
+        return $this;
+    }
+
+    /**
+     * @return JournalCollectorInterface
+     */
+    public function withOpposingAccount(): JournalCollectorInterface
+    {
+        $this->joinOpposingTables();
+
+        $accountIds = $this->accountIds;
+        $this->query->where(
+            function (EloquentBuilder $q1) use ($accountIds) {
+                // set 1:
+                // where source is in the set of $accounts
+                // but destination is not.
+                $q1->where(
+                    function (EloquentBuilder $q2) use ($accountIds) {
+                        // transactions.account_id in set
+                        $q2->whereIn('transactions.account_id', $accountIds);
+                        // opposing.account_id not in set
+                        $q2->whereNotIn('opposing.account_id', $accountIds);
+
+                    }
+                );
+                // set 1:
+                // where source is not in the set of $accounts
+                // but destination is.
+                $q1->orWhere(
+                    function (EloquentBuilder $q3) use ($accountIds) {
+                        // transactions.account_id not in set
+                        $q3->whereNotIn('transactions.account_id', $accountIds);
+                        // B in set
+                        // opposing.account_id not in set
+                        $q3->whereIn('opposing.account_id', $accountIds);
+                    }
+                );
+            }
+        );
+
+        return $this;
+    }
+
+    /**
+     * @return JournalCollectorInterface
+     */
+    public function withoutBudget(): JournalCollectorInterface
+    {
+        $this->joinBudgetTables();
+
+        $this->query->where(
+            function (EloquentBuilder $q) {
+                $q->whereNull('budget_transaction.budget_id');
+                $q->whereNull('budget_transaction_journal.budget_id');
+            }
+        );
+
+        return $this;
+    }
+
+    /**
+     * @return JournalCollectorInterface
+     */
+    public function withoutCategory(): JournalCollectorInterface
+    {
+        $this->joinCategoryTables();
+
+        $this->query->where(
+            function (EloquentBuilder $q) {
+                $q->whereNull('category_transaction.category_id');
+                $q->whereNull('category_transaction_journal.category_id');
+            }
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $set
+     *
+     * @return Collection
+     */
+    private function filterInternalTransfers(Collection $set): Collection
+    {
+        if ($this->filterInternalTransfers === false) {
+            Log::debug('Did NO filtering for internal transfers on given set.');
+
+            return $set;
+        }
+        if ($this->joinedOpposing === false) {
+            Log::info('Cannot filter internal transfers because no opposing information is present.');
+
+            return $set;
+        }
+
+        $accountIds = $this->accountIds;
+        $set        = $set->filter(
+            function (Transaction $transaction) use ($accountIds) {
+                // both id's in $accountids?
+                if (in_array($transaction->account_id, $accountIds) && in_array($transaction->opposing_account_id, $accountIds)) {
+                    Log::debug(
+                        sprintf(
+                            'Transaction #%d has #%d and #%d in set, so removed',
+                            $transaction->id, $transaction->account_id, $transaction->opposing_account_id
+                        ), $accountIds
+                    );
+
+                    return false;
+                }
+
+                return $transaction;
+
+            }
+        );
+
+        return $set;
+    }
+
+    /**
+     * If the set of accounts used by the collector includes more than one asset
+     * account, chances are the set include double entries: transfers get selected
+     * on both the source, and then again on the destination account.
+     *
+     * This method filters them out.
+     *
+     * @param Collection $set
+     *
+     * @return Collection
+     */
+    private function filterTransfers(Collection $set): Collection
+    {
+        if ($this->filterTransfers) {
+            $set = $set->filter(
+                function (Transaction $transaction) {
+                    if (!($transaction->transaction_type_type === TransactionType::TRANSFER && bccomp($transaction->transaction_amount, '0') === -1)) {
+
+                        Log::debug(
+                            sprintf(
+                                'Included journal #%d (transaction #%d) because its a %s with amount %f',
+                                $transaction->transaction_journal_id,
+                                $transaction->id,
+                                $transaction->transaction_type_type,
+                                $transaction->transaction_amount
+                            )
+                        );
+
+                        return $transaction;
+                    }
+
+                    Log::debug(
+                        sprintf(
+                            'Removed journal #%d (transaction #%d) because its a %s with amount %f',
+                            $transaction->transaction_journal_id,
+                            $transaction->id,
+                            $transaction->transaction_type_type,
+                            $transaction->transaction_amount
+                        )
+                    );
+
+                    return false;
+                }
+            );
+        }
+
+        return $set;
+    }
+
+    /**
+     *
+     */
+    private function joinBudgetTables()
+    {
+        if (!$this->joinedBudget) {
+            // join some extra tables:
+            $this->joinedBudget = true;
+            $this->query->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id');
+            $this->query->leftJoin('budgets as transaction_journal_budgets', 'transaction_journal_budgets.id', '=', 'budget_transaction_journal.budget_id');
+            $this->query->leftJoin('budget_transaction', 'budget_transaction.transaction_id', '=', 'transactions.id');
+            $this->query->leftJoin('budgets as transaction_budgets', 'transaction_budgets.id', '=', 'budget_transaction.budget_id');
+
+            $this->fields[] = 'budget_transaction_journal.budget_id as transaction_journal_budget_id';
+            $this->fields[] = 'transaction_journal_budgets.encrypted as transaction_journal_budget_encrypted';
+            $this->fields[] = 'transaction_journal_budgets.name as transaction_journal_budget_name';
+
+            $this->fields[] = 'budget_transaction.budget_id as transaction_budget_id';
+            $this->fields[] = 'transaction_budgets.encrypted as transaction_budget_encrypted';
+            $this->fields[] = 'transaction_budgets.name as transaction_budget_name';
+        }
+    }
+
+    /**
+     *
+     */
+    private function joinCategoryTables()
+    {
+        if (!$this->joinedCategory) {
+            // join some extra tables:
+            $this->joinedCategory = true;
+            $this->query->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id');
+            $this->query->leftJoin(
+                'categories as transaction_journal_categories', 'transaction_journal_categories.id', '=', 'category_transaction_journal.category_id'
+            );
+
+            $this->query->leftJoin('category_transaction', 'category_transaction.transaction_id', '=', 'transactions.id');
+            $this->query->leftJoin('categories as transaction_categories', 'transaction_categories.id', '=', 'category_transaction.category_id');
+
+            $this->fields[] = 'category_transaction_journal.category_id as transaction_journal_category_id';
+            $this->fields[] = 'transaction_journal_categories.encrypted as transaction_journal_category_encrypted';
+            $this->fields[] = 'transaction_journal_categories.name as transaction_journal_category_name';
+
+            $this->fields[] = 'category_transaction.category_id as transaction_category_id';
+            $this->fields[] = 'transaction_categories.encrypted as transaction_category_encrypted';
+            $this->fields[] = 'transaction_categories.name as transaction_category_name';
+        }
+    }
+
+    /**
+     *
+     */
+    private function joinOpposingTables()
+    {
+        if (!$this->joinedOpposing) {
+            Log::debug('joinedOpposing is false');
+            // join opposing transaction (hard):
+            $this->query->leftJoin(
+                'transactions as opposing', function (JoinClause $join) {
+                $join->on('opposing.transaction_journal_id', '=', 'transactions.transaction_journal_id')
+                     ->where('opposing.identifier', '=', DB::raw('transactions.identifier'))
+                     ->where('opposing.amount', '=', DB::raw('transactions.amount * -1'));
+            }
+            );
+            $this->query->leftJoin('accounts as opposing_accounts', 'opposing.account_id', '=', 'opposing_accounts.id');
+            $this->query->leftJoin('account_types as opposing_account_types', 'opposing_accounts.account_type_id', '=', 'opposing_account_types.id');
+            $this->query->whereNull('opposing.deleted_at');
+
+            $this->fields[]       = 'opposing.account_id as opposing_account_id';
+            $this->fields[]       = 'opposing_accounts.name as opposing_account_name';
+            $this->fields[]       = 'opposing_accounts.encrypted as opposing_account_encrypted';
+            $this->fields[]       = 'opposing_account_types.type as opposing_account_type';
+            $this->joinedOpposing = true;
+            Log::debug('joinedOpposing is now true!');
+        }
+    }
+
+    /**
+     *
+     */
+    private function joinTagTables()
+    {
+        if (!$this->joinedTag) {
+            // join some extra tables:
+            $this->joinedTag = true;
+            $this->query->leftJoin('tag_transaction_journal', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id');
+        }
+    }
+
+    /**
+     * @return EloquentBuilder
+     */
+    private function startQuery(): EloquentBuilder
+    {
+        /** @var EloquentBuilder $query */
+        $query = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+                            ->leftJoin('transaction_currencies', 'transaction_currencies.id', 'transaction_journals.transaction_currency_id')
+                            ->leftJoin('transaction_types', 'transaction_types.id', 'transaction_journals.transaction_type_id')
+                            ->leftJoin('bills', 'bills.id', 'transaction_journals.bill_id')
+                            ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+                            ->leftJoin('account_types', 'accounts.account_type_id', 'account_types.id')
+                            ->whereNull('transactions.deleted_at')
+                            ->whereNull('transaction_journals.deleted_at')
+                            ->where('transaction_journals.user_id', $this->user->id)
+                            ->orderBy('transaction_journals.date', 'DESC')
+                            ->orderBy('transaction_journals.order', 'ASC')
+                            ->orderBy('transaction_journals.id', 'DESC');
+
+        return $query;
+
+    }
+}

app/Helpers/Collector/JournalCollectorInterface.php

@@ -0,0 +1,176 @@
+<?php
+/**
+ * JournalCollectorInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Helpers\Collector;
+
+use Carbon\Carbon;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\Category;
+use FireflyIII\Models\Tag;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface JournalCollectorInterface
+ *
+ * @package FireflyIII\Helpers\Collector
+ */
+interface JournalCollectorInterface
+{
+
+    /**
+     * @return int
+     */
+    public function count(): int;
+
+    /**
+     * @return JournalCollectorInterface
+     */
+    public function disableFilter(): JournalCollectorInterface;
+
+    /**
+     * @return JournalCollectorInterface
+     */
+    public function disableInternalFilter(): JournalCollectorInterface;
+
+    /**
+     * @return JournalCollectorInterface
+     */
+    public function enableInternalFilter(): JournalCollectorInterface;
+
+    /**
+     * @return Collection
+     */
+    public function getJournals(): Collection;
+
+    /**
+     * @return LengthAwarePaginator
+     */
+    public function getPaginatedJournals(): LengthAwarePaginator;
+
+    /**
+     * @param Collection $accounts
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setAccounts(Collection $accounts): JournalCollectorInterface;
+
+    /**
+     * @return JournalCollectorInterface
+     */
+    public function setAllAssetAccounts(): JournalCollectorInterface;
+
+    /**
+     * @param Collection $bills
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setBills(Collection $bills): JournalCollectorInterface;
+
+    /**
+     * @param Budget $budget
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setBudget(Budget $budget): JournalCollectorInterface;
+
+
+    /**
+     * @param Collection $budgets
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setBudgets(Collection $budgets): JournalCollectorInterface;
+
+    /**
+     * @param Collection $categories
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setCategories(Collection $categories): JournalCollectorInterface;
+
+    /**
+     * @param Category $category
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setCategory(Category $category): JournalCollectorInterface;
+
+    /**
+     * @param int $limit
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setLimit(int $limit): JournalCollectorInterface;
+
+    /**
+     * @param int $offset
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setOffset(int $offset): JournalCollectorInterface;
+
+    /**
+     * @param int $page
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setPage(int $page): JournalCollectorInterface;
+
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setRange(Carbon $start, Carbon $end): JournalCollectorInterface;
+
+    /**
+     * @param Tag $tag
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setTag(Tag $tag): JournalCollectorInterface;
+
+    /**
+     * @param array $types
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setTypes(array $types): JournalCollectorInterface;
+
+    /**
+     * @return JournalCollectorInterface
+     */
+    public function withBudgetInformation(): JournalCollectorInterface;
+
+    /**
+     * @return JournalCollectorInterface
+     */
+    public function withCategoryInformation(): JournalCollectorInterface;
+
+    /**
+     * @return JournalCollectorInterface
+     */
+    public function withOpposingAccount(): JournalCollectorInterface;
+
+    /**
+     * @return JournalCollectorInterface
+     */
+    public function withoutBudget(): JournalCollectorInterface;
+
+    /**
+     * @return JournalCollectorInterface
+     */
+    public function withoutCategory(): JournalCollectorInterface;
+}

app/Helpers/FiscalHelper.php

@@ -0,0 +1,87 @@
+<?php
+/**
+ * FiscalHelper.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Helpers;
+
+use Carbon\Carbon;
+use Preferences;
+
+/**
+ * Class FiscalHelper
+ *
+ * @package FireflyIII\Helpers
+ */
+class FiscalHelper implements FiscalHelperInterface
+{
+
+    /** @var bool */
+    protected $useCustomFiscalYear;
+
+    /**
+     * FiscalHelper constructor.
+     *
+     *
+     */
+    public function __construct()
+    {
+        $this->useCustomFiscalYear = Preferences::get('customFiscalYear', false)->data;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return Carbon date object
+     */
+    public function endOfFiscalYear(Carbon $date): Carbon
+    {
+        // 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();
+
+            return $endDate;
+        }
+        $endDate->endOfYear();
+
+
+        return $endDate;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return Carbon date object
+     */
+    public function startOfFiscalYear(Carbon $date): Carbon
+    {
+        // 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();
+            }
+
+            return $startDate;
+        }
+        $startDate->startOfYear();
+
+        return $startDate;
+    }
+}

app/Helpers/FiscalHelperInterface.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * FiscalHelperInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+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 last day of the fiscal year.
+     *
+     * @param Carbon $date
+     *
+     * @return Carbon date object
+     */
+    public function endOfFiscalYear(Carbon $date): Carbon;
+
+    /**
+     * 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): Carbon;
+
+}

app/Helpers/Help/Help.php

@@ -0,0 +1,130 @@
+<?php
+/**
+ * Help.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Helpers\Help;
+
+use Cache;
+use League\CommonMark\CommonMarkConverter;
+use Log;
+use Requests;
+use Requests_Exception;
+use Route;
+
+/**
+ * Class Help
+ *
+ * @package FireflyIII\Helpers\Help
+ */
+class Help implements HelpInterface
+{
+    /** @var string */
+    protected $userAgent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.71 Safari/537.36';
+
+    /**
+     * @param string $route
+     * @param string $language
+     *
+     * @return string
+     */
+    public function getFromCache(string $route, string $language): string
+    {
+        $line = sprintf('help.%s.%s', $route, $language);
+
+        return Cache::get($line);
+    }
+
+    /**
+     * @param string $language
+     * @param string $route
+     *
+     * @return string
+     */
+    public function getFromGithub(string $language, string $route): string
+    {
+
+        $uri = sprintf('https://raw.githubusercontent.com/firefly-iii/help/master/%s/%s.md', $language, $route);
+        Log::debug(sprintf('Trying to get %s...', $uri));
+        $opt     = ['useragent' => $this->userAgent];
+        $content = '';
+        try {
+            $result = Requests::get($uri, [], $opt);
+        } catch (Requests_Exception $e) {
+            Log::error($e);
+
+            return '';
+        }
+
+
+        Log::debug(sprintf('Status code is %d', $result->status_code));
+
+        if ($result->status_code === 200) {
+            $content = trim($result->body);
+        }
+        if (strlen($content) > 0) {
+            Log::debug('Content is longer than zero. Expect something.');
+            $converter = new CommonMarkConverter();
+            $content   = $converter->convertToHtml($content);
+        }
+
+        return $content;
+    }
+
+    /**
+     *
+     * @param string $route
+     *
+     * @return bool
+     */
+    public function hasRoute(string $route): bool
+    {
+        return Route::has($route);
+    }
+
+    /**
+     * @param string $route
+     * @param string $language
+     *
+     * @return bool
+     */
+    public function inCache(string $route, string $language): bool
+    {
+        $line   = sprintf('help.%s.%s', $route, $language);
+        $result = Cache::has($line);
+        if ($result) {
+            Log::debug(sprintf('Cache has this entry: %s', 'help.' . $route . '.' . $language));
+        }
+        if (!$result) {
+            Log::debug(sprintf('Cache does not have this entry: %s', 'help.' . $route . '.' . $language));
+        }
+
+        return $result;
+
+    }
+
+    /**
+     *
+     * @param string $route
+     * @param string $language
+     * @param string $content
+     *
+     */
+    public function putInCache(string $route, string $language, string $content)
+    {
+        $key = sprintf('help.%s.%s', $route, $language);
+        if (strlen($content) > 0) {
+            Log::debug(sprintf('Will store entry in cache: %s', $key));
+            Cache::put($key, $content, 10080); // a week.
+            return;
+        }
+        Log::info(sprintf('Will not cache %s because content is empty.', $key));
+    }
+}

app/Helpers/Help/HelpInterface.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * HelpInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Helpers\Help;
+
+/**
+ * Interface HelpInterface
+ *
+ * @package FireflyIII\Helpers\Help
+ */
+interface HelpInterface
+{
+
+    /**
+     * @param string $route
+     * @param string $language
+     *
+     * @return string
+     */
+    public function getFromCache(string $route, string $language): string;
+
+    /**
+     * @param string $language
+     * @param string $route
+     *
+     * @return string
+     */
+    public function getFromGithub(string $language, string $route): string;
+
+    /**
+     * @param string $route
+     *
+     * @return bool
+     */
+    public function hasRoute(string $route): bool;
+
+    /**
+     * @param string $route
+     * @param string $language
+     *
+     * @return bool
+     */
+    public function inCache(string $route, string $language): bool;
+
+    /**
+     * @param string $route
+     * @param string $language
+     * @param string $content
+     */
+    public function putInCache(string $route, string $language, string $content);
+}

app/Helpers/Report/BalanceReportHelper.php

@@ -0,0 +1,294 @@
+<?php
+/**
+ * BalanceReportHelper.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Helpers\Report;
+
+use Carbon\Carbon;
+use DB;
+use FireflyIII\Helpers\Collection\Balance;
+use FireflyIII\Helpers\Collection\BalanceEntry;
+use FireflyIII\Helpers\Collection\BalanceHeader;
+use FireflyIII\Helpers\Collection\BalanceLine;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Models\Tag;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use Illuminate\Database\Query\JoinClause;
+use Illuminate\Support\Collection;
+use Log;
+
+/**
+ * Class BalanceReportHelper
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects) // I can't really help it.
+ * @package FireflyIII\Helpers\Report
+ */
+class BalanceReportHelper implements BalanceReportHelperInterface
+{
+
+    /** @var  BudgetRepositoryInterface */
+    protected $budgetRepository;
+
+    /**
+     * ReportHelper constructor.
+     *
+     *
+     * @param BudgetRepositoryInterface $budgetRepository
+     */
+    public function __construct(BudgetRepositoryInterface $budgetRepository)
+    {
+        $this->budgetRepository = $budgetRepository;
+    }
+
+
+    /**
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return Balance
+     */
+    public function getBalanceReport(Collection $accounts, Carbon $start, Carbon $end): Balance
+    {
+        Log::debug('Start of balance report');
+        $balance      = new Balance;
+        $header       = new BalanceHeader;
+        $budgetLimits = $this->budgetRepository->getAllBudgetLimits($start, $end);
+        foreach ($accounts as $account) {
+            Log::debug(sprintf('Add account %s to headers.', $account->name));
+            $header->addAccount($account);
+        }
+
+        /** @var BudgetLimit $budgetLimit */
+        foreach ($budgetLimits as $budgetLimit) {
+            $line = $this->createBalanceLine($budgetLimit, $accounts);
+            $balance->addBalanceLine($line);
+        }
+        Log::debug('Create rest of the things.');
+        $noBudgetLine       = $this->createNoBudgetLine($accounts, $start, $end);
+        $coveredByTagLine   = $this->createTagsBalanceLine($accounts, $start, $end);
+        $leftUnbalancedLine = $this->createLeftUnbalancedLine($noBudgetLine, $coveredByTagLine);
+
+        $balance->addBalanceLine($noBudgetLine);
+        $balance->addBalanceLine($coveredByTagLine);
+        $balance->addBalanceLine($leftUnbalancedLine);
+        $balance->setBalanceHeader($header);
+
+        Log::debug('Clear unused budgets.');
+        // remove budgets without expenses from balance lines:
+        $balance = $this->removeUnusedBudgets($balance);
+
+        Log::debug('Return report.');
+
+        return $balance;
+    }
+
+    /**
+     * This method collects all transfers that are part of a "balancing act" tag
+     * and groups the amounts of those transfers by their destination account.
+     *
+     * This is used to indicate which expenses, usually outside of budgets, have been
+     * corrected by transfers from a savings account.
+     *
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return Collection
+     */
+    private function allCoveredByBalancingActs(Collection $accounts, Carbon $start, Carbon $end): Collection
+    {
+        $ids = $accounts->pluck('id')->toArray();
+        $set = auth()->user()->tags()
+                     ->leftJoin('tag_transaction_journal', 'tag_transaction_journal.tag_id', '=', 'tags.id')
+                     ->leftJoin('transaction_journals', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
+                     ->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id')
+                     ->leftJoin(
+                         'transactions AS t_source', function (JoinClause $join) {
+                         $join->on('transaction_journals.id', '=', 't_source.transaction_journal_id')->where('t_source.amount', '<', 0);
+                     }
+                     )
+                     ->leftJoin(
+                         'transactions AS t_destination', function (JoinClause $join) {
+                         $join->on('transaction_journals.id', '=', 't_destination.transaction_journal_id')->where('t_destination.amount', '>', 0);
+                     }
+                     )
+                     ->where('tags.tagMode', 'balancingAct')
+                     ->where('transaction_types.type', TransactionType::TRANSFER)
+                     ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
+                     ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
+                     ->whereNull('transaction_journals.deleted_at')
+                     ->whereIn('t_source.account_id', $ids)
+                     ->whereIn('t_destination.account_id', $ids)
+                     ->groupBy('t_destination.account_id')
+                     ->get(
+                         [
+                             't_destination.account_id',
+                             DB::raw('SUM(t_destination.amount) AS sum'),
+                         ]
+                     );
+
+        return $set;
+    }
+
+
+    /**
+     * @param BudgetLimit $budgetLimit
+     * @param Collection  $accounts
+     *
+     * @return BalanceLine
+     */
+    private function createBalanceLine(BudgetLimit $budgetLimit, Collection $accounts): BalanceLine
+    {
+        $line = new BalanceLine;
+        $line->setBudget($budgetLimit->budget);
+        $line->setBudgetLimit($budgetLimit);
+
+        // loop accounts:
+        foreach ($accounts as $account) {
+            $balanceEntry = new BalanceEntry;
+            $balanceEntry->setAccount($account);
+            $spent = $this->budgetRepository->spentInPeriod(new Collection([$budgetLimit->budget]), new Collection([$account]), $budgetLimit->start_date, $budgetLimit->end_date);
+            $balanceEntry->setSpent($spent);
+            $line->addBalanceEntry($balanceEntry);
+        }
+
+        return $line;
+    }
+
+    /**
+     * @param BalanceLine $noBudgetLine
+     * @param BalanceLine $coveredByTagLine
+     *
+     * @return BalanceLine
+     */
+    private function createLeftUnbalancedLine(BalanceLine $noBudgetLine, BalanceLine $coveredByTagLine): BalanceLine
+    {
+        $line = new BalanceLine;
+        $line->setRole(BalanceLine::ROLE_DIFFROLE);
+        $noBudgetEntries = $noBudgetLine->getBalanceEntries();
+        $tagEntries      = $coveredByTagLine->getBalanceEntries();
+
+        foreach ($noBudgetEntries as $entry) {
+            $account  = $entry->getAccount();
+            $tagEntry = $tagEntries->filter(
+                function (BalanceEntry $current) use ($account) {
+                    return $current->getAccount()->id === $account->id;
+                }
+            );
+            if ($tagEntry->first()) {
+                // found corresponding entry. As we should:
+                $newEntry = new BalanceEntry;
+                $newEntry->setAccount($account);
+                $spent = bcadd($tagEntry->first()->getLeft(), $entry->getSpent());
+                $newEntry->setSpent($spent);
+                $line->addBalanceEntry($newEntry);
+            }
+        }
+
+        return $line;
+
+
+    }
+
+    /**
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return BalanceLine
+     */
+    private function createNoBudgetLine(Collection $accounts, Carbon $start, Carbon $end): BalanceLine
+    {
+        $empty = new BalanceLine;
+
+        foreach ($accounts as $account) {
+            $spent = $this->budgetRepository->spentInPeriodWoBudget(new Collection([$account]), $start, $end);
+            // 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): BalanceLine
+    {
+        $tags     = new BalanceLine;
+        $tagsLeft = $this->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;
+            }
+
+            // balanced by tags
+            $tagEntry = new BalanceEntry;
+            $tagEntry->setAccount($account);
+            $tagEntry->setLeft($left);
+            $tags->addBalanceEntry($tagEntry);
+
+        }
+
+        return $tags;
+    }
+
+    /**
+     * @param Balance $balance
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly 5.
+     *
+     * @return Balance
+     */
+    private function removeUnusedBudgets(Balance $balance): Balance
+    {
+        $set    = $balance->getBalanceLines();
+        $newSet = new Collection;
+        foreach ($set as $entry) {
+            if (!is_null($entry->getBudget()->id)) {
+                $sum = '0';
+                foreach ($entry->getBalanceEntries() as $balanceEntry) {
+                    $sum = bcadd($sum, $balanceEntry->getSpent());
+                }
+                if (bccomp($sum, '0') === -1) {
+                    $newSet->push($entry);
+                }
+                continue;
+            }
+            $newSet->push($entry);
+        }
+
+        $balance->setBalanceLines($newSet);
+
+        return $balance;
+
+    }
+
+}

app/Helpers/Report/BalanceReportHelperInterface.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * BalanceReportHelperInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+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 Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return Balance
+     */
+    public function getBalanceReport(Collection $accounts, Carbon $start, Carbon $end): Balance;
+}

app/Helpers/Report/BudgetReportHelper.php

@@ -0,0 +1,140 @@
+<?php
+/**
+ * BudgetReportHelper.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Helpers\Report;
+
+
+use Carbon\Carbon;
+use FireflyIII\Helpers\Collection\Budget as BudgetCollection;
+use FireflyIII\Helpers\Collection\BudgetLine;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use Illuminate\Support\Collection;
+
+/**
+ * Class BudgetReportHelper
+ *
+ * @package FireflyIII\Helpers\Report
+ */
+class BudgetReportHelper implements BudgetReportHelperInterface
+{
+    /** @var BudgetRepositoryInterface */
+    private $repository;
+
+    /**
+     * BudgetReportHelper constructor.
+     *
+     * @param BudgetRepositoryInterface $repository
+     */
+    public function __construct(BudgetRepositoryInterface $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly 5.
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return BudgetCollection
+     */
+    public function getBudgetReport(Carbon $start, Carbon $end, Collection $accounts): BudgetCollection
+    {
+        $object = new BudgetCollection;
+        $set    = $this->repository->getBudgets();
+
+        /** @var Budget $budget */
+        foreach ($set as $budget) {
+            $budgetLimits = $this->repository->getBudgetLimits($budget, $start, $end);
+            if ($budgetLimits->count() == 0) { // no budget limit(s) for this budget
+                $spent = $this->repository->spentInPeriod(new Collection([$budget]), $accounts, $start, $end);// spent for budget in time range
+                if ($spent > 0) {
+                    $budgetLine = new BudgetLine;
+                    $budgetLine->setBudget($budget)->setOverspent($spent);
+                    $object->addOverspent($spent)->addBudgetLine($budgetLine);
+                }
+                continue;
+            }
+            /** @var BudgetLimit $budgetLimit */
+            foreach ($budgetLimits as $budgetLimit) { // one or more repetitions for budget
+                $data       = $this->calculateExpenses($budget, $budgetLimit, $accounts);
+                $budgetLine = new BudgetLine;
+                $budgetLine->setBudget($budget)->setBudgetLimit($budgetLimit)
+                           ->setLeft($data['left'])->setSpent($data['expenses'])->setOverspent($data['overspent'])
+                           ->setBudgeted(strval($budgetLimit->amount));
+
+                $object->addBudgeted(strval($budgetLimit->amount))->addSpent($data['spent'])
+                       ->addLeft($data['left'])->addOverspent($data['overspent'])->addBudgetLine($budgetLine);
+
+            }
+        }
+        $noBudget   = $this->repository->spentInPeriodWoBudget($accounts, $start, $end); // stuff outside of budgets
+        $budgetLine = new BudgetLine;
+        $budgetLine->setOverspent($noBudget)->setSpent($noBudget);
+        $object->addOverspent($noBudget)->addBudgetLine($budgetLine);
+
+        return $object;
+    }
+
+    /**
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return Collection
+     */
+    public function getBudgetsWithExpenses(Carbon $start, Carbon $end, Collection $accounts): Collection
+    {
+        /** @var BudgetRepositoryInterface $repository */
+        $repository = app(BudgetRepositoryInterface::class);
+        $budgets    = $repository->getActiveBudgets();
+
+        $set = new Collection;
+        /** @var Budget $budget */
+        foreach ($budgets as $budget) {
+            $total = $repository->spentInPeriod(new Collection([$budget]), $accounts, $start, $end);
+            if (bccomp($total, '0') === -1) {
+                $set->push($budget);
+            }
+        }
+        $set = $set->sortBy(
+            function (Budget $budget) {
+                return $budget->name;
+            }
+        );
+
+        return $set;
+    }
+
+    /**
+     * @param Budget      $budget
+     * @param BudgetLimit $budgetLimit
+     * @param Collection  $accounts
+     *
+     * @return array
+     */
+    private function calculateExpenses(Budget $budget, BudgetLimit $budgetLimit, Collection $accounts): array
+    {
+        $array              = [];
+        $expenses           = $this->repository->spentInPeriod(new Collection([$budget]), $accounts, $budgetLimit->start_date, $budgetLimit->end_date);
+        $array['left']      = bccomp(bcadd($budgetLimit->amount, $expenses), '0') === 1 ? bcadd($budgetLimit->amount, $expenses) : '0';
+        $array['spent']     = bccomp(bcadd($budgetLimit->amount, $expenses), '0') === 1 ? $expenses : '0';
+        $array['overspent'] = bccomp(bcadd($budgetLimit->amount, $expenses), '0') === 1 ? '0' : bcadd($expenses, $budgetLimit->amount);
+        $array['expenses']  = $expenses;
+
+        return $array;
+
+    }
+}

app/Helpers/Report/BudgetReportHelperInterface.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * BudgetReportHelperInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+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): BudgetCollection;
+
+    /**
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return Collection
+     */
+    public function getBudgetsWithExpenses(Carbon $start, Carbon $end, Collection $accounts): Collection;
+
+}

app/Helpers/Report/ReportHelper.php

@@ -0,0 +1,150 @@
+<?php
+/**
+ * ReportHelper.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Helpers\Report;
+
+use Carbon\Carbon;
+use FireflyIII\Helpers\Collection\Bill as BillCollection;
+use FireflyIII\Helpers\Collection\BillLine;
+use FireflyIII\Helpers\Collection\Category as CategoryCollection;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\FiscalHelperInterface;
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\Category;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use Illuminate\Support\Collection;
+
+/**
+ * Class ReportHelper
+ *
+ * @package FireflyIII\Helpers\Report
+ */
+class ReportHelper implements ReportHelperInterface
+{
+
+    /** @var  BudgetRepositoryInterface */
+    protected $budgetRepository;
+
+    /**
+     * ReportHelper constructor.
+     *
+     *
+     * @param BudgetRepositoryInterface $budgetRepository
+     */
+    public function __construct(BudgetRepositoryInterface $budgetRepository)
+    {
+        $this->budgetRepository = $budgetRepository;
+    }
+
+    /**
+     * This method generates a full report for the given period on all
+     * the users bills and their payments.
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly 5.
+     *
+     * 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, Collection $accounts): BillCollection
+    {
+        /** @var BillRepositoryInterface $repository */
+        $repository = app(BillRepositoryInterface::class);
+        $bills      = $repository->getBillsForAccounts($accounts);
+        $collector  = app(JournalCollectorInterface::class, [auth()->user()]);
+        $collector->setAccounts($accounts)->setRange($start, $end)->setBills($bills);
+        $journals   = $collector->getJournals();
+        $collection = new BillCollection;
+        $collection->setStartDate($start);
+        $collection->setEndDate($end);
+
+        /** @var Bill $bill */
+        foreach ($bills as $bill) {
+            $billLine = new BillLine;
+            $billLine->setBill($bill);
+            $billLine->setMin(strval($bill->amount_min));
+            $billLine->setMax(strval($bill->amount_max));
+            $billLine->setHit(false);
+            $entry = $journals->filter(
+                function (Transaction $transaction) use ($bill) {
+                    return $transaction->bill_id === $bill->id;
+                }
+            );
+            $first = $entry->first();
+            if (!is_null($first)) {
+                $billLine->setTransactionJournalId($first->id);
+                $billLine->setAmount($first->transaction_amount);
+                $billLine->setLastHitDate($first->date);
+                $billLine->setHit(true);
+            }
+            if ($billLine->isActive() || $billLine->isHit()) {
+                $collection->addBill($billLine);
+            }
+        }
+        $collection->filterBills();
+
+        return $collection;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return array
+     */
+    public function listOfMonths(Carbon $date): array
+    {
+        /** @var FiscalHelperInterface $fiscalHelper */
+        $fiscalHelper = app(FiscalHelperInterface::class);
+        $start        = clone $date;
+        $start->startOfMonth();
+        $end = Carbon::now();
+        $end->endOfMonth();
+        $months = [];
+
+        while ($start <= $end) {
+            $year = $fiscalHelper->endOfFiscalYear($start)->year; // current 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 = clone $currentEnd; // to make the hop to the next month properly
+            $start->addDay();
+        }
+
+        return $months;
+    }
+
+}

app/Helpers/Report/ReportHelperInterface.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * ReportHelperInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Helpers\Report;
+
+use Carbon\Carbon;
+use FireflyIII\Helpers\Collection\Bill as BillCollection;
+use FireflyIII\Helpers\Collection\Category as CategoryCollection;
+use FireflyIII\Helpers\Collection\Expense;
+use FireflyIII\Helpers\Collection\Income;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface ReportHelperInterface
+ *
+ * @package FireflyIII\Helpers\Report
+ */
+interface ReportHelperInterface
+{
+
+    /**
+     * This method generates a full report for the given period on all
+     * the users bills and their payments.
+     *
+     * 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, Collection $accounts): BillCollection;
+
+    /**
+     * @param Carbon $date
+     *
+     * @return array
+     */
+    public function listOfMonths(Carbon $date): array;
+
+}

app/Http/Controllers/AccountController.php

@@ -0,0 +1,480 @@
+<?php
+/**
+ * AccountController.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers;
+
+use Amount;
+use Carbon\Carbon;
+use ExpandedForm;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Http\Requests\AccountFormRequest;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
+use FireflyIII\Repositories\Account\AccountTaskerInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Support\CacheProperties;
+use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+use Log;
+use Navigation;
+use Preferences;
+use Session;
+use Steam;
+use URL;
+use View;
+
+/**
+ * Class AccountController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class AccountController extends Controller
+{
+    /**
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        // translations:
+        $this->middleware(
+            function ($request, $next) {
+                View::share('mainTitleIcon', 'fa-credit-card');
+                View::share('title', trans('firefly.accounts'));
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param string $what
+     *
+     * @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory|View
+     */
+    public function create(string $what = 'asset')
+    {
+        /** @var CurrencyRepositoryInterface $repository */
+        $repository      = app(CurrencyRepositoryInterface::class);
+        $currencies      = ExpandedForm::makeSelectList($repository->get());
+        $defaultCurrency = Amount::getDefaultCurrency();
+        $subTitleIcon    = config('firefly.subIconsByIdentifier.' . $what);
+        $subTitle        = trans('firefly.make_new_' . $what . '_account');
+
+        // pre fill some data
+        Session::flash('preFilled', ['currency_id' => $defaultCurrency->id,]);
+
+        // put previous url in session if not redirect from store (not "create another").
+        if (session('accounts.create.fromStore') !== true) {
+            Session::put('accounts.create.url', URL::previous());
+        }
+        Session::forget('accounts.create.fromStore');
+        Session::flash('gaEventCategory', 'accounts');
+        Session::flash('gaEventAction', 'create-' . $what);
+
+        return view('accounts.create', compact('subTitleIcon', 'what', 'subTitle', 'currencies'));
+
+    }
+
+    /**
+     * @param ARI     $repository
+     * @param Account $account
+     *
+     * @return View
+     */
+    public function delete(ARI $repository, Account $account)
+    {
+        $typeName    = config('firefly.shortNamesByFullName.' . $account->accountType->type);
+        $subTitle    = trans('firefly.delete_' . $typeName . '_account', ['name' => $account->name]);
+        $accountList = ExpandedForm::makeSelectListWithEmpty($repository->getAccountsByType([$account->accountType->type]));
+        unset($accountList[$account->id]);
+
+        // put previous url in session
+        Session::put('accounts.delete.url', URL::previous());
+        Session::flash('gaEventCategory', 'accounts');
+        Session::flash('gaEventAction', 'delete-' . $typeName);
+
+        return view('accounts.delete', compact('account', 'subTitle', 'accountList'));
+    }
+
+    /**
+     * @param Request $request
+     * @param ARI     $repository
+     * @param Account $account
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function destroy(Request $request, ARI $repository, Account $account)
+    {
+        $type      = $account->accountType->type;
+        $typeName  = config('firefly.shortNamesByFullName.' . $type);
+        $name      = $account->name;
+        $accountId = $account->id;
+        $moveTo    = $repository->find(intval($request->get('move_account_before_delete')));
+
+        $repository->destroy($account, $moveTo);
+
+        Session::flash('success', strval(trans('firefly.' . $typeName . '_deleted', ['name' => $name])));
+        Preferences::mark();
+
+        $uri = session('accounts.delete.url');
+        if (!(strpos($uri, sprintf('accounts/show/%s', $accountId)) === false)) {
+            // uri would point back to account
+            $uri = route('accounts.index', [$typeName]);
+        }
+
+        return redirect($uri);
+    }
+
+    /**
+     * @param Account $account
+     *
+     * @return View
+     */
+    public function edit(Account $account)
+    {
+
+        $what         = config('firefly.shortNamesByFullName')[$account->accountType->type];
+        $subTitle     = trans('firefly.edit_' . $what . '_account', ['name' => $account->name]);
+        $subTitleIcon = config('firefly.subIconsByIdentifier.' . $what);
+        /** @var CurrencyRepositoryInterface $repository */
+        $repository = app(CurrencyRepositoryInterface::class);
+        $currencies = ExpandedForm::makeSelectList($repository->get());
+
+        // put previous url in session if not redirect from store (not "return_to_edit").
+        if (session('accounts.edit.fromUpdate') !== true) {
+            Session::put('accounts.edit.url', URL::previous());
+        }
+        Session::forget('accounts.edit.fromUpdate');
+
+        // pre fill some useful values.
+
+        // the opening balance is tricky:
+        $openingBalanceAmount = $account->getOpeningBalanceAmount();
+        $openingBalanceAmount = $account->getOpeningBalanceAmount() === '0' ? '' : $openingBalanceAmount;
+        $openingBalanceDate   = $account->getOpeningBalanceDate();
+        $openingBalanceDate   = $openingBalanceDate->year === 1900 ? null : $openingBalanceDate->format('Y-m-d');
+
+        $preFilled = [
+            'accountNumber'        => $account->getMeta('accountNumber'),
+            'accountRole'          => $account->getMeta('accountRole'),
+            'ccType'               => $account->getMeta('ccType'),
+            'ccMonthlyPaymentDate' => $account->getMeta('ccMonthlyPaymentDate'),
+            'BIC'                  => $account->getMeta('BIC'),
+            'openingBalanceDate'   => $openingBalanceDate,
+            'openingBalance'       => $openingBalanceAmount,
+            'virtualBalance'       => $account->virtual_balance,
+            'currency_id'          => $account->getMeta('currency_id'),
+        ];
+        Session::flash('preFilled', $preFilled);
+        Session::flash('gaEventCategory', 'accounts');
+        Session::flash('gaEventAction', 'edit-' . $what);
+
+        return view('accounts.edit', compact('currencies', 'account', 'subTitle', 'subTitleIcon', 'openingBalance', 'what'));
+    }
+
+    /**
+     * @param ARI    $repository
+     * @param string $what
+     *
+     * @return View
+     */
+    public function index(ARI $repository, string $what)
+    {
+        $what         = $what ?? 'asset';
+        $subTitle     = trans('firefly.' . $what . '_accounts');
+        $subTitleIcon = config('firefly.subIconsByIdentifier.' . $what);
+        $types        = config('firefly.accountTypesByIdentifier.' . $what);
+        $accounts     = $repository->getAccountsByType($types);
+        /** @var Carbon $start */
+        $start = clone session('start', Carbon::now()->startOfMonth());
+        /** @var Carbon $end */
+        $end = clone session('end', Carbon::now()->endOfMonth());
+        $start->subDay();
+
+        $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 = $this->isInArray($activities, $account->id);
+                $account->startBalance     = $this->isInArray($startBalances, $account->id);
+                $account->endBalance       = $this->isInArray($endBalances, $account->id);
+                $account->difference       = bcsub($account->endBalance, $account->startBalance);
+            }
+        );
+
+        return view('accounts.index', compact('what', 'subTitleIcon', 'subTitle', 'accounts'));
+    }
+
+    /**
+     * @param Request                   $request
+     * @param JournalCollectorInterface $collector
+     * @param Account                   $account
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
+     */
+    public function show(Request $request, JournalCollectorInterface $collector, Account $account)
+    {
+        if ($account->accountType->type === AccountType::INITIAL_BALANCE) {
+            return $this->redirectToOriginalAccount($account);
+        }
+        // show journals from current period only:
+        $subTitleIcon = config('firefly.subIconsByIdentifier.' . $account->accountType->type);
+        $subTitle     = $account->name;
+        $range        = Preferences::get('viewRange', '1M')->data;
+        $start        = session('start', Navigation::startOfPeriod(new Carbon, $range));
+        $end          = session('end', Navigation::endOfPeriod(new Carbon, $range));
+        $page         = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
+        $pageSize     = intval(Preferences::get('transactionPageSize', 50)->data);
+        $chartUri     = route('chart.account.single', [$account->id]);
+        $accountType  = $account->accountType->type;
+
+        // grab those journals:
+        $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->setLimit($pageSize)->setPage($page);
+        $journals = $collector->getPaginatedJournals();
+        $journals->setPath('accounts/show/' . $account->id);
+
+        // generate entries for each period (and cache those)
+        $entries = $this->periodEntries($account);
+
+        return view('accounts.show', compact('account', 'accountType', 'entries', 'subTitleIcon', 'journals', 'subTitle', 'start', 'end', 'chartUri'));
+    }
+
+    /**
+     * @param Request $request
+     * @param ARI     $repository
+     * @param Account $account
+     *
+     * @return View
+     */
+    public function showAll(Request $request, AccountRepositoryInterface $repository, Account $account)
+    {
+        $subTitle = sprintf('%s (%s)', $account->name, strtolower(trans('firefly.everything')));
+        $page     = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
+        $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
+        $chartUri = route('chart.account.all', [$account->id]);
+
+        // replace with journal collector:
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class, [auth()->user()]);
+        $collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page);
+        $journals = $collector->getPaginatedJournals();
+        $journals->setPath('accounts/show/' . $account->id . '/all');
+
+        // get oldest and newest journal for account:
+        $start = $repository->oldestJournalDate($account);
+        $end   = $repository->newestJournalDate($account);
+
+        // same call, except "entries".
+        return view('accounts.show', compact('account', 'subTitleIcon', 'journals', 'subTitle', 'start', 'end', 'chartUri'));
+    }
+
+    /**
+     * @param Request $request
+     * @param Account $account
+     * @param string  $date
+     *
+     * @return View
+     */
+    public function showByDate(Request $request, Account $account, string $date)
+    {
+        $carbon      = new Carbon($date);
+        $range       = Preferences::get('viewRange', '1M')->data;
+        $start       = Navigation::startOfPeriod($carbon, $range);
+        $end         = Navigation::endOfPeriod($carbon, $range);
+        $subTitle    = $account->name . ' (' . Navigation::periodShow($start, $range) . ')';
+        $page        = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
+        $pageSize    = intval(Preferences::get('transactionPageSize', 50)->data);
+        $chartUri    = route('chart.account.period', [$account->id, $carbon->format('Y-m-d')]);
+        $accountType = $account->accountType->type;
+
+        // replace with journal collector:
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class, [auth()->user()]);
+        $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->setLimit($pageSize)->setPage($page);
+        $journals = $collector->getPaginatedJournals();
+        $journals->setPath('accounts/show/' . $account->id . '/' . $date);
+
+        // generate entries for each period (and cache those)
+        $entries = $this->periodEntries($account);
+
+        // same call, except "entries".
+        return view('accounts.show', compact('account', 'accountType', 'entries', 'subTitleIcon', 'journals', 'subTitle', 'start', 'end', 'chartUri'));
+    }
+
+    /**
+     * @param AccountFormRequest $request
+     * @param ARI                $repository
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     *
+     */
+    public function store(AccountFormRequest $request, ARI $repository)
+    {
+        $data    = $request->getAccountData();
+        $account = $repository->store($data);
+
+        Session::flash('success', strval(trans('firefly.stored_new_account', ['name' => $account->name])));
+        Preferences::mark();
+
+        // update preferences if necessary:
+        $frontPage = Preferences::get('frontPageAccounts', [])->data;
+        if (count($frontPage) > 0) {
+            $frontPage[] = $account->id;
+            Preferences::set('frontPageAccounts', $frontPage);
+        }
+
+        if (intval($request->get('create_another')) === 1) {
+            // set value so create routine will not overwrite URL:
+            Session::put('accounts.create.fromStore', true);
+
+            return redirect(route('accounts.create', [$request->input('what')]))->withInput();
+        }
+
+        // redirect to previous URL.
+        return redirect(session('accounts.create.url'));
+    }
+
+    /**
+     * @param AccountFormRequest $request
+     * @param ARI                $repository
+     * @param Account            $account
+     *
+     * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function update(AccountFormRequest $request, ARI $repository, Account $account)
+    {
+        $data = $request->getAccountData();
+        $repository->update($account, $data);
+
+        Session::flash('success', strval(trans('firefly.updated_account', ['name' => $account->name])));
+        Preferences::mark();
+
+        if (intval($request->get('return_to_edit')) === 1) {
+            // set value so edit routine will not overwrite URL:
+            Session::put('accounts.edit.fromUpdate', true);
+
+            return redirect(route('accounts.edit', [$account->id]))->withInput(['return_to_edit' => 1]);
+        }
+
+        // redirect to previous URL.
+        return redirect(session('accounts.edit.url'));
+
+    }
+
+
+    /**
+     * @param array $array
+     * @param int   $entryId
+     *
+     * @return null|mixed
+     */
+    protected function isInArray(array $array, int $entryId)
+    {
+        if (isset($array[$entryId])) {
+            return $array[$entryId];
+        }
+
+        return '0';
+    }
+
+    /**
+     * This method returns "period entries", so nov-2015, dec-2015, etc etc (this depends on the users session range)
+     * and for each period, the amount of money spent and earned. This is a complex operation which is cached for
+     * performance reasons.
+     *
+     * @param Account $account The account involved.
+     *
+     * @return Collection
+     */
+    private function periodEntries(Account $account): Collection
+    {
+        /** @var ARI $repository */
+        $repository = app(ARI::class);
+        /** @var AccountTaskerInterface $tasker */
+        $tasker = app(AccountTaskerInterface::class);
+
+        $start   = $repository->oldestJournalDate($account);
+        $range   = Preferences::get('viewRange', '1M')->data;
+        $start   = Navigation::startOfPeriod($start, $range);
+        $end     = Navigation::endOfX(new Carbon, $range);
+        $entries = new Collection;
+
+        // properties for cache
+        $cache = new CacheProperties;
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('account-show-period-entries');
+        $cache->addProperty($account->id);
+
+        if ($cache->has()) {
+            Log::debug('Entries are cached, return cache.');
+
+            return $cache->get();
+        }
+
+        // only include asset accounts when this account is an asset:
+        $assets = new Collection;
+        if (in_array($account->accountType->type, [AccountType::ASSET, AccountType::DEFAULT])) {
+            $assets = $repository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT]);
+        }
+        Log::debug('Going to get period expenses and incomes.');
+        while ($end >= $start) {
+            $end        = Navigation::startOfPeriod($end, $range);
+            $currentEnd = Navigation::endOfPeriod($end, $range);
+            $spent      = $tasker->amountOutInPeriod(new Collection([$account]), $assets, $end, $currentEnd);
+            $earned     = $tasker->amountInInPeriod(new Collection([$account]), $assets, $end, $currentEnd);
+            $dateStr    = $end->format('Y-m-d');
+            $dateName   = Navigation::periodShow($end, $range);
+            $entries->push([$dateStr, $dateName, $spent, $earned, clone $end]);
+            $end = Navigation::subtractPeriod($end, $range, 1);
+
+        }
+        $cache->store($entries);
+
+        return $entries;
+    }
+
+    /**
+     * @param Account $account
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @throws FireflyException
+     */
+    private function redirectToOriginalAccount(Account $account)
+    {
+        /** @var Transaction $transaction */
+        $transaction = $account->transactions()->first();
+        if (is_null($transaction)) {
+            throw new FireflyException('Expected a transaction. This account has none. BEEP, error.');
+        }
+
+        $journal = $transaction->transactionJournal;
+        /** @var Transaction $opposingTransaction */
+        $opposingTransaction = $journal->transactions()->where('transactions.id', '!=', $transaction->id)->first();
+
+        if (is_null($opposingTransaction)) {
+            throw new FireflyException('Expected an opposing transaction. This account has none. BEEP, error.');
+        }
+
+        return redirect(route('accounts.show', [$opposingTransaction->account_id]));
+    }
+}

app/Http/Controllers/Admin/ConfigurationController.php

@@ -0,0 +1,93 @@
+<?php
+/**
+ * ConfigurationController.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers\Admin;
+
+
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Http\Requests\ConfigurationRequest;
+use FireflyIII\Support\Facades\FireflyConfig;
+use Preferences;
+use Redirect;
+use Session;
+use View;
+
+/**
+ * Class ConfigurationController
+ *
+ * @package FireflyIII\Http\Controllers\Admin
+ */
+class ConfigurationController extends Controller
+{
+    /**
+     * ConfigurationController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+
+        $this->middleware(
+            function ($request, $next) {
+                View::share('title', strval(trans('firefly.administration')));
+                View::share('mainTitleIcon', 'fa-hand-spock-o');
+
+                return $next($request);
+            }
+        );
+
+    }
+
+    /**
+     * @return View
+     */
+    public function index()
+    {
+        $subTitle     = strval(trans('firefly.instance_configuration'));
+        $subTitleIcon = 'fa-wrench';
+
+        // all available configuration and their default value in case
+        // they don't exist yet.
+        $singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
+        $isDemoSite     = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
+        $siteOwner      = env('SITE_OWNER');
+
+        return view(
+            'admin.configuration.index',
+            compact('subTitle', 'subTitleIcon', 'singleUserMode', 'isDemoSite', 'siteOwner')
+        );
+
+    }
+
+    /**
+     * @param ConfigurationRequest $request
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postIndex(ConfigurationRequest $request)
+    {
+        // get config values:
+        $data = $request->getConfigurationData();
+
+        // store config values
+        FireflyConfig::set('single_user_mode', $data['single_user_mode']);
+        FireflyConfig::set('is_demo_site', $data['is_demo_site']);
+
+        // flash message
+        Session::flash('success', strval(trans('firefly.configuration_updated')));
+        Preferences::mark();
+
+        return Redirect::route('admin.configuration.index');
+    }
+
+}

app/Http/Controllers/Admin/HomeController.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * HomeController.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers\Admin;
+
+
+use FireflyIII\Http\Controllers\Controller;
+
+/**
+ * Class HomeController
+ *
+ * @package FireflyIII\Http\Controllers\Admin
+ */
+class HomeController extends Controller
+{
+    /**
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function index()
+    {
+        $title         = strval(trans('firefly.administration'));
+        $mainTitleIcon = 'fa-hand-spock-o';
+
+        return view('admin.index', compact('title', 'mainTitleIcon'));
+    }
+
+}

app/Http/Controllers/Admin/UserController.php

@@ -0,0 +1,164 @@
+<?php
+/**
+ * UserController.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers\Admin;
+
+
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Http\Requests\UserFormRequest;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\User;
+use Preferences;
+use Session;
+use URL;
+use View;
+
+/**
+ * Class UserController
+ *
+ * @package FireflyIII\Http\Controllers\Admin
+ */
+class UserController extends Controller
+{
+    /**
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+
+        $this->middleware(
+            function ($request, $next) {
+                View::share('title', strval(trans('firefly.administration')));
+                View::share('mainTitleIcon', 'fa-hand-spock-o');
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param User $user
+     *
+     * @return View
+     */
+    public function edit(User $user)
+    {
+        // put previous url in session if not redirect from store (not "return_to_edit").
+        if (session('users.edit.fromUpdate') !== true) {
+            Session::put('users.edit.url', URL::previous());
+        }
+        Session::forget('users.edit.fromUpdate');
+
+        $subTitle     = strval(trans('firefly.edit_user', ['email' => $user->email]));
+        $subTitleIcon = 'fa-user-o';
+        $codes        = [
+            ''        => strval(trans('firefly.no_block_code')),
+            'bounced' => strval(trans('firefly.block_code_bounced')),
+            'expired' => strval(trans('firefly.block_code_expired')),
+        ];
+
+        return view('admin.users.edit', compact('user', 'subTitle', 'subTitleIcon', 'codes'));
+
+    }
+
+    /**
+     * @param UserRepositoryInterface $repository
+     *
+     * @return View
+     */
+    public function index(UserRepositoryInterface $repository)
+    {
+        $subTitle     = strval(trans('firefly.user_administration'));
+        $subTitleIcon = 'fa-users';
+        $users        = $repository->all();
+
+        // add meta stuff.
+        $users->each(
+            function (User $user) {
+                $list          = ['twoFactorAuthEnabled', 'twoFactorAuthSecret'];
+                $preferences   = Preferences::getArrayForUser($user, $list);
+                $user->isAdmin = $user->hasRole('owner');
+                $is2faEnabled  = $preferences['twoFactorAuthEnabled'] === true;
+                $has2faSecret  = !is_null($preferences['twoFactorAuthSecret']);
+                $user->has2FA  = ($is2faEnabled && $has2faSecret) ? true : false;
+                $user->prefs   = $preferences;
+            }
+        );
+
+
+        return view('admin.users.index', compact('subTitle', 'subTitleIcon', 'users'));
+
+    }
+
+    /**
+     * @param UserRepositoryInterface $repository
+     * @param User                    $user
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function show(UserRepositoryInterface $repository, User $user)
+    {
+        $title         = strval(trans('firefly.administration'));
+        $mainTitleIcon = 'fa-hand-spock-o';
+        $subTitle      = strval(trans('firefly.single_user_administration', ['email' => $user->email]));
+        $subTitleIcon  = 'fa-user';
+        $information   = $repository->getUserData($user);
+
+        return view(
+            'admin.users.show',
+            compact(
+                'title', 'mainTitleIcon', 'subTitle', 'subTitleIcon', 'information', 'user'
+            )
+        );
+    }
+
+    /**
+     * @param UserFormRequest $request
+     * @param User            $user
+     *
+     * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function update(UserFormRequest $request, User $user)
+    {
+        $data = $request->getUserData();
+
+        // update password
+        if (strlen($data['password']) > 0) {
+            $user->password = bcrypt($data['password']);
+            $user->save();
+        }
+
+        // change blocked status and code:
+        $user->blocked      = $data['blocked'];
+        $user->blocked_code = $data['blocked_code'];
+        $user->save();
+
+        Session::flash('success', strval(trans('firefly.updated_user', ['email' => $user->email])));
+        Preferences::mark();
+
+        if (intval($request->get('return_to_edit')) === 1) {
+            // set value so edit routine will not overwrite URL:
+            Session::put('users.edit.fromUpdate', true);
+
+            return redirect(route('admin.users.edit', [$user->id]))->withInput(['return_to_edit' => 1]);
+        }
+
+        // redirect to previous URL.
+        return redirect(session('users.edit.url'));
+
+    }
+
+
+}

app/Http/Controllers/AttachmentController.php

@@ -0,0 +1,183 @@
+<?php
+/**
+ * AttachmentController.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers;
+
+use File;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Http\Requests\AttachmentFormRequest;
+use FireflyIII\Models\Attachment;
+use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
+use Preferences;
+use Response;
+use Session;
+use URL;
+use View;
+
+/**
+ * Class AttachmentController
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects) // it's 13.
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class AttachmentController extends Controller
+{
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        // translations:
+        $this->middleware(
+            function ($request, $next) {
+                View::share('mainTitleIcon', 'fa-paperclip');
+                View::share('title', trans('firefly.attachments'));
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param Attachment $attachment
+     *
+     * @return View
+     */
+    public function delete(Attachment $attachment)
+    {
+        $subTitle = trans('firefly.delete_attachment', ['name' => $attachment->filename]);
+
+        // put previous url in session
+        Session::put('attachments.delete.url', URL::previous());
+        Session::flash('gaEventCategory', 'attachments');
+        Session::flash('gaEventAction', 'delete-attachment');
+
+        return view('attachments.delete', compact('attachment', 'subTitle'));
+    }
+
+    /**
+     * @param AttachmentRepositoryInterface $repository
+     * @param Attachment                    $attachment
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy(AttachmentRepositoryInterface $repository, Attachment $attachment)
+    {
+        $name = $attachment->filename;
+
+        $repository->destroy($attachment);
+
+        Session::flash('success', strval(trans('firefly.attachment_deleted', ['name' => $name])));
+        Preferences::mark();
+
+        return redirect(session('attachments.delete.url'));
+    }
+
+    /**
+     * @param AttachmentRepositoryInterface $repository
+     * @param Attachment                    $attachment
+     *
+     * @return mixed
+     * @throws FireflyException
+     */
+    public function download(AttachmentRepositoryInterface $repository, Attachment $attachment)
+    {
+        if ($repository->exists($attachment)) {
+            $content = $repository->getContent($attachment);
+            $quoted  = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));
+
+            return response($content, 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', strlen($content));
+        }
+        throw new FireflyException('Could not find the indicated attachment. The file is no longer there.');
+    }
+
+    /**
+     * @param Attachment $attachment
+     *
+     * @return 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('attachments.edit.fromUpdate') !== true) {
+            Session::put('attachments.edit.url', URL::previous());
+        }
+        Session::forget('attachments.edit.fromUpdate');
+
+        return view('attachments.edit', compact('attachment', 'subTitleIcon', 'subTitle'));
+    }
+
+    /**
+     * @param Attachment $attachment
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function preview(Attachment $attachment)
+    {
+        $image = 'images/page_green.png';
+
+        if ($attachment->mime == 'application/pdf') {
+            $image = 'images/page_white_acrobat.png';
+        }
+        $file     = public_path($image);
+        $response = Response::make(File::get($file));
+        $response->header('Content-Type', 'image/png');
+
+        return $response;
+    }
+
+
+    /**
+     * @param AttachmentFormRequest         $request
+     * @param AttachmentRepositoryInterface $repository
+     * @param Attachment                    $attachment
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function update(AttachmentFormRequest $request, AttachmentRepositoryInterface $repository, Attachment $attachment)
+    {
+        $data = $request->getAttachmentData();
+        $repository->update($attachment, $data);
+
+        Session::flash('success', strval(trans('firefly.attachment_updated', ['name' => $attachment->filename])));
+        Preferences::mark();
+
+        if (intval($request->get('return_to_edit')) === 1) {
+            // set value so edit routine will not overwrite URL:
+            Session::put('attachments.edit.fromUpdate', true);
+
+            return redirect(route('attachments.edit', [$attachment->id]))->withInput(['return_to_edit' => 1]);
+        }
+
+        // redirect to previous URL.
+        return redirect(session('attachments.edit.url'));
+
+    }
+
+}

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ * ForgotPasswordController.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers\Auth;
+
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\User;
+use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
+use Illuminate\Http\Request;
+use Password;
+
+/**
+ * Class ForgotPasswordController
+ *
+ * @package FireflyIII\Http\Controllers\Auth
+ */
+class ForgotPasswordController extends Controller
+{
+    use SendsPasswordResetEmails;
+
+    /**
+     * Create a new controller instance.
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware('guest');
+    }
+
+    /**
+     * Send a reset link to the given user.
+     *
+     * @param  Request $request
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function sendResetLinkEmail(Request $request)
+    {
+        $this->validate($request, ['email' => 'required|email']);
+
+        // verify if the user is not a demo user. If so, we give him back an error.
+        $user = User::where('email', $request->get('email'))->first();
+        if (!is_null($user) && $user->hasRole('demo')) {
+            return back()->withErrors(
+                ['email' => trans('firefly.cannot_reset_demo_user')]
+            );
+        }
+
+        $response = $this->broker()->sendResetLink(
+            $request->only('email')
+        );
+
+        if ($response === Password::RESET_LINK_SENT) {
+            return back()->with('status', trans($response));
+        }
+
+        // If an error was returned by the password broker, we will get this message
+        // translated so we can notify a user of the problem. We'll redirect back
+        // to where the users came from so they can attempt this process again.
+        return back()->withErrors(
+            ['email' => trans($response)]
+        );
+    }
+}

app/Http/Controllers/Auth/LoginController.php

@@ -0,0 +1,160 @@
+<?php
+/**
+ * LoginController.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers\Auth;
+
+use Config;
+use FireflyConfig;
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\User;
+use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Http\Request;
+use Lang;
+
+/**
+ * Class LoginController
+ *
+ * @package FireflyIII\Http\Controllers\Auth
+ */
+class LoginController extends Controller
+{
+
+    use AuthenticatesUsers;
+
+    /**
+     * Where to redirect users after login / registration.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/';
+
+    /**
+     * Create a new controller instance.
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware('guest', ['except' => 'logout']);
+    }
+
+    /**
+     * Handle a login request to the application.
+     *
+     * @param Request $request
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response
+     */
+    public function login(Request $request)
+    {
+        $this->validateLogin($request);
+        $lockedOut = $this->hasTooManyLoginAttempts($request);
+        if ($lockedOut) {
+            $this->fireLockoutEvent($request);
+
+            return $this->sendLockoutResponse($request);
+        }
+
+        $credentials            = $this->credentials($request);
+        $credentials['blocked'] = 0; // must not be blocked.
+
+        if ($this->guard()->attempt($credentials, $request->has('remember'))) {
+            return $this->sendLoginResponse($request);
+        }
+
+        $errorMessage = $this->getBlockedError($credentials['email']);
+
+        if (!$lockedOut) {
+            $this->incrementLoginAttempts($request);
+        }
+
+        return $this->sendFailedLoginResponse($request, $errorMessage);
+    }
+
+    /**
+     * Show the application login form.
+     *
+     * @param Request $request
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function showLoginForm(Request $request)
+    {
+        // is allowed to?
+        $singleUserMode    = FireflyConfig::get('single_user_mode', Config::get('firefly.configuration.single_user_mode'))->data;
+        $userCount         = User::count();
+        $allowRegistration = true;
+        if ($singleUserMode === true && $userCount > 0) {
+            $allowRegistration = false;
+        }
+
+        $email    = $request->old('email');
+        $remember = $request->old('remember');
+
+        return view('auth.login', compact('allowRegistration', 'email', 'remember'));
+    }
+
+    /**
+     * Get the failed login message.
+     *
+     * @param string $message
+     *
+     * @return string
+     */
+    protected function getFailedLoginMessage(string $message)
+    {
+        if (strlen($message) > 0) {
+            return $message;
+        }
+
+        return Lang::has('auth.failed') ? Lang::get('auth.failed') : 'These credentials do not match our records.';
+    }
+
+    /**
+     * Get the failed login response instance.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param string                   $message
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    protected function sendFailedLoginResponse(Request $request, string $message)
+    {
+        return redirect()->back()
+                         ->withInput($request->only($this->username(), 'remember'))
+                         ->withErrors(
+                             [
+                                 $this->username() => $this->getFailedLoginMessage($message),
+                             ]
+                         );
+    }
+
+    /**
+     * @param string $email
+     *
+     * @return string
+     */
+    private function getBlockedError(string $email): string
+    {
+        // check if user is blocked:
+        $errorMessage = '';
+        /** @var User $foundUser */
+        $foundUser = User::where('email', $email)->where('blocked', 1)->first();
+        if (!is_null($foundUser)) {
+            // user exists, but is blocked:
+            $code         = strlen(strval($foundUser->blocked_code)) > 0 ? $foundUser->blocked_code : 'general_blocked';
+            $errorMessage = strval(trans('firefly.' . $code . '_error', ['email' => $email]));
+        }
+
+        return $errorMessage;
+    }
+}

app/Http/Controllers/Auth/PasswordController.php

@@ -0,0 +1,86 @@
+<?php
+/**
+ * PasswordController.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+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
+ *
+ * @package FireflyIII\Http\Controllers\Auth
+ * @method getEmailSubject()
+ * @method getSendResetLinkEmailSuccessResponse(string $response)
+ * @method getSendResetLinkEmailFailureResponse(string $response)
+ */
+class PasswordController extends Controller
+{
+
+    use ResetsPasswords;
+
+    /**
+     * Create a new password controller instance.
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->middleware('guest');
+    }
+
+    /**
+     * Send a reset link to the given user.
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's 7 but ok
+     *
+     * @param  \Illuminate\Http\Request $request
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function sendResetLinkEmail(Request $request)
+    {
+        $this->validate($request, ['email' => 'required|email']);
+
+        $user     = User::whereEmail($request->get('email'))->first();
+        $response = 'passwords.blocked';
+
+        if (is_null($user)) {
+            $response = Password::INVALID_USER;
+        }
+
+        if (!is_null($user) && intval($user->blocked) === 0) {
+            $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/Auth/RegisterController.php

@@ -0,0 +1,149 @@
+<?php
+/**
+ * RegisterController.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers\Auth;
+
+use Auth;
+use Config;
+use FireflyConfig;
+use FireflyIII\Events\RegisteredUser;
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\User;
+use Illuminate\Foundation\Auth\RegistersUsers;
+use Illuminate\Http\Request;
+use Session;
+use Validator;
+
+/**
+ * Class RegisterController
+ *
+ * @package FireflyIII\Http\Controllers\Auth
+ */
+class RegisterController extends Controller
+{
+
+    use RegistersUsers;
+
+    /**
+     * Where to redirect users after login / registration.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/home';
+
+    /**
+     * Create a new controller instance.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware('guest');
+    }
+
+    /**
+     * @param Request $request
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
+     */
+    public function register(Request $request)
+    {
+        // is allowed to?
+        $singleUserMode = FireflyConfig::get('single_user_mode', Config::get('firefly.configuration.single_user_mode'))->data;
+        $userCount      = User::count();
+        if ($singleUserMode === true && $userCount > 0) {
+            $message = 'Registration is currently not available.';
+
+            return view('error', compact('message'));
+        }
+
+
+        $validator = $this->validator($request->all());
+
+        if ($validator->fails()) {
+            $this->throwValidationException($request, $validator);
+        }
+
+        $user = $this->create($request->all());
+
+        // trigger user registration event:
+        event(new RegisteredUser($user, $request->ip()));
+
+        Auth::login($user);
+
+        Session::flash('success', strval(trans('firefly.registered')));
+        Session::flash('gaEventCategory', 'user');
+        Session::flash('gaEventAction', 'new-registration');
+
+        return redirect($this->redirectPath());
+    }
+
+    /**
+     * OLD
+     * Show the application registration form.
+     *
+     * @param Request $request
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function showRegistrationForm(Request $request)
+    {
+        // is demo site?
+        $isDemoSite = FireflyConfig::get('is_demo_site', Config::get('firefly.configuration.is_demo_site'))->data;
+
+        // is allowed to?
+        $singleUserMode = FireflyConfig::get('single_user_mode', Config::get('firefly.configuration.single_user_mode'))->data;
+        $userCount      = User::count();
+        if ($singleUserMode === true && $userCount > 0) {
+            $message = 'Registration is currently not available.';
+
+            return view('error', compact('message'));
+        }
+
+        $email = $request->old('email');
+
+        return view('auth.register', compact('isDemoSite', 'email'));
+    }
+
+    /**
+     * Create a new user instance after a valid registration.
+     *
+     * @param  array $data
+     *
+     * @return User
+     */
+    protected function create(array $data)
+    {
+        return User::create(
+            [
+                'email'    => $data['email'],
+                'password' => bcrypt($data['password']),
+            ]
+        );
+    }
+
+    /**
+     * 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|min:6|confirmed',
+                 ]
+        );
+    }
+}

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * ResetPasswordController.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers\Auth;
+
+use FireflyIII\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\ResetsPasswords;
+
+/**
+ * Class ResetPasswordController
+ *
+ * @package FireflyIII\Http\Controllers\Auth
+ */
+class ResetPasswordController extends Controller
+{
+
+    use ResetsPasswords;
+
+    /**
+     * Create a new controller instance.
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->middleware('guest');
+    }
+}

app/Http/Controllers/Auth/TwoFactorController.php

@@ -0,0 +1,91 @@
+<?php
+/**
+ * TwoFactorController.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers\Auth;
+
+use Carbon\Carbon;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Http\Requests\TokenFormRequest;
+use Log;
+use Preferences;
+use Session;
+
+/**
+ * Class TwoFactorController
+ *
+ * @package FireflyIII\Http\Controllers\Auth
+ */
+class TwoFactorController extends Controller
+{
+
+    /**
+     * @return mixed
+     * @throws FireflyException
+     */
+    public function index()
+    {
+        $user = auth()->user();
+
+        // to make sure the validator in the next step gets the secret, we push it in session
+        $secret = Preferences::get('twoFactorAuthSecret', null)->data;
+        $title  = strval(trans('firefly.two_factor_title'));
+
+        // make sure the user has two factor configured:
+        $has2FA = Preferences::get('twoFactorAuthEnabled', null)->data;
+        if (is_null($has2FA) || $has2FA === false) {
+            return redirect(route('index'));
+        }
+
+        if (strlen(strval($secret)) === 0) {
+            throw new FireflyException('Your two factor authentication secret is empty, which it cannot be at this point. Please check the log files.');
+        }
+        Session::flash('two-factor-secret', $secret);
+
+        return view('auth.two-factor', compact('user', 'title'));
+    }
+
+    /**
+     * @return mixed
+     * @throws FireflyException
+     */
+    public function lostTwoFactor()
+    {
+        $user      = auth()->user();
+        $siteOwner = env('SITE_OWNER', '');
+        $title     = strval(trans('firefly.two_factor_forgot_title'));
+
+        Log::info(
+            'To reset the two factor authentication for user #' . $user->id .
+            ' (' . $user->email . '), simply open the "preferences" table and delete the entries with the names "twoFactorAuthEnabled" and' .
+            ' "twoFactorAuthSecret" for user_id ' . $user->id . '. That will take care of it.'
+        );
+
+        return view('auth.lost-two-factor', compact('user', 'siteOwner', 'title'));
+    }
+
+    /**
+     * @param TokenFormRequest $request
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter) // it's unused but the class does some validation.
+     *
+     * @return mixed
+     */
+    public function postIndex(TokenFormRequest $request)
+    {
+        Session::put('twofactor-authenticated', true);
+        Session::put('twofactor-authenticated-date', new Carbon);
+
+        return redirect(route('home'));
+    }
+
+}

app/Http/Controllers/BillController.php

@@ -0,0 +1,283 @@
+<?php
+/**
+ * BillController.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers;
+
+use Carbon\Carbon;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Http\Requests\BillFormRequest;
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+use Preferences;
+use Session;
+use URL;
+use View;
+
+/**
+ * Class BillController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class BillController extends Controller
+{
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+
+        $this->middleware(
+            function ($request, $next) {
+                View::share('title', trans('firefly.bills'));
+                View::share('mainTitleIcon', 'fa-calendar-o');
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @return View
+     */
+    public function create()
+    {
+        $periods = [];
+        foreach (config('firefly.bill_periods') as $current) {
+            $periods[$current] = trans('firefly.' . $current);
+        }
+        $subTitle = trans('firefly.create_new_bill');
+
+
+        // put previous url in session if not redirect from store (not "create another").
+        if (session('bills.create.fromStore') !== true) {
+            Session::put('bills.create.url', URL::previous());
+        }
+        Session::forget('bills.create.fromStore');
+        Session::flash('gaEventCategory', 'bills');
+        Session::flash('gaEventAction', 'create');
+
+        return view('bills.create', compact('periods', 'subTitle'));
+    }
+
+    /**
+     * @param Bill $bill
+     *
+     * @return View
+     */
+    public function delete(Bill $bill)
+    {
+        // put previous url in session
+        Session::put('bills.delete.url', URL::previous());
+        Session::flash('gaEventCategory', 'bills');
+        Session::flash('gaEventAction', 'delete');
+        $subTitle = trans('firefly.delete_bill', ['name' => $bill->name]);
+
+        return view('bills.delete', compact('bill', 'subTitle'));
+    }
+
+    /**
+     * @param BillRepositoryInterface $repository
+     * @param Bill                    $bill
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy(BillRepositoryInterface $repository, Bill $bill)
+    {
+        $name   = $bill->name;
+        $billId = $bill->id;
+        $repository->destroy($bill);
+
+        Session::flash('success', strval(trans('firefly.deleted_bill', ['name' => $name])));
+        Preferences::mark();
+
+        $uri = session('bills.delete.url');
+        if (!(strpos($uri, sprintf('bills/show/%s', $billId)) === false)) {
+            // uri would point back to bill
+            $uri = route('bills.index');
+        }
+
+        return redirect($uri);
+    }
+
+    /**
+     * @param Bill $bill
+     *
+     * @return View
+     */
+    public function edit(Bill $bill)
+    {
+        $periods = [];
+        foreach (config('firefly.bill_periods') as $current) {
+            $periods[$current] = trans('firefly.' . $current);
+        }
+        $subTitle = trans('firefly.edit_bill', ['name' => $bill->name]);
+
+        // put previous url in session if not redirect from store (not "return_to_edit").
+        if (session('bills.edit.fromUpdate') !== true) {
+            Session::put('bills.edit.url', URL::previous());
+        }
+        Session::forget('bills.edit.fromUpdate');
+        Session::flash('gaEventCategory', 'bills');
+        Session::flash('gaEventAction', 'edit');
+
+        return view('bills.edit', compact('subTitle', 'periods', 'bill'));
+    }
+
+    /**
+     * @param BillRepositoryInterface $repository
+     *
+     * @return View
+     */
+    public function index(BillRepositoryInterface $repository)
+    {
+        /** @var Carbon $start */
+        $start = session('start');
+        /** @var Carbon $end */
+        $end = session('end');
+
+        $bills = $repository->getBills();
+        $bills->each(
+            function (Bill $bill) use ($repository, $start, $end) {
+
+                // paid in this period?
+                $bill->paidDates = $repository->getPaidDatesInRange($bill, $start, $end);
+                $bill->payDates  = $repository->getPayDatesInRange($bill, $start, $end);
+                $lastDate        = clone $start;
+                if ($bill->paidDates->count() >= $bill->payDates->count()) {
+                    $lastDate = $end;
+                }
+                $bill->nextExpectedMatch = $repository->nextExpectedMatch($bill, $lastDate);
+            }
+        );
+
+        return view('bills.index', compact('bills'));
+    }
+
+    /**
+     * @param BillRepositoryInterface $repository
+     * @param Bill                    $bill
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function rescan(BillRepositoryInterface $repository, Bill $bill)
+    {
+        if (intval($bill->active) == 0) {
+            Session::flash('warning', strval(trans('firefly.cannot_scan_inactive_bill')));
+
+            return redirect(URL::previous());
+        }
+
+        $journals = $repository->getPossiblyRelatedJournals($bill);
+        /** @var TransactionJournal $journal */
+        foreach ($journals as $journal) {
+            $repository->scan($bill, $journal);
+        }
+
+
+        Session::flash('success', strval(trans('firefly.rescanned_bill')));
+        Preferences::mark();
+
+        return redirect(URL::previous());
+    }
+
+    /**
+     * @param Request                 $request
+     * @param BillRepositoryInterface $repository
+     * @param Bill                    $bill
+     *
+     * @return View
+     */
+    public function show(Request $request, BillRepositoryInterface $repository, Bill $bill)
+    {
+        /** @var Carbon $date */
+        $date           = session('start');
+        $year           = $date->year;
+        $page           = intval($request->get('page')) == 0 ? 1 : intval($request->get('page'));
+        $pageSize       = intval(Preferences::get('transactionPageSize', 50)->data);
+        $yearAverage    = $repository->getYearAverage($bill, $date);
+        $overallAverage = $repository->getOverallAverage($bill);
+
+        // use collector:
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class, [auth()->user()]);
+        $collector->setAllAssetAccounts()->setBills(new Collection([$bill]))->setLimit($pageSize)->setPage($page)->withBudgetInformation()
+                  ->withCategoryInformation();
+        $journals = $collector->getPaginatedJournals();
+        $journals->setPath('/bills/show/' . $bill->id);
+
+        $bill->nextExpectedMatch = $repository->nextExpectedMatch($bill, new Carbon);
+        $hideBill                = true;
+        $subTitle                = e($bill->name);
+
+        return view('bills.show', compact('journals', 'yearAverage', 'overallAverage', 'year', 'hideBill', 'bill', 'subTitle'));
+    }
+
+    /**
+     * @param BillFormRequest         $request
+     * @param BillRepositoryInterface $repository
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store(BillFormRequest $request, BillRepositoryInterface $repository)
+    {
+        $billData = $request->getBillData();
+        $bill     = $repository->store($billData);
+        Session::flash('success', strval(trans('firefly.stored_new_bill', ['name' => e($bill->name)])));
+        Preferences::mark();
+
+        if (intval($request->get('create_another')) === 1) {
+            // set value so create routine will not overwrite URL:
+            Session::put('bills.create.fromStore', true);
+
+            return redirect(route('bills.create'))->withInput();
+        }
+
+        // redirect to previous URL.
+        return redirect(session('bills.create.url'));
+
+    }
+
+    /**
+     * @param BillFormRequest         $request
+     * @param BillRepositoryInterface $repository
+     * @param Bill                    $bill
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function update(BillFormRequest $request, BillRepositoryInterface $repository, Bill $bill)
+    {
+        $billData = $request->getBillData();
+        $bill     = $repository->update($bill, $billData);
+
+        Session::flash('success', strval(trans('firefly.updated_bill', ['name' => e($bill->name)])));
+        Preferences::mark();
+
+        if (intval($request->get('return_to_edit')) === 1) {
+            // set value so edit routine will not overwrite URL:
+            Session::put('bills.edit.fromUpdate', true);
+
+            return redirect(route('bills.edit', [$bill->id]))->withInput(['return_to_edit' => 1]);
+        }
+
+        // redirect to previous URL.
+        return redirect(session('bills.edit.url'));
+
+    }
+
+}

app/Http/Controllers/BudgetController.php

@@ -0,0 +1,456 @@
+<?php
+/**
+ * BudgetController.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers;
+
+use Amount;
+use Carbon\Carbon;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Http\Requests\BudgetFormRequest;
+use FireflyIII\Http\Requests\BudgetIncomeRequest;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Support\CacheProperties;
+use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+use Preferences;
+use Response;
+use Session;
+use URL;
+use View;
+
+/**
+ * Class BudgetController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class BudgetController extends Controller
+{
+
+    /** @var  BudgetRepositoryInterface */
+    private $repository;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        View::share('hideBudgets', true);
+
+        $this->middleware(
+            function ($request, $next) {
+                View::share('title', trans('firefly.budgets'));
+                View::share('mainTitleIcon', 'fa-tasks');
+                $this->repository = app(BudgetRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param Request $request
+     * @param Budget  $budget
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function amount(Request $request, Budget $budget)
+    {
+        $amount = intval($request->get('amount'));
+        /** @var Carbon $start */
+        $start = session('start', Carbon::now()->startOfMonth());
+        /** @var Carbon $end */
+        $end         = session('end', Carbon::now()->endOfMonth());
+        $budgetLimit = $this->repository->updateLimitAmount($budget, $start, $end, $amount);
+        if ($amount == 0) {
+            $budgetLimit = null;
+        }
+        Preferences::mark();
+
+        return Response::json(['name' => $budget->name, 'limit' => $budgetLimit ? $budgetLimit->id : 0, 'amount' => $amount]);
+
+    }
+
+    /**
+     * @return View
+     */
+    public function create()
+    {
+        // put previous url in session if not redirect from store (not "create another").
+        if (session('budgets.create.fromStore') !== true) {
+            Session::put('budgets.create.url', URL::previous());
+        }
+        Session::forget('budgets.create.fromStore');
+        Session::flash('gaEventCategory', 'budgets');
+        Session::flash('gaEventAction', 'create');
+        $subTitle = (string)trans('firefly.create_new_budget');
+
+        return view('budgets.create', compact('subTitle'));
+    }
+
+    /**
+     * @param Budget $budget
+     *
+     * @return View
+     */
+    public function delete(Budget $budget)
+    {
+        $subTitle = trans('firefly.delete_budget', ['name' => $budget->name]);
+
+        // put previous url in session
+        Session::put('budgets.delete.url', URL::previous());
+        Session::flash('gaEventCategory', 'budgets');
+        Session::flash('gaEventAction', 'delete');
+
+        return view('budgets.delete', compact('budget', 'subTitle'));
+    }
+
+    /**
+     * @param Budget $budget
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy(Budget $budget)
+    {
+
+        $name     = $budget->name;
+        $budgetId = $budget->id;
+        $this->repository->destroy($budget);
+
+
+        Session::flash('success', strval(trans('firefly.deleted_budget', ['name' => e($name)])));
+        Preferences::mark();
+
+        $uri = session('budgets.delete.url');
+        if (!(strpos($uri, sprintf('budgets/show/%s', $budgetId)) === false)) {
+            // uri would point back to budget
+            $uri = route('budgets.index');
+        }
+
+        return redirect($uri);
+    }
+
+    /**
+     * @param Budget $budget
+     *
+     * @return View
+     */
+    public function edit(Budget $budget)
+    {
+        $subTitle = trans('firefly.edit_budget', ['name' => $budget->name]);
+
+        // put previous url in session if not redirect from store (not "return_to_edit").
+        if (session('budgets.edit.fromUpdate') !== true) {
+            Session::put('budgets.edit.url', URL::previous());
+        }
+        Session::forget('budgets.edit.fromUpdate');
+        Session::flash('gaEventCategory', 'budgets');
+        Session::flash('gaEventAction', 'edit');
+
+        return view('budgets.edit', compact('budget', 'subTitle'));
+
+    }
+
+    /**
+     * @return View
+     */
+    public function index()
+    {
+        $this->repository->cleanupBudgets();
+
+        $budgets           = $this->repository->getActiveBudgets();
+        $inactive          = $this->repository->getInactiveBudgets();
+        $start             = session('start', new Carbon);
+        $end               = session('end', new Carbon);
+        $periodStart       = $start->formatLocalized($this->monthAndDayFormat);
+        $periodEnd         = $end->formatLocalized($this->monthAndDayFormat);
+        $budgetInformation = $this->collectBudgetInformation($budgets, $start, $end);
+        $defaultCurrency   = Amount::getDefaultCurrency();
+        $available         = $this->repository->getAvailableBudget($defaultCurrency, $start, $end);
+        $spent             = array_sum(array_column($budgetInformation, 'spent'));
+        $budgeted          = array_sum(array_column($budgetInformation, 'budgeted'));
+
+        return view(
+            'budgets.index',
+            compact('available', 'periodStart', 'periodEnd', 'budgetInformation', 'inactive', 'budgets', 'spent', 'budgeted')
+        );
+    }
+
+    /**
+     * @param Request $request
+     *
+     * @return View
+     */
+    public function noBudget(Request $request)
+    {
+        /** @var Carbon $start */
+        $start = session('start', Carbon::now()->startOfMonth());
+        /** @var Carbon $end */
+        $end      = session('end', Carbon::now()->endOfMonth());
+        $page     = intval($request->get('page')) == 0 ? 1 : intval($request->get('page'));
+        $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
+        $subTitle = trans(
+            'firefly.without_budget_between',
+            ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
+        );
+
+        // collector
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class, [auth()->user()]);
+        $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutBudget();
+        $journals = $collector->getPaginatedJournals();
+        $journals->setPath('/budgets/list/noBudget');
+
+        return view('budgets.no-budget', compact('journals', 'subTitle'));
+    }
+
+    /**
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postUpdateIncome(BudgetIncomeRequest $request)
+    {
+        $start           = session('start', new Carbon);
+        $end             = session('end', new Carbon);
+        $defaultCurrency = Amount::getDefaultCurrency();
+        $amount          = $request->get('amount');
+
+        $this->repository->setAvailableBudget($defaultCurrency, $start, $end, $amount);
+        Preferences::mark();
+
+        return redirect(route('budgets.index'));
+    }
+
+    /**
+     * @param Request $request
+     * @param Budget  $budget
+     *
+     * @return View
+     */
+    public function show(Request $request, Budget $budget)
+    {
+        /** @var Carbon $start */
+        $start      = session('first', Carbon::create()->startOfYear());
+        $end        = new Carbon;
+        $page       = intval($request->get('page')) == 0 ? 1 : intval($request->get('page'));
+        $pageSize   = intval(Preferences::get('transactionPageSize', 50)->data);
+        $limits     = $this->getLimits($budget, $start, $end);
+        $repetition = null;
+        // collector:
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class, [auth()->user()]);
+        $collector->setAllAssetAccounts()->setRange($start, $end)->setBudget($budget)->setLimit($pageSize)->setPage($page)->withCategoryInformation();
+        $journals = $collector->getPaginatedJournals();
+        $journals->setPath('/budgets/show/' . $budget->id);
+
+
+        $subTitle = e($budget->name);
+
+        return view('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle'));
+    }
+
+    /**
+     * @param Request     $request
+     * @param Budget      $budget
+     * @param BudgetLimit $budgetLimit
+     *
+     * @return View
+     * @throws FireflyException
+     */
+    public function showByBudgetLimit(Request $request, Budget $budget, BudgetLimit $budgetLimit)
+    {
+        if ($budgetLimit->budget->id != $budget->id) {
+            throw new FireflyException('This budget limit is not part of this budget.');
+        }
+
+        /** @var AccountRepositoryInterface $accountRepository */
+        $accountRepository = app(AccountRepositoryInterface::class);
+        $page              = intval($request->get('page')) == 0 ? 1 : intval($request->get('page'));
+        $pageSize          = intval(Preferences::get('transactionPageSize', 50)->data);
+        $subTitle          = trans(
+            'firefly.budget_in_period', [
+                                          'name'  => $budget->name,
+                                          'start' => $budgetLimit->start_date->formatLocalized($this->monthAndDayFormat),
+                                          'end'   => $budgetLimit->end_date->formatLocalized($this->monthAndDayFormat),
+                                      ]
+        );
+        $accounts          = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::CASH]);
+
+        // collector:
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class, [auth()->user()]);
+        $collector->setAllAssetAccounts()->setRange($budgetLimit->start_date, $budgetLimit->end_date)
+                  ->setBudget($budget)->setLimit($pageSize)->setPage($page)->withCategoryInformation();
+        $journals = $collector->getPaginatedJournals();
+        $journals->setPath('/budgets/show/' . $budget->id . '/' . $budgetLimit->id);
+
+
+        $start  = session('first', Carbon::create()->startOfYear());
+        $end    = new Carbon;
+        $limits = $this->getLimits($budget, $start, $end);
+
+        return view('budgets.show', compact('limits', 'budget', 'budgetLimit', 'journals', 'subTitle'));
+
+    }
+
+    /**
+     * @param BudgetFormRequest $request
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store(BudgetFormRequest $request)
+    {
+        $data   = $request->getBudgetData();
+        $budget = $this->repository->store($data);
+
+        Session::flash('success', strval(trans('firefly.stored_new_budget', ['name' => e($budget->name)])));
+        Preferences::mark();
+
+        if (intval($request->get('create_another')) === 1) {
+            // set value so create routine will not overwrite URL:
+            Session::put('budgets.create.fromStore', true);
+
+            return redirect(route('budgets.create'))->withInput();
+        }
+
+        // redirect to previous URL.
+        return redirect(session('budgets.create.url'));
+
+    }
+
+    /**
+     * @param BudgetFormRequest $request
+     * @param Budget            $budget
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function update(BudgetFormRequest $request, Budget $budget)
+    {
+        $data = $request->getBudgetData();
+        $this->repository->update($budget, $data);
+
+        Session::flash('success', strval(trans('firefly.updated_budget', ['name' => e($budget->name)])));
+        Preferences::mark();
+
+        if (intval($request->get('return_to_edit')) === 1) {
+            // set value so edit routine will not overwrite URL:
+            Session::put('budgets.edit.fromUpdate', true);
+
+            return redirect(route('budgets.edit', [$budget->id]))->withInput(['return_to_edit' => 1]);
+        }
+
+        // redirect to previous URL.
+        return redirect(session('budgets.edit.url'));
+
+    }
+
+    /**
+     * @return View
+     */
+    public function updateIncome()
+    {
+        $start           = session('start', new Carbon);
+        $end             = session('end', new Carbon);
+        $defaultCurrency = Amount::getDefaultCurrency();
+        $available       = $this->repository->getAvailableBudget($defaultCurrency, $start, $end);
+
+
+        return view('budgets.income', compact('available', 'start', 'end'));
+    }
+
+    /**
+     * @param Collection $budgets
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return array
+     */
+    private function collectBudgetInformation(Collection $budgets, Carbon $start, Carbon $end): array
+    {
+        // get account information
+        /** @var AccountRepositoryInterface $accountRepository */
+        $accountRepository = app(AccountRepositoryInterface::class);
+        $accounts          = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::CASH]);
+        $return            = [];
+        /** @var Budget $budget */
+        foreach ($budgets as $budget) {
+            $budgetId          = $budget->id;
+            $return[$budgetId] = [
+                'spent'      => $this->repository->spentInPeriod(new Collection([$budget]), $accounts, $start, $end),
+                'budgeted'   => '0',
+                'currentRep' => false,
+            ];
+            $budgetLimits      = $this->repository->getBudgetLimits($budget, $start, $end);
+            $otherLimits       = new Collection;
+
+            // get all the budget limits relevant between start and end and examine them:
+            /** @var BudgetLimit $limit */
+            foreach ($budgetLimits as $limit) {
+                if ($limit->start_date->isSameDay($start) && $limit->end_date->isSameDay($end)
+                ) {
+                    $return[$budgetId]['currentLimit'] = $limit;
+                    $return[$budgetId]['budgeted']     = $limit->amount;
+                    continue;
+                }
+                // otherwise it's just one of the many relevant repetitions:
+                $otherLimits->push($limit);
+            }
+            $return[$budgetId]['otherLimits'] = $otherLimits;
+        }
+
+        return $return;
+    }
+
+
+    /**
+     * @param Budget $budget
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return Collection
+     */
+    private function getLimits(Budget $budget, Carbon $start, Carbon $end): Collection
+    {
+        // properties for cache
+        $cache = new CacheProperties;
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty($budget->id);
+        $cache->addProperty('get-limits');
+
+        if ($cache->has()) {
+            return $cache->get();
+        }
+
+        /** @var AccountRepositoryInterface $accountRepository */
+        $accountRepository = app(AccountRepositoryInterface::class);
+        $accounts          = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::CASH]);
+        $set               = $this->repository->getBudgetLimits($budget, $start, $end);
+        $limits            = new Collection();
+
+        /** @var BudgetLimit $entry */
+        foreach ($set as $entry) {
+            $entry->spent = $this->repository->spentInPeriod(new Collection([$budget]), $accounts, $entry->start_date, $entry->end_date);
+            $limits->push($entry);
+        }
+        $cache->store($limits);
+
+        return $set;
+    }
+
+}