Merge branch 'release/4.3.0'

New Crowdin translations

.env.example

@@ -35,13 +35,17 @@ MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
 SEND_REGISTRATION_MAIL=true
-MUST_CONFIRM_ACCOUNT=false
-
+SEND_ERROR_MESSAGE=true
 SHOW_INCOMPLETE_TRANSLATIONS=false
 
+CACHE_PREFIX=firefly
+
 ANALYTICS_ID=
 SITE_OWNER=mail@example.com
 
 PUSHER_KEY=
 PUSHER_SECRET=
 PUSHER_APP_ID=
+
+DEMO_USERNAME=
+DEMO_PASSWORD=

.env.testing

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

.gitignore

@@ -11,3 +11,4 @@ result.html
 test-import.sh
 test-import-report.txt
 public/google*.html
+.env.backup

.travis.yml

@@ -0,0 +1,17 @@
+language: php
+sudo: false
+php:
+  - '7.0'
+
+install:
+  - phpenv config-rm xdebug.ini
+  - rm composer.lock
+  - composer update --no-scripts
+  - php artisan clear-compiled
+  - php artisan optimize
+  - php artisan env
+  - cp .env.testing .env
+  - mv storage/database/databasecopy.sqlite storage/database/database.sqlite
+
+script:
+  - phpunit

CHANGELOG.md

@@ -2,7 +2,228 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [4.0.0] - 2015-05-25
+
+## [4.3.0] - 2015-12-26
+### Added
+- New method of keeping track of available budget, see issue #489
+- Support for Spanish
+- Firefly III now has an extended demo mode. Will expand further in the future.
+ 
+
+### Changed
+- New favicon
+- Import routine no longer gives transactions a description #483
+
+
+### Removed
+- All test data generation code.
+
+### Fixed
+- Removed import accounts from search results #478
+- Redirect after delete will no longer go back to deleted item #477
+- Cannot math #482
+- Fixed bug in virtual balance field #479
+
+## [4.2.2] - 2016-12-18
+### Added
+- New budget report (still a bit of a beta)
+- Can now edit user
+
+### Changed
+- New config for specific events. Still need to build Notifications.
+
+### Fixed
+- Various bugs
+- Issue #472 thanks to @zjean
+
+## [4.2.1] - 2016-12-09
+### Added
+- BIC support (see #430)
+- New category report section and chart (see the general financial report)
+
+
+### Changed
+- Date range picker now also available on mobile devices (see #435)
+- Extended range of amounts for issue #439
+- Rewrote all routes. Old bookmarks may break.
+
+## [4.2.0] - 2016-11-27
+### Added
+- Lots of (empty) tests
+- Expanded transaction lists (#377)
+- New charts at account view
+- First code for #305
+
+
+### Changed
+- Updated all email messages.
+- Made some fonts local
+
+
+### Deprecated
+- Initial release.
+
+### Removed
+- Initial release.
+
+### Fixed
+- Issue #408
+- Various issues with split journals
+- Issue #414, thx @zjean
+- Issue #419, thx @schwalberich 
+- Issue #422, thx @xzaz
+- Various import bugs, such as #416 (@zjean)
+
+
+### Security
+- Initial release.
+
+
+## [4.1.7] - 2016-11-19
+### Added
+- Check for database table presence in console commands.
+- Category report
+- Reinstated old test routines.
+
+
+### Changed
+- Confirm account setting is no longer in `.env` file.
+- Titles are now in reverse (current page > parent > firefly iii)
+- Easier update of language files thanks to Github implementation.
+- Uniform colours for charts.
+
+### Fixed
+- Made all pages more mobile friendly.
+- Fixed #395 found by @marcoveeneman.
+- Fixed #398 found by @marcoveeneman.
+- Fixed #401 found by @marcoveeneman.
+- Many optimizations.
+- Updated many libraries.
+- Various bugs found by myself.
+
+
+## [4.1.6] - 2016-11-06
+### Added
+- New budget table for multi year report.
+
+### Changed
+- Greatly expanded help pages and their function.
+- Built a new transaction collector, which I think was the idea of @roberthorlings originally.
+- Rebuilt seach engine.
+
+### Fixed
+- #375, thanks to @schoentoon which made it impossible to resurrect currencies.
+- #370 thanks to @ksmolder
+- #378, thanks to @HomelessAvatar
+
+## [4.1.5] - 2016-11-01
+### Changed
+- Report parts are loaded using AJAX, making a lot of code more simple.
+- Help content will fall back to English.
+- Help content is translated through Crowdin.
+
+### Fixed
+- Issue #370
+
+## [4.1.4] - 2016-10-30
+### Added
+- New Dockerfile thanks to @schoentoon
+- Added changing the destination account as rule action.
+- Added changing the source account as rule action.
+- Can convert transactions into different types.
+
+### Changed
+- Changed the export routine to be more future-proof.
+- Improved help routine.
+- Integrated CrowdIn translations.
+- Simplified reports
+- Change error message to refer to solution.
+
+### Fixed
+- #367 thanks to @HungryFeline
+- #366 thanks to @3mz3t
+- #362 and #341 thanks to @bnw
+- #355 thanks to @roberthorlings
+
+## [4.1.3] - 2016-10-22
+### Fixed
+- Some event handlers called the wrong method.
+
+## [4.1.2] - 2016-10-22
+
+### Fixed
+- A bug is fixed in the journal event handler that prevented Firefly III from actually storing journals.
+
+## [4.1.1] - 2016-10-22
+
+### Added
+- Option to show deposit accounts on the front page.
+- Script to upgrade split transactions
+- Can now save notes on piggy banks.
+- Extend user admin options.
+- Run import jobs from the command line
+
+
+### Changed
+- New preferences screen layout.
+
+### Deprecated
+- ``firefly:import`` is now ``firefly:start-import``
+
+### Removed
+- Lots of old code
+
+### Fixed
+- #357, where non utf-8 files would break Firefly.
+- Tab delimiter is not properly loaded from import configuration (@roberthorlings)
+- System response to yearly bills
+
+## [4.0.2] - 2016-10-14
+### Added
+- Added ``intl`` dependency to composer file to ease installation (thanks @telyn)
+- Added support for Croatian.
+
+### Changed
+- Updated all copyright notices to refer to the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/)
+- Fixed #344
+- Fixed #346, thanks to @SanderKleykens
+- #351
+- Did some internal remodelling.
+
+### Fixed
+- PostgreSQL compatibility thanks to @SanderKleykens
+- @RobertHorlings fixed a bug in the ABN Amro import specific.
+
+
+## [4.0.1] - 2016-10-04
+### Added
+- New ING import specific by @tomwerf
+- New Presidents Choice specific to fix #307
+- Added some trimming (#335)
+
+### Changed
+- Initial release.
+
+### Deprecated
+- Initial release.
+
+### Removed
+- Initial release.
+
+### Fixed
+- Fixed a bug where incoming transactions would not be properly filtered in several reports.
+- #334 by @cyberkov
+- #337
+- #336
+- #338 found by @roberthorlings
+
+### Security
+- Initial release.
+
+
+
+
+## [4.0.0] - 2015-09-26
 ### Added
 - Upgraded to Laravel 5.3, most other libraries upgraded as well.
 - Added GBP as currency, thanks to @Mortalife

Dockerfile

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

README.md

@@ -1,16 +1,24 @@
-# 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)
+# Firefly III: A personal finances manager 
 
-## A personal finances manager
+[![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)
 
-[![Screenshot](https://i.nder.be/hhfv03hp/400)](https://i.nder.be/hhfv03hp) [![Screenshot](https://i.nder.be/hhmwmqw9/400)](https://i.nder.be/hhmwmqw9)
+[![Build Status](https://travis-ci.org/JC5/firefly-iii.svg?branch=master)](https://travis-ci.org/JC5/firefly-iii) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=44UKUT455HUFA) 
 
-[![Screenshot](https://i.nder.be/g63q05m0/400)](https://i.nder.be/g63q05m0) [![Screenshot](https://i.nder.be/c2g30ngg/400)](https://i.nder.be/c2g30ngg)
+[![The index of Firefly III](https://i.nder.be/hurdhgyg/400)](https://i.nder.be/h2b37243) [![The account overview of Firefly III](https://i.nder.be/hnkfkdpr/400)](https://i.nder.be/hv70pbwc)
+
+[![The useful financial reports of Firefly III](https://i.nder.be/h7sk6nb7/400)](https://i.nder.be/ccn0u2mp) [![Even more useful reports in Firefly III](https://i.nder.be/g237hr35/400)](https://i.nder.be/gm8hbh7z)
+
+_(You can click on the images for a better view)_
 
 "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.
 
+## Try it out!
+
+Try out Firefly III on the [demo site](https://firefly-iii.nder.be/).
+
 ## Installation
 
-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/).
+To install Firefly III, you'll need a web server (preferrably on Linux) and access to the command line. Then, please read the [installation guide](https://firefly-iii.github.io/installation-guide/).
 
 ## More about Firefly III
 
@@ -25,6 +33,8 @@ Firefly works on the principle that if you know where you're money is going, you
 - Firefly has lots of features without becoming fancy or bloated.
 - If you feel you're missing something you can just ask me and I'll add it!
 
-Firefly is pretty awesome. [You can read more about Firefly III, and its features, on the Github Pages](https://jc5.github.io/firefly-iii/).
+Firefly is pretty awesome. [You can read more about Firefly III, and its features, on the Github Pages](https://firefly-iii.github.io/).
+
+If you like Firefly and if it helps you save lots of money, why not send me [a dime for every dollar saved](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=44UKUT455HUFA) (this is a joke, although the Paypal form works just fine, try it!)
 
 If you want to contact me, please open an issue or [email me](mailto:thegrumpydictator@gmail.com).

app/Bootstrap/ConfigureLogging.php

@@ -3,8 +3,10 @@
  * 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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);

app/Console/Commands/CreateImport.php

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

app/Console/Commands/EncryptFile.php

@@ -3,8 +3,10 @@
  * 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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);

app/Console/Commands/Import.php

@@ -3,8 +3,10 @@
  * 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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);
@@ -16,6 +18,7 @@ use FireflyIII\Import\Logging\CommandHandler;
 use FireflyIII\Models\ImportJob;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
+use Illuminate\Support\Collection;
 use Log;
 
 /**
@@ -30,14 +33,14 @@ class Import extends Command
      *
      * @var string
      */
-    protected $description = 'Import stuff into Firefly III.';
+    protected $description = 'This will start a new import.';
 
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'firefly:import {key}';
+    protected $signature = 'firefly:start-import {key}';
 
     /**
      * Create a new command instance.
@@ -49,49 +52,33 @@ class Import extends Command
     }
 
     /**
-     * Execute the console command.
      *
-     * @return mixed
      */
     public function handle()
     {
+        Log::debug('Start start-import command');
         $jobKey = $this->argument('key');
         $job    = ImportJob::whereKey($jobKey)->first();
         if (!$this->isValid($job)) {
+            Log::error('Job is not valid for some reason. Exit.');
+
             return;
         }
 
-        $this->line('Going to import job with key "' . $job->key . '" of type ' . $job->file_type);
+        $this->line(sprintf('Going to import job with key "%s" of type "%s"', $job->key, $job->file_type));
 
         $monolog = Log::getMonolog();
         $handler = new CommandHandler($this);
         $monolog->pushHandler($handler);
+        $importProcedure = new ImportProcedure;
+        $result          = $importProcedure->runImport($job);
 
-        $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));
-        }
-
+        // display result to user:
+        $this->presentResults($result);
         $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);
-            }
-        }
+        $this->presentErrors($job);
 
         return;
     }
@@ -117,4 +104,36 @@ class Import extends Command
 
         return true;
     }
+
+    /**
+     * @param ImportJob $job
+     */
+    private function presentErrors(ImportJob $job)
+    {
+        $extendedStatus = $job->extended_status;
+        if (isset($extendedStatus['errors']) && count($extendedStatus['errors']) > 0) {
+            $this->line(sprintf('The following %d error(s) occured during the import:', count($extendedStatus['errors'])));
+            foreach ($extendedStatus['errors'] as $error) {
+                $this->error($error);
+            }
+        }
+    }
+
+    /**
+     * @param Collection $result
+     */
+    private function presentResults(Collection $result)
+    {
+        /**
+         * @var int                $index
+         * @var TransactionJournal $journal
+         */
+        foreach ($result as $index => $journal) {
+            if (!is_null($journal->id)) {
+                $this->line(sprintf('Line #%d has been imported as transaction #%d.', $index, $journal->id));
+                continue;
+            }
+            $this->error(sprintf('Could not store line #%d', $index));
+        }
+    }
 }

app/Console/Commands/MoveRepository.php

@@ -0,0 +1,86 @@
+<?php
+/**
+ * MoveRepository.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Console\Commands;
+
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+
+/**
+ * Class MoveRepository
+ *
+ * @package FireflyIII\Console\Commands
+ */
+class MoveRepository extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Alerts the user that the Github repository will move, if they are interested to know this.';
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly:github-move';
+
+    /**
+     * Create a new command instance.
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $moveDate = new Carbon('2017-01-01');
+        $final    = new Carbon('2017-03-01');
+        $now      = new Carbon;
+
+        // display message before 2017-01-01
+        if ($moveDate > $now) {
+            $this->line('+------------------------------------------------------------------------------+');
+            $this->line('');
+            $this->line('The Github repository for Firefly III will MOVE');
+            $this->line('This move will be on January 1st 2017');
+            $this->line('');
+            $this->error('READ THIS WIKI PAGE FOR MORE INFORMATION');
+            $this->line('');
+            $this->info('https://github.com/firefly-iii/help/wiki/New-Github-repository');
+            $this->line('');
+            $this->line('+------------------------------------------------------------------------------+');
+        }
+
+        // display message after 2017-01-01 but before 2017-03-01
+        if ($moveDate <= $now && $now <= $final) {
+            $this->line('+------------------------------------------------------------------------------+');
+            $this->line('');
+            $this->line('The Github repository for Firefly III has MOVED');
+            $this->line('This move was on January 1st 2017!');
+            $this->line('');
+            $this->error('READ THIS WIKI PAGE FOR MORE INFORMATION');
+            $this->line('');
+            $this->info('https://github.com/firefly-iii/help/wiki/New-Github-repository');
+            $this->line('');
+            $this->line('+------------------------------------------------------------------------------+');
+        }
+
+    }
+}

app/Console/Commands/ScanAttachments.php

@@ -3,8 +3,10 @@
  * ScanAttachments.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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);
@@ -58,42 +60,26 @@ class ScanAttachments extends Command
         /** @var Attachment $attachment */
         foreach ($attachments as $attachment) {
             $fileName = $attachment->fileName();
-
-            // try to grab file content:
             try {
                 $content = $disk->get($fileName);
             } catch (FileNotFoundException $e) {
                 $this->error(sprintf('Could not find data for attachment #%d', $attachment->id));
                 continue;
             }
-            // try to decrypt content.
             try {
                 $decrypted = Crypt::decrypt($content);
             } catch (DecryptException $e) {
                 $this->error(sprintf('Could not decrypt data of attachment #%d', $attachment->id));
                 continue;
             }
-
-            // make temp file:
             $tmpfname = tempnam(sys_get_temp_dir(), 'FireflyIII');
-
-            // store content in temp file:
             file_put_contents($tmpfname, $decrypted);
-
-            // get md5 and mime
-            $md5  = md5_file($tmpfname);
-            $mime = mime_content_type($tmpfname);
-
-            // update attachment:
+            $md5              = md5_file($tmpfname);
+            $mime             = mime_content_type($tmpfname);
             $attachment->md5  = $md5;
             $attachment->mime = $mime;
             $attachment->save();
-
-
             $this->line(sprintf('Fixed attachment #%d', $attachment->id));
-
-            // find file:
-
         }
     }
 }

app/Console/Commands/UpgradeDatabase.php

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

app/Console/Commands/UpgradeFireflyInstructions.php

@@ -3,8 +3,10 @@
  * 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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);
@@ -61,21 +63,20 @@ class UpgradeFireflyInstructions extends Command
 
         }
 
-        $this->line('+------------------------------------------------------------------------------+');
-        $this->line('');
 
         if (is_null($text)) {
-            $this->line('Thank you for installing Firefly III, v' . $version);
+            $this->line(sprintf('Thank you for installing Firefly III, v%s', $version));
             $this->info('There are no extra upgrade instructions.');
             $this->line('Firefly III should be ready for use.');
         } 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->line('+------------------------------------------------------------------------------+');
+            $this->line('');
+            $this->line(sprintf('Thank you for installing Firefly III, v%s', $version));
             $this->info(wordwrap($text));
+            $this->line('');
+            $this->line('+------------------------------------------------------------------------------+');
         }
 
-        $this->line('');
-        $this->line('+------------------------------------------------------------------------------+');
+
     }
 }

app/Console/Commands/VerifyDatabase.php

@@ -3,8 +3,10 @@
  * 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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);
@@ -13,16 +15,17 @@ namespace FireflyIII\Console\Commands;
 
 use Crypt;
 use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Budget;
-use FireflyIII\Models\Category;
-use FireflyIII\Models\Tag;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Console\Command;
+use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Database\Eloquent\Builder;
+use Schema;
 use stdClass;
 
 /**
@@ -58,16 +61,21 @@ class VerifyDatabase extends Command
      */
     public function handle()
     {
+        // if table does not exist, return false
+        if (!Schema::hasTable('users')) {
+            return;
+        }
+
+        $this->reportObject('budget');
+        $this->reportObject('category');
+        $this->reportObject('tag');
+
         // accounts with no transactions.
         $this->reportAccounts();
         // budgets with no limits
         $this->reportBudgetLimits();
         // budgets with no transactions
-        $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:
@@ -82,6 +90,9 @@ class VerifyDatabase extends Command
 
         // transfers with budgets.
         $this->reportTransfersBudgets();
+
+        // report on journals with the wrong types of accounts.
+        $this->reportIncorrectJournals();
     }
 
     /**
@@ -89,14 +100,13 @@ class VerifyDatabase extends Command
      */
     private function reportAccounts()
     {
-        $set = Account
-            ::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
-            ->leftJoin('users', 'accounts.user_id', '=', 'users.id')
-            ->groupBy(['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email'])
-            ->whereNull('transactions.account_id')
-            ->get(
-                ['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email']
-            );
+        $set = Account::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
+                      ->leftJoin('users', 'accounts.user_id', '=', 'users.id')
+                      ->groupBy(['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email'])
+                      ->whereNull('transactions.account_id')
+                      ->get(
+                          ['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email']
+                      );
 
         /** @var stdClass $entry */
         foreach ($set as $entry) {
@@ -112,59 +122,19 @@ class VerifyDatabase extends Command
      */
     private function reportBudgetLimits()
     {
-        $set = Budget
-            ::leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budgets.id')
-            ->leftJoin('users', 'budgets.user_id', '=', 'users.id')
-            ->groupBy(['budgets.id', 'budgets.name', 'budgets.user_id', 'users.email'])
-            ->whereNull('budget_limits.id')
-            ->get(['budgets.id', 'budgets.name', 'budgets.user_id', 'users.email']);
+        $set = Budget::leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budgets.id')
+                     ->leftJoin('users', 'budgets.user_id', '=', 'users.id')
+                     ->groupBy(['budgets.id', 'budgets.name', 'budgets.encrypted', 'budgets.user_id', 'users.email'])
+                     ->whereNull('budget_limits.id')
+                     ->get(['budgets.id', 'budgets.name', 'budgets.user_id', 'budgets.encrypted', 'users.email']);
 
-        /** @var stdClass $entry */
+        /** @var Budget $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.';
+            $name = $entry->encrypted ? Crypt::decrypt($entry->name) : $entry->name;
+            $line = sprintf(
+                'Notice: User #%d (%s) has budget #%d ("%s") which has no budget limits.',
+                $entry->user_id, $entry->email, $entry->id, $name
+            );
             $this->line($line);
         }
     }
@@ -174,55 +144,94 @@ class VerifyDatabase extends Command
      */
     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']
-            );
+        $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 . '"'
+                ' Find it in the table called "accounts" and change the "deleted_at" field to: "' . $date . '"'
             );
         }
     }
 
+    private function reportIncorrectJournals()
+    {
+        $configuration = [
+            // a withdrawal can not have revenue account:
+            TransactionType::WITHDRAWAL => [AccountType::REVENUE],
+
+            // deposit cannot have an expense account:
+            TransactionType::DEPOSIT    => [AccountType::EXPENSE],
+
+            // transfer cannot have either:
+            TransactionType::TRANSFER   => [AccountType::EXPENSE, AccountType::REVENUE],
+        ];
+        foreach ($configuration as $transactionType => $accountTypes) {
+            $set = TransactionJournal::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+                                     ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                     ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+                                     ->leftJoin('account_types', 'account_types.id', 'accounts.account_type_id')
+                                     ->leftJoin('users', 'users.id', '=', 'transaction_journals.user_id')
+                                     ->where('transaction_types.type', $transactionType)
+                                     ->whereIn('account_types.type', $accountTypes)
+                                     ->whereNull('transaction_journals.deleted_at')
+                                     ->get(
+                                         ['transaction_journals.id', 'transaction_journals.user_id', 'users.email', 'account_types.type as a_type',
+                                          'transaction_types.type']
+                                     );
+            foreach ($set as $entry) {
+                $this->error(
+                    sprintf(
+                        'Transaction journal #%d (user #%d, %s) is of type "%s" but ' .
+                        'is linked to a "%s". The transaction journal should be recreated.',
+                        $entry->id,
+                        $entry->user_id,
+                        $entry->email,
+                        $entry->type,
+                        $entry->a_type
+                    )
+                );
+            }
+        }
+    }
+
     /**
      * Any deleted transaction journals that have transactions that are NOT deleted:
      */
     private function reportJournals()
     {
-        $set = TransactionJournal
-            ::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-            ->whereNotNull('transaction_journals.deleted_at')// USE THIS
-            ->whereNull('transactions.deleted_at')
-            ->whereNotNull('transactions.id')
-            ->get(
-                [
-                    'transaction_journals.id as journal_id',
-                    'transaction_journals.description',
-                    'transaction_journals.deleted_at as journal_deleted',
-                    'transactions.id as transaction_id',
-                    'transactions.deleted_at as transaction_deleted_at']
-            );
+        $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 . '"'
+                ' Find it in the table called "transactions" and change the "deleted_at" field to: "' . $entry->journal_deleted . '"'
             );
         }
     }
@@ -232,20 +241,52 @@ class VerifyDatabase extends Command
      */
     private function reportNoTransactions()
     {
-        $set = TransactionJournal
-            ::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-            ->groupBy('transaction_journals.id')
-            ->whereNull('transactions.transaction_journal_id')
-            ->get(['transaction_journals.id']);
+        $set = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                 ->groupBy('transaction_journals.id')
+                                 ->whereNull('transactions.transaction_journal_id')
+                                 ->get(['transaction_journals.id']);
 
         foreach ($set as $entry) {
             $this->error(
-                'Error: Journal #' . $entry->id . ' has zero transactions. Open table `transaction_journals` and delete the entry with id #' . $entry->id
+                'Error: Journal #' . $entry->id . ' has zero transactions. Open table "transaction_journals" and delete the entry with id #' . $entry->id
             );
         }
 
     }
 
+    /**
+     * @param string $name
+     */
+    private function reportObject(string $name)
+    {
+        $plural = str_plural($name);
+        $class  = sprintf('FireflyIII\Models\%s', ucfirst($name));
+        $field  = $name == 'tag' ? 'tag' : 'name';
+        $set    = $class::leftJoin($name . '_transaction_journal', $plural . '.id', '=', $name . '_transaction_journal.' . $name . '_id')
+                        ->leftJoin('users', $plural . '.user_id', '=', 'users.id')
+                        ->distinct()
+                        ->whereNull($name . '_transaction_journal.' . $name . '_id')
+                        ->whereNull($plural . '.deleted_at')
+                        ->get([$plural . '.id', $plural . '.' . $field . ' as name', $plural . '.user_id', 'users.email']);
+
+        /** @var stdClass $entry */
+        foreach ($set as $entry) {
+
+            $objName = $entry->name;
+            try {
+                $objName = Crypt::decrypt($objName);
+            } catch (DecryptException $e) {
+                // it probably was not encrypted.
+            }
+
+            $line = sprintf(
+                'Notice: User #%d (%s) has %s #%d ("%s") which has no transactions.',
+                $entry->user_id, $entry->email, $name, $entry->id, $objName
+            );
+            $this->line($line);
+        }
+    }
+
     /**
      * Reports for each user when the sum of their transactions is not zero.
      */
@@ -263,45 +304,23 @@ class VerifyDatabase extends Command
         }
     }
 
-    /**
-     * 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']
-            );
+        $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 . '"'
+                ' Find it in the table called "transaction_journals" and change the "deleted_at" field to: "' . $entry->transaction_deleted . '"'
             );
         }
     }
@@ -311,12 +330,11 @@ class VerifyDatabase extends Command
      */
     private function reportTransfersBudgets()
     {
-        $set = TransactionJournal
-            ::distinct()
-            ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
-            ->leftJoin('budget_transaction_journal', 'transaction_journals.id', '=', 'budget_transaction_journal.transaction_journal_id')
-            ->where('transaction_types.type', TransactionType::TRANSFER)
-            ->whereNotNull('budget_transaction_journal.budget_id')->get(['transaction_journals.id']);
+        $set = TransactionJournal::distinct()
+                                 ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+                                 ->leftJoin('budget_transaction_journal', 'transaction_journals.id', '=', 'budget_transaction_journal.transaction_journal_id')
+                                 ->where('transaction_types.type', TransactionType::TRANSFER)
+                                 ->whereNotNull('budget_transaction_journal.budget_id')->get(['transaction_journals.id']);
 
         /** @var TransactionJournal $entry */
         foreach ($set as $entry) {

app/Console/Kernel.php

@@ -3,17 +3,22 @@
  * 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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);
 
 namespace FireflyIII\Console;
 
+use FireflyIII\Console\Commands\CreateImport;
 use FireflyIII\Console\Commands\EncryptFile;
 use FireflyIII\Console\Commands\Import;
+use FireflyIII\Console\Commands\MoveRepository;
 use FireflyIII\Console\Commands\ScanAttachments;
+use FireflyIII\Console\Commands\UpgradeDatabase;
 use FireflyIII\Console\Commands\UpgradeFireflyInstructions;
 use FireflyIII\Console\Commands\VerifyDatabase;
 use Illuminate\Console\Scheduling\Schedule;
@@ -55,9 +60,11 @@ class Kernel extends ConsoleKernel
             UpgradeFireflyInstructions::class,
             VerifyDatabase::class,
             Import::class,
+            CreateImport::class,
             EncryptFile::class,
             ScanAttachments::class,
-
+            UpgradeDatabase::class,
+            MoveRepository::class,
         ];
 
     /**

app/Crud/Account/AccountCrud.php

@@ -1,534 +0,0 @@
-<?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);
-
-        }
-        Log::debug(sprintf('Searching for account named %s of the following type(s)', $name), ['types' => $types]);
-
-        $accounts = $query->get(['accounts.*']);
-        /** @var Account $account */
-        foreach ($accounts as $account) {
-            if ($account->name === $name) {
-                Log::debug(sprintf('Found #%d (%s) with type id %d', $account->id, $account->name, $account->account_type_id));
-
-                return $account;
-            }
-        }
-        Log::debug('Found nothing.');
-
-        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

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

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

@@ -1,47 +0,0 @@
-<?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/BlockedBadLogin.php

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

app/Events/BlockedUseOfDomain.php

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

app/Events/BlockedUseOfEmail.php

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

app/Events/BlockedUserLogin.php

@@ -1,10 +1,12 @@
 <?php
 /**
- * ResendConfirmation.php
+ * BlockedUserLogin.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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);
@@ -15,11 +17,11 @@ use FireflyIII\User;
 use Illuminate\Queue\SerializesModels;
 
 /**
- * Class ResendConfirmation
+ * Class BlockedUserLogin
  *
  * @package FireflyIII\Events
  */
-class ResendConfirmation extends Event
+class BlockedUserLogin extends Event
 {
     use SerializesModels;
 
@@ -27,9 +29,9 @@ class ResendConfirmation extends Event
     public $user;
 
     /**
-     * Create a new event instance.
+     * Create a new event instance. This event is triggered when a blocked user logs in.
      *
-     * @param  User  $user
+     * @param User   $user
      * @param string $ipAddress
      */
     public function __construct(User $user, string $ipAddress)

app/Events/ConfirmedUser.php

@@ -1,10 +1,12 @@
 <?php
 /**
- * UserRegistration.php
+ * ConfirmedUser.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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);
@@ -15,11 +17,11 @@ use FireflyIII\User;
 use Illuminate\Queue\SerializesModels;
 
 /**
- * Class UserRegistration
+ * Class ConfirmedUser
  *
  * @package FireflyIII\Events
  */
-class UserRegistration extends Event
+class ConfirmedUser extends Event
 {
     use SerializesModels;
 
@@ -27,7 +29,7 @@ class UserRegistration extends Event
     public $user;
 
     /**
-     * Create a new event instance.
+     * Create a new event instance. This event is triggered when a user confirms their new account.
      *
      * @param  User  $user
      * @param string $ipAddress

app/Events/DeletedUser.php

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

app/Events/Event.php

@@ -3,8 +3,10 @@
  * 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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);

app/Events/LockedOutUser.php

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

app/Events/RegisteredUser.php

@@ -1,10 +1,12 @@
 <?php
 /**
- * UserIsDeleted.php
+ * RegisteredUser.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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);
@@ -15,11 +17,11 @@ use FireflyIII\User;
 use Illuminate\Queue\SerializesModels;
 
 /**
- * Class UserIsDeleted
+ * Class RegisteredUser
  *
  * @package FireflyIII\Events
  */
-class UserIsDeleted extends Event
+class RegisteredUser extends Event
 {
     use SerializesModels;
 
@@ -27,7 +29,7 @@ class UserIsDeleted extends Event
     public $user;
 
     /**
-     * Create a new event instance.
+     * Create a new event instance. This event is triggered when a new user registers.
      *
      * @param  User  $user
      * @param string $ipAddress

app/Events/RequestedNewPassword.php

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

app/Events/ResentConfirmation.php

@@ -1,10 +1,12 @@
 <?php
 /**
- * UserIsConfirmed.php
+ * ResentConfirmation.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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);
@@ -15,11 +17,11 @@ use FireflyIII\User;
 use Illuminate\Queue\SerializesModels;
 
 /**
- * Class UserIsConfirmed
+ * Class ResentConfirmation
  *
  * @package FireflyIII\Events
  */
-class UserIsConfirmed extends Event
+class ResentConfirmation extends Event
 {
     use SerializesModels;
 
@@ -27,7 +29,7 @@ class UserIsConfirmed extends Event
     public $user;
 
     /**
-     * Create a new event instance.
+     * Create a new event instance. This event is triggered when a users wants a new confirmation.
      *
      * @param  User  $user
      * @param string $ipAddress

app/Events/StoredBudgetLimit.php

@@ -1,10 +1,12 @@
 <?php
 /**
- * BudgetLimitStored.php
+ * StoredBudgetLimit.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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);
@@ -16,11 +18,11 @@ use FireflyIII\Models\BudgetLimit;
 use Illuminate\Queue\SerializesModels;
 
 /**
- * Class BudgetLimitStored
+ * Class StoredBudgetLimit
  *
  * @package FireflyIII\Events
  */
-class BudgetLimitStored extends Event
+class StoredBudgetLimit extends Event
 {
 
     use SerializesModels;

app/Events/StoredTransactionJournal.php

@@ -1,10 +1,12 @@
 <?php
 /**
- * TransactionJournalStored.php
+ * StoredTransactionJournal.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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);
@@ -15,11 +17,11 @@ use FireflyIII\Models\TransactionJournal;
 use Illuminate\Queue\SerializesModels;
 
 /**
- * Class TransactionJournalStored
+ * Class StoredTransactionJournal
  *
  * @package FireflyIII\Events
  */
-class TransactionJournalStored extends Event
+class StoredTransactionJournal extends Event
 {
 
     use SerializesModels;

app/Events/TransactionStored.php

@@ -1,39 +0,0 @@
-<?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/UpdatedBudgetLimit.php

@@ -1,10 +1,12 @@
 <?php
 /**
- * BudgetLimitUpdated.php
+ * UpdatedBudgetLimit.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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);
@@ -16,11 +18,11 @@ use FireflyIII\Models\BudgetLimit;
 use Illuminate\Queue\SerializesModels;
 
 /**
- * Class BudgetLimitUpdated
+ * Class UpdatedBudgetLimit
  *
  * @package FireflyIII\Events
  */
-class BudgetLimitUpdated extends Event
+class UpdatedBudgetLimit extends Event
 {
 
     use SerializesModels;

app/Events/UpdatedTransactionJournal.php

@@ -1,10 +1,12 @@
 <?php
 /**
- * TransactionJournalUpdated.php
+ * UpdatedTransactionJournal.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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);
@@ -15,11 +17,11 @@ use FireflyIII\Models\TransactionJournal;
 use Illuminate\Queue\SerializesModels;
 
 /**
- * Class TransactionJournalUpdated
+ * Class UpdatedTransactionJournal
  *
  * @package FireflyIII\Events
  */
-class TransactionJournalUpdated extends Event
+class UpdatedTransactionJournal extends Event
 {
 
     use SerializesModels;

app/Exceptions/FireflyException.php

@@ -3,8 +3,10 @@
  * 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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);

app/Exceptions/Handler.php

@@ -3,8 +3,10 @@
  * 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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);
@@ -75,7 +77,8 @@ class Handler extends ExceptionHandler
      */
     public function report(Exception $exception)
     {
-        if ($exception instanceof FireflyException || $exception instanceof ErrorException) {
+        $doMailError = env('SEND_ERROR_MESSAGE', true);
+        if (($exception instanceof FireflyException || $exception instanceof ErrorException) && $doMailError) {
             $userData = [
                 'id'    => 0,
                 'email' => 'unknown@example.com',
@@ -106,7 +109,8 @@ class Handler extends ExceptionHandler
     /**
      * Convert an authentication exception into an unauthenticated response.
      *
-     * @param  \Illuminate\Http\Request                 $request
+     * @param  \Illuminate\Http\Request $request
+     *
      * @return \Illuminate\Http\Response
      */
     protected function unauthenticated($request)

app/Exceptions/NotImplementedException.php

@@ -3,8 +3,10 @@
  * 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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);

app/Exceptions/ValidationException.php

@@ -3,8 +3,10 @@
  * 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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);

app/Export/Collector/AttachmentCollector.php

@@ -3,19 +3,20 @@
  * 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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);
 
 namespace FireflyIII\Export\Collector;
 
-use Amount;
+use Carbon\Carbon;
 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;
@@ -29,12 +30,14 @@ use Storage;
  */
 class AttachmentCollector extends BasicCollector implements CollectorInterface
 {
-    /** @var string */
-    private $explanationString = '';
+    /** @var  Carbon */
+    private $end;
     /** @var \Illuminate\Contracts\Filesystem\Filesystem */
     private $exportDisk;
     /** @var  AttachmentRepositoryInterface */
     private $repository;
+    /** @var  Carbon */
+    private $start;
     /** @var \Illuminate\Contracts\Filesystem\Filesystem */
     private $uploadDisk;
 
@@ -67,34 +70,17 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
             $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
+     * @param Carbon $start
+     * @param Carbon $end
      */
-    private function explain(Attachment $attachment)
+    public function setDates(Carbon $start, Carbon $end)
     {
-        /** @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;
-
+        $this->start = $start;
+        $this->end   = $end;
     }
 
     /**
@@ -110,10 +96,8 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
                 $decrypted  = Crypt::decrypt($this->uploadDisk->get($file));
                 $exportFile = $this->exportFileName($attachment);
                 $this->exportDisk->put($exportFile, $decrypted);
-                $this->getFiles()->push($exportFile);
+                $this->getEntries()->push($exportFile);
 
-                // explain:
-                $this->explain($attachment);
             } catch (DecryptException $e) {
                 Log::error('Catchable error: could not decrypt attachment #' . $attachment->id . ' because: ' . $e->getMessage());
             }
@@ -141,7 +125,7 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
      */
     private function getAttachments(): Collection
     {
-        $attachments = $this->repository->get();
+        $attachments = $this->repository->getBetween($this->start, $this->end);
 
         return $attachments;
     }

app/Export/Collector/BasicCollector.php

@@ -3,8 +3,10 @@
  * 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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);
@@ -25,7 +27,7 @@ class BasicCollector
     /** @var ExportJob */
     protected $job;
     /** @var Collection */
-    private $files;
+    private $entries;
 
     /**
      * BasicCollector constructor.
@@ -34,24 +36,24 @@ class BasicCollector
      */
     public function __construct(ExportJob $job)
     {
-        $this->files = new Collection;
-        $this->job   = $job;
+        $this->entries = new Collection;
+        $this->job     = $job;
     }
 
     /**
      * @return Collection
      */
-    public function getFiles(): Collection
+    public function getEntries(): Collection
     {
-        return $this->files;
+        return $this->entries;
     }
 
     /**
-     * @param Collection $files
+     * @param Collection $entries
      */
-    public function setFiles(Collection $files)
+    public function setEntries(Collection $entries)
     {
-        $this->files = $files;
+        $this->entries = $entries;
     }
 
 

app/Export/Collector/CollectorInterface.php

@@ -3,8 +3,10 @@
  * 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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);
@@ -23,7 +25,7 @@ interface CollectorInterface
     /**
      * @return Collection
      */
-    public function getFiles(): Collection;
+    public function getEntries(): Collection;
 
     /**
      * @return bool
@@ -31,9 +33,9 @@ interface CollectorInterface
     public function run(): bool;
 
     /**
-     * @param Collection $files
+     * @param Collection $entries
      *
      */
-    public function setFiles(Collection $files);
+    public function setEntries(Collection $entries);
 
 }

app/Export/Collector/JournalExportCollector.php

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

app/Export/Collector/UploadCollector.php

@@ -3,8 +3,10 @@
  * 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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);
@@ -24,16 +26,14 @@ use Storage;
  */
 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;
+    /** @var string */
+    private $vintageFormat;
 
     /**
-     *
      * AttachmentCollector constructor.
      *
      * @param ExportJob $job
@@ -49,50 +49,74 @@ class UploadCollector extends BasicCollector implements CollectorInterface
         $this->exportDisk = Storage::disk('export');
 
         // file names associated with the old import routine.
-        $this->expected = 'csv-upload-' . auth()->user()->id . '-';
+        $this->vintageFormat = sprintf('csv-upload-%d-', auth()->user()->id);
 
-        // for the new import routine:
-        $this->getImportKeys();
     }
 
     /**
+     * Is called from the outside to actually start the export.
+     *
      * @return bool
      */
     public function run(): bool
     {
-        // grab upload directory.
-        $files = $this->uploadDisk->files();
+        // collect old upload files (names beginning with "csv-upload".
+        $this->collectVintageUploads();
 
-        foreach ($files as $entry) {
-            $this->processUpload($entry);
+        // then collect current upload files:
+        $this->collectModernUploads();
+
+        return true;
+    }
+
+    /**
+     * This method collects all the uploads that are uploaded using the new importer. So after the summer of 2016.
+     *
+     * @return bool
+     */
+    private function collectModernUploads(): bool
+    {
+        $set  = $this->job->user->importJobs()->where('status', 'import_complete')->get(['import_jobs.*']);
+        $keys = [];
+        if ($set->count() > 0) {
+            $keys = $set->pluck('key')->toArray();
+        }
+
+        foreach ($keys as $key) {
+            $this->processModernUpload($key);
         }
 
         return true;
     }
 
     /**
+     * This method collects all the uploads that are uploaded using the "old" importer. So from before the summer of 2016.
      *
+     * @return bool
      */
-    private function getImportKeys()
+    private function collectVintageUploads(): bool
     {
-        $set = auth()->user()->importJobs()->where('status', 'import_complete')->get(['import_jobs.*']);
-        if ($set->count() > 0) {
-            $keys             = $set->pluck('key')->toArray();
-            $this->importKeys = $keys;
+        // grab upload directory.
+        $files = $this->uploadDisk->files();
 
+        foreach ($files as $entry) {
+            $this->processVintageUpload($entry);
         }
-        Log::debug('Valid import keys are ', $this->importKeys);
+
+        return true;
     }
 
     /**
+     * This method tells you when the vintage upload file was actually uploaded.
+     *
      * @param string $entry
      *
      * @return string
      */
-    private function getOriginalUploadDate(string $entry): string
+    private function getVintageUploadDate(string $entry): string
     {
         // this is an original upload.
-        $parts          = explode('-', str_replace(['.csv.encrypted', $this->expected], '', $entry));
+        $parts          = explode('-', str_replace(['.csv.encrypted', $this->vintageFormat], '', $entry));
         $originalUpload = intval($parts[1]);
         $date           = date('Y-m-d \a\t H-i-s', $originalUpload);
 
@@ -100,33 +124,17 @@ class UploadCollector extends BasicCollector implements CollectorInterface
     }
 
     /**
+     * Tells you if a file name is a vintage upload.
+     *
      * @param string $entry
      *
      * @return bool
      */
-    private function isImportFile(string $entry): bool
+    private function isVintageImport(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);
+        $len = strlen($this->vintageFormat);
         // file is part of the old import routine:
-        if (substr($entry, 0, $len) === $this->expected) {
+        if (substr($entry, 0, $len) === $this->vintageFormat) {
 
             return true;
         }
@@ -135,49 +143,62 @@ class UploadCollector extends BasicCollector implements CollectorInterface
     }
 
     /**
-     * @param $entry
+     * @param string $key
+     *
+     * @return bool
      */
-    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)
+    private function processModernUpload(string $key): bool
     {
         // 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());
+        $job = $this->job->user->importJobs()->where('key', $key)->first();
+        if (is_null($job)) {
+            return false;
         }
 
-        if (!is_null($job) && strlen($content) > 0) {
+        // find the file for this import:
+        $content = '';
+        try {
+            $content = Crypt::decrypt($this->uploadDisk->get(sprintf('%s.upload', $key)));
+        } catch (DecryptException $e) {
+            Log::error(sprintf('Could not decrypt old import file "%s". Skipped because: %s', $key, $e->getMessage()));
+        }
+
+        if (strlen($content) > 0) {
             // add to export disk.
             $date = $job->created_at->format('Y-m-d');
             $file = sprintf('%s-Old %s import dated %s.%s', $this->job->key, strtoupper($job->file_type), $date, $job->file_type);
             $this->exportDisk->put($file, $content);
-            $this->getFiles()->push($file);
+            $this->getEntries()->push($file);
         }
+
+        return true;
     }
 
     /**
+     * If the file is a vintage upload, process it.
+     *
+     * @param string $entry
+     *
+     * @return bool
+     */
+    private function processVintageUpload(string $entry): bool
+    {
+        if ($this->isVintageImport($entry)) {
+            $this->saveVintageImportFile($entry);
+
+            return true;
+        }
+
+        return false;
+    }
+
+
+    /**
+     * This will store the content of the old vintage upload somewhere.
+     *
      * @param string $entry
      */
-    private function saveOldImportFile(string $entry)
+    private function saveVintageImportFile(string $entry)
     {
         $content = '';
         try {
@@ -188,10 +209,10 @@ class UploadCollector extends BasicCollector implements CollectorInterface
 
         if (strlen($content) > 0) {
             // add to export disk.
-            $date = $this->getOriginalUploadDate($entry);
+            $date = $this->getVintageUploadDate($entry);
             $file = $this->job->key . '-Old import dated ' . $date . '.csv';
             $this->exportDisk->put($file, $content);
-            $this->getFiles()->push($file);
+            $this->getEntries()->push($file);
         }
     }
 

app/Export/ConfigurationFile.php

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

@@ -3,16 +3,17 @@
  * 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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);
 
 namespace FireflyIII\Export\Entry;
 
-use FireflyIII\Models\TransactionJournal;
-use Illuminate\Support\Collection;
+use Crypt;
 
 /**
  * To extend the exported object, in case of new features in Firefly III for example,
@@ -33,98 +34,77 @@ use Illuminate\Support\Collection;
  */
 final class Entry
 {
-    /** @var  string */
-    public $amount;
-    /** @var  EntryBill */
-    public $bill;
-    /** @var  EntryBudget */
-    public $budget;
-    /** @var  EntryCategory */
-    public $category;
-    /** @var  string */
+    // @formatter:off
+    public $journal_id;
     public $date;
-    /** @var  string */
     public $description;
-    /** @var  EntryAccount */
-    public $destinationAccount;
-    /** @var  Collection */
-    public $destinationAccounts;
-    /** @var  EntryAccount */
-    public $sourceAccount;
-    /** @var  Collection */
-    public $sourceAccounts;
+
+    public $currency_code;
+    public $amount;
+
+    public $transaction_type;
+
+    public $source_account_id;
+    public $source_account_name;
+
+    public $destination_account_id;
+    public $destination_account_name;
+
+
+    public $budget_id;
+    public $budget_name;
+    public $category_id;
+    public $category_name;
+    // @formatter:on
 
     /**
      * Entry constructor.
      */
     private function __construct()
     {
-        $this->sourceAccounts      = new Collection;
-        $this->destinationAccounts = new Collection;
     }
 
     /**
-     * @param TransactionJournal $journal
+     * @param $object
      *
      * @return Entry
      */
-    public static function fromJournal(TransactionJournal $journal)
+    public static function fromObject($object): Entry
     {
+        $entry = new self;
 
-        $entry              = new self;
-        $entry->description = $journal->description;
-        $entry->date        = $journal->date->format('Y-m-d');
-        $entry->amount      = TransactionJournal::amount($journal);
+        // journal information:
+        $entry->journal_id       = $object->transaction_journal_id;
+        $entry->description      = $object->journal_encrypted === 1 ? Crypt::decrypt($object->journal_description) : $object->journal_description;
+        $entry->amount           = round($object->amount, 2); // always positive
+        $entry->date             = $object->date;
+        $entry->transaction_type = $object->transaction_type;
+        $entry->currency_code    = $object->transaction_currency_code;
 
-        $entry->budget   = new EntryBudget($journal->budgets->first());
-        $entry->category = new EntryCategory($journal->categories->first());
-        $entry->bill     = new EntryBill($journal->bill);
+        // source information:
+        $entry->source_account_id   = $object->account_id;
+        $entry->source_account_name = $object->account_name_encrypted === 1 ? Crypt::decrypt($object->account_name) : $object->account_name;
 
-        $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));
-        }
+        // destination information
+        $entry->destination_account_id   = $object->opposing_account_id;
+        $entry->destination_account_name = $object->opposing_account_encrypted === 1 ? Crypt::decrypt($object->opposing_account_name)
+            : $object->opposing_account_name;
 
-        foreach ($destinations as $destination) {
-            $entry->destinationAccounts->push(new EntryAccount($destination));
+
+        // category and budget
+        $entry->category_id   = $object->category_id ?? '';
+        $entry->category_name = $object->category_name ?? '';
+        $entry->budget_id     = $object->budget_id ?? '';
+        $entry->budget_name   = $object->budget_name ?? '';
+
+
+        // update description when transaction description is different:
+        if (!is_null($object->description) && $object->description != $entry->description) {
+            $entry->description = $entry->description . ' (' . $object->description . ')';
         }
 
         return $entry;
-
-    }
-
-    /**
-     * @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

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

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

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

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

@@ -3,8 +3,10 @@
  * 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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);

app/Export/Exporter/CsvExporter.php

@@ -3,8 +3,10 @@
  * 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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);
@@ -12,9 +14,7 @@ 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;
 
@@ -60,110 +60,24 @@ class CsvExporter extends BasicExporter implements ExporterInterface
         $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));
+        // get field names for header row:
+        $first   = $this->getEntries()->first();
+        $headers = array_keys(get_object_vars($first));
+        $rows[]  = $headers;
 
         /** @var Entry $entry */
         foreach ($this->getEntries() as $entry) {
-            // 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;
+            $line = [];
+            foreach ($headers as $header) {
+                $line[] = $entry->$header;
+            }
+            $rows[] = $line;
         }
         $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()
     {

app/Export/Exporter/ExporterInterface.php

@@ -3,8 +3,10 @@
  * 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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);

app/Export/Processor.php

@@ -3,8 +3,10 @@
  * 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.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
  */
 
 declare(strict_types = 1);
@@ -13,13 +15,13 @@ namespace FireflyIII\Export;
 
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Export\Collector\AttachmentCollector;
+use FireflyIII\Export\Collector\JournalExportCollector;
 use FireflyIII\Export\Collector\UploadCollector;
 use FireflyIII\Export\Entry\Entry;
 use FireflyIII\Models\ExportJob;
-use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use Illuminate\Filesystem\FilesystemAdapter;
 use Illuminate\Support\Collection;
+use Log;
 use Storage;
 use ZipArchive;
 
@@ -28,7 +30,7 @@ use ZipArchive;
  *
  * @package FireflyIII\Export
  */
-class Processor
+class Processor implements ProcessorInterface
 {
 
     /** @var Collection */
@@ -38,15 +40,11 @@ class Processor
     /** @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 */
@@ -66,7 +64,6 @@ class Processor
         $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;
@@ -82,8 +79,9 @@ class Processor
     {
         /** @var AttachmentCollector $attachmentCollector */
         $attachmentCollector = app(AttachmentCollector::class, [$this->job]);
+        $attachmentCollector->setDates($this->settings['startDate'], $this->settings['endDate']);
         $attachmentCollector->run();
-        $this->files = $this->files->merge($attachmentCollector->getFiles());
+        $this->files = $this->files->merge($attachmentCollector->getEntries());
 
         return true;
     }
@@ -93,9 +91,13 @@ class Processor
      */
     public function collectJournals(): bool
     {
-        /** @var JournalRepositoryInterface $repository */
-        $repository     = app(JournalRepositoryInterface::class);
-        $this->journals = $repository->getJournalsInRange($this->accounts, $this->settings['startDate'], $this->settings['endDate']);
+        /** @var JournalExportCollector $collector */
+        $collector = app(JournalExportCollector::class, [$this->job]);
+        $collector->setDates($this->settings['startDate'], $this->settings['endDate']);
+        $collector->setAccounts($this->settings['accounts']);
+        $collector->run();
+        $this->journals = $collector->getEntries();
+        Log::debug(sprintf('Count %d journals in collectJournals() ', $this->journals->count()));
 
         return true;
     }
@@ -109,7 +111,7 @@ class Processor
         $uploadCollector = app(UploadCollector::class, [$this->job]);
         $uploadCollector->run();
 
-        $this->files = $this->files->merge($uploadCollector->getFiles());
+        $this->files = $this->files->merge($uploadCollector->getEntries());
 
         return true;
     }
@@ -120,22 +122,11 @@ class Processor
     public function convertJournals(): bool
     {
         $count = 0;
-        /** @var TransactionJournal $journal */
-        foreach ($this->journals as $journal) {
-            $this->exportEntries->push(Entry::fromJournal($journal));
+        foreach ($this->journals as $object) {
+            $this->exportEntries->push(Entry::fromObject($object));
             $count++;
         }
-
-        return true;
-    }
-
-    /**
-     * @return bool
-     */
-    public function createConfigFile(): bool
-    {
-        $this->configurationMaker = app(ConfigurationFile::class, [$this->job]);
-        $this->files->push($this->configurationMaker->make());
+        Log::debug(sprintf('Count %d entries in exportEntries (convertJournals)', $this->exportEntries->count()));
 
         return true;
     }

app/Export/ProcessorInterface.php

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

app/Generator/Chart/Account/AccountChartGeneratorInterface.php

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

@@ -1,107 +0,0 @@
-<?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/Basic/ChartJsGenerator.php

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

app/Generator/Chart/Basic/GeneratorInterface.php

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

app/Generator/Chart/Bill/BillChartGeneratorInterface.php

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

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

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

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

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

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

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

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

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

@@ -1,63 +0,0 @@
-<?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/Generator/Report/Audit/MonthReportGenerator.php

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

app/Generator/Report/Audit/MultiYearReportGenerator.php

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

app/Generator/Report/Audit/YearReportGenerator.php

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

app/Generator/Report/Budget/MonthReportGenerator.php

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

app/Generator/Report/Budget/MultiYearReportGenerator.php

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

app/Generator/Report/Budget/YearReportGenerator.php

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

app/Generator/Report/Category/MonthReportGenerator.php

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

app/Generator/Report/Category/MultiYearReportGenerator.php

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

app/Generator/Report/Category/YearReportGenerator.php

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

app/Generator/Report/ReportGeneratorFactory.php

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

app/Generator/Report/ReportGeneratorInterface.php

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

app/Generator/Report/Standard/MonthReportGenerator.php

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

app/Generator/Report/Standard/MultiYearReportGenerator.php

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

app/Generator/Report/Standard/YearReportGenerator.php

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

app/Generator/Report/Support.php

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

app/Handlers/Events/AttachUserRole.php

@@ -1,50 +0,0 @@
-<?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/BudgetEventHandler.php

@@ -0,0 +1,93 @@
+<?php
+/**
+ * BudgetEventHandler.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Handlers\Events;
+
+
+use Carbon\Carbon;
+use FireflyIII\Events\StoredBudgetLimit;
+use FireflyIII\Events\UpdatedBudgetLimit;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Models\LimitRepetition;
+use Illuminate\Database\QueryException;
+use Log;
+
+/**
+ * Handles budget related events.
+ *
+ * Class BudgetEventHandler
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class BudgetEventHandler
+{
+    /**
+     * This method creates a new budget limit repetition when a new budget limit has been created.
+     *
+     * @param StoredBudgetLimit $budgetLimitEvent
+     *
+     * @return bool
+     */
+    public function storeRepetition(StoredBudgetLimit $budgetLimitEvent): bool
+    {
+        return $this->processRepetitionChange($budgetLimitEvent->budgetLimit, $budgetLimitEvent->end);
+    }
+
+    /**
+     * Updates, if present the budget limit repetition part of a budget limit.
+     *
+     * @param UpdatedBudgetLimit $budgetLimitEvent
+     *
+     * @return bool
+     */
+    public function updateRepetition(UpdatedBudgetLimit $budgetLimitEvent): bool
+    {
+        return $this->processRepetitionChange($budgetLimitEvent->budgetLimit, $budgetLimitEvent->end);
+    }
+
+    /**
+     * @param BudgetLimit $budgetLimit
+     * @param Carbon      $date
+     *
+     * @return bool
+     */
+    private function processRepetitionChange(BudgetLimit $budgetLimit, Carbon $date): bool
+    {
+        $set = $budgetLimit->limitrepetitions()
+                           ->where('startdate', $budgetLimit->startdate->format('Y-m-d 00:00:00'))
+                           ->where('enddate', $date->format('Y-m-d 00:00:00'))
+                           ->get();
+        if ($set->count() == 0) {
+            $repetition            = new LimitRepetition;
+            $repetition->startdate = $budgetLimit->startdate;
+            $repetition->enddate   = $date;
+            $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();
+
+        }
+
+        return true;
+    }
+}

app/Handlers/Events/BudgetLimitEventHandler.php

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

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

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

@@ -1,66 +0,0 @@
-<?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;
-
-/**
- * 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/ScanForBillsAfterStore.php

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

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

@@ -1,67 +0,0 @@
-<?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/StoredJournalEventHandler.php

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

app/Handlers/Events/UpdateJournalConnection.php

@@ -1,72 +0,0 @@
-<?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/UpdatedJournalEventHandler.php

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

app/Handlers/Events/UserConfirmation.php

@@ -1,107 +0,0 @@
-<?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/UserEventHandler.php

@@ -0,0 +1,446 @@
+<?php
+/**
+ * UserEventHandler.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Handlers\Events;
+
+use Exception;
+use FireflyConfig;
+use FireflyIII\Events\BlockedBadLogin;
+use FireflyIII\Events\BlockedUseOfDomain;
+use FireflyIII\Events\BlockedUseOfEmail;
+use FireflyIII\Events\BlockedUserLogin;
+use FireflyIII\Events\ConfirmedUser;
+use FireflyIII\Events\DeletedUser;
+use FireflyIII\Events\LockedOutUser;
+use FireflyIII\Events\RegisteredUser;
+use FireflyIII\Events\RequestedNewPassword;
+use FireflyIII\Events\ResentConfirmation;
+use FireflyIII\Models\Configuration;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Mail\Message;
+use Log;
+use Mail;
+use Preferences;
+use Session;
+use Swift_TransportException;
+
+/**
+ * Class UserEventHandler
+ *
+ * This class responds to any events that have anything to do with the User object.
+ *
+ * The method name reflects what is being done. This is in the present tense.
+ *
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class UserEventHandler
+{
+
+    /**
+     * This method will bestow upon a user the "owner" role if he is the first user in the system.
+     *
+     * @param RegisteredUser $event
+     *
+     * @return bool
+     */
+    public function attachUserRole(RegisteredUser $event): bool
+    {
+        /** @var UserRepositoryInterface $repository */
+        $repository = app(UserRepositoryInterface::class);
+
+        // first user ever?
+        if ($repository->count() === 1) {
+            $repository->attachRole($event->user, 'owner');
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle user logout events.
+     *
+     * @return bool
+     */
+    public function logoutUser(): bool
+    {
+        // dump stuff from the session:
+        Session::forget('twofactor-authenticated');
+        Session::forget('twofactor-authenticated-date');
+
+        return true;
+    }
+
+    /**
+     * @param BlockedBadLogin $event
+     *
+     * @return bool
+     */
+    public function reportBadLogin(BlockedBadLogin $event)
+    {
+        $email     = $event->email;
+        $owner     = env('SITE_OWNER');
+        $ipAddress = $event->ipAddress;
+        /** @var Configuration $sendmail */
+        $sendmail = FireflyConfig::get('mail_for_bad_login', config('firefly.configuration.mail_for_bad_login'));
+        Log::debug(sprintf('Now in reportBadLogin for email address %s', $email));
+        Log::error(sprintf('User %s tried to login with bad credentials.', $email));
+        if (is_null($sendmail) || (!is_null($sendmail) && $sendmail->data === false)) {
+
+            return true;
+        }
+
+        try {
+            Mail::send(
+                ['emails.blocked-bad-creds-html', 'emails.blocked-bad-creds-text'], ['email' => $email, 'ip' => $ipAddress],
+                function (Message $message) use ($owner) {
+                    $message->to($owner, $owner)->subject('Blocked login attempt with bad credentials');
+                }
+            );
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * @param BlockedUserLogin $event
+     *
+     * @return bool
+     */
+    public function reportBlockedUser(BlockedUserLogin $event): bool
+    {
+        $user      = $event->user;
+        $owner     = env('SITE_OWNER');
+        $email     = $user->email;
+        $ipAddress = $event->ipAddress;
+        /** @var Configuration $sendmail */
+        $sendmail = FireflyConfig::get('mail_for_blocked_login', config('firefly.configuration.mail_for_blocked_login'));
+        Log::debug(sprintf('Now in reportBlockedUser for email address %s', $email));
+        Log::error(sprintf('User #%d (%s) has their accout blocked (blocked_code is "%s") but tried to login.', $user->id, $email, $user->blocked_code));
+        if (is_null($sendmail) || (!is_null($sendmail) && $sendmail->data === false)) {
+            return true;
+        }
+
+        // send email message:
+        try {
+            Mail::send(
+                ['emails.blocked-login-html', 'emails.blocked-login-text'],
+                [
+                    'user_id'      => $user->id,
+                    'user_address' => $email,
+                    'ip'           => $ipAddress,
+                    'code'         => $user->blocked_code,
+                ], function (Message $message) use ($owner, $user) {
+                $message->to($owner, $owner)->subject('Blocked login attempt of blocked user');
+            }
+            );
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * @param LockedOutUser $event
+     *
+     * @return bool
+     */
+    public function reportLockout(LockedOutUser $event): bool
+    {
+        $email     = $event->email;
+        $owner     = env('SITE_OWNER');
+        $ipAddress = $event->ipAddress;
+        /** @var Configuration $sendmail */
+        $sendmail = FireflyConfig::get('mail_for_lockout', config('firefly.configuration.mail_for_lockout'));
+        Log::debug(sprintf('Now in respondToLockout for email address %s', $email));
+        Log::error(sprintf('User %s was locked out after too many invalid login attempts.', $email));
+        if (is_null($sendmail) || (!is_null($sendmail) && $sendmail->data === false)) {
+            return true;
+        }
+
+        // send email message:
+        try {
+            Mail::send(
+                ['emails.locked-out-html', 'emails.locked-out-text'], ['email' => $email, 'ip' => $ipAddress], function (Message $message) use ($owner) {
+                $message->to($owner, $owner)->subject('User was locked out');
+            }
+            );
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * @param BlockedUseOfDomain $event
+     *
+     * @return bool
+     */
+    public function reportUseBlockedDomain(BlockedUseOfDomain $event): bool
+    {
+        $email     = $event->email;
+        $owner     = env('SITE_OWNER');
+        $ipAddress = $event->ipAddress;
+        $parts     = explode('@', $email);
+        /** @var Configuration $sendmail */
+        $sendmail = FireflyConfig::get('mail_for_blocked_domain', config('firefly.configuration.mail_for_blocked_domain'));
+        Log::debug(sprintf('Now in reportUseBlockedDomain for email address %s', $email));
+        Log::error(sprintf('Somebody tried to register using an email address (%s) connected to a banned domain (%s).', $email, $parts[1]));
+        if (is_null($sendmail) || (!is_null($sendmail) && $sendmail->data === false)) {
+            return true;
+        }
+
+        // send email message:
+        try {
+            Mail::send(
+                ['emails.blocked-registration-html', 'emails.blocked-registration-text'],
+                [
+                    'email_address'  => $email,
+                    'blocked_domain' => $parts[1],
+                    'ip'             => $ipAddress,
+                ], function (Message $message) use ($owner) {
+                $message->to($owner, $owner)->subject('Blocked registration attempt with blocked domain');
+            }
+            );
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * @param BlockedUseOfEmail $event
+     *
+     * @return bool
+     */
+    public function reportUseOfBlockedEmail(BlockedUseOfEmail $event): bool
+    {
+        $email     = $event->email;
+        $owner     = env('SITE_OWNER');
+        $ipAddress = $event->ipAddress;
+        /** @var Configuration $sendmail */
+        $sendmail = FireflyConfig::get('mail_for_blocked_email', config('firefly.configuration.mail_for_blocked_email'));
+        Log::debug(sprintf('Now in reportUseOfBlockedEmail for email address %s', $email));
+        Log::error(sprintf('Somebody tried to register using email address %s which is blocked (SHA2 hash).', $email));
+        if (is_null($sendmail) || (!is_null($sendmail) && $sendmail->data === false)) {
+            return true;
+        }
+
+        // send email message:
+        try {
+            Mail::send(
+                ['emails.blocked-email-html', 'emails.blocked-email-text'],
+                [
+                    'user_address' => $email,
+                    'ip'           => $ipAddress,
+                ], function (Message $message) use ($owner) {
+                $message->to($owner, $owner)->subject('Blocked registration attempt with blocked email address');
+            }
+            );
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * @param DeletedUser $event
+     *
+     * @return bool
+     */
+    public function saveEmailAddress(DeletedUser $event): bool
+    {
+        Preferences::mark();
+        $email = hash('sha256', $event->email);
+        Log::debug(sprintf('Hash of email is %s', $email));
+        /** @var Configuration $configuration */
+        $configuration = FireflyConfig::get('deleted_users', []);
+        $content       = $configuration->data;
+        if (!is_array($content)) {
+            $content = [];
+        }
+        $content[]           = $email;
+        $configuration->data = $content;
+        Log::debug('New content of deleted_users is ', $content);
+        FireflyConfig::set('deleted_users', $content);
+
+        Preferences::mark();
+
+        return true;
+    }
+
+    /**
+     * This method will send a newly registered user a confirmation message, urging him or her to activate their account.
+     *
+     * @param RegisteredUser $event
+     *
+     * @return bool
+     */
+    public function sendConfirmationMessage(RegisteredUser $event): bool
+    {
+        return $this->sendConfirmation($event->user, $event->ipAddress);
+    }
+
+    /**
+     * If the user has somehow lost his or her confirmation message, this event will send it to the user again.
+     *
+     * At the moment, this method is exactly the same as the ::sendConfirmationMessage method, but that will change.
+     *
+     * @param ResentConfirmation $event
+     *
+     * @return bool
+     */
+    function sendConfirmationMessageAgain(ResentConfirmation $event): bool
+    {
+        return $this->sendConfirmation($event->user, $event->ipAddress);
+
+    }
+
+    /**
+     * @param RequestedNewPassword $event
+     *
+     * @return bool
+     */
+    public function sendNewPassword(RequestedNewPassword $event): bool
+    {
+        $email     = $event->user->email;
+        $ipAddress = $event->ipAddress;
+        $token     = $event->token;
+
+        $url = route('password.reset', [$token]);
+
+        // send email.
+        try {
+            Mail::send(
+                ['emails.password-html', 'emails.password-text'], ['url' => $url, 'ip' => $ipAddress], function (Message $message) use ($email) {
+                $message->to($email, $email)->subject('Your password reset request');
+            }
+            );
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * This method will send the user a registration mail, welcoming him or her to Firefly III.
+     * This message is only sent when the configuration of Firefly III says so.
+     *
+     * @param RegisteredUser $event
+     *
+     * @return bool
+     */
+    public function sendRegistrationMail(RegisteredUser $event)
+    {
+
+        $sendMail = env('SEND_REGISTRATION_MAIL', true);
+        if (!$sendMail) {
+            return true;
+        }
+        // get the email address
+        $email     = $event->user->email;
+        $address   = route('index');
+        $ipAddress = $event->ipAddress;
+        // send email.
+        try {
+            Mail::send(
+                ['emails.registered-html', 'emails.registered-text'], ['address' => $address, 'ip' => $ipAddress], function (Message $message) use ($email) {
+                $message->to($email, $email)->subject('Welcome to Firefly III!');
+            }
+            );
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * When the user is confirmed, this method stores the IP address of the user
+     * as a preference. Since this preference cannot be edited, it is effectively hidden
+     * from the user yet stored conveniently.
+     *
+     * @param ConfirmedUser $event
+     *
+     * @return bool
+     */
+    public function storeConfirmationIpAddress(ConfirmedUser $event): bool
+    {
+        Preferences::setForUser($event->user, 'confirmation_ip_address', $event->ipAddress);
+
+        return true;
+    }
+
+    /**
+     * This message stores the users IP address on registration, in much the same
+     * fashion as the previous method.
+     *
+     * @param RegisteredUser $event
+     *
+     * @return bool
+     */
+    public function storeRegistrationIpAddress(RegisteredUser $event): bool
+    {
+        Preferences::setForUser($event->user, 'registration_ip_address', $event->ipAddress);
+
+        return true;
+
+    }
+
+    /**
+     * @param User   $user
+     * @param string $ipAddress
+     *
+     * @return bool
+     */
+    private function sendConfirmation(User $user, string $ipAddress): bool
+    {
+        $mustConfirmAccount = FireflyConfig::get('must_confirm_account', config('firefly.configuration.must_confirm_account'))->data;
+        if ($mustConfirmAccount === false) {
+            Preferences::setForUser($user, 'user_confirmed', true);
+            Preferences::setForUser($user, 'user_confirmed_last_mail', 0);
+            Preferences::mark();
+
+            return true;
+        }
+        $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-text'], ['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 true;
+    }
+
+}