Merge branch 'release/3.10.2'

Signed-off-by: James Cole <thegrumpydictator@gmail.com>

.coveralls.yml

@@ -1,3 +0,0 @@
-src_dir: .
-coverage_clover: tests/_output/coverage.xml
-json_path: tests/_output/coveralls-upload.json

.env.example

@@ -0,0 +1,44 @@
+APP_ENV=production
+APP_DEBUG=false
+APP_FORCE_SSL=false
+APP_FORCE_ROOT=
+APP_KEY=SomeRandomStringOf32CharsExactly
+LOG_LEVEL=warning
+
+DB_CONNECTION=mysql
+DB_HOST=localhost
+DB_DATABASE=homestead
+DB_USERNAME=homestead
+DB_PASSWORD=secret
+
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+QUEUE_DRIVER=sync
+
+COOKIE_PATH="/"
+COOKIE_DOMAIN=
+COOKIE_SECURE=false
+
+DEFAULT_CURRENCY=EUR
+DEFAULT_LANGUAGE=en_US
+
+REDIS_HOST=localhost
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=smtp
+MAIL_HOST=mailtrap.io
+MAIL_PORT=2525
+MAIL_FROM=enter_your_email_here
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+SEND_REGISTRATION_MAIL=true
+MUST_CONFIRM_ACCOUNT=false
+
+SHOW_INCOMPLETE_TRANSLATIONS=false
+SHOW_DEMO_WARNING=false
+
+ANALYTICS_ID=
+SITE_OWNER=mail@example.com

.env.testing

@@ -0,0 +1,38 @@
+APP_ENV=testing
+APP_DEBUG=true
+APP_FORCE_SSL=false
+APP_KEY=SomeRandomStringOf32CharsExactly
+LOG_LEVEL=debug
+
+DB_CONNECTION=sqlite
+DB_HOST=localhost
+DB_DATABASE=homestead
+DB_USERNAME=homestead
+DB_PASSWORD=secret
+
+CACHE_DRIVER=array
+SESSION_DRIVER=array
+QUEUE_DRIVER=array
+
+DEFAULT_CURRENCY=EUR
+DEFAULT_LANGUAGE=en_US
+
+REDIS_HOST=localhost
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=log
+MAIL_HOST=mailtrap.io
+MAIL_PORT=2525
+MAIL_FROM=your_address_here@example.com
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+SHOW_INCOMPLETE_TRANSLATIONS=false
+
+ANALYTICS_ID=abcde
+RUNCLEANUP=false
+SITE_OWNER=your_address_here@example.com
+
+BLOCKED_DOMAINS=

.gitattributes

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

.gitignore

@@ -1,27 +1,9 @@
-/bootstrap/compiled.php
 /vendor
-composer.phar
+/node_modules
-.env.*.php
+.env
-.env.php
+_development
-Thumbs.db
+.env.local
-.idea/
+result.html
-tests/_output/*
+test-import.sh
-_ide_helper.php
+test-import-report.txt
-/build/logs/clover.xml
+public/google*.html
-index.html*
-app/storage/firefly-export*
-.vagrant
-firefly-iii-import-*.json
-tests/_output/*
-testing.sqlite
-_ide_helper_models.php
-clean.sqlite
-tests/acceptance/AcceptanceTester.php
-tests/functional/FunctionalTester.php
-tests/unit/UnitTester.php
-pi.php
-tests/_data/db.sqlite
-tests/_data/dump.sql
-db.sqlite_snapshot
-c3.php
-db.sqlite-journal

.scrutinizer.yml

@@ -0,0 +1,7 @@
+# .scrutinizer.yml
+tools:
+  external_code_coverage: false
+filter:
+    excluded_paths:
+        - app/Support/Migration/*
+        - app/database/migrations/*

.travis.yml

@@ -1,16 +0,0 @@
-language: php
-
-php:
-  - 5.5
-  - 5.6
-
-install:
-  - composer install
-
-script:
-  - ./tests/_data/db.sh
-  - php vendor/bin/codecept build
-  - php vendor/bin/codecept run --coverage --coverage-xml
-
-after_script:
-  - php vendor/bin/coveralls

CHANGELOG.md

@@ -0,0 +1,201 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased]
+- No unreleased changes yet.
+
+## [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/JC5/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
+
+
+### Deprecated
+- Initial release.
+
+### Removed
+- Initial release.
+
+### 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.
+
+### Security
+- Initial release.
+
+
+[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.

LICENSE

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

README.md

@@ -1,74 +1,30 @@
-Firefly III
+# Firefly III [![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/JC5/firefly-iii/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master)
-===========
 
-[![Build Status](https://travis-ci.org/JC5/firefly-iii.svg?branch=develop)](https://travis-ci.org/JC5/firefly-iii)
+## A personal finances manager
-[![Project Status](http://stillmaintained.com/JC5/firefly-iii.png?a=b)](http://stillmaintained.com/JC5/firefly-iii)
-[![Coverage Status](https://coveralls.io/repos/JC5/firefly-iii/badge.png?branch=master)](https://coveralls.io/r/JC5/firefly-iii?branch=master)
-[![SensioLabsInsight](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102/mini.png)](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102)
 
-[![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable.svg)](https://packagist.org/packages/grumpydictator/firefly-iii)
+[![Screenshot](https://i.nder.be/hhfv03hp/400)](https://i.nder.be/hhfv03hp) [![Screenshot](https://i.nder.be/hhmwmqw9/400)](https://i.nder.be/hhmwmqw9)
-[![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)
 
-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).
+[![Screenshot](https://i.nder.be/g63q05m0/400)](https://i.nder.be/g63q05m0) [![Screenshot](https://i.nder.be/c2g30ngg/400)](https://i.nder.be/c2g30ngg)
 
-Firefly Mark III is a new version of Firefly built upon best practices and lessons learned
+"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.
-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.
 
-## Current features
+## Installation
 
-- [A double-entry bookkeeping system](http://en.wikipedia.org/wiki/Double-entry_bookkeeping_system);
+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://jc5.github.io/firefly-iii/installation-guide/).
-- 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);
-- View basic income / expense reports.
-- Lots of help text in case you don't get it;
 
-Everything is organised:
+## More about Firefly III
 
-- Clear views that should show you how you're doing;
+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.
-- Easy navigation through your records;
-- Browse back and forth to see previous months or even years;
-- Lots of charts because we all love them.
 
-## Changes
+Firefly works on the principle that if you know where you're money is going, you can stop it from going there.
 
-Firefly III will feature, but does not feature yet:
+#### Some advantages of using Firefly
 
-- Financial reporting showing you how well you are doing;
+- Firefly can import any CSV file, so migrating from other systems is easy.
-- More control over other resources outside of personal finance
+- 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!
-  - Accounts shared with a partner (household accounts)
+- Firefly has lots of features without becoming fancy or bloated.
-  - Debts
+- If you feel you're missing something you can just ask me and I'll add it!
-  - Credit cards
-- More 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.
-- Any other features I might not have thought of.
 
-Some stuff has been removed:
+Firefly is pretty awesome. [You can read more about Firefly III, and its features, on the Github Pages](https://jc5.github.io/firefly-iii/).
 
-- The nesting of budgets, categories and beneficiaries is removed because it was pretty pointless.
+If you want to contact me, please open an issue or [email me](mailto:thegrumpydictator@gmail.com).
-- 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.
-
-## Screenshots
-
-![Index](http://i.imgur.com/TkZNIer.png)
-
-![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 coming, slowly.
-
-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.
-
-Questions, ideas or other things to contribute? [Let me know](https://github.com/JC5/firefly-iii/issues/new)!

app/Bootstrap/ConfigureLogging.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * ConfigureLogging.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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
+{
+    /**
+     * @param Application $app
+     * @param Writer      $log
+     */
+    protected function configureDailyHandler(Application $app, Writer $log)
+    {
+        $log->useDailyFiles(
+            $app->storagePath() . '/logs/firefly-iii.log',
+            $app->make('config')->get('app.log_max_files', 5)
+        );
+    }
+
+    /**
+     * @param Application $app
+     * @param Writer      $log
+     */
+    protected function configureSingleHandler(Application $app, Writer $log)
+    {
+        $log->useFiles($app->storagePath() . '/logs/firefly-iii.log');
+    }
+}

app/Console/Commands/EncryptFile.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * EncryptFile.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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,120 @@
+<?php
+/**
+ * Import.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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 Log;
+
+/**
+ * Class Import
+ *
+ * @package FireflyIII\Console\Commands
+ */
+class Import extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Import stuff into Firefly III.';
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly:import {key}';
+
+    /**
+     * Create a new command instance.
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $jobKey = $this->argument('key');
+        $job    = ImportJob::whereKey($jobKey)->first();
+        if (!$this->isValid($job)) {
+            return;
+        }
+
+        $this->line('Going to import job with key "' . $job->key . '" of type ' . $job->file_type);
+
+        $monolog = Log::getMonolog();
+        $handler = new CommandHandler($this);
+        $monolog->pushHandler($handler);
+
+        $result = ImportProcedure::runImport($job);
+
+
+        /**
+         * @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));
+        }
+
+        $this->line('The import has completed.');
+
+        // get any errors from the importer:
+        $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);
+            }
+        }
+
+        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;
+    }
+}

app/Console/Commands/UpgradeFireflyInstructions.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ * UpgradeFireflyInstructions.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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    = $config[$version] ?? null;
+
+        $this->line('+------------------------------------------------------------------------------+');
+        $this->line('');
+
+        if (is_null($text)) {
+            $this->line('Thank you for installing Firefly III, v' . $version);
+            $this->line('If you are upgrading from a previous version,');
+            $this->info('there are no extra upgrade instructions.');
+            $this->line('Firefly III should be ready for use.');
+        } else {
+            $this->line('Thank you for installing Firefly III, v' . $version);
+            $this->line('If you are upgrading from a previous version,');
+            $this->line('please follow these upgrade instructions carefully:');
+            $this->info(wordwrap($text));
+        }
+
+        $this->line('');
+        $this->line('+------------------------------------------------------------------------------+');
+    }
+}

app/Console/Commands/VerifyDatabase.php

@@ -0,0 +1,309 @@
+<?php
+/**
+ * VerifyDatabase.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Console\Commands;
+
+use Crypt;
+use DB;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\Category;
+use FireflyIII\Models\Tag;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Builder;
+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()
+    {
+        // accounts with no transactions.
+        $this->reportAccounts();
+        // budgets with no limits
+        $this->reportBudgetLimits();
+        // budgets with no transactions
+        $this->reportBudgets();
+        // categories with no transactions
+        $this->reportCategories();
+        // tags with no transactions
+        $this->reportTags();
+        // 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();
+    }
+
+    /**
+     * 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')
+            ->having('transaction_count', '=', 0)
+            ->get(
+                ['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email',
+                 DB::raw('COUNT(`transactions`.`id`) AS `transaction_count`')]
+            );
+
+        /** @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')
+            ->having('budget_limit_count', '=', 0)
+            ->get(['budgets.id', 'budgets.name', 'budgets.user_id', 'users.email', DB::raw('COUNT(`budget_limits`.`id`) AS `budget_limit_count`')]);
+
+        /** @var stdClass $entry */
+        foreach ($set as $entry) {
+            $line = 'Notice: User #' . $entry->user_id . ' (' . $entry->email . ') has budget #' . $entry->id . ' ("' . Crypt::decrypt($entry->name)
+                    . '") which has no budget limits.';
+            $this->line($line);
+        }
+    }
+
+    /**
+     * Reports on budgets without any transactions.
+     */
+    private function reportBudgets()
+    {
+        $set = Budget
+            ::leftJoin('budget_transaction_journal', 'budgets.id', '=', 'budget_transaction_journal.budget_id')
+            ->leftJoin('users', 'budgets.user_id', '=', 'users.id')
+            ->distinct()
+            ->whereNull('budget_transaction_journal.budget_id')
+            ->whereNull('budgets.deleted_at')
+            ->get(['budgets.id', 'budgets.name', 'budgets.user_id', 'users.email']);
+
+        /** @var stdClass $entry */
+        foreach ($set as $entry) {
+            $line = 'Notice: User #' . $entry->user_id . ' (' . $entry->email . ') has budget #' . $entry->id . ' ("' . Crypt::decrypt($entry->name)
+                    . '") which has no transactions.';
+            $this->line($line);
+        }
+    }
+
+    /**
+     * Reports on categories without any transactions.
+     */
+    private function reportCategories()
+    {
+        $set = Category
+            ::leftJoin('category_transaction_journal', 'categories.id', '=', 'category_transaction_journal.category_id')
+            ->leftJoin('users', 'categories.user_id', '=', 'users.id')
+            ->distinct()
+            ->whereNull('category_transaction_journal.category_id')
+            ->whereNull('categories.deleted_at')
+            ->get(['categories.id', 'categories.name', 'categories.user_id', 'users.email']);
+
+        /** @var stdClass $entry */
+        foreach ($set as $entry) {
+            $line = 'Notice: User #' . $entry->user_id . ' (' . $entry->email . ') has category #' . $entry->id . ' ("' . Crypt::decrypt($entry->name)
+                    . '") which has no transactions.';
+            $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 . '"'
+            );
+        }
+    }
+
+    /**
+     * 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()
+    {
+        /*
+         * select transaction_journals.id, count(transactions.id) as transaction_count from transaction_journals
+left join transactions ON transaction_journals.id = transactions.transaction_journal_id
+group by transaction_journals.id
+having transaction_count = 0
+         */
+        $set = TransactionJournal
+            ::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+            ->groupBy('transaction_journals.id')
+            ->having('transaction_count', '=', 0)
+            ->get(['transaction_journals.id', DB::raw('COUNT(`transactions`.`id`) as `transaction_count`')]);
+
+        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
+            );
+        }
+
+    }
+
+    /**
+     * 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 tags without any transactions.
+     */
+    private function reportTags()
+    {
+        $set = Tag
+            ::leftJoin('tag_transaction_journal', 'tags.id', '=', 'tag_transaction_journal.tag_id')
+            ->leftJoin('users', 'tags.user_id', '=', 'users.id')
+            ->distinct()
+            ->whereNull('tag_transaction_journal.tag_id')
+            ->whereNull('tags.deleted_at')
+            ->get(['tags.id', 'tags.tag', 'tags.user_id', 'users.email']);
+
+        /** @var stdClass $entry */
+        foreach ($set as $entry) {
+            $line = 'Notice: User #' . $entry->user_id . ' (' . $entry->email . ') has tag #' . $entry->id . ' ("' . $entry->tag
+                    . '") which has no transactions.';
+            $this->line($line);
+        }
+    }
+
+    /**
+     * 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 . '"'
+            );
+        }
+    }
+}

app/Console/Kernel.php

@@ -0,0 +1,59 @@
+<?php
+/**
+ * Kernel.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Console;
+
+use FireflyIII\Console\Commands\EncryptFile;
+use FireflyIII\Console\Commands\Import;
+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.
+     *
+     * This needs to be for with the next upgrade.
+     *
+     * @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,
+            EncryptFile::class,
+        ];
+}

app/Crud/Account/AccountCrud.php

@@ -0,0 +1,530 @@
+<?php
+/**
+ * AccountCrud.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Crud\Account;
+
+use Carbon\Carbon;
+use DB;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountMeta;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\User;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Collection;
+use Log;
+
+/**
+ * Class AccountCrud
+ *
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ *
+ * @package FireflyIII\Crud\Account
+ */
+class AccountCrud implements AccountCrudInterface
+{
+
+    /** @var User */
+    private $user;
+    /** @var array */
+    private $validFields = ['accountRole', 'ccMonthlyPaymentDate', 'ccType', 'accountNumber'];
+
+    /**
+     * AccountCrud constructor.
+     *
+     * @param User $user
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+
+    /**
+     * @param Account $account
+     * @param Account $moveTo
+     *
+     * @return bool
+     */
+    public function destroy(Account $account, Account $moveTo): bool
+    {
+        if (!is_null($moveTo->id)) {
+            DB::table('transactions')->where('account_id', $account->id)->update(['account_id' => $moveTo->id]);
+        }
+        if (!is_null($account)) {
+            $account->delete();
+        }
+
+        return true;
+    }
+
+    /**
+     * @param $accountId
+     *
+     * @return Account
+     */
+    public function find(int $accountId): Account
+    {
+        $account = $this->user->accounts()->find($accountId);
+        if (is_null($account)) {
+            return new Account;
+        }
+
+        return $account;
+    }
+
+    /**
+     * @param string $number
+     * @param array  $types
+     *
+     * @return Account
+     */
+    public function findByAccountNumber(string $number, array $types): Account
+    {
+        $query = $this->user->accounts()
+                            ->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id')
+                            ->where('account_meta.name', 'accountNumber')
+                            ->where('account_meta.data', json_encode($number));
+
+        if (count($types) > 0) {
+            $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
+            $query->whereIn('account_types.type', $types);
+        }
+
+        /** @var Collection $accounts */
+        $accounts = $query->get(['accounts.*']);
+        if ($accounts->count() > 0) {
+            return $accounts->first();
+        }
+
+        return new Account;
+    }
+
+    /**
+     * @param string $iban
+     * @param array  $types
+     *
+     * @return Account
+     */
+    public function findByIban(string $iban, array $types): Account
+    {
+        $query = $this->user->accounts()->where('iban', '!=', '');
+
+        if (count($types) > 0) {
+            $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
+            $query->whereIn('account_types.type', $types);
+        }
+
+        $accounts = $query->get(['accounts.*']);
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            if ($account->iban === $iban) {
+                return $account;
+            }
+        }
+
+        return new Account;
+    }
+
+    /**
+     * @param string $name
+     * @param array  $types
+     *
+     * @return Account
+     */
+    public function findByName(string $name, array $types): Account
+    {
+        $query = $this->user->accounts();
+
+        if (count($types) > 0) {
+            $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
+            $query->whereIn('account_types.type', $types);
+        }
+
+        $accounts = $query->get(['accounts.*']);
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            if ($account->name === $name) {
+
+                return $account;
+            }
+        }
+
+        return new Account;
+    }
+
+    /**
+     * @param array $accountIds
+     *
+     * @return Collection
+     */
+    public function getAccountsById(array $accountIds): Collection
+    {
+        /** @var Collection $result */
+        $query = $this->user->accounts()->with(
+            ['accountmeta' => function (HasMany $query) {
+                $query->where('name', 'accountRole');
+            }]
+        );
+
+        if (count($accountIds) > 0) {
+            $query->whereIn('accounts.id', $accountIds);
+        }
+
+        $result = $query->get(['accounts.*']);
+        $result = $result->sortBy(
+            function (Account $account) {
+                return strtolower($account->name);
+            }
+        );
+
+        return $result;
+    }
+
+    /**
+     * @param array $types
+     *
+     * @return Collection
+     */
+    public function getAccountsByType(array $types): Collection
+    {
+        /** @var Collection $result */
+        $query = $this->user->accounts()->with(
+            ['accountmeta' => function (HasMany $query) {
+                $query->where('name', 'accountRole');
+            }]
+        );
+        if (count($types) > 0) {
+            $query->accountTypeIn($types);
+        }
+
+        $result = $query->get(['accounts.*']);
+        $result = $result->sortBy(
+            function (Account $account) {
+                return strtolower($account->name);
+            }
+        );
+
+        return $result;
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return Account
+     */
+    public function store(array $data): Account
+    {
+        $newAccount = $this->storeAccount($data);
+        if (!is_null($newAccount->id)) {
+            $this->storeMetadata($newAccount, $data);
+        }
+
+        if ($data['openingBalance'] != 0) {
+            $this->storeInitialBalance($newAccount, $data);
+        }
+
+        return $newAccount;
+
+    }
+
+    /**
+     * @param $account
+     * @param $name
+     * @param $value
+     *
+     * @return AccountMeta
+     */
+    public function storeMeta(Account $account, string $name, $value): AccountMeta
+    {
+        return AccountMeta::create(['name' => $name, 'data' => $value, 'account_id' => $account->id,]);
+    }
+
+    /**
+     * @param Account $account
+     * @param array   $data
+     *
+     * @return Account
+     */
+    public function update(Account $account, array $data): Account
+    {
+        // update the account:
+        $account->name            = $data['name'];
+        $account->active          = $data['active'] == '1' ? true : false;
+        $account->virtual_balance = $data['virtualBalance'];
+        $account->iban            = $data['iban'];
+        $account->save();
+
+        $this->updateMetadata($account, $data);
+        $this->updateInitialBalance($account, $data);
+
+        return $account;
+    }
+
+    /**
+     * @param Account $account
+     * @param string  $type
+     *
+     * @return Account
+     */
+    public function updateAccountType(Account $account, string $type): Account
+    {
+        $type = AccountType::whereType($type)->first();
+        if (!is_null($type)) {
+            $account->accountType()->associate($type);
+            $account->save();
+        }
+
+        return $this->find($account->id);
+
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return Account
+     */
+    protected function storeAccount(array $data): Account
+    {
+        $type        = config('firefly.accountTypeByIdentifier.' . $data['accountType']);
+        $accountType = AccountType::whereType($type)->first();
+        $newAccount  = new Account(
+            [
+                'user_id'         => $data['user'],
+                'account_type_id' => $accountType->id,
+                'name'            => $data['name'],
+                'virtual_balance' => $data['virtualBalance'],
+                'active'          => $data['active'] === true ? true : false,
+                'iban'            => $data['iban'],
+            ]
+        );
+
+        if (!$newAccount->isValid()) {
+            // does the account already exist?
+            $searchData      = [
+                'user_id'         => $data['user'],
+                'account_type_id' => $accountType->id,
+                'virtual_balance' => $data['virtualBalance'],
+                'name'            => $data['name'],
+                'iban'            => $data['iban'],
+            ];
+            $existingAccount = Account::firstOrNullEncrypted($searchData);
+            if (!$existingAccount) {
+                Log::error('Account create error', $newAccount->getErrors()->toArray());
+
+                return new Account;
+            }
+            $newAccount = $existingAccount;
+
+        }
+        $newAccount->save();
+
+        return $newAccount;
+    }
+
+    /**
+     * @param Account $account
+     * @param array   $data
+     *
+     * @return TransactionJournal
+     */
+    protected function storeInitialBalance(Account $account, array $data): TransactionJournal
+    {
+        $amount          = $data['openingBalance'];
+        $user            = $data['user'];
+        $name            = $data['name'];
+        $opposing        = $this->storeOpposingAccount($amount, $user, $name);
+        $transactionType = TransactionType::whereType(TransactionType::OPENING_BALANCE)->first();
+        $journal         = TransactionJournal::create(
+            [
+                'user_id'                 => $data['user'],
+                'transaction_type_id'     => $transactionType->id,
+                'transaction_currency_id' => $data['openingBalanceCurrency'],
+                'description'             => 'Initial balance for "' . $account->name . '"',
+                'completed'               => true,
+                'date'                    => $data['openingBalanceDate'],
+                'encrypted'               => true,
+            ]
+        );
+
+        $firstAccount  = $account;
+        $secondAccount = $opposing;
+        $firstAmount   = $amount;
+        $secondAmount  = $amount * -1;
+
+        if ($data['openingBalance'] < 0) {
+            $firstAccount  = $opposing;
+            $secondAccount = $account;
+            $firstAmount   = $amount * -1;
+            $secondAmount  = $amount;
+        }
+
+        $one = new Transaction(['account_id' => $firstAccount->id, 'transaction_journal_id' => $journal->id, 'amount' => $firstAmount]);
+        $one->save();// first transaction: from
+        $two = new Transaction(['account_id' => $secondAccount->id, 'transaction_journal_id' => $journal->id, 'amount' => $secondAmount]);
+        $two->save(); // second transaction: to
+
+        return $journal;
+    }
+
+    /**
+     * @param Account $account
+     * @param array   $data
+     */
+    protected function storeMetadata(Account $account, array $data)
+    {
+        foreach ($this->validFields as $field) {
+            if (isset($data[$field])) {
+                $metaData = new AccountMeta(
+                    [
+                        'account_id' => $account->id,
+                        'name'       => $field,
+                        'data'       => $data[$field],
+                    ]
+                );
+                $metaData->save();
+            }
+        }
+    }
+
+    /**
+     * @param Account $account
+     * @param array   $data
+     *
+     * @return bool
+     */
+    protected function updateInitialBalance(Account $account, array $data): bool
+    {
+        $openingBalance = $this->openingBalanceTransaction($account);
+        if ($data['openingBalance'] != 0) {
+            if (!is_null($openingBalance->id)) {
+                $date   = $data['openingBalanceDate'];
+                $amount = $data['openingBalance'];
+
+                return $this->updateJournal($account, $openingBalance, $date, $amount);
+            }
+
+            $this->storeInitialBalance($account, $data);
+
+            return true;
+        }
+        // else, delete it:
+        if ($openingBalance) { // opening balance is zero, should we delete it?
+            $openingBalance->delete(); // delete existing opening balance.
+        }
+
+        return true;
+    }
+
+    /**
+     * @param Account $account
+     * @param array   $data
+     *
+     */
+    protected function updateMetadata(Account $account, array $data)
+    {
+        foreach ($this->validFields as $field) {
+            $entry = $account->accountMeta()->where('name', $field)->first();
+
+            if (isset($data[$field])) {
+                // update if new data is present:
+                if (!is_null($entry)) {
+                    $entry->data = $data[$field];
+                    $entry->save();
+
+                    continue;
+                }
+                $metaData = new AccountMeta(
+                    [
+                        'account_id' => $account->id,
+                        'name'       => $field,
+                        'data'       => $data[$field],
+                    ]
+                );
+                $metaData->save();
+            }
+        }
+
+    }
+
+    /**
+     * @param Account $account
+     *
+     * @return TransactionJournal|null
+     */
+    private function openingBalanceTransaction(Account $account): TransactionJournal
+    {
+        $journal = TransactionJournal
+            ::sortCorrectly()
+            ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+            ->where('transactions.account_id', $account->id)
+            ->transactionTypes([TransactionType::OPENING_BALANCE])
+            ->first(['transaction_journals.*']);
+        if (is_null($journal)) {
+            return new TransactionJournal;
+        }
+
+        return $journal;
+    }
+
+    /**
+     * @param float  $amount
+     * @param int    $user
+     * @param string $name
+     *
+     * @return Account
+     */
+    private function storeOpposingAccount(float $amount, int $user, string $name):Account
+    {
+        $type         = $amount < 0 ? 'expense' : 'revenue';
+        $opposingData = [
+            'user'           => $user,
+            'accountType'    => $type,
+            'name'           => $name . ' initial balance',
+            'active'         => false,
+            'iban'           => '',
+            'virtualBalance' => 0,
+        ];
+
+        return $this->storeAccount($opposingData);
+    }
+
+    /**
+     * @param Account            $account
+     * @param TransactionJournal $journal
+     * @param Carbon             $date
+     * @param float              $amount
+     *
+     * @return bool
+     */
+    private function updateJournal(Account $account, TransactionJournal $journal, Carbon $date, float $amount): bool
+    {
+        // update date:
+        $journal->date = $date;
+        $journal->save();
+        // update transactions:
+        /** @var Transaction $transaction */
+        foreach ($journal->transactions()->get() as $transaction) {
+            if ($account->id == $transaction->account_id) {
+                $transaction->amount = $amount;
+                $transaction->save();
+            }
+            if ($account->id != $transaction->account_id) {
+                $transaction->amount = $amount * -1;
+                $transaction->save();
+            }
+        }
+
+        return true;
+
+    }
+}

app/Crud/Account/AccountCrudInterface.php

@@ -0,0 +1,109 @@
+<?php
+/**
+ * AccountCrudInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Crud\Account;
+
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountMeta;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface AccountCrudInterface
+ *
+ * @package FireflyIII\Crud\Account
+ */
+interface AccountCrudInterface
+{
+    /**
+     * @param Account $account
+     * @param Account $moveTo
+     *
+     * @return bool
+     */
+    public function destroy(Account $account, Account $moveTo): bool;
+
+    /**
+     * @param int $accountId
+     *
+     * @return Account
+     */
+    public function find(int $accountId): Account;
+
+    /**
+     * @param string $number
+     * @param array  $types
+     *
+     * @return Account
+     */
+    public function findByAccountNumber(string $number, array $types): Account;
+
+    /**
+     * @param string $iban
+     * @param array  $types
+     *
+     * @return Account
+     */
+    public function findByIban(string $iban, array $types): Account;
+
+    /**
+     * @param string $name
+     * @param array  $types
+     *
+     * @return Account
+     */
+    public function findByName(string $name, array $types): Account;
+
+    /**
+     * @param array $accountIds
+     *
+     * @return Collection
+     */
+    public function getAccountsById(array $accountIds): Collection;
+
+    /**
+     * @param array $types
+     *
+     * @return Collection
+     */
+    public function getAccountsByType(array $types): Collection;
+
+    /**
+     * @param array $data
+     *
+     * @return Account
+     */
+    public function store(array $data) : Account;
+
+    /**
+     * @param $account
+     * @param $name
+     * @param $value
+     *
+     * @return AccountMeta
+     */
+    public function storeMeta(Account $account, string $name, $value): AccountMeta;
+
+    /**
+     * @param Account $account
+     * @param array   $data
+     *
+     * @return Account
+     */
+    public function update(Account $account, array $data): Account;
+
+    /**
+     * @param Account $account
+     * @param string  $type
+     *
+     * @return Account
+     */
+    public function updateAccountType(Account $account, string $type): Account;
+}

app/Crud/Split/Journal.php

@@ -0,0 +1,216 @@
+<?php
+/**
+ * Journal.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Crud\Split;
+
+use FireflyIII\Events\TransactionStored;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\Category;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\User;
+use Illuminate\Support\Collection;
+
+/**
+ * Class Journal
+ *
+ * @package FireflyIII\Crud\Split
+ */
+class Journal implements JournalInterface
+{
+    /** @var User */
+    private $user;
+
+    /**
+     * AttachmentRepository constructor.
+     *
+     * @param User $user
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+
+    /**
+     * @param $journal
+     *
+     * @return bool
+     */
+    public function markAsComplete(TransactionJournal $journal)
+    {
+        $journal->completed = 1;
+        $journal->save();
+
+        return true;
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     * @param array              $transaction
+     *
+     * @return Collection
+     */
+    public function storeTransaction(TransactionJournal $journal, array $transaction): Collection
+    {
+        // store accounts (depends on type)
+        list($sourceAccount, $destinationAccount) = $this->storeAccounts($journal->transactionType->type, $transaction);
+
+        // store transaction one way:
+        /** @var Transaction $one */
+        $one = Transaction::create(
+            ['account_id'  => $sourceAccount->id, 'transaction_journal_id' => $journal->id, 'amount' => $transaction['amount'] * -1,
+             'description' => $transaction['description']]
+        );
+        $two = Transaction::create(
+            ['account_id'  => $destinationAccount->id, 'transaction_journal_id' => $journal->id, 'amount' => $transaction['amount'],
+             'description' => $transaction['description']]
+        );
+
+        if (strlen($transaction['category']) > 0) {
+            $category = Category::firstOrCreateEncrypted(['name' => $transaction['category'], 'user_id' => $journal->user_id]);
+            $one->categories()->save($category);
+            $two->categories()->save($category);
+        }
+        if (intval($transaction['budget_id']) > 0) {
+            $budget = Budget::find($transaction['budget_id']);
+            $one->budgets()->save($budget);
+            $two->budgets()->save($budget);
+        }
+
+        if ($transaction['piggy_bank_id'] > 0) {
+            $transaction['date'] = $journal->date->format('Y-m-d');
+            event(new TransactionStored($transaction));
+        }
+
+        return new Collection([$one, $two]);
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     * @param array              $data
+     *
+     * @return TransactionJournal
+     */
+    public function updateJournal(TransactionJournal $journal, array $data): TransactionJournal
+    {
+        $journal->description             = $data['journal_description'];
+        $journal->transaction_currency_id = $data['journal_currency_id'];
+        $journal->date                    = $data['date'];
+        $journal->interest_date           = $data['interest_date'];
+        $journal->book_date               = $data['book_date'];
+        $journal->process_date            = $data['process_date'];
+        $journal->save();
+
+        // delete original transactions, and recreate them.
+        $journal->transactions()->delete();
+
+        foreach ($data['transactions'] as $transaction) {
+            $this->storeTransaction($journal, $transaction);
+        }
+
+        $journal->completed = true;
+        $journal->save();
+
+        return $journal;
+    }
+
+    /**
+     * @param string $type
+     * @param array  $transaction
+     *
+     * @return array
+     * @throws FireflyException
+     */
+    private function storeAccounts(string $type, array $transaction): array
+    {
+        $sourceAccount      = null;
+        $destinationAccount = null;
+        switch ($type) {
+            case TransactionType::WITHDRAWAL:
+                list($sourceAccount, $destinationAccount) = $this->storeWithdrawalAccounts($transaction);
+                break;
+            case TransactionType::DEPOSIT:
+                list($sourceAccount, $destinationAccount) = $this->storeDepositAccounts($transaction);
+                break;
+            case TransactionType::TRANSFER:
+                $sourceAccount      = Account::where('user_id', $this->user->id)->where('id', $transaction['source_account_id'])->first();
+                $destinationAccount = Account::where('user_id', $this->user->id)->where('id', $transaction['destination_account_id'])->first();
+                break;
+            default:
+                throw new FireflyException('Cannot handle ' . e($type));
+        }
+
+        return [$sourceAccount, $destinationAccount];
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return array
+     */
+    private function storeDepositAccounts(array $data): array
+    {
+        $destinationAccount = Account::where('user_id', $this->user->id)->where('id', $data['destination_account_id'])->first(['accounts.*']);
+
+
+        if (isset($data['source_account_name']) && strlen($data['source_account_name']) > 0) {
+            $sourceType    = AccountType::where('type', 'Revenue account')->first();
+            $sourceAccount = Account::firstOrCreateEncrypted(
+                ['user_id' => $this->user->id, 'account_type_id' => $sourceType->id, 'name' => $data['source_account_name'], 'active' => 1]
+            );
+
+            return [$sourceAccount, $destinationAccount];
+        }
+
+        $sourceType    = AccountType::where('type', 'Cash account')->first();
+        $sourceAccount = Account::firstOrCreateEncrypted(
+            ['user_id' => $this->user->id, 'account_type_id' => $sourceType->id, 'name' => 'Cash account', 'active' => 1]
+        );
+
+        return [$sourceAccount, $destinationAccount];
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return array
+     */
+    private function storeWithdrawalAccounts(array $data): array
+    {
+        $sourceAccount = Account::where('user_id', $this->user->id)->where('id', $data['source_account_id'])->first(['accounts.*']);
+
+        if (strlen($data['destination_account_name']) > 0) {
+            $destinationType    = AccountType::where('type', 'Expense account')->first();
+            $destinationAccount = Account::firstOrCreateEncrypted(
+                [
+                    'user_id'         => $this->user->id,
+                    'account_type_id' => $destinationType->id,
+                    'name'            => $data['destination_account_name'],
+                    'active'          => 1,
+                ]
+            );
+
+            return [$sourceAccount, $destinationAccount];
+        }
+        $destinationType    = AccountType::where('type', 'Cash account')->first();
+        $destinationAccount = Account::firstOrCreateEncrypted(
+            ['user_id' => $this->user->id, 'account_type_id' => $destinationType->id, 'name' => 'Cash account', 'active' => 1]
+        );
+
+        return [$sourceAccount, $destinationAccount];
+
+
+    }
+}

app/Crud/Split/JournalInterface.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * JournalInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Crud\Split;
+
+
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface JournalInterface
+ *
+ * @package FireflyIII\Crud\Split
+ */
+interface JournalInterface
+{
+    /**
+     * @param $journal
+     *
+     * @return bool
+     */
+    public function markAsComplete(TransactionJournal $journal);
+
+    /**
+     * @param TransactionJournal $journal
+     * @param array              $transaction
+     *
+     * @return Collection
+     */
+    public function storeTransaction(TransactionJournal $journal, array $transaction): Collection;
+
+    /**
+     * @param TransactionJournal $journal
+     * @param array              $data
+     *
+     * @return TransactionJournal
+     */
+    public function updateJournal(TransactionJournal $journal, array $data): TransactionJournal;
+}

app/Events/BudgetLimitStored.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * BudgetLimitStored.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Events;
+
+use Carbon\Carbon;
+use FireflyIII\Models\BudgetLimit;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class BudgetLimitStored
+ *
+ * @package FireflyIII\Events
+ */
+class BudgetLimitStored extends Event
+{
+
+    use SerializesModels;
+
+    /** @var  BudgetLimit */
+    public $budgetLimit;
+
+    /** @var  Carbon */
+    public $end; // the only variable we can't get from the budget limit (if necessary).
+
+    /**
+     * BudgetLimitEvents constructor.
+     *
+     * @param BudgetLimit $budgetLimit
+     * @param Carbon      $end
+     */
+    public function __construct(BudgetLimit $budgetLimit, Carbon $end)
+    {
+        //
+        $this->budgetLimit = $budgetLimit;
+        $this->end         = $end;
+
+    }
+
+}

app/Events/BudgetLimitUpdated.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * BudgetLimitUpdated.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Events;
+
+use Carbon\Carbon;
+use FireflyIII\Models\BudgetLimit;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class BudgetLimitUpdated
+ *
+ * @package FireflyIII\Events
+ */
+class BudgetLimitUpdated extends Event
+{
+
+    use SerializesModels;
+
+    /** @var  BudgetLimit */
+    public $budgetLimit;
+
+    /** @var  Carbon */
+    public $end; // the only variable we can't get from the budget limit (if necessary).
+
+    /**
+     * BudgetLimitEvents constructor.
+     *
+     * @param BudgetLimit $budgetLimit
+     * @param Carbon      $end
+     */
+    public function __construct(BudgetLimit $budgetLimit, Carbon $end)
+    {
+        //
+        $this->budgetLimit = $budgetLimit;
+        $this->end         = $end;
+
+    }
+
+}

app/Events/Event.php

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

app/Events/ResendConfirmation.php

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

app/Events/TransactionJournalStored.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * TransactionJournalStored.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Events;
+
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class TransactionJournalStored
+ *
+ * @package FireflyIII\Events
+ */
+class TransactionJournalStored 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/TransactionJournalUpdated.php

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

app/Events/TransactionStored.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * TransactionStored.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Events;
+
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class TransactionJournalStored
+ *
+ * @package FireflyIII\Events
+ */
+class TransactionStored extends Event
+{
+
+    use SerializesModels;
+
+    public $transaction = [];
+
+    /**
+     * Create a new event instance.
+     *
+     * @param array $transaction
+     */
+    public function __construct(array $transaction)
+    {
+        //
+        $this->transaction = $transaction;
+    }
+
+}

app/Events/UserIsConfirmed.php

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

app/Events/UserIsDeleted.php

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

app/Events/UserRegistration.php

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

app/Exceptions/FireflyException.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * FireflyException.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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,101 @@
+<?php
+/**
+ * Handler.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Exceptions;
+
+use Auth;
+use ErrorException;
+use Exception;
+use FireflyIII\Jobs\MailError;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+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
+        = [
+            AuthorizationException::class,
+            HttpException::class,
+            ModelNotFoundException::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
+     *
+     * @return void
+     */
+    public function report(Exception $exception)
+    {
+
+        if ($exception instanceof FireflyException || $exception instanceof ErrorException) {
+            $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.
+            $job = new MailError($userData, env('SITE_OWNER'), Request::ip(), $data);
+            dispatch($job);
+        }
+
+        parent::report($exception);
+    }
+}

app/Exceptions/NotImplementedException.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * NotImplementedException.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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,21 @@
+<?php
+/**
+ * ValidationException.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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,148 @@
+<?php
+/**
+ * AttachmentCollector.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Collector;
+
+use Amount;
+use Crypt;
+use FireflyIII\Models\Attachment;
+use FireflyIII\Models\ExportJob;
+use FireflyIII\Models\TransactionJournal;
+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 string */
+    private $explanationString = '';
+    /** @var \Illuminate\Contracts\Filesystem\Filesystem */
+    private $exportDisk;
+    /** @var  AttachmentRepositoryInterface */
+    private $repository;
+    /** @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);
+        }
+
+        // put the explanation string in a file and attach it as well.
+        $file = $this->job->key . '-Source of all your attachments explained.txt';
+        $this->exportDisk->put($file, $this->explanationString);
+        $this->getFiles()->push($file);
+
+        return true;
+    }
+
+    /**
+     * @param Attachment $attachment
+     */
+    private function explain(Attachment $attachment)
+    {
+        /** @var TransactionJournal $journal */
+        $journal = $attachment->attachable;
+        $args    = [
+            'attachment_name' => e($attachment->filename),
+            'attachment_id'   => $attachment->id,
+            'type'            => strtolower($journal->transactionType->type),
+            'description'     => e($journal->description),
+            'journal_id'      => $journal->id,
+            'date'            => $journal->date->formatLocalized(strval(trans('config.month_and_day'))),
+            'amount'          => Amount::formatJournal($journal, false),
+        ];
+        $string  = trans('firefly.attachment_explanation', $args) . "\n";
+        Log::debug('Appended explanation string', ['string' => $string]);
+        $this->explanationString .= $string;
+
+    }
+
+    /**
+     * @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->getFiles()->push($exportFile);
+
+                // explain:
+                $this->explain($attachment);
+            } 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->get();
+
+        return $attachments;
+    }
+}

app/Export/Collector/BasicCollector.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ * BasicCollector.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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 $files;
+
+    /**
+     * BasicCollector constructor.
+     *
+     * @param ExportJob $job
+     */
+    public function __construct(ExportJob $job)
+    {
+        $this->files = new Collection;
+        $this->job   = $job;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getFiles(): Collection
+    {
+        return $this->files;
+    }
+
+    /**
+     * @param Collection $files
+     */
+    public function setFiles(Collection $files)
+    {
+        $this->files = $files;
+    }
+
+
+}

app/Export/Collector/CollectorInterface.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * CollectorInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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 getFiles(): Collection;
+
+    /**
+     * @return bool
+     */
+    public function run(): bool;
+
+    /**
+     * @param Collection $files
+     *
+     */
+    public function setFiles(Collection $files);
+
+}

app/Export/Collector/UploadCollector.php

@@ -0,0 +1,200 @@
+<?php
+/**
+ * UploadCollector.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Collector;
+
+use Auth;
+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 string */
+    private $expected;
+    /** @var \Illuminate\Contracts\Filesystem\Filesystem */
+    private $exportDisk;
+    private $importKeys = [];
+    /** @var \Illuminate\Contracts\Filesystem\Filesystem */
+    private $uploadDisk;
+
+    /**
+     *
+     * 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->expected = 'csv-upload-' . Auth::user()->id . '-';
+
+        // for the new import routine:
+        $this->getImportKeys();
+    }
+
+    /**
+     * @return bool
+     */
+    public function run(): bool
+    {
+        // grab upload directory.
+        $files = $this->uploadDisk->files();
+
+        foreach ($files as $entry) {
+            $this->processUpload($entry);
+        }
+
+        return true;
+    }
+
+    /**
+     *
+     */
+    private function getImportKeys()
+    {
+        $set = Auth::user()->importJobs()->where('status', 'import_complete')->get(['import_jobs.*']);
+        if ($set->count() > 0) {
+            $keys             = $set->pluck('key')->toArray();
+            $this->importKeys = $keys;
+
+        }
+        Log::debug('Valid import keys are ', $this->importKeys);
+    }
+
+    /**
+     * @param string $entry
+     *
+     * @return string
+     */
+    private function getOriginalUploadDate(string $entry): string
+    {
+        // this is an original upload.
+        $parts          = explode('-', str_replace(['.csv.encrypted', $this->expected], '', $entry));
+        $originalUpload = intval($parts[1]);
+        $date           = date('Y-m-d \a\t H-i-s', $originalUpload);
+
+        return $date;
+    }
+
+    /**
+     * @param string $entry
+     *
+     * @return bool
+     */
+    private function isImportFile(string $entry): bool
+    {
+        $name = str_replace('.upload', '', $entry);
+        if (in_array($name, $this->importKeys)) {
+            Log::debug(sprintf('Import file "%s" is in array', $name), $this->importKeys);
+
+            return true;
+        }
+        Log::debug(sprintf('Import file "%s" is NOT in array', $name), $this->importKeys);
+
+        return false;
+    }
+
+    /**
+     * @param string $entry
+     *
+     * @return bool
+     */
+    private function isOldImport(string $entry): bool
+    {
+        $len = strlen($this->expected);
+        // file is part of the old import routine:
+        if (substr($entry, 0, $len) === $this->expected) {
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param $entry
+     */
+    private function processUpload(string $entry)
+    {
+        // file is old import:
+        if ($this->isOldImport($entry)) {
+            $this->saveOldImportFile($entry);
+        }
+
+        // file is current import.
+        if ($this->isImportFile($entry)) {
+            $this->saveImportFile($entry);
+        }
+    }
+
+    /**
+     * @param string $entry
+     */
+    private function saveImportFile(string $entry)
+    {
+        // find job associated with import file:
+        $name    = str_replace('.upload', '', $entry);
+        $job     = Auth::user()->importJobs()->where('key', $name)->first();
+        $content = '';
+        try {
+            $content = Crypt::decrypt($this->uploadDisk->get($entry));
+        } catch (DecryptException $e) {
+            Log::error('Could not decrypt old import file ' . $entry . '. Skipped because ' . $e->getMessage());
+        }
+
+        if (!is_null($job) && 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->getFiles()->push($file);
+        }
+    }
+
+    /**
+     * @param string $entry
+     */
+    private function saveOldImportFile(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->getOriginalUploadDate($entry);
+            $file = $this->job->key . '-Old import dated ' . $date . '.csv';
+            $this->exportDisk->put($file, $content);
+            $this->getFiles()->push($file);
+        }
+    }
+
+
+}

app/Export/ConfigurationFile.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * ConfigurationFile.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export;
+
+use FireflyIII\Export\Entry\Entry;
+use FireflyIII\Models\ExportJob;
+use Storage;
+
+/**
+ * Class ConfigurationFile
+ *
+ * @package FireflyIII\Export
+ */
+class ConfigurationFile
+{
+    /** @var \Illuminate\Contracts\Filesystem\Filesystem */
+    private $exportDisk;
+    /** @var  ExportJob */
+    private $job;
+
+    /**
+     * ConfigurationFile constructor.
+     *
+     * @param ExportJob $job
+     */
+    public function __construct(ExportJob $job)
+    {
+        $this->job        = $job;
+        $this->exportDisk = Storage::disk('export');
+    }
+
+    /**
+     * @return string
+     */
+    public function make(): string
+    {
+        $fields = array_keys(Entry::getFieldsAndTypes());
+        $types  = Entry::getFieldsAndTypes();
+
+        $configuration = [
+            'date-format' => 'Y-m-d', // unfortunately, this is hard-coded.
+            'has-headers' => true,
+            'map'         => [], // we could build a map if necessary for easy re-import.
+            'roles'       => [],
+            'mapped'      => [],
+            'specifix'    => [],
+        ];
+        foreach ($fields as $field) {
+            $configuration['roles'][] = $types[$field];
+        }
+        $file = $this->job->key . '-configuration.json';
+        $this->exportDisk->put($file, json_encode($configuration, JSON_PRETTY_PRINT));
+
+        return $file;
+    }
+
+}

app/Export/Entry/Entry.php

@@ -0,0 +1,130 @@
+<?php
+/**
+ * Entry.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Entry;
+
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Support\Collection;
+
+/**
+ * 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
+ *
+ * @package FireflyIII\Export\Entry
+ */
+final class Entry
+{
+    /** @var  string */
+    public $amount;
+    /** @var  EntryBill */
+    public $bill;
+    /** @var  EntryBudget */
+    public $budget;
+    /** @var  EntryCategory */
+    public $category;
+    /** @var  string */
+    public $date;
+    /** @var  string */
+    public $description;
+    /** @var  EntryAccount */
+    public $destinationAccount;
+    /** @var  Collection */
+    public $destinationAccounts;
+    /** @var  EntryAccount */
+    public $sourceAccount;
+    /** @var  Collection */
+    public $sourceAccounts;
+
+    /**
+     * Entry constructor.
+     */
+    private function __construct()
+    {
+        $this->sourceAccounts      = new Collection;
+        $this->destinationAccounts = new Collection;
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return Entry
+     */
+    public static function fromJournal(TransactionJournal $journal)
+    {
+
+        $entry              = new self;
+        $entry->description = $journal->description;
+        $entry->date        = $journal->date->format('Y-m-d');
+        $entry->amount      = TransactionJournal::amount($journal);
+
+        $entry->budget   = new EntryBudget($journal->budgets->first());
+        $entry->category = new EntryCategory($journal->categories->first());
+        $entry->bill     = new EntryBill($journal->bill);
+
+        $sources                   = TransactionJournal::sourceAccountList($journal);
+        $destinations              = TransactionJournal::destinationAccountList($journal);
+        $entry->sourceAccount      = new EntryAccount($sources->first());
+        $entry->destinationAccount = new EntryAccount($destinations->first());
+
+        foreach ($sources as $source) {
+            $entry->sourceAccounts->push(new EntryAccount($source));
+        }
+
+        foreach ($destinations as $destination) {
+            $entry->destinationAccounts->push(new EntryAccount($destination));
+        }
+
+        return $entry;
+
+    }
+
+    /**
+     * @return array
+     */
+    public static function getFieldsAndTypes(): array
+    {
+        // key = field name (see top of class)
+        // value = field type (see csv.php under 'roles')
+        return [
+            'description'                => 'description',
+            'amount'                     => 'amount',
+            'date'                       => 'date-transaction',
+            'source_account_id'          => 'account-id',
+            'source_account_name'        => 'account-name',
+            'source_account_iban'        => 'account-iban',
+            'source_account_type'        => '_ignore',
+            'source_account_number'      => 'account-number',
+            'destination_account_id'     => 'opposing-id',
+            'destination_account_name'   => 'opposing-name',
+            'destination_account_iban'   => 'opposing-iban',
+            'destination_account_type'   => '_ignore',
+            'destination_account_number' => 'account-number',
+            'budget_id'                  => 'budget-id',
+            'budget_name'                => 'budget-name',
+            'category_id'                => 'category-id',
+            'category_name'              => 'category-name',
+            'bill_id'                    => 'bill-id',
+            'bill_name'                  => 'bill-name',
+        ];
+    }
+
+}

app/Export/Entry/EntryAccount.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * EntryAccount.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Entry;
+
+use FireflyIII\Models\Account;
+
+/**
+ * Class EntryAccount
+ *
+ * @package FireflyIII\Export\Entry
+ */
+class EntryAccount
+{
+    /** @var  int */
+    public $accountId;
+    /** @var  string */
+    public $iban;
+    /** @var  string */
+    public $name;
+    /** @var  string */
+    public $number;
+    /** @var  string */
+    public $type;
+
+    /**
+     * EntryAccount constructor.
+     *
+     * @param Account $account
+     */
+    public function __construct(Account $account)
+    {
+        $this->accountId = $account->id;
+        $this->name      = $account->name;
+        $this->iban      = $account->iban;
+        $this->type      = $account->accountType->type;
+        $this->number    = $account->getMeta('accountNumber');
+    }
+}

app/Export/Entry/EntryBill.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * EntryBill.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Entry;
+
+use FireflyIII\Models\Bill;
+
+/**
+ * Class EntryBill
+ *
+ * @package FireflyIII\Export\Entry
+ */
+class EntryBill
+{
+    /** @var  int */
+    public $billId = '';
+    /** @var  string */
+    public $name = '';
+
+    /**
+     * EntryBill constructor.
+     *
+     * @param Bill $bill
+     */
+    public function __construct(Bill $bill = null)
+    {
+        if (!is_null($bill)) {
+            $this->billId = $bill->id;
+            $this->name   = $bill->name;
+        }
+    }
+
+}

app/Export/Entry/EntryBudget.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * EntryBudget.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Entry;
+
+use FireflyIII\Models\Budget;
+
+/**
+ * Class EntryBudget
+ *
+ * @package FireflyIII\Export\Entry
+ */
+class EntryBudget
+{
+    /** @var  int */
+    public $budgetId = '';
+    /** @var  string */
+    public $name = '';
+
+    /**
+     * EntryBudget constructor.
+     *
+     * @param Budget $budget
+     */
+    public function __construct(Budget $budget = null)
+    {
+        if (!is_null($budget)) {
+            $this->budgetId = $budget->id;
+            $this->name     = $budget->name;
+        }
+    }
+
+}

app/Export/Entry/EntryCategory.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * EntryCategory.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Entry;
+
+use FireflyIII\Models\Category;
+
+/**
+ * Class EntryCategory
+ *
+ * @package FireflyIII\Export\Entry
+ */
+class EntryCategory
+{
+    /** @var  int */
+    public $categoryId = '';
+    /** @var  string */
+    public $name = '';
+
+    /**
+     * EntryCategory constructor.
+     *
+     * @param Category $category
+     */
+    public function __construct(Category $category = null)
+    {
+        if (!is_null($category)) {
+            $this->categoryId = $category->id;
+            $this->name       = $category->name;
+        }
+    }
+}

app/Export/Exporter/BasicExporter.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * BasicExporter.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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,172 @@
+<?php
+/**
+ * CsvExporter.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Exporter;
+
+use FireflyIII\Export\Entry\Entry;
+use FireflyIII\Export\Entry\EntryAccount;
+use FireflyIII\Models\ExportJob;
+use Illuminate\Support\Collection;
+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     = [];
+
+        // Count the maximum number of sources and destinations each entry has. May need to expand the number of export fields:
+        $maxSourceAccounts = 1;
+        $maxDestAccounts   = 1;
+        /** @var Entry $entry */
+        foreach ($this->getEntries() as $entry) {
+            $sources           = $entry->sourceAccounts->count();
+            $destinations      = $entry->destinationAccounts->count();
+            $maxSourceAccounts = max($maxSourceAccounts, $sources);
+            $maxDestAccounts   = max($maxDestAccounts, $destinations);
+        }
+        $rows[] = array_keys($this->getFieldsAndTypes($maxSourceAccounts, $maxDestAccounts));
+
+        /** @var Entry $entry */
+        foreach ($this->getEntries() as $entry) {
+            // order is defined in Entry::getFieldsAndTypes.
+            $current    = [$entry->description, $entry->amount, $entry->date];
+            $sourceData = $this->getAccountData($maxSourceAccounts, $entry->sourceAccounts);
+            $current    = array_merge($current, $sourceData);
+            $destData   = $this->getAccountData($maxDestAccounts, $entry->destinationAccounts);
+            $current    = array_merge($current, $destData);
+            $rest       = [$entry->budget->budgetId, $entry->budget->name, $entry->category->categoryId, $entry->category->name, $entry->bill->billId,
+                           $entry->bill->name];
+            $current    = array_merge($current, $rest);
+            $rows[]     = $current;
+        }
+        $writer->insertAll($rows);
+
+        return true;
+    }
+
+    /**
+     * @param int        $max
+     * @param Collection $accounts
+     *
+     * @return array
+     */
+    private function getAccountData(int $max, Collection $accounts): array
+    {
+        $current = [];
+        for ($i = 0; $i < $max; $i++) {
+            /** @var EntryAccount $source */
+            $source        = $accounts->get($i);
+            $currentId     = '';
+            $currentName   = '';
+            $currentIban   = '';
+            $currentType   = '';
+            $currentNumber = '';
+            if ($source) {
+                $currentId     = $source->accountId;
+                $currentName   = $source->name;
+                $currentIban   = $source->iban;
+                $currentType   = $source->type;
+                $currentNumber = $source->number;
+            }
+            $current[] = $currentId;
+            $current[] = $currentName;
+            $current[] = $currentIban;
+            $current[] = $currentType;
+            $current[] = $currentNumber;
+        }
+        unset($source);
+
+        return $current;
+    }
+
+    /**
+     * @param int $sources
+     * @param int $destinations
+     *
+     * @return array
+     */
+    private function getFieldsAndTypes(int $sources, int $destinations): array
+    {
+        // key = field name (see top of class)
+        // value = field type (see csv.php under 'roles')
+        $array = [
+            'description' => 'description',
+            'amount'      => 'amount',
+            'date'        => 'date-transaction',
+        ];
+        for ($i = 0; $i < $sources; $i++) {
+            $array['source_account_' . $i . '_id']     = 'account-id';
+            $array['source_account_' . $i . '_name']   = 'account-name';
+            $array['source_account_' . $i . '_iban']   = 'account-iban';
+            $array['source_account_' . $i . '_type']   = '_ignore';
+            $array['source_account_' . $i . '_number'] = 'account-number';
+        }
+        for ($i = 0; $i < $destinations; $i++) {
+            $array['destination_account_' . $i . '_id']     = 'account-id';
+            $array['destination_account_' . $i . '_name']   = 'account-name';
+            $array['destination_account_' . $i . '_iban']   = 'account-iban';
+            $array['destination_account_' . $i . '_type']   = '_ignore';
+            $array['destination_account_' . $i . '_number'] = 'account-number';
+        }
+
+        $array['budget_id']     = 'budget-id';
+        $array['budget_name']   = 'budget-name';
+        $array['category_id']   = 'category-id';
+        $array['category_name'] = 'category-name';
+        $array['bill_id']       = 'bill-id';
+        $array['bill_name']     = 'bill-name';
+
+        return $array;
+    }
+
+    private function tempFile()
+    {
+        $this->fileName = $this->job->key . '-records.csv';
+    }
+}

app/Export/Exporter/ExporterInterface.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * ExporterInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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
+     *
+     */
+    public function setEntries(Collection $entries);
+
+}

app/Export/Processor.php

@@ -0,0 +1,203 @@
+<?php
+/**
+ * Processor.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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\UploadCollector;
+use FireflyIII\Export\Entry\Entry;
+use FireflyIII\Models\ExportJob;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use Illuminate\Filesystem\FilesystemAdapter;
+use Illuminate\Support\Collection;
+use Storage;
+use ZipArchive;
+
+/**
+ * Class Processor
+ *
+ * @package FireflyIII\Export
+ */
+class Processor
+{
+
+    /** @var Collection */
+    public $accounts;
+    /** @var  string */
+    public $exportFormat;
+    /** @var  bool */
+    public $includeAttachments;
+    /** @var  bool */
+    public $includeConfig;
+    /** @var  bool */
+    public $includeOldUploads;
+    /** @var  ExportJob */
+    public $job;
+    /** @var array */
+    public $settings;
+    /** @var  \FireflyIII\Export\ConfigurationFile */
+    private $configurationMaker;
+    /** @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->includeConfig      = $settings['includeConfig'];
+        $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->run();
+        $this->files = $this->files->merge($attachmentCollector->getFiles());
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function collectJournals(): bool
+    {
+        /** @var JournalRepositoryInterface $repository */
+        $repository     = app(JournalRepositoryInterface::class);
+        $this->journals = $repository->getJournalsInRange($this->accounts, $this->settings['startDate'], $this->settings['endDate']);
+
+        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->getFiles());
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function convertJournals(): bool
+    {
+        $count = 0;
+        /** @var TransactionJournal $journal */
+        foreach ($this->journals as $journal) {
+            $this->exportEntries->push(Entry::fromJournal($journal));
+            $count++;
+        }
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function createConfigFile(): bool
+    {
+        $this->configurationMaker = app(ConfigurationFile::class, [$this->job]);
+        $this->files->push($this->configurationMaker->make());
+
+        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($disk);
+
+        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;
+    }
+
+    /**
+     * @param FilesystemAdapter $disk
+     */
+    private function deleteFiles(FilesystemAdapter $disk)
+    {
+        foreach ($this->getFiles() as $file) {
+            $disk->delete($file);
+        }
+    }
+}

app/Generator/Chart/Account/AccountChartGeneratorInterface.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * AccountChartGeneratorInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Chart\Account;
+
+use Carbon\Carbon;
+use FireflyIII\Models\Account;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface AccountChartGeneratorInterface
+ *
+ * @package FireflyIII\Generator\Chart\Account
+ */
+interface AccountChartGeneratorInterface
+{
+
+    /**
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return array
+     */
+    public function expenseAccounts(Collection $accounts, Carbon $start, Carbon $end): array;
+
+    /**
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return array
+     */
+    public function frontpage(Collection $accounts, Carbon $start, Carbon $end): array;
+
+    /**
+     * @param Account $account
+     * @param array   $labels
+     * @param array   $dataSet
+     *
+     * @return array
+     */
+    public function single(Account $account, array $labels, array $dataSet): array;
+}

app/Generator/Chart/Account/ChartJsAccountChartGenerator.php

@@ -0,0 +1,107 @@
+<?php
+/**
+ * ChartJsAccountChartGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Generator\Chart\Account;
+
+use Carbon\Carbon;
+use FireflyIII\Models\Account;
+use Illuminate\Support\Collection;
+
+/**
+ * Class ChartJsAccountChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Account
+ */
+class ChartJsAccountChartGenerator implements AccountChartGeneratorInterface
+{
+
+    /**
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return array
+     */
+    public function expenseAccounts(Collection $accounts, Carbon $start, Carbon $end): array
+    {
+        $data = [
+            'count'  => 1,
+            'labels' => [], 'datasets' => [[
+                                               'label' => trans('firefly.spent'),
+                                               'data'  => []]]];
+        foreach ($accounts as $account) {
+            if ($account->difference > 0) {
+                $data['labels'][]              = $account->name;
+                $data['datasets'][0]['data'][] = $account->difference;
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return array
+     */
+    public function frontpage(Collection $accounts, Carbon $start, Carbon $end): array
+    {
+        // language:
+        $format  = (string)trans('config.month_and_day');
+        $data    = ['count' => 0, 'labels' => [], 'datasets' => [],];
+        $current = clone $start;
+        while ($current <= $end) {
+            $data['labels'][] = $current->formatLocalized($format);
+            $current->addDay();
+        }
+
+        foreach ($accounts as $account) {
+            $data['datasets'][] = [
+                'label'                => $account->name,
+                'fillColor'            => 'rgba(220,220,220,0.2)',
+                'strokeColor'          => 'rgba(220,220,220,1)',
+                'pointColor'           => 'rgba(220,220,220,1)',
+                'pointStrokeColor'     => '#fff',
+                'pointHighlightFill'   => '#fff',
+                'pointHighlightStroke' => 'rgba(220,220,220,1)',
+                'data'                 => $account->balances,
+            ];
+        }
+        $data['count'] = count($data['datasets']);
+
+        return $data;
+    }
+
+    /**
+     * @param Account $account
+     * @param array   $labels
+     * @param array   $dataSet
+     *
+     * @return array
+     */
+    public function single(Account $account, array $labels, array $dataSet): array
+    {
+        $data = [
+            'count'    => 1,
+            'labels'   => $labels,
+            'datasets' => [
+                [
+                    'label' => $account->name,
+                    'data'  => $dataSet,
+                ],
+            ],
+        ];
+
+        return $data;
+    }
+
+}

app/Generator/Chart/Bill/BillChartGeneratorInterface.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * BillChartGeneratorInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Chart\Bill;
+
+
+use FireflyIII\Models\Bill;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface BillChartGeneratorInterface
+ *
+ * @package FireflyIII\Generator\Chart\Bill
+ */
+interface BillChartGeneratorInterface
+{
+
+    /**
+     * @param string $paid
+     * @param string $unpaid
+     *
+     * @return array
+     */
+    public function frontpage(string $paid, string $unpaid): array;
+
+    /**
+     * @param Bill       $bill
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function single(Bill $bill, Collection $entries): array;
+
+}

app/Generator/Chart/Bill/ChartJsBillChartGenerator.php

@@ -0,0 +1,91 @@
+<?php
+/**
+ * ChartJsBillChartGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Chart\Bill;
+
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Support\Collection;
+
+/**
+ * Class ChartJsBillChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Bill
+ */
+class ChartJsBillChartGenerator implements BillChartGeneratorInterface
+{
+
+    /**
+     * @param string $paid
+     * @param string $unpaid
+     *
+     * @return array
+     */
+    public function frontpage(string $paid, string $unpaid): array
+    {
+        $data = [
+            'datasets' => [
+                [
+                    'data'            => [round($unpaid, 2), round(bcmul($paid, '-1'), 2)],
+                    'backgroundColor' => ['rgba(53, 124, 165,0.7)', 'rgba(0, 141, 76, 0.7)',],
+                ],
+
+            ],
+            'labels'   => [strval(trans('firefly.unpaid')), strval(trans('firefly.paid'))],
+
+        ];
+
+        return $data;
+    }
+
+    /**
+     * @param Bill       $bill
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function single(Bill $bill, Collection $entries): array
+    {
+        $format       = (string)trans('config.month');
+        $data         = ['count' => 3, 'labels' => [], 'datasets' => [],];
+        $minAmount    = [];
+        $maxAmount    = [];
+        $actualAmount = [];
+        /** @var TransactionJournal $entry */
+        foreach ($entries as $entry) {
+            $data['labels'][] = $entry->date->formatLocalized($format);
+            $minAmount[]      = round($bill->amount_min, 2);
+            $maxAmount[]      = round($bill->amount_max, 2);
+            // journalAmount has been collected in BillRepository::getJournals
+            $actualAmount[] = round(TransactionJournal::amountPositive($entry), 2);
+        }
+
+        $data['datasets'][] = [
+            'type'  => 'bar',
+            'label' => trans('firefly.minAmount'),
+            'data'  => $minAmount,
+        ];
+        $data['datasets'][] = [
+            'type'  => 'line',
+            'label' => trans('firefly.billEntry'),
+            'data'  => $actualAmount,
+        ];
+        $data['datasets'][] = [
+            'type'  => 'bar',
+            'label' => trans('firefly.maxAmount'),
+            'data'  => $maxAmount,
+        ];
+
+        $data['count'] = count($data['datasets']);
+
+        return $data;
+    }
+}

app/Generator/Chart/Budget/BudgetChartGeneratorInterface.php

@@ -0,0 +1,62 @@
+<?php
+/**
+ * BudgetChartGeneratorInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Chart\Budget;
+
+use Illuminate\Support\Collection;
+
+/**
+ * Interface BudgetChartGeneratorInterface
+ *
+ * @package FireflyIII\Generator\Chart\Budget
+ */
+interface BudgetChartGeneratorInterface
+{
+
+    /**
+     * @param Collection $entries
+     * @param string     $dateFormat
+     *
+     * @return array
+     */
+    public function budgetLimit(Collection $entries, string $dateFormat): array;
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function frontpage(Collection $entries): array;
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function multiYear(Collection $entries): array;
+
+    /**
+     * @param Collection $entries
+     * @param string     $viewRange
+     *
+     * @return array
+     */
+    public function period(Collection $entries, string $viewRange) : array;
+
+    /**
+     * @param Collection $budgets
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function year(Collection $budgets, Collection $entries): array;
+
+}

app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php

@@ -0,0 +1,208 @@
+<?php
+/**
+ * ChartJsBudgetChartGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Generator\Chart\Budget;
+
+
+use Illuminate\Support\Collection;
+use Navigation;
+
+/**
+ * Class ChartJsBudgetChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Budget
+ */
+class ChartJsBudgetChartGenerator implements BudgetChartGeneratorInterface
+{
+    /**
+     *
+     * @param Collection $entries
+     * @param string     $dateFormat
+     *
+     * @return array
+     */
+    public function budgetLimit(Collection $entries, string $dateFormat = 'month_and_day'): array
+    {
+        $format = strval(trans('config.' . $dateFormat));
+        $data   = [
+            'labels'   => [],
+            'datasets' => [
+                [
+                    'label' => 'Amount',
+                    'data'  => [],
+                ],
+            ],
+        ];
+
+        /** @var array $entry */
+        foreach ($entries as $entry) {
+            $data['labels'][]              = $entry[0]->formatLocalized($format);
+            $data['datasets'][0]['data'][] = $entry[1];
+
+        }
+
+        $data['count'] = count($data['datasets']);
+
+        return $data;
+    }
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function frontpage(Collection $entries): array
+    {
+        $data      = [
+            'count'    => 0,
+            'labels'   => [],
+            'datasets' => [],
+        ];
+        $left      = [];
+        $spent     = [];
+        $overspent = [];
+        $filtered  = $entries->filter(
+            function ($entry) {
+                return ($entry[1] != 0 || $entry[2] != 0 || $entry[3] != 0);
+            }
+        );
+        foreach ($filtered as $entry) {
+            $data['labels'][] = $entry[0];
+            $left[]           = round($entry[1], 2);
+            $spent[]          = round(bcmul($entry[2], '-1'), 2); // spent is coming in negative, must be positive
+            $overspent[]      = round(bcmul($entry[3], '-1'), 2); // same
+        }
+
+        $data['datasets'][] = [
+            'label' => trans('firefly.overspent'),
+            'data'  => $overspent,
+        ];
+        $data['datasets'][] = [
+            'label' => trans('firefly.left'),
+            'data'  => $left,
+        ];
+        $data['datasets'][] = [
+            'label' => trans('firefly.spent'),
+            'data'  => $spent,
+        ];
+
+        $data['count'] = 3;
+
+        return $data;
+    }
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function multiYear(Collection $entries): array
+    {
+        // dataset:
+        $data = [
+            'count'    => 0,
+            'labels'   => [],
+            'datasets' => [],
+        ];
+        // get labels from one of the budgets (assuming there's at least one):
+        $first = $entries->first();
+        $keys  = array_keys($first['budgeted']);
+        foreach ($keys as $year) {
+            $data['labels'][] = strval($year);
+        }
+
+        // then, loop all entries and create datasets:
+        foreach ($entries as $entry) {
+            $name               = $entry['name'];
+            $spent              = $entry['spent'];
+            $budgeted           = $entry['budgeted'];
+            $data['datasets'][] = ['label' => 'Spent on ' . $name, 'data' => array_values($spent)];
+            $data['datasets'][] = ['label' => 'Budgeted for ' . $name, 'data' => array_values($budgeted)];
+        }
+        $data['count'] = count($data['datasets']);
+
+        return $data;
+
+    }
+
+    /**
+     * @param Collection $entries
+     * @param string     $viewRange
+     *
+     * @return array
+     */
+    public function period(Collection $entries, string $viewRange) : array
+    {
+        $data = [
+            'labels'   => [],
+            'datasets' => [
+                0 => [
+                    'label' => trans('firefly.budgeted'),
+                    'data'  => [],
+                ],
+                1 => [
+                    'label' => trans('firefly.spent'),
+                    'data'  => [],
+                ],
+            ],
+            'count'    => 2,
+        ];
+        foreach ($entries as $entry) {
+            $label            = Navigation::periodShow($entry['date'], $viewRange);
+            $data['labels'][] = $label;
+            // data set 0 is budgeted
+            // data set 1 is spent:
+            $data['datasets'][0]['data'][] = $entry['budgeted'];
+            $data['datasets'][1]['data'][] = round(($entry['spent'] * -1), 2);
+
+        }
+
+        return $data;
+
+    }
+
+    /**
+     * @param Collection $budgets
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function year(Collection $budgets, Collection $entries): array
+    {
+        // language:
+        $format = (string)trans('config.month');
+
+        $data = [
+            'labels'   => [],
+            'datasets' => [],
+        ];
+
+        foreach ($budgets as $budget) {
+            $data['labels'][] = $budget->name;
+        }
+        // also add "no budget"
+        $data['labels'][] = strval(trans('firefly.no_budget'));
+
+        /** @var array $entry */
+        foreach ($entries as $entry) {
+            $array = [
+                'label' => $entry[0]->formatLocalized($format),
+                'data'  => [],
+            ];
+            array_shift($entry);
+            $array['data']      = $entry;
+            $data['datasets'][] = $array;
+
+        }
+        $data['count'] = count($data['datasets']);
+
+        return $data;
+    }
+}

app/Generator/Chart/Category/CategoryChartGeneratorInterface.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * CategoryChartGeneratorInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Chart\Category;
+
+use Illuminate\Support\Collection;
+
+/**
+ * Interface CategoryChartGeneratorInterface
+ *
+ * @package FireflyIII\Generator\Chart\Category
+ */
+interface CategoryChartGeneratorInterface
+{
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function all(Collection $entries): array;
+
+    /**
+     * @param Collection $categories
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function earnedInPeriod(Collection $categories, Collection $entries): array;
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function frontpage(Collection $entries): array;
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function multiYear(Collection $entries): array;
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function period(Collection $entries): array;
+
+    /**
+     * @param Collection $categories
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function spentInPeriod(Collection $categories, Collection $entries): array;
+}

app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php

@@ -0,0 +1,190 @@
+<?php
+/**
+ * ChartJsCategoryChartGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Generator\Chart\Category;
+
+use Illuminate\Support\Collection;
+
+
+/**
+ * Class ChartJsCategoryChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Category
+ */
+class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
+{
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function all(Collection $entries): array
+    {
+        $data = [
+            'count'    => 2,
+            'labels'   => [],
+            'datasets' => [
+                [
+                    'label' => trans('firefly.spent'),
+                    'data'  => [],
+                ],
+                [
+                    'label' => trans('firefly.earned'),
+                    'data'  => [],
+                ],
+            ],
+        ];
+
+        foreach ($entries as $entry) {
+            $data['labels'][] = $entry[1];
+            $spent            = $entry[2];
+            $earned           = $entry[3];
+
+            $data['datasets'][0]['data'][] = bccomp($spent, '0') === 0 ? null : round(bcmul($spent, '-1'), 4);
+            $data['datasets'][1]['data'][] = bccomp($earned, '0') === 0 ? null : round($earned, 4);
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param Collection $categories
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function earnedInPeriod(Collection $categories, Collection $entries): array
+    {
+
+        // language:
+        $format = (string)trans('config.month');
+
+        $data = [
+            'count'    => 0,
+            'labels'   => [],
+            'datasets' => [],
+        ];
+
+        foreach ($categories as $category) {
+            $data['labels'][] = $category->name;
+        }
+
+        foreach ($entries as $entry) {
+            $date = $entry[0]->formatLocalized($format);
+            array_shift($entry);
+            $data['count']++;
+            $data['datasets'][] = ['label' => $date, 'data' => $entry];
+        }
+
+        return $data;
+
+    }
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function frontpage(Collection $entries): array
+    {
+        $data = [
+            'count'    => 1,
+            'labels'   => [],
+            'datasets' => [
+                [
+                    'label' => trans('firefly.spent'),
+                    'data'  => [],
+                ],
+            ],
+        ];
+        foreach ($entries as $entry) {
+            if ($entry->spent != 0) {
+                $data['labels'][]              = $entry->name;
+                $data['datasets'][0]['data'][] = round(bcmul($entry->spent, '-1'), 2);
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function multiYear(Collection $entries): array
+    {
+        // get labels from one of the categories (assuming there's at least one):
+        $first = $entries->first();
+        $data  = ['count' => 0, 'labels' => array_keys($first['spent']), 'datasets' => [],];
+
+        // then, loop all entries and create datasets:
+        foreach ($entries as $entry) {
+            $name   = $entry['name'];
+            $spent  = $entry['spent'];
+            $earned = $entry['earned'];
+            if (array_sum(array_values($spent)) != 0) {
+                $data['datasets'][] = ['label' => 'Spent in category ' . $name, 'data' => array_values($spent)];
+            }
+            if (array_sum(array_values($earned)) != 0) {
+                $data['datasets'][] = ['label' => 'Earned in category ' . $name, 'data' => array_values($earned)];
+            }
+        }
+        $data['count'] = count($data['datasets']);
+
+        return $data;
+    }
+
+    /**
+     *
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function period(Collection $entries): array
+    {
+        return $this->all($entries);
+
+    }
+
+    /**
+     * @param Collection $categories
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function spentInPeriod(Collection $categories, Collection $entries): array
+    {
+
+        // language:
+        $format = (string)trans('config.month');
+
+        $data = [
+            'count'    => 0,
+            'labels'   => [],
+            'datasets' => [],
+        ];
+
+        foreach ($categories as $category) {
+            $data['labels'][] = $category->name;
+        }
+
+        foreach ($entries as $entry) {
+            $date = $entry[0]->formatLocalized($format);
+            array_shift($entry);
+            $data['count']++;
+            $data['datasets'][] = ['label' => $date, 'data' => $entry];
+        }
+
+        return $data;
+
+    }
+}

app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * ChartJsPiggyBankChartGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Generator\Chart\PiggyBank;
+
+use Carbon\Carbon;
+use Illuminate\Support\Collection;
+
+
+/**
+ * Class ChartJsPiggyBankChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\PiggyBank
+ */
+class ChartJsPiggyBankChartGenerator implements PiggyBankChartGeneratorInterface
+{
+
+    /**
+     * @param Collection $set
+     *
+     * @return array
+     */
+    public function history(Collection $set): array
+    {
+
+        // language:
+        $format = (string)trans('config.month_and_day');
+
+        $data = [
+            'count'    => 1,
+            'labels'   => [],
+            'datasets' => [
+                [
+                    'label' => 'Diff',
+                    'data'  => [],
+                ],
+            ],
+        ];
+        $sum  = '0';
+        foreach ($set as $key => $value) {
+            $date                          = new Carbon($key);
+            $sum                           = bcadd($sum, $value);
+            $data['labels'][]              = $date->formatLocalized($format);
+            $data['datasets'][0]['data'][] = round($sum, 2);
+        }
+
+        return $data;
+    }
+}

app/Generator/Chart/PiggyBank/PiggyBankChartGeneratorInterface.php

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

app/Generator/Chart/Report/ChartJsReportChartGenerator.php

@@ -0,0 +1,178 @@
+<?php
+/**
+ * ChartJsReportChartGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Generator\Chart\Report;
+
+use Illuminate\Support\Collection;
+
+/**
+ * Class ChartJsReportChartGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Report
+ */
+class ChartJsReportChartGenerator implements ReportChartGeneratorInterface
+{
+
+    /**
+     * Same as above but other translations.
+     *
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function multiYearInOut(Collection $entries): array
+    {
+        $data = [
+            'count'    => 2,
+            'labels'   => [],
+            'datasets' => [
+                [
+                    'label' => trans('firefly.income'),
+                    'data'  => [],
+                ],
+                [
+                    'label' => trans('firefly.expenses'),
+                    'data'  => [],
+                ],
+            ],
+        ];
+
+        foreach ($entries as $entry) {
+            $data['labels'][]              = $entry[0]->formatLocalized('%Y');
+            $data['datasets'][0]['data'][] = round($entry[1], 2);
+            $data['datasets'][1]['data'][] = round($entry[2], 2);
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param string $income
+     * @param string $expense
+     * @param int    $count
+     *
+     * @return array
+     */
+    public function multiYearInOutSummarized(string $income, string $expense, int $count): array
+    {
+        $data                          = [
+            'count'    => 2,
+            'labels'   => [trans('firefly.sum_of_years'), trans('firefly.average_of_years')],
+            'datasets' => [
+                [
+                    'label' => trans('firefly.income'),
+                    'data'  => [],
+                ],
+                [
+                    'label' => trans('firefly.expenses'),
+                    'data'  => [],
+                ],
+            ],
+        ];
+        $data['datasets'][0]['data'][] = round($income, 2);
+        $data['datasets'][1]['data'][] = round($expense, 2);
+        $data['datasets'][0]['data'][] = round(($income / $count), 2);
+        $data['datasets'][1]['data'][] = round(($expense / $count), 2);
+
+        return $data;
+    }
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function netWorth(Collection $entries) : array
+    {
+        $format = (string)trans('config.month_and_day');
+        $data   = [
+            'count'    => 1,
+            'labels'   => [],
+            'datasets' => [
+                [
+                    'label' => trans('firefly.net_worth'),
+                    'data'  => [],
+                ],
+            ],
+        ];
+        foreach ($entries as $entry) {
+            $data['labels'][]              = trim($entry['date']->formatLocalized($format));
+            $data['datasets'][0]['data'][] = round($entry['net-worth'], 2);
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function yearInOut(Collection $entries): array
+    {
+        // language:
+        $format = (string)trans('config.month');
+
+        $data = [
+            'count'    => 2,
+            'labels'   => [],
+            'datasets' => [
+                [
+                    'label' => trans('firefly.income'),
+                    'data'  => [],
+                ],
+                [
+                    'label' => trans('firefly.expenses'),
+                    'data'  => [],
+                ],
+            ],
+        ];
+
+        foreach ($entries as $entry) {
+            $data['labels'][]              = $entry[0]->formatLocalized($format);
+            $data['datasets'][0]['data'][] = round($entry[1], 2);
+            $data['datasets'][1]['data'][] = round($entry[2], 2);
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param string $income
+     * @param string $expense
+     * @param int    $count
+     *
+     * @return array
+     */
+    public function yearInOutSummarized(string $income, string $expense, int $count): array
+    {
+
+        $data                          = [
+            'count'    => 2,
+            'labels'   => [trans('firefly.sum_of_year'), trans('firefly.average_of_year')],
+            'datasets' => [
+                [
+                    'label' => trans('firefly.income'),
+                    'data'  => [],
+                ],
+                [
+                    'label' => trans('firefly.expenses'),
+                    'data'  => [],
+                ],
+            ],
+        ];
+        $data['datasets'][0]['data'][] = round($income, 2);
+        $data['datasets'][1]['data'][] = round($expense, 2);
+        $data['datasets'][0]['data'][] = round(($income / $count), 2);
+        $data['datasets'][1]['data'][] = round(($expense / $count), 2);
+
+        return $data;
+    }
+}

app/Generator/Chart/Report/ReportChartGeneratorInterface.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * ReportChartGeneratorInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Chart\Report;
+
+use Illuminate\Support\Collection;
+
+/**
+ * Interface ReportChartGeneratorInterface
+ *
+ * @package FireflyIII\Generator\Chart\Report
+ */
+interface ReportChartGeneratorInterface
+{
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function multiYearInOut(Collection $entries): array;
+
+    /**
+     * @param string $income
+     * @param string $expense
+     * @param int    $count
+     *
+     * @return array
+     */
+    public function multiYearInOutSummarized(string $income, string $expense, int $count): array;
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function netWorth(Collection $entries) : array;
+
+    /**
+     * @param Collection $entries
+     *
+     * @return array
+     */
+    public function yearInOut(Collection $entries): array;
+
+    /**
+     * @param string $income
+     * @param string $expense
+     * @param int    $count
+     *
+     * @return array
+     */
+    public function yearInOutSummarized(string $income, string $expense, int $count): array;
+
+}

app/Handlers/Events/AttachUserRole.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * AttachUserRole.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Handlers\Events;
+
+
+use FireflyIII\Events\UserRegistration;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
+
+/**
+ * Class AttachUserRole
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class AttachUserRole
+{
+    /**
+     * Create the event listener.
+     *
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  UserRegistration $event
+     */
+    public function handle(UserRegistration $event)
+    {
+        /** @var UserRepositoryInterface $repository */
+        $repository = app(UserRepositoryInterface::class);
+
+        // first user ever?
+        if ($repository->count() == 1) {
+            $repository->attachRole($event->user, 'owner');
+        }
+    }
+
+}

app/Handlers/Events/BudgetLimitEventHandler.php

@@ -0,0 +1,107 @@
+<?php
+/**
+ * BudgetLimitEventHandler.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Handlers\Events;
+
+use FireflyIII\Events\BudgetLimitStored;
+use FireflyIII\Events\BudgetLimitUpdated;
+use FireflyIII\Models\LimitRepetition;
+use Illuminate\Database\QueryException;
+use Log;
+
+/**
+ * Class BudgetLimitEventHandler
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class BudgetLimitEventHandler
+{
+    /**
+     * Create the event listener.
+     *
+     */
+    public function __construct()
+    {
+
+    }
+
+    /**
+     * In a perfect world, the store() routine should be different from the update()
+     * routine. It would not have to check count() == 0 because there could be NO
+     * limit repetitions at this point. However, the database can be wrong so we check.
+     *
+     * @param BudgetLimitStored $event
+     */
+    public function store(BudgetLimitStored $event)
+    {
+        $budgetLimit = $event->budgetLimit;
+        $end         = $event->end;
+        $set         = $budgetLimit->limitrepetitions()
+                                   ->where('startdate', $budgetLimit->startdate->format('Y-m-d 00:00:00'))
+                                   ->where('enddate', $end->format('Y-m-d 00:00:00'))
+                                   ->get();
+        if ($set->count() == 0) {
+            $repetition            = new LimitRepetition;
+            $repetition->startdate = $budgetLimit->startdate;
+            $repetition->enddate   = $end;
+            $repetition->amount    = $budgetLimit->amount;
+            $repetition->budgetLimit()->associate($budgetLimit);
+
+            try {
+                $repetition->save();
+            } catch (QueryException $e) {
+                Log::error('Trying to save new LimitRepetition failed: ' . $e->getMessage());
+            }
+        }
+
+        if ($set->count() == 1) {
+            $repetition         = $set->first();
+            $repetition->amount = $budgetLimit->amount;
+            $repetition->save();
+
+        }
+
+    }
+
+    /**
+     * @param BudgetLimitUpdated $event
+     */
+    public function update(BudgetLimitUpdated $event)
+    {
+        $budgetLimit = $event->budgetLimit;
+        $end         = $event->end;
+        $set         = $budgetLimit->limitrepetitions()
+                                   ->where('startdate', $budgetLimit->startdate->format('Y-m-d 00:00:00'))
+                                   ->where('enddate', $end->format('Y-m-d 00:00:00'))
+                                   ->get();
+        if ($set->count() == 0) {
+            $repetition            = new LimitRepetition;
+            $repetition->startdate = $budgetLimit->startdate;
+            $repetition->enddate   = $end;
+            $repetition->amount    = $budgetLimit->amount;
+            $repetition->budgetLimit()->associate($budgetLimit);
+
+            try {
+                $repetition->save();
+            } catch (QueryException $e) {
+                Log::error('Trying to save new LimitRepetition failed: ' . $e->getMessage());
+            }
+        }
+
+        if ($set->count() == 1) {
+            $repetition         = $set->first();
+            $repetition->amount = $budgetLimit->amount;
+            $repetition->save();
+
+        }
+    }
+
+}

app/Handlers/Events/ConnectJournalToPiggyBank.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * ConnectJournalToPiggyBank.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Handlers\Events;
+
+use Auth;
+use FireflyIII\Events\TransactionJournalStored;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\PiggyBankEvent;
+use FireflyIII\Models\TransactionJournal;
+
+/**
+ * Class ConnectJournalToPiggyBank
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class ConnectJournalToPiggyBank
+{
+
+    /**
+     * Connect a new transaction journal to any related piggy banks.
+     *
+     * @param  TransactionJournalStored $event
+     *
+     * @return bool
+     */
+    public function handle(TransactionJournalStored $event): bool
+    {
+        /** @var TransactionJournal $journal */
+        $journal     = $event->journal;
+        $piggyBankId = $event->piggyBankId;
+
+        /** @var PiggyBank $piggyBank */
+        $piggyBank = Auth::user()->piggyBanks()->where('piggy_banks.id', $piggyBankId)->first(['piggy_banks.*']);
+
+        if (is_null($piggyBank)) {
+            return true;
+        }
+        // update piggy bank rep for date of transaction journal.
+        $repetition = $piggyBank->piggyBankRepetitions()->relevantOnDate($journal->date)->first();
+        if (is_null($repetition)) {
+            return true;
+        }
+
+        $amount = TransactionJournal::amountPositive($journal);
+        // if piggy account matches source account, the amount is positive
+        $sources = TransactionJournal::sourceAccountList($journal)->pluck('id')->toArray();
+        if (in_array($piggyBank->account_id, $sources)) {
+            $amount = bcmul($amount, '-1');
+        }
+
+
+        $repetition->currentamount = bcadd($repetition->currentamount, $amount);
+        $repetition->save();
+
+        PiggyBankEvent::create(['piggy_bank_id' => $piggyBank->id, 'transaction_journal_id' => $journal->id, 'date' => $journal->date, 'amount' => $amount]);
+
+        return true;
+
+    }
+
+
+}

app/Handlers/Events/ConnectTransactionToPiggyBank.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * ConnectTransactionToPiggyBank.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Handlers\Events;
+
+use FireflyIII\Events\TransactionStored;
+use FireflyIII\Models\PiggyBankEvent;
+use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
+
+/**
+ * Class ConnectTransactionToPiggyBank
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class ConnectTransactionToPiggyBank
+{
+
+    /**
+     * Connect a new transaction journal to any related piggy banks.
+     *
+     * @param  TransactionStored $event
+     *
+     * @return bool
+     */
+    public function handle(TransactionStored $event): bool
+    {
+
+        /** @var PiggyBankRepositoryInterface $repository */
+        $repository  = app(PiggyBankRepositoryInterface::class);
+        $transaction = $event->transaction;
+
+        $piggyBank = $repository->find($transaction['piggy_bank_id']);
+
+        // valid piggy:
+        if (is_null($piggyBank->id)) {
+            return true;
+        }
+        $amount = strval($transaction['amount']);
+        // piggy bank account something with amount:
+        if ($transaction['source_account_id'] == $piggyBank->account_id) {
+            // if the source of this transaction is the same as the piggy bank,
+            // the money is being removed from the piggy bank. So the
+            // amount must be negative:
+            $amount = bcmul($amount, '-1');
+        }
+
+        $repetition = $piggyBank->currentRelevantRep();
+        // add or remove the money from the piggy bank:
+        $newAmount                 = bcadd(strval($repetition->currentamount), $amount);
+        $repetition->currentamount = $newAmount;
+        $repetition->save();
+
+        // now generate a piggy bank event:
+        PiggyBankEvent::create(['piggy_bank_id' => $piggyBank->id, 'date' => $transaction['date'], 'amount' => $newAmount]);
+
+        return true;
+    }
+
+
+}

app/Handlers/Events/FireRulesForStore.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * FireRulesForStore.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Handlers\Events;
+
+
+use FireflyIII\Events\TransactionJournalStored;
+use FireflyIII\Models\Rule;
+use FireflyIII\Models\RuleGroup;
+use FireflyIII\Rules\Processor;
+use FireflyIII\User;
+use Illuminate\Support\Facades\Auth;
+
+/**
+ * Class FireRulesForStore
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class FireRulesForStore
+{
+
+    /**
+     * Connect a new transaction journal to any related piggy banks.
+     *
+     * @param  TransactionJournalStored $event
+     *
+     * @return bool
+     */
+    public function handle(TransactionJournalStored $event): bool
+    {
+        // get all the user's rule groups, with the rules, order by 'order'.
+        /** @var User $user */
+        $user   = Auth::user();
+        $groups = $user->ruleGroups()->where('rule_groups.active', 1)->orderBy('order', 'ASC')->get();
+        //
+        /** @var RuleGroup $group */
+        foreach ($groups as $group) {
+            $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($event->journal);
+
+                if ($rule->stop_processing) {
+                    return true;
+                }
+
+            }
+        }
+
+        return true;
+    }
+}

app/Handlers/Events/FireRulesForUpdate.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * FireRulesForUpdate.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Handlers\Events;
+
+use Auth;
+use FireflyIII\Events\TransactionJournalUpdated;
+use FireflyIII\Models\Rule;
+use FireflyIII\Models\RuleGroup;
+use FireflyIII\Rules\Processor;
+use FireflyIII\User;
+
+/**
+ * Class FireRulesForUpdate
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class FireRulesForUpdate
+{
+    /**
+     * Handle the event.
+     *
+     * @param  TransactionJournalUpdated $event
+     *
+     * @return bool
+     */
+    public function handle(TransactionJournalUpdated $event): bool
+    {
+        // get all the user's rule groups, with the rules, order by 'order'.
+        /** @var User $user */
+        $user   = Auth::user();
+        $groups = $user->ruleGroups()->where('rule_groups.active', 1)->orderBy('order', 'ASC')->get();
+        //
+        /** @var RuleGroup $group */
+        foreach ($groups as $group) {
+            $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($event->journal);
+
+                if ($rule->stop_processing) {
+                    break;
+                }
+
+            }
+        }
+
+        return true;
+    }
+}

app/Handlers/Events/ScanForBillsAfterStore.php

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

app/Handlers/Events/ScanForBillsAfterUpdate.php

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

app/Handlers/Events/SendRegistrationMail.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * SendRegistrationMail.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Handlers\Events;
+
+
+use FireflyIII\Events\UserRegistration;
+use Illuminate\Mail\Message;
+use Log;
+use Mail;
+use Swift_TransportException;
+
+/**
+ * Class SendRegistrationMail
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class SendRegistrationMail
+{
+    /**
+     * Create the event listener.
+     *
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  UserRegistration $event
+     *
+     * @return bool
+     */
+    public function handle(UserRegistration $event): bool
+    {
+        $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'], ['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/Handlers/Events/UpdateJournalConnection.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * UpdateJournalConnection.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Handlers\Events;
+
+use FireflyIII\Events\TransactionJournalUpdated;
+use FireflyIII\Models\PiggyBankEvent;
+use FireflyIII\Models\PiggyBankRepetition;
+use FireflyIII\Models\TransactionJournal;
+
+/**
+ * Class UpdateJournalConnection
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class UpdateJournalConnection
+{
+
+    /**
+     * Handle the event.
+     *
+     * @param  TransactionJournalUpdated $event
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly 5.
+     *
+     * @return bool
+     */
+    public function handle(TransactionJournalUpdated $event):bool
+    {
+        $journal = $event->journal;
+
+        if (!$journal->isTransfer()) {
+            return true;
+        }
+
+        // get the event connected to this journal:
+        /** @var PiggyBankEvent $event */
+        $event = PiggyBankEvent::where('transaction_journal_id', $journal->id)->first();
+        if (is_null($event)) {
+            return false;
+        }
+        $piggyBank  = $event->piggyBank()->first();
+        $repetition = null;
+        if (!is_null($piggyBank)) {
+            /** @var PiggyBankRepetition $repetition */
+            $repetition = $piggyBank->piggyBankRepetitions()->relevantOnDate($journal->date)->first();
+        }
+
+        if (is_null($repetition)) {
+            return false;
+        }
+
+        $amount = TransactionJournal::amount($journal);
+        $diff   = bcsub($amount, $event->amount); // update current repetition
+
+        $repetition->currentamount = bcadd($repetition->currentamount, $diff);
+        $repetition->save();
+
+
+        $event->amount = $amount;
+        $event->save();
+
+        return true;
+    }
+
+}

app/Handlers/Events/UserConfirmation.php

@@ -0,0 +1,107 @@
+<?php
+/**
+ * UserConfirmation.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Handlers\Events;
+
+
+use Exception;
+use FireflyIII\Events\ResendConfirmation;
+use FireflyIII\Events\UserRegistration;
+use FireflyIII\User;
+use Illuminate\Mail\Message;
+use Log;
+use Mail;
+use Preferences;
+use Swift_TransportException;
+
+/**
+ * Class UserConfirmation
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class UserConfirmation
+{
+    /**
+     * Create the event listener.
+     *
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * @param ResendConfirmation $event
+     *
+     * @return bool
+     */
+    public function resendConfirmation(ResendConfirmation $event): bool
+    {
+        $user      = $event->user;
+        $ipAddress = $event->ipAddress;
+        $this->doConfirm($user, $ipAddress);
+
+        return true;
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  UserRegistration $event
+     *
+     * @return bool
+     */
+    public function sendConfirmation(UserRegistration $event): bool
+    {
+        $user      = $event->user;
+        $ipAddress = $event->ipAddress;
+        $this->doConfirm($user, $ipAddress);
+
+        return true;
+    }
+
+    /**
+     * @param User   $user
+     * @param string $ipAddress
+     */
+    private function doConfirm(User $user, string $ipAddress)
+    {
+        $confirmAccount = env('MUST_CONFIRM_ACCOUNT', false);
+        if ($confirmAccount === false) {
+            Preferences::setForUser($user, 'user_confirmed', true);
+            Preferences::setForUser($user, 'user_confirmed_last_mail', 0);
+            Preferences::mark();
+
+            return;
+        }
+        $email = $user->email;
+        $code  = str_random(16);
+        $route = route('do_confirm_account', [$code]);
+        Preferences::setForUser($user, 'user_confirmed', false);
+        Preferences::setForUser($user, 'user_confirmed_last_mail', time());
+        Preferences::setForUser($user, 'user_confirmed_code', $code);
+        try {
+            Mail::send(
+                ['emails.confirm-account-html', 'emails.confirm-account'], ['route' => $route, 'ip' => $ipAddress],
+                function (Message $message) use ($email) {
+                    $message->to($email, $email)->subject('Please confirm your Firefly III account');
+                }
+            );
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        } catch (Exception $e) {
+            Log::error($e->getMessage());
+        }
+
+        return;
+    }
+
+}

app/Handlers/Events/UserEventListener.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * UserEventListener.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Handlers\Events;
+
+use Session;
+
+/**
+ * Class UserEventListener
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class UserEventListener
+{
+    /**
+     * Handle user logout events.
+     *
+     * @return bool
+     */
+    public function onUserLogout(): bool
+    {
+        // dump stuff from the session:
+        Session::forget('twofactor-authenticated');
+        Session::forget('twofactor-authenticated-date');
+
+        return true;
+    }
+}

app/Handlers/Events/UserSaveIpAddress.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ * UserSaveIpAddress.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Handlers\Events;
+
+use FireflyIII\Events\UserIsConfirmed;
+use FireflyIII\Events\UserRegistration;
+use Preferences;
+
+/**
+ * Class UserSaveIpAddress
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class UserSaveIpAddress
+{
+    /**
+     * Create the event listener.
+     *
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  UserIsConfirmed $event
+     *
+     * @return bool
+     */
+    public function saveFromConfirmation(UserIsConfirmed $event): bool
+    {
+        Preferences::setForUser($event->user, 'confirmation_ip_address', $event->ipAddress);
+
+        return true;
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  UserRegistration $event
+     *
+     * @return bool
+     */
+    public function saveFromRegistration(UserRegistration $event): bool
+    {
+        Preferences::setForUser($event->user, 'registration_ip_address', $event->ipAddress);
+
+        return true;
+    }
+}

app/Helpers/Attachments/AttachmentHelper.php

@@ -0,0 +1,269 @@
+<?php
+/**
+ * AttachmentHelper.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Helpers\Attachments;
+
+use Auth;
+use Crypt;
+use FireflyIII\Models\Attachment;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\MessageBag;
+use Input;
+use Log;
+use Storage;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+use TypeError;
+
+/**
+ * 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 = storage_path('upload') . DIRECTORY_SEPARATOR . 'at-' . $attachment->id . '.data';
+
+        return $path;
+    }
+
+    /**
+     * @return MessageBag
+     */
+    public function getErrors(): MessageBag
+    {
+        return $this->errors;
+    }
+
+    /**
+     * @return MessageBag
+     */
+    public function getMessages(): MessageBag
+    {
+        return $this->messages;
+    }
+
+    /**
+     * @param Model $model
+     *
+     * @return bool
+     */
+    public function saveAttachmentsForModel(Model $model): bool
+    {
+        $files = $this->getFiles();
+
+        if (!is_null($files) && !is_array($files)) {
+            $this->processFile($files, $model);
+        }
+
+        if (is_array($files)) {
+            $this->processFiles($files, $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;
+    }
+
+    /**
+     * @return array|null|UploadedFile
+     */
+    private function getFiles()
+    {
+        $files = null;
+        try {
+            if (Input::hasFile('attachments')) {
+                $files = Input::file('attachments');
+            }
+        } catch (TypeError $e) {
+            // Log it, do nothing else.
+            Log::error($e->getMessage());
+        }
+
+        return $files;
+    }
+
+    /**
+     * @param array $files
+     *
+     * @param Model $model
+     *
+     * @return bool
+     */
+    private function processFiles(array $files, Model $model): bool
+    {
+        foreach ($files as $entry) {
+            if (!is_null($entry)) {
+                $this->processFile($entry, $model);
+            }
+        }
+
+        return true;
+    }
+
+
+}

app/Helpers/Attachments/AttachmentHelperInterface.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * AttachmentHelperInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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): bool;
+
+}

app/Helpers/Collection/Account.php

@@ -0,0 +1,105 @@
+<?php
+/**
+ * Account.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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,79 @@
+<?php
+/**
+ * Balance.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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,81 @@
+<?php
+/**
+ * BalanceEntry.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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,53 @@
+<?php
+/**
+ * BalanceHeader.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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,178 @@
+<?php
+/**
+ * BalanceLine.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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 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  Carbon */
+    protected $endDate;
+    /** @var int */
+    protected $role = self::ROLE_DEFAULTROLE;
+    /** @var  Carbon */
+    protected $startDate;
+
+    /**
+     *
+     */
+    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 Carbon
+     */
+    public function getEndDate()
+    {
+        return $this->endDate;
+    }
+
+    /**
+     * @param Carbon $endDate
+     */
+    public function setEndDate($endDate)
+    {
+        $this->endDate = $endDate;
+    }
+
+    /**
+     * @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->startDate;
+    }
+
+    /**
+     * @param Carbon $startDate
+     */
+    public function setStartDate($startDate)
+    {
+        $this->startDate = $startDate;
+    }
+
+    /**
+     * @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 trans('firefly.no_budget');
+        }
+        if ($this->getRole() == self::ROLE_TAGROLE) {
+            return trans('firefly.coveredWithTags');
+        }
+        if ($this->getRole() == self::ROLE_DIFFROLE) {
+            return trans('firefly.leftUnbalanced');
+        }
+
+        return '';
+    }
+
+    /**
+     * If a BalanceLine has a budget/repetition, each BalanceEntry in this BalanceLine
+     * should have a "spent" value, which is the amount of money that has been spent
+     * 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->budget->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,63 @@
+<?php
+/**
+ * Bill.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Helpers\Collection;
+
+
+use Illuminate\Support\Collection;
+
+/**
+ * Class Bill
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class Bill
+{
+
+    /**
+     * @var Collection
+     */
+    protected $bills;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->bills = new Collection;
+    }
+
+    /**
+     * @param BillLine $bill
+     */
+    public function addBill(BillLine $bill)
+    {
+        $this->bills->push($bill);
+    }
+
+    /**
+     * @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;
+    }
+
+}

app/Helpers/Collection/BillLine.php

@@ -0,0 +1,152 @@
+<?php
+/**
+ * BillLine.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Helpers\Collection;
+
+use FireflyIII\Models\Bill as BillModel;
+
+/**
+ *
+ * Class BillLine
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class BillLine
+{
+
+    /** @var  bool */
+    protected $active;
+    /** @var  string */
+    protected $amount;
+    /** @var  BillModel */
+    protected $bill;
+    /** @var  bool */
+    protected $hit;
+    /** @var  string */
+    protected $max;
+    /** @var  string */
+    protected $min;
+
+    /** @var  int */
+    private $transactionJournalId;
+
+    /**
+     * @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 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 $this->active;
+    }
+
+    /**
+     * @param bool $active
+     */
+    public function setActive(bool $active)
+    {
+        $this->active = $active;
+    }
+
+    /**
+     * @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,195 @@
+<?php
+/**
+ * Budget.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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
+    {
+        $add            = strval(round($add, 2));
+        $this->budgeted = bcadd($this->budgeted, $add);
+
+        return $this;
+    }
+
+    /**
+     * @param string $add
+     *
+     * @return Budget
+     */
+    public function addLeft(string $add): Budget
+    {
+        $add        = strval(round($add, 2));
+        $this->left = bcadd($this->left, $add);
+
+        return $this;
+    }
+
+    /**
+     * @param string $add
+     *
+     * @return Budget
+     */
+    public function addOverspent(string $add): Budget
+    {
+        $add             = strval(round($add, 2));
+        $this->overspent = bcadd($this->overspent, $add);
+
+        return $this;
+    }
+
+    /**
+     * @param string $add
+     *
+     * @return Budget
+     */
+    public function addSpent(string $add): Budget
+    {
+        $add         = strval(round($add, 2));
+        $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 = strval(round($overspent, 2));
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSpent(): string
+    {
+        return $this->spent;
+    }
+
+    /**
+     * @param string $spent
+     *
+     * @return Budget
+     */
+    public function setSpent(string $spent): Budget
+    {
+        $this->spent = strval(round($spent, 2));
+
+        return $this;
+    }
+
+
+}

app/Helpers/Collection/BudgetLine.php

@@ -0,0 +1,159 @@
+<?php
+/**
+ * BudgetLine.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Helpers\Collection;
+
+use FireflyIII\Models\Budget as BudgetModel;
+use FireflyIII\Models\LimitRepetition;
+
+/**
+ *
+ * Class BudgetLine
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class BudgetLine
+{
+
+    /** @var  BudgetModel */
+    protected $budget;
+    /** @var string */
+    protected $budgeted = '0';
+    /** @var string */
+    protected $left = '0';
+    /** @var string */
+    protected $overspent = '0';
+    /** @var  LimitRepetition */
+    protected $repetition;
+    /** @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 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 LimitRepetition
+     */
+    public function getRepetition(): LimitRepetition
+    {
+        return $this->repetition ?? new LimitRepetition;
+    }
+
+    /**
+     * @param LimitRepetition $repetition
+     *
+     * @return BudgetLine
+     */
+    public function setRepetition(LimitRepetition $repetition): BudgetLine
+    {
+        $this->repetition = $repetition;
+
+        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,84 @@
+<?php
+/**
+ * Category.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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)
+    {
+        $add         = strval(round($add, 2));
+        $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 strval(round($this->total, 2));
+    }
+
+
+}

app/Helpers/Collection/Expense.php

@@ -0,0 +1,109 @@
+<?php
+/**
+ * Expense.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Helpers\Collection;
+
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Support\Collection;
+use stdClass;
+
+/**
+ *
+ * Class Expense
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class Expense
+{
+    /** @var Collection */
+    protected $expenses;
+    /** @var string */
+    protected $total = '0';
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->expenses = new Collection;
+    }
+
+    /**
+     * @param TransactionJournal $entry
+     */
+    public function addOrCreateExpense(TransactionJournal $entry)
+    {
+        // add each account individually:
+        $destinations = TransactionJournal::destinationTransactionList($entry);
+
+        foreach ($destinations as $transaction) {
+            $amount  = strval($transaction->amount);
+            $account = $transaction->account;
+            if (bccomp('0', $amount) === -1) {
+                $amount = bcmul($amount, '-1');
+            }
+
+            $object         = new stdClass;
+            $object->amount = $amount;
+            $object->name   = $account->name;
+            $object->count  = 1;
+            $object->id     = $account->id;
+
+            // overrule some properties:
+            if ($this->expenses->has($account->id)) {
+                $object         = $this->expenses->get($account->id);
+                $object->amount = bcadd($object->amount, $amount);
+                $object->count++;
+            }
+            $this->expenses->put($account->id, $object);
+        }
+
+
+    }
+
+    /**
+     * @param string $add
+     */
+    public function addToTotal(string $add)
+    {
+        $add = strval(round($add, 2));
+        if (bccomp('0', $add) === -1) {
+            $add = bcmul($add, '-1');
+        }
+
+        // if amount is positive, the original transaction
+        // was a transfer. But since this is an expense report,
+        // that amount must be negative.
+
+        $this->total = bcadd($this->total, $add);
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getExpenses(): Collection
+    {
+        $set = $this->expenses->sortBy(
+            function (stdClass $object) {
+                return $object->amount;
+            }
+        );
+
+        return $set;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTotal(): string
+    {
+        return strval(round($this->total, 2));
+    }
+}

app/Helpers/Collection/Income.php

@@ -0,0 +1,101 @@
+<?php
+/**
+ * Income.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Helpers\Collection;
+
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Support\Collection;
+use stdClass;
+
+/**
+ *
+ * Class Income
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class Income
+{
+
+    /** @var Collection */
+    protected $incomes;
+    /** @var string */
+    protected $total = '0';
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->incomes = new Collection;
+    }
+
+    /**
+     * @param TransactionJournal $entry
+     */
+    public function addOrCreateIncome(TransactionJournal $entry)
+    {
+        // add each account individually:
+        $sources = TransactionJournal::sourceTransactionList($entry);
+
+        foreach ($sources as $transaction) {
+            $amount  = strval($transaction->amount);
+            $account = $transaction->account;
+            $amount  = bcmul($amount, '-1');
+
+            $object         = new stdClass;
+            $object->amount = $amount;
+            $object->name   = $account->name;
+            $object->count  = 1;
+            $object->id     = $account->id;
+
+            // overrule some properties:
+            if ($this->incomes->has($account->id)) {
+                $object         = $this->incomes->get($account->id);
+                $object->amount = bcadd($object->amount, $amount);
+                $object->count++;
+            }
+            $this->incomes->put($account->id, $object);
+        }
+
+    }
+
+    /**
+     * @param string $add
+     */
+    public function addToTotal(string $add)
+    {
+        $add         = strval(round($add, 2));
+        $this->total = bcadd($this->total, $add);
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getIncomes(): Collection
+    {
+        $set = $this->incomes->sortByDesc(
+            function (stdClass $object) {
+                return $object->amount;
+            }
+        );
+
+        return $set;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTotal(): string
+    {
+        return strval(round($this->total, 2));
+    }
+
+
+}

app/Helpers/FiscalHelper.php

@@ -0,0 +1,85 @@
+<?php
+/**
+ * FiscalHelper.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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,44 @@
+<?php
+/**
+ * FiscalHelperInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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,108 @@
+<?php
+/**
+ * Help.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+namespace FireflyIII\Helpers\Help;
+
+use Cache;
+use League\CommonMark\CommonMarkConverter;
+use Requests;
+use Route;
+
+/**
+ * Class Help
+ *
+ * @package FireflyIII\Helpers\Help
+ */
+class Help implements HelpInterface
+{
+
+    /**
+     *
+     * @param string $key
+     *
+     * @return string
+     */
+    public function getFromCache(string $key): string
+    {
+        return Cache::get($key);
+    }
+
+    /**
+     * @param string $language
+     * @param string $route
+     *
+     * @return array
+     */
+    public function getFromGithub(string $language, string $route): array
+    {
+
+        $uri        = sprintf('https://raw.githubusercontent.com/JC5/firefly-iii-help/master/%s/%s.md', $language, $route);
+        $routeIndex = str_replace('.', '-', $route);
+        $title      = trans('help.' . $routeIndex);
+        $content    = [
+            'text'  => '<p>' . strval(trans('firefly.route_has_no_help')) . '</p>',
+            'title' => $title,
+        ];
+
+
+        $result = Requests::get($uri);
+
+
+        if ($result->status_code === 200) {
+            $content['text'] = $result->body;
+        }
+
+
+        if (strlen(trim($content['text'])) == 0) {
+            $content['text'] = '<p>' . strval(trans('firefly.route_has_no_help')) . '</p>';
+        }
+        $converter       = new CommonMarkConverter();
+        $content['text'] = $converter->convertToHtml($content['text']);
+
+        return $content;
+
+    }
+
+    /**
+     *
+     * @param string $route
+     *
+     * @return bool
+     */
+    public function hasRoute(string $route):bool
+    {
+        return Route::has($route);
+    }
+
+    /**
+     *
+     * @param string $route
+     *
+     * @return bool
+     */
+    public function inCache(string $route):bool
+    {
+        return Cache::has('help.' . $route . '.title') && Cache::has('help.' . $route . '.text');
+    }
+
+    /**
+     *
+     * @param string $route
+     * @param string $language
+     * @param array  $content
+     *
+     * @internal param $title
+     */
+    public function putInCache(string $route, string $language, array $content)
+    {
+        Cache::put('help.' . $route . '.text.' . $language, $content['text'], 10080); // a week.
+        Cache::put('help.' . $route . '.title.' . $language, $content['title'], 10080);
+    }
+}

app/Helpers/Help/HelpInterface.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * HelpInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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 $key
+     *
+     * @return string
+     */
+    public function getFromCache(string $key): string;
+
+    /**
+     * @param string $language
+     * @param string $route
+     *
+     * @return array
+     */
+    public function getFromGithub(string $language, string $route):array;
+
+    /**
+     * @param string $route
+     *
+     * @return bool
+     */
+    public function hasRoute(string $route): bool;
+
+    /**
+     * @param string $route
+     *
+     * @return bool
+     */
+    public function inCache(string $route): bool;
+
+    /**
+     * @param string $route
+     * @param string $language
+     * @param array  $content
+     */
+    public function putInCache(string $route, string $language, array $content);
+}

app/Helpers/Report/AccountReportHelper.php

@@ -0,0 +1,142 @@
+<?php
+/**
+ * AccountReportHelper.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Helpers\Report;
+
+use Carbon\Carbon;
+use DB;
+use FireflyIII\Helpers\Collection\Account as AccountCollection;
+use FireflyIII\Models\Account;
+use Illuminate\Support\Collection;
+
+
+/**
+ * Class AccountReportHelper
+ *
+ * @package FireflyIII\Helpers\Report
+ */
+class AccountReportHelper implements AccountReportHelperInterface
+{
+    /**
+     * @param Account    $account
+     * @param Collection $startSet
+     * @param Collection $endSet
+     * @param Collection $backupSet
+     *
+     * @return Account
+     */
+    public static function reportFilter(Account $account, Collection $startSet, Collection $endSet, Collection $backupSet)
+    {
+        // The balance for today always incorporates transactions made on today. So to get todays "start" balance, we sub one day.
+        $account->startBalance = '0';
+        $account->endBalance   = '0';
+        $currentStart          = $startSet->filter(
+            function (Account $entry) use ($account) {
+                return $account->id == $entry->id;
+            }
+        );
+
+        $currentBackup = $backupSet->filter( // grab entry from current backup as well:
+            function (Account $entry) use ($account) {
+                return $account->id == $entry->id;
+            }
+        );
+
+        // first try to set from backup
+        if (!is_null($currentBackup->first())) {
+            $account->startBalance = $currentBackup->first()->balance;
+        }
+
+        // overrule with data from start
+        if (!is_null($currentStart->first())) {
+            $account->startBalance = $currentStart->first()->balance;
+        }
+
+        $currentEnd = $endSet->filter(
+            function (Account $entry) use ($account) {
+                return $account->id == $entry->id;
+            }
+        );
+
+        if (!is_null($currentEnd->first())) {
+            $account->endBalance = $currentEnd->first()->balance;
+        }
+
+        return $account;
+    }
+
+    /**
+     * This method generates a full report for the given period on all
+     * given accounts.
+     *
+     * a special consideration for accounts that did exist on this exact day.
+     * we also grab the balance from today just in case, to see if that changes things.
+     * it's a fall back for users who (rightly so) start keeping score at the first of
+     * the month and find the first report lacking / broken.
+     *
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return AccountCollection
+     */
+    public function getAccountReport(Carbon $start, Carbon $end, Collection $accounts): AccountCollection
+    {
+        $startAmount = '0';
+        $endAmount   = '0';
+        $diff        = '0';
+        $ids         = $accounts->pluck('id')->toArray();
+        $yesterday   = clone $start;
+        $yesterday->subDay();
+        $startSet  = $this->getSet($ids, $yesterday); // get balances for start.
+        $backupSet = $this->getSet($ids, $start);
+        $endSet    = $this->getSet($ids, $end);
+
+        $accounts->each(
+            function (Account $account) use ($startSet, $endSet, $backupSet) {
+                return self::reportFilter($account, $startSet, $endSet, $backupSet);
+            }
+        );
+
+        // summarize:
+        foreach ($accounts as $account) {
+            $startAmount = bcadd($startAmount, $account->startBalance);
+            $endAmount   = bcadd($endAmount, $account->endBalance);
+            $diff        = bcadd($diff, bcsub($account->endBalance, $account->startBalance));
+        }
+
+        $object = new AccountCollection;
+        $object->setStart($startAmount);
+        $object->setEnd($endAmount);
+        $object->setDifference($diff);
+        $object->setAccounts($accounts);
+
+        return $object;
+    }
+
+    /**
+     * @param array  $ids
+     * @param Carbon $date
+     *
+     * @return Collection
+     */
+    private function getSet(array $ids, Carbon $date): Collection
+    {
+        return Account::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
+                      ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+                      ->whereIn('accounts.id', $ids)
+                      ->whereNull('transaction_journals.deleted_at')
+                      ->whereNull('transactions.deleted_at')
+                      ->where('transaction_journals.date', '<=', $date->format('Y-m-d'))
+                      ->groupBy('accounts.id')
+                      ->get(['accounts.id', DB::raw('SUM(`transactions`.`amount`) as `balance`')]);
+    }
+}

app/Helpers/Report/AccountReportHelperInterface.php

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

app/Helpers/Report/BalanceReportHelper.php

@@ -0,0 +1,292 @@
+<?php
+/**
+ * BalanceReportHelper.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Helpers\Report;
+
+use Auth;
+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\Budget;
+use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Models\Tag;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use Illuminate\Database\Query\JoinClause;
+use Illuminate\Support\Collection;
+
+/**
+ * Class BalanceReportHelper
+ *
+ * @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 Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return Balance
+     */
+    public function getBalanceReport(Carbon $start, Carbon $end, Collection $accounts): Balance
+    {
+        $balance          = new Balance;
+        $header           = new BalanceHeader;
+        $limitRepetitions = $this->budgetRepository->getAllBudgetLimitRepetitions($start, $end);
+        foreach ($accounts as $account) {
+            $header->addAccount($account);
+        }
+
+        /** @var LimitRepetition $repetition */
+        foreach ($limitRepetitions as $repetition) {
+            $budget = $this->budgetRepository->find($repetition->budget_id);
+            $line   = $this->createBalanceLine($budget, $repetition, $accounts);
+            $balance->addBalanceLine($line);
+        }
+        $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);
+
+        // remove budgets without expenses from balance lines:
+        $balance = $this->removeUnusedBudgets($balance);
+
+        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 Budget          $budget
+     * @param LimitRepetition $repetition
+     * @param Collection      $accounts
+     *
+     * @return BalanceLine
+     */
+    private function createBalanceLine(Budget $budget, LimitRepetition $repetition, Collection $accounts): BalanceLine
+    {
+        $line           = new BalanceLine;
+        $budget->amount = $repetition->amount;
+        $line->setBudget($budget);
+        $line->setStartDate($repetition->startdate);
+        $line->setEndDate($repetition->enddate);
+
+        // loop accounts:
+        foreach ($accounts as $account) {
+            $balanceEntry = new BalanceEntry;
+            $balanceEntry->setAccount($account);
+            $spent = $this->budgetRepository->spentInPeriod(
+                new Collection([$budget]), new Collection([$account]), $repetition->startdate, $repetition->enddate
+            );
+            $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->spentInPeriodWithoutBudget(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,34 @@
+<?php
+/**
+ * BalanceReportHelperInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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 Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return Balance
+     */
+    public function getBalanceReport(Carbon $start, Carbon $end, Collection $accounts): Balance;
+}

app/Helpers/Report/BudgetReportHelper.php

@@ -0,0 +1,275 @@
+<?php
+/**
+ * BudgetReportHelper.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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\LimitRepetition;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Support\CacheProperties;
+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.ExcessiveMethodLength) // at 43, its ok.
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly 5.
+     *
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return Collection
+     */
+    public function budgetYearOverview(Carbon $start, Carbon $end, Collection $accounts): Collection
+    {
+        // chart properties for cache:
+        $cache = new CacheProperties;
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('budget-year');
+        $cache->addProperty($accounts->pluck('id')->toArray());
+        if ($cache->has()) {
+            return $cache->get();
+        }
+
+        $current = clone $start;
+        $return  = new Collection;
+        $set     = $this->repository->getBudgets();
+        $budgets = [];
+        $spent   = [];
+        $headers = $this->createYearHeaders($current, $end);
+
+        /** @var Budget $budget */
+        foreach ($set as $budget) {
+            $id           = $budget->id;
+            $budgets[$id] = $budget->name;
+            $current      = clone $start;
+            $budgetData   = $this->getBudgetSpentData($current, $end, $budget, $accounts);
+            $sum          = $budgetData['sum'];
+            $spent[$id]   = $budgetData['spent'];
+
+            if (bccomp('0', $sum) === 0) {
+                // not spent anything.
+                unset($spent[$id]);
+                unset($budgets[$id]);
+            }
+        }
+
+        $return->put('headers', $headers);
+        $return->put('budgets', $budgets);
+        $return->put('spent', $spent);
+
+        $cache->store($return);
+
+        return $return;
+    }
+
+    /**
+     * @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) {
+            $repetitions = $budget->limitrepetitions()->before($end)->after($start)->get();
+
+            // no repetition(s) for this budget:
+            if ($repetitions->count() == 0) {
+                // spent for budget in time range:
+                $spent = $this->repository->spentInPeriod(new Collection([$budget]), $accounts, $start, $end);
+
+                if ($spent > 0) {
+                    $budgetLine = new BudgetLine;
+                    $budgetLine->setBudget($budget)->setOverspent($spent);
+                    $object->addOverspent($spent)->addBudgetLine($budgetLine);
+                }
+                continue;
+            }
+            // one or more repetitions for budget:
+            /** @var LimitRepetition $repetition */
+            foreach ($repetitions as $repetition) {
+                $data = $this->calculateExpenses($budget, $repetition, $accounts);
+
+                $budgetLine = new BudgetLine;
+                $budgetLine->setBudget($budget)->setRepetition($repetition)
+                           ->setLeft($data['left'])->setSpent($data['expenses'])->setOverspent($data['overspent'])
+                           ->setBudgeted(strval($repetition->amount));
+
+                $object->addBudgeted(strval($repetition->amount))->addSpent($data['spent'])
+                       ->addLeft($data['left'])->addOverspent($data['overspent'])->addBudgetLine($budgetLine);
+
+            }
+
+        }
+
+        // stuff outside of budgets:
+
+        $noBudget   = $this->repository->spentInPeriodWithoutBudget($accounts, $start, $end);
+        $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;
+    }
+
+    /**
+     * Take the array as returned by CategoryRepositoryInterface::spentPerDay and CategoryRepositoryInterface::earnedByDay
+     * and sum up everything in the array in the given range.
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     * @param array  $array
+     *
+     * @return string
+     */
+    protected function getSumOfRange(Carbon $start, Carbon $end, array $array)
+    {
+        $sum          = '0';
+        $currentStart = clone $start; // to not mess with the original one
+        $currentEnd   = clone $end; // to not mess with the original one
+
+        while ($currentStart <= $currentEnd) {
+            $date = $currentStart->format('Y-m-d');
+            if (isset($array[$date])) {
+                $sum = bcadd($sum, $array[$date]);
+            }
+            $currentStart->addDay();
+        }
+
+        return $sum;
+    }
+
+    /**
+     * @param Budget          $budget
+     * @param LimitRepetition $repetition
+     * @param Collection      $accounts
+     *
+     * @return array
+     */
+    private function calculateExpenses(Budget $budget, LimitRepetition $repetition, Collection $accounts): array
+    {
+        $array              = [];
+        $expenses           = $this->repository->spentInPeriod(new Collection([$budget]), $accounts, $repetition->startdate, $repetition->enddate);
+        $array['left']      = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? bcadd($repetition->amount, $expenses) : '0';
+        $array['spent']     = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? $expenses : '0';
+        $array['overspent'] = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? '0' : bcadd($expenses, $repetition->amount);
+        $array['expenses']  = $expenses;
+
+        return $array;
+
+    }
+
+    /**
+     * @param Carbon $current
+     * @param Carbon $end
+     *
+     * @return array
+     */
+    private function createYearHeaders(Carbon $current, Carbon $end): array
+    {
+        $headers = [];
+        while ($current < $end) {
+            $short           = $current->format('m-Y');
+            $headers[$short] = $current->formatLocalized((string)trans('config.month'));
+            $current->addMonth();
+        }
+
+        return $headers;
+    }
+
+    /**
+     * @param Carbon     $current
+     * @param Carbon     $end
+     * @param Budget     $budget
+     * @param Collection $accounts
+     *
+     * @return array
+     */
+    private function getBudgetSpentData(Carbon $current, Carbon $end, Budget $budget, Collection $accounts): array
+    {
+        $sum   = '0';
+        $spent = [];
+        while ($current < $end) {
+            $currentEnd = clone $current;
+            $currentEnd->endOfMonth();
+            $format         = $current->format('m-Y');
+            $budgetSpent    = $this->repository->spentInPeriod(new Collection([$budget]), $accounts, $current, $currentEnd);
+            $spent[$format] = $budgetSpent;
+            $sum            = bcadd($sum, $budgetSpent);
+            $current->addMonth();
+        }
+
+        return [
+            'spent' => $spent,
+            'sum'   => $sum,
+        ];
+    }
+}

app/Helpers/Report/BudgetReportHelperInterface.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * BudgetReportHelperInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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 Collection
+     */
+    public function budgetYearOverview(Carbon $start, Carbon $end, Collection $accounts): Collection;
+
+    /**
+     * @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,320 @@
+<?php
+/**
+ * ReportHelper.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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\Collection\Expense;
+use FireflyIII\Helpers\Collection\Income;
+use FireflyIII\Helpers\FiscalHelperInterface;
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\Category;
+use FireflyIII\Models\Tag;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Query\JoinClause;
+use Illuminate\Support\Collection;
+
+/**
+ * Class ReportHelper
+ *
+ * @package FireflyIII\Helpers\Report
+ */
+class ReportHelper implements ReportHelperInterface
+{
+
+    /** @var  BudgetRepositoryInterface */
+    protected $budgetRepository;
+    /** @var  TagRepositoryInterface */
+    protected $tagRepository;
+
+    /**
+     * ReportHelper constructor.
+     *
+     *
+     * @param BudgetRepositoryInterface $budgetRepository
+     * @param TagRepositoryInterface    $tagRepository
+     */
+    public function __construct(BudgetRepositoryInterface $budgetRepository, TagRepositoryInterface $tagRepository)
+    {
+        $this->budgetRepository = $budgetRepository;
+        $this->tagRepository    = $tagRepository;
+    }
+
+    /**
+     * 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
+    {
+        /** @var BillRepositoryInterface $repository */
+        $repository = app(BillRepositoryInterface::class);
+        $bills      = $repository->getBillsForAccounts($accounts);
+        $journals   = $repository->getAllJournalsInRange($bills, $start, $end);
+        $collection = new BillCollection;
+
+        /** @var Bill $bill */
+        foreach ($bills as $bill) {
+            $billLine = new BillLine;
+            $billLine->setBill($bill);
+            $billLine->setActive(intval($bill->active) === 1);
+            $billLine->setMin(strval($bill->amount_min));
+            $billLine->setMax(strval($bill->amount_max));
+            $billLine->setHit(false);
+            // is hit in period?
+
+            $entry = $journals->filter(
+                function (TransactionJournal $journal) use ($bill) {
+                    return $journal->bill_id === $bill->id;
+                }
+            );
+            $first = $entry->first();
+            if (!is_null($first)) {
+                $billLine->setTransactionJournalId($first->id);
+                $billLine->setAmount($first->journalAmount);
+                $billLine->setHit(true);
+            }
+
+            if ($billLine->isActive()) {
+                $collection->addBill($billLine);
+            }
+        }
+
+        return $collection;
+    }
+
+    /**
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return CategoryCollection
+     */
+    public function getCategoryReport(Carbon $start, Carbon $end, Collection $accounts): CategoryCollection
+    {
+        $object = new CategoryCollection;
+        /** @var CategoryRepositoryInterface $repository */
+        $repository = app(CategoryRepositoryInterface::class);
+        $categories = $repository->getCategories();
+
+        /** @var Category $category */
+        foreach ($categories as $category) {
+            $spent = $repository->spentInPeriod(new Collection([$category]), $accounts, $start, $end);
+            // CategoryCollection expects the amount in $spent:
+            $category->spent = $spent;
+            $object->addCategory($category);
+        }
+
+        return $object;
+    }
+
+    /**
+     * Get a full report on the users expenses during the period for a list of accounts.
+     *
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return Expense
+     */
+    public function getExpenseReport(Carbon $start, Carbon $end, Collection $accounts): Expense
+    {
+        $object = new Expense;
+        /** @var AccountRepositoryInterface $repos */
+        $repos    = app(AccountRepositoryInterface::class);
+        $journals = $repos->expensesInPeriod($accounts, $start, $end);
+
+        /** @var TransactionJournal $entry */
+        foreach ($journals as $entry) {
+            $amount = TransactionJournal::amount($entry);
+            $object->addToTotal($amount);
+            $object->addOrCreateExpense($entry);
+        }
+
+        return $object;
+    }
+
+    /**
+     * Get a full report on the users incomes during the period for the given accounts.
+     *
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return Income
+     */
+    public function getIncomeReport(Carbon $start, Carbon $end, Collection $accounts): Income
+    {
+        $object = new Income;
+        /** @var AccountRepositoryInterface $repos */
+        $repos    = app(AccountRepositoryInterface::class);
+        $journals = $repos->incomesInPeriod($accounts, $start, $end);
+
+        foreach ($journals as $entry) {
+            $amount = TransactionJournal::amount($entry);
+            $object->addToTotal($amount);
+            $object->addOrCreateIncome($entry);
+        }
+
+        return $object;
+    }
+
+    /**
+     * @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;
+    }
+
+    /**
+     * Returns an array of tags and their comparitive size with amounts bla bla.
+     *
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return array
+     */
+    public function tagReport(Carbon $start, Carbon $end, Collection $accounts): array
+    {
+        $ids        = $accounts->pluck('id')->toArray();
+        $set        = Tag::
+        leftJoin('tag_transaction_journal', 'tags.id', '=', 'tag_transaction_journal.tag_id')
+                         ->leftJoin('transaction_journals', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
+                         ->leftJoin(
+                             'transactions AS source', function (JoinClause $join) {
+                             $join->on('source.transaction_journal_id', '=', 'transaction_journals.id')->where('source.amount', '<', '0');
+                         }
+                         )
+                         ->leftJoin(
+                             'transactions AS destination', function (JoinClause $join) {
+                             $join->on('destination.transaction_journal_id', '=', 'transaction_journals.id')->where('destination.amount', '>', '0');
+                         }
+                         )
+                         ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
+                         ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
+                         ->where(
+                             function (Builder $q) use ($ids) {
+                                 $q->whereIn('source.account_id', $ids)
+                                   ->whereIn('destination.account_id', $ids, 'xor');
+                             }
+                         )
+                         ->get(['tags.id', 'tags.tag', 'transaction_journals.id as journal_id', 'destination.amount']);
+        $collection = [];
+        if ($set->count() === 0) {
+            return $collection;
+        }
+        /** @var Tag $entry */
+        foreach ($set as $entry) {
+            // less than zero? multiply to be above zero.
+            $amount          = $entry->amount;
+            $id              = intval($entry->id);
+            $previousAmount  = $collection[$id]['amount'] ?? '0';
+            $collection[$id] = [
+                'id'     => $id,
+                'tag'    => $entry->tag,
+                'amount' => bcadd($previousAmount, $amount),
+            ];
+        }
+
+        // cleanup collection (match "fonts")
+        $max = strval(max(array_column($collection, 'amount')));
+        foreach ($collection as $id => $entry) {
+            $size = bcdiv($entry['amount'], $max, 4);
+            if (bccomp($size, '0.25') === -1) {
+                $size = '0.5';
+            }
+            $collection[$id]['fontsize'] = $size;
+        }
+
+        return $collection;
+    }
+
+    /**
+     * Take the array as returned by CategoryRepositoryInterface::spentPerDay and CategoryRepositoryInterface::earnedByDay
+     * and sum up everything in the array in the given range.
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     * @param array  $array
+     *
+     * @return string
+     */
+    protected function getSumOfRange(Carbon $start, Carbon $end, array $array)
+    {
+        $sum          = '0';
+        $currentStart = clone $start; // to not mess with the original one
+        $currentEnd   = clone $end; // to not mess with the original one
+
+        while ($currentStart <= $currentEnd) {
+            $date = $currentStart->format('Y-m-d');
+            if (isset($array[$date])) {
+                $sum = bcadd($sum, $array[$date]);
+            }
+            $currentStart->addDay();
+        }
+
+        return $sum;
+    }
+}

app/Helpers/Report/ReportHelperInterface.php

@@ -0,0 +1,92 @@
+<?php
+/**
+ * ReportHelperInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT 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     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return CategoryCollection
+     */
+    public function getCategoryReport(Carbon $start, Carbon $end, Collection $accounts): CategoryCollection;
+
+    /**
+     * Get a full report on the users expenses during the period for a list of accounts.
+     *
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return Expense
+     */
+    public function getExpenseReport(Carbon $start, Carbon $end, Collection $accounts): Expense;
+
+    /**
+     * Get a full report on the users incomes during the period for the given accounts.
+     *
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return Income
+     */
+    public function getIncomeReport(Carbon $start, Carbon $end, Collection $accounts): Income;
+
+    /**
+     * @param Carbon $date
+     *
+     * @return array
+     */
+    public function listOfMonths(Carbon $date): array;
+
+    /**
+     * Returns an array of tags and their comparitive size with amounts bla bla.
+     *
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
+     *
+     * @return array
+     */
+    public function tagReport(Carbon $start, Carbon $end, Collection $accounts): array;
+
+}

app/Http/Controllers/AccountController.php

@@ -0,0 +1,458 @@
+<?php
+/**
+ * AccountController.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers;
+
+use Auth;
+use Carbon\Carbon;
+use ExpandedForm;
+use FireflyIII\Crud\Account\AccountCrudInterface;
+use FireflyIII\Http\Requests\AccountFormRequest;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
+use FireflyIII\Support\CacheProperties;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
+use Input;
+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();
+        View::share('mainTitleIcon', 'fa-credit-card');
+        View::share('title', trans('firefly.accounts'));
+    }
+
+    /**
+     * @param string $what
+     *
+     * @return View
+     */
+    public function create(string $what = 'asset')
+    {
+        $subTitleIcon = config('firefly.subIconsByIdentifier.' . $what);
+        $subTitle     = trans('firefly.make_new_' . $what . '_account');
+        Session::flash('preFilled', []);
+
+        // 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'));
+
+    }
+
+    /**
+     * @param AccountCrudInterface $crud
+     * @param Account              $account
+     *
+     * @return View
+     */
+    public function delete(AccountCrudInterface $crud, Account $account)
+    {
+        $typeName    = config('firefly.shortNamesByFullName.' . $account->accountType->type);
+        $subTitle    = trans('firefly.delete_' . $typeName . '_account', ['name' => $account->name]);
+        $accountList = ExpandedForm::makeSelectListWithEmpty($crud->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 AccountCrudInterface $crud
+     * @param Account              $account
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function destroy(AccountCrudInterface $crud, Account $account)
+    {
+        $type     = $account->accountType->type;
+        $typeName = config('firefly.shortNamesByFullName.' . $type);
+        $name     = $account->name;
+        $moveTo   = $crud->find(intval(Input::get('move_account_before_delete')));
+
+        $crud->destroy($account, $moveTo);
+
+        Session::flash('success', strval(trans('firefly.' . $typeName . '_deleted', ['name' => $name])));
+        Preferences::mark();
+
+        return redirect(session('accounts.delete.url'));
+    }
+
+    /**
+     * @param ARI     $repository
+     * @param Account $account
+     *
+     * @return View
+     */
+    public function edit(ARI $repository, Account $account)
+    {
+
+        $what           = config('firefly.shortNamesByFullName')[$account->accountType->type];
+        $subTitle       = trans('firefly.edit_' . $what . '_account', ['name' => $account->name]);
+        $subTitleIcon   = config('firefly.subIconsByIdentifier.' . $what);
+        $openingBalance = $repository->openingBalanceTransaction($account);
+
+        // 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 = null;
+
+        if ($openingBalance->id) {
+            $transaction          = $repository->getFirstTransaction($openingBalance, $account);
+            $openingBalanceAmount = $transaction->amount;
+        }
+
+        $preFilled = [
+            'accountNumber'        => $account->getMeta('accountNumber'),
+            'accountRole'          => $account->getMeta('accountRole'),
+            'ccType'               => $account->getMeta('ccType'),
+            'ccMonthlyPaymentDate' => $account->getMeta('ccMonthlyPaymentDate'),
+            'openingBalanceDate'   => $openingBalance->id ? $openingBalance->date->format('Y-m-d') : null,
+            'openingBalance'       => $openingBalanceAmount,
+            'virtualBalance'       => round($account->virtual_balance, 2),
+        ];
+        Session::flash('preFilled', $preFilled);
+        Session::flash('gaEventCategory', 'accounts');
+        Session::flash('gaEventAction', 'edit-' . $what);
+
+        return view('accounts.edit', compact('account', 'subTitle', 'subTitleIcon', 'openingBalance', 'what'));
+    }
+
+    /**
+     * @param AccountCrudInterface $crud
+     * @param string               $what
+     *
+     * @return View
+     */
+    public function index(AccountCrudInterface $crud, string $what)
+    {
+        $what = $what ?? 'asset';
+
+        $subTitle     = trans('firefly.' . $what . '_accounts');
+        $subTitleIcon = config('firefly.subIconsByIdentifier.' . $what);
+        $types        = config('firefly.accountTypesByIdentifier.' . $what);
+        $accounts     = $crud->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);
+            }
+        );
+
+        return view('accounts.index', compact('what', 'subTitleIcon', 'subTitle', 'accounts'));
+    }
+
+    /**
+     * @param ARI     $repository
+     * @param Account $account
+     *
+     * @return View
+     */
+    public function show(ARI $repository, Account $account)
+    {
+        // show journals from current period only:
+        $subTitleIcon = config('firefly.subIconsByIdentifier.' . $account->accountType->type);
+        $subTitle     = $account->name;
+        $range        = Preferences::get('viewRange', '1M')->data;
+        /** @var Carbon $start */
+        $start        = session('start', Navigation::startOfPeriod(new Carbon, $range));
+        /** @var Carbon $end */
+        $end          = session('end', Navigation::endOfPeriod(new Carbon, $range));
+        $page         = intval(Input::get('page'));
+        $pageSize     = Preferences::get('transactionPageSize', 50)->data;
+        $offset       = ($page - 1) * $pageSize;
+        $set          = $repository->journalsInPeriod(new Collection([$account]), [], $start, $end);
+        $count        = $set->count();
+        $subSet       = $set->splice($offset, $pageSize);
+        $journals     = new LengthAwarePaginator($subSet, $count, $pageSize, $page);
+        $journals->setPath('accounts/show/' . $account->id);
+
+        // grouped other months thing:
+        // oldest transaction in account:
+        $start = $repository->firstUseDate($account);
+        if ($start->year == 1900) {
+            $start = new Carbon;
+        }
+        $range   = Preferences::get('viewRange', '1M')->data;
+        $start   = Navigation::startOfPeriod($start, $range);
+        $end     = Navigation::endOfX(new Carbon, $range);
+        $entries = new Collection;
+
+        // chart properties for cache:
+        $cache = new CacheProperties;
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('account-show');
+        $cache->addProperty($account->id);
+
+
+        if ($cache->has()) {
+            $entries = $cache->get();
+
+            return view('accounts.show', compact('account', 'what', 'entries', 'subTitleIcon', 'journals', 'subTitle'));
+        }
+
+        while ($end >= $start) {
+            $end        = Navigation::startOfPeriod($end, $range);
+            $currentEnd = Navigation::endOfPeriod($end, $range);
+            $spent      = $this->spentInPeriod($account, $end, $currentEnd);
+            $earned     = $this->earnedInPeriod($account, $end, $currentEnd);
+            $dateStr    = $end->format('Y-m-d');
+            $dateName   = Navigation::periodShow($end, $range);
+            $entries->push([$dateStr, $dateName, $spent, $earned]);
+            $end = Navigation::subtractPeriod($end, $range, 1);
+
+        }
+        $cache->store($entries);
+
+        return view('accounts.show', compact('account', 'what', 'entries', 'subTitleIcon', 'journals', 'subTitle'));
+    }
+
+    /**
+     * @param ARI     $repository
+     * @param Account $account
+     * @param string  $date
+     *
+     * @return View
+     */
+    public function showWithDate(ARI $repository, 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(Input::get('page'));
+        $page     = $page === 0 ? 1 : $page;
+        $pageSize = Preferences::get('transactionPageSize', 50)->data;
+        $offset   = ($page - 1) * $pageSize;
+        $set      = $repository->journalsInPeriod(new Collection([$account]), [], $start, $end);
+        $count    = $set->count();
+        $subSet   = $set->splice($offset, $pageSize);
+        $journals = new LengthAwarePaginator($subSet, $count, $pageSize, $page);
+        $journals->setPath('accounts/show/' . $account->id . '/' . $date);
+
+        return view('accounts.show_with_date', compact('category', 'date', 'account', 'journals', 'subTitle', 'carbon'));
+    }
+
+    /**
+     * @param AccountFormRequest   $request
+     * @param AccountCrudInterface $crud
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function store(AccountFormRequest $request, AccountCrudInterface $crud)
+    {
+        $accountData = [
+            'name'                   => $request->input('name'),
+            'accountType'            => $request->input('what'),
+            'virtualBalance'         => round($request->input('virtualBalance'), 2),
+            'virtualBalanceCurrency' => intval($request->input('amount_currency_id_virtualBalance')),
+            'active'                 => true,
+            'user'                   => Auth::user()->id,
+            'iban'                   => $request->input('iban'),
+            'accountNumber'          => $request->input('accountNumber'),
+            'accountRole'            => $request->input('accountRole'),
+            'openingBalance'         => round($request->input('openingBalance'), 2),
+            'openingBalanceDate'     => new Carbon((string)$request->input('openingBalanceDate')),
+            'openingBalanceCurrency' => intval($request->input('amount_currency_id_openingBalance')),
+
+        ];
+
+        $account = $crud->store($accountData);
+
+        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(Input::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 AccountCrudInterface $crud
+     * @param Account              $account
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function update(AccountFormRequest $request, AccountCrudInterface $crud, Account $account)
+    {
+
+        $accountData = [
+            'name'                   => $request->input('name'),
+            'active'                 => $request->input('active'),
+            'user'                   => Auth::user()->id,
+            'iban'                   => $request->input('iban'),
+            'accountNumber'          => $request->input('accountNumber'),
+            'accountRole'            => $request->input('accountRole'),
+            'virtualBalance'         => round($request->input('virtualBalance'), 2),
+            'openingBalance'         => round($request->input('openingBalance'), 2),
+            'openingBalanceDate'     => new Carbon((string)$request->input('openingBalanceDate')),
+            'openingBalanceCurrency' => intval($request->input('amount_currency_id_openingBalance')),
+            'ccType'                 => $request->input('ccType'),
+            'ccMonthlyPaymentDate'   => $request->input('ccMonthlyPaymentDate'),
+        ];
+        $crud->update($account, $accountData);
+
+        Session::flash('success', strval(trans('firefly.updated_account', ['name' => $account->name])));
+        Preferences::mark();
+
+        if (intval(Input::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 '';
+    }
+
+    /**
+     * Asset accounts actually earn money by being the destination of a deposit or the destination
+     * of a transfer. The money moves to them.
+     *
+     * A revenue account doesn't really earn money itself. Money is earned "from" the revenue account.
+     * So, the call to find out how many money has been earned by/from a revenue account is slightly different.
+     *
+     *
+     *
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return string
+     */
+    private function earnedInPeriod(Account $account, Carbon $start, Carbon $end)
+    {
+        /** @var ARI $repository */
+        $repository = app(ARI::class);
+        $collection = new Collection([$account]);
+        $type       = $account->accountType->type;
+        switch ($type) {
+            case AccountType::DEFAULT:
+            case AccountType::ASSET:
+                return $repository->earnedInPeriod($collection, $start, $end);
+            case AccountType::REVENUE:
+                return $repository->earnedFromInPeriod($collection, $start, $end);
+            default:
+                return '0';
+        }
+    }
+
+    /**
+     * Asset accounts actually spend money by being the source of a withdrawal or the source
+     * of a transfer. The money moves away from them.
+     *
+     * An expense account doesn't really spend money itself. Money is spent "at" the expense account.
+     * So, the call to find out how many money has been spent on/at an expense account is slightly different.
+     *
+     *
+     *
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return string
+     */
+    private function spentInPeriod(Account $account, Carbon $start, Carbon $end): string
+    {
+        /** @var ARI $repository */
+        $repository = app(ARI::class);
+        $collection = new Collection([$account]);
+        $type       = $account->accountType->type;
+        switch ($type) {
+            case AccountType::DEFAULT:
+            case AccountType::ASSET:
+                return $repository->spentInPeriod($collection, $start, $end);
+            case AccountType::EXPENSE:
+                return $repository->spentAtInPeriod($collection, $start, $end);
+            default:
+                return '0';
+        }
+    }
+
+}