Merge branch 'release/3.3.9'

Add savings total for savings widget on dashboard

.coveralls.yml

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

.env.example

@@ -0,0 +1,18 @@
+APP_ENV=production
+APP_DEBUG=false
+APP_KEY=SomeRandomString
+
+DB_CONNECTION=mysql
+DB_HOST=localhost
+DB_DATABASE=homestead
+DB_USERNAME=homestead
+DB_PASSWORD=secret
+
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+
+EMAIL_SMTP=
+EMAIL_DRIVER=smtp
+EMAIL_USERNAME=
+EMAIL_PASSWORD=
+ANALYTICS_ID=

.env.testing

@@ -0,0 +1,17 @@
+APP_ENV=testing
+APP_DEBUG=true
+APP_KEY=SomeRandomString
+
+DB_CONNECTION=sqlite
+DB_HOST=localhost
+DB_DATABASE=homestead
+DB_USERNAME=homestead
+DB_PASSWORD=secret
+
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+
+EMAIL_SMTP=
+EMAIL_USERNAME=
+EMAIL_PASSWORD=
+ANALYTICS_ID=ABC

.gitignore

@@ -1,8 +1,6 @@
 /bootstrap/compiled.php
 /vendor
 composer.phar
-.env.*.php
-.env.php
 Thumbs.db
 .idea/
 tests/_output/*
@@ -25,3 +23,8 @@ tests/_data/dump.sql
 db.sqlite_snapshot
 c3.php
 db.sqlite-journal
+tests/_output/*
+.env
+clover.xml
+node_modules/
+addNewLines.php

.travis.yml

@@ -1,16 +1,22 @@
 language: php
+sudo: false
+
 
 php:
   - 5.5
   - 5.6
 
+addons:
+  code_climate:
+    repo_token: 26489f9e854fcdf7e7660ba29c1455694685465b1f90329a79f7d2bf448acb61
+
 install:
-  - composer install
+  - composer update
+  - php artisan env
+  - mv -v .env.testing .env
 
 script:
-  - ./tests/_data/db.sh
-  - php vendor/bin/codecept build
-  - php vendor/bin/codecept run --coverage --coverage-xml
+  - phpunit --debug
 
 after_script:
   - php vendor/bin/coveralls

README.md

@@ -1,32 +1,45 @@
-Firefly III
+Firefly III (v3.3.9)
 ===========
 
 [![Build Status](https://travis-ci.org/JC5/firefly-iii.svg?branch=develop)](https://travis-ci.org/JC5/firefly-iii)
 [![Project Status](http://stillmaintained.com/JC5/firefly-iii.png?a=b)](http://stillmaintained.com/JC5/firefly-iii)
-[![Coverage Status](https://coveralls.io/repos/JC5/firefly-iii/badge.png?branch=master)](https://coveralls.io/r/JC5/firefly-iii?branch=master)
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102/mini.png)](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102)
+[![Code Climate](https://codeclimate.com/github/JC5/firefly-iii/badges/gpa.svg)](https://codeclimate.com/github/JC5/firefly-iii)
+[![Coverage Status](https://coveralls.io/repos/JC5/firefly-iii/badge.svg?branch=master)](https://coveralls.io/r/JC5/firefly-iii?branch=master)
+[![Coverage Status](https://coveralls.io/repos/JC5/firefly-iii/badge.svg?branch=master)](https://coveralls.io/r/JC5/firefly-iii?branch=develop)
 
 [![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable.svg)](https://packagist.org/packages/grumpydictator/firefly-iii)
 [![Total Downloads](https://poser.pugx.org/grumpydictator/firefly-iii/downloads.svg)](https://packagist.org/packages/grumpydictator/firefly-iii)
 [![Latest Unstable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/unstable.svg)](https://packagist.org/packages/grumpydictator/firefly-iii)
 [![License](https://poser.pugx.org/grumpydictator/firefly-iii/license.svg)](https://packagist.org/packages/grumpydictator/firefly-iii)
 
-Firefly II is a tool to help you manage your finances. Please read the full description [in the wiki](https://github.com/JC5/firefly-iii/wiki/full-description).
+Firefly III is a tool to help you manage your finances. Please read the full description [in the wiki](https://github.com/JC5/firefly-iii/wiki/full-description).
 
 Firefly Mark III is a new version of Firefly built upon best practices and lessons learned
 from building [Firefly](https://github.com/JC5/Firefly). It's Mark III since the original Firefly never made it outside of my
 laptop and [Firefly II](https://github.com/JC5/Firefly) is live.
 
+If you're not sure if this tool is for you, please read the [full description](https://github.com/JC5/firefly-iii/wiki/full-description).
+
+To install and use Firefly III, please read [the installation guide](https://github.com/JC5/firefly-iii/wiki/Installation),
+ [the upgrade guide](https://github.com/JC5/firefly-iii/wiki/Upgrade-instructions) (if applicable) and the **[first use guide](https://github.com/JC5/firefly-iii/wiki/First-use)**.
+ 
+If you want to try out Firefly III, you can do so on [this dedicated website](https://geld.nder.be/). This site always runs the latest version of Firefly III. If you want to use it, please read the [privacy considerations](https://github.com/JC5/firefly-iii/wiki/Privacy-on-demo-site) for this demo-site.
+
 ## Current features
 
-- [A double-entry bookkeeping system](http://en.wikipedia.org/wiki/Double-entry_bookkeeping_system);
+- [A double-entry bookkeeping system](https://en.wikipedia.org/wiki/Double-entry_bookkeeping_system);
 - You can store, edit and remove withdrawals, deposits and transfers. This allows you full financial management;
-- It's possible to create, change and manage money using _budgets_;
+- You can manage different types of accounts
+  - Asset accounts
+  - Shared asset accounts (household accounts)
+  - Saving accounts
+  - Credit cards
+- It's possible to create, change and manage money using _[budgets](https://en.wikipedia.org/wiki/Envelope_system)_;
 - Organize transactions using categories;
 - Save towards a goal using piggy banks;
-- Predict and anticipate large expenses using "repeated expenses" (ie. yearly taxes);
-- Predict and anticipate bills using "recurring transactions" (rent for example);
-- View basic income / expense reports.
+- Predict and anticipate bills;
+- View income / expense reports;
 - Lots of help text in case you don't get it;
 
 Everything is organised:
@@ -35,16 +48,15 @@ Everything is organised:
 - Easy navigation through your records;
 - Browse back and forth to see previous months or even years;
 - Lots of charts because we all love them.
+- Financial reporting showing you how well you are doing;
 
 ## Changes
 
 Firefly III will feature, but does not feature yet:
 
-- Financial reporting showing you how well you are doing;
+
 - More control over other resources outside of personal finance
-  - Accounts shared with a partner (household accounts)
   - Debts
-  - Credit cards
 - More test-coverage;
 - Firefly will be able to split transactions; a single purchase can be split in multiple entries, for more fine-grained control.
 - Firefly will be able to join transactions.
@@ -53,7 +65,6 @@ Firefly III will feature, but does not feature yet:
 Some stuff has been removed:
 
 - The nesting of budgets, categories and beneficiaries is removed because it was pretty pointless.
-- Firefly will not encrypt the content of the (MySQL) tables. Old versions of Firefly had this capability but it sucks when searching, sorting and organizing entries.
 
 ## Screenshots
 
@@ -68,7 +79,4 @@ Some stuff has been removed:
 ## Current state
 I have the basics up and running. Test coverage is currently coming, slowly.
 
-Although I have not checked extensively, some forms and views have CSRF vulnerabilities. This is because not all
-views escape all characters by default. Will be fixed.
-
 Questions, ideas or other things to contribute? [Let me know](https://github.com/JC5/firefly-iii/issues/new)!

app/Commands/Command.php

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

app/Console/Kernel.php

@@ -0,0 +1,34 @@
+<?php namespace FireflyIII\Console;
+
+use Illuminate\Console\Scheduling\Schedule;
+use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+
+/**
+ * Class Kernel
+ *
+ * @package FireflyIII\Console
+ */
+class Kernel extends ConsoleKernel
+{
+
+    /**
+     * The Artisan commands provided by your application.
+     *
+     * @var array
+     */
+    protected $commands
+        = [
+        ];
+
+    /**
+     * Define the application's command schedule.
+     *
+     * @param  \Illuminate\Console\Scheduling\Schedule $schedule
+     *
+     * @return void
+     */
+    protected function schedule(Schedule $schedule)
+    {
+    }
+
+}

app/Events/Event.php

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

app/Events/JournalCreated.php

@@ -0,0 +1,32 @@
+<?php namespace FireflyIII\Events;
+
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class JournalCreated
+ *
+ * @package FireflyIII\Events
+ */
+class JournalCreated extends Event
+{
+
+    use SerializesModels;
+
+    public $journal;
+    public $piggyBankId;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(TransactionJournal $journal, $piggyBankId)
+    {
+        //
+        $this->journal     = $journal;
+        $this->piggyBankId = $piggyBankId;
+
+    }
+
+}

app/Events/JournalDeleted.php

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

app/Events/JournalSaved.php

@@ -0,0 +1,24 @@
+<?php namespace FireflyIII\Events;
+
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Queue\SerializesModels;
+
+class JournalSaved extends Event
+{
+
+    use SerializesModels;
+
+    public $journal;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(TransactionJournal $journal)
+    {
+        //
+        $this->journal = $journal;
+    }
+
+}

app/Exceptions/FireflyException.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace FireflyIII\Exception;
+namespace FireflyIII\Exceptions;
 
 
 /**
  * Class FireflyException
  *
- * @package FireflyIII\Exception
+ * @package FireflyIII\Exceptions
  */
 class FireflyException extends \Exception
 {

app/Exceptions/Handler.php

@@ -0,0 +1,56 @@
+<?php namespace FireflyIII\Exceptions;
+
+use Exception;
+use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+
+/**
+ * Class Handler
+ *
+ * @package FireflyIII\Exceptions
+ */
+class Handler extends ExceptionHandler
+{
+
+    /**
+     * A list of the exception types that should not be reported.
+     *
+     * @var array
+     */
+    protected $dontReport
+        = [
+            'Symfony\Component\HttpKernel\Exception\HttpException'
+        ];
+
+    /**
+     * Render an exception into an HTTP response.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Exception               $e
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function render($request, Exception $e)
+    {
+        if ($this->isHttpException($e)) {
+            return $this->renderHttpException($e);
+        } else {
+            return parent::render($request, $e);
+        }
+    }
+
+    /**
+     * Report or log an exception.
+     *
+     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
+     *
+     * @param  \Exception $e
+     *
+     * @return void
+     */
+    public function report(Exception $e)
+    {
+        /** @noinspection PhpInconsistentReturnPointsInspection */
+        return parent::report($e);
+    }
+
+}

app/Exceptions/NotImplementedException.php

@@ -1,11 +1,11 @@
 <?php
-namespace FireflyIII\Exception;
+namespace FireflyIII\Exceptions;
 
 
 /**
  * Class NotImplementedException
  *
- * @package FireflyIII\Exception
+ * @package FireflyIII\Exceptions
  */
 class NotImplementedException extends \Exception
 {

app/Exceptions/ValidationException.php

@@ -1,8 +1,8 @@
 <?php
-namespace FireflyIII\Exception;
+namespace FireflyIII\Exceptions;
 
 /**
- * Class ValidationException
+ * Class ValidationExceptions
  *
  * @package FireflyIII\Exception
  */

app/Handlers/Events/ConnectJournalToPiggyBank.php

@@ -0,0 +1,83 @@
+<?php namespace FireflyIII\Handlers\Events;
+
+use Auth;
+use FireflyIII\Events\JournalCreated;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\PiggyBankEvent;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournal;
+use Log;
+
+/**
+ * Class ConnectJournalToPiggyBank
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class ConnectJournalToPiggyBank
+{
+
+    /**
+     * Create the event handler.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event when journal is saved.
+     *
+     * @param  JournalCreated $event
+     *
+     * @return void
+     */
+    public function handle(JournalCreated $event)
+    {
+        /** @var TransactionJournal $journal */
+        $journal     = $event->journal;
+        $piggyBankId = $event->piggyBankId;
+        if (intval($piggyBankId) < 1) {
+            return;
+        }
+
+        Log::debug('JournalCreated event: ' . $journal->id . ', ' . $piggyBankId);
+
+        /** @var PiggyBank $piggyBank */
+        $piggyBank = Auth::user()->piggybanks()->where('piggy_banks.id', $piggyBankId)->first(['piggy_banks.*']);
+
+        if (is_null($piggyBank) || $journal->transactionType->type != 'Transfer') {
+            return;
+        }
+        Log::debug('Found a piggy bank');
+        $amount = $journal->amount;
+        Log::debug('Amount: ' . $amount);
+        if ($amount == 0) {
+            return;
+        }
+        // update piggy bank rep for date of transaction journal.
+        $repetition = $piggyBank->piggyBankRepetitions()->relevantOnDate($journal->date)->first();
+        if (is_null($repetition)) {
+            Log::debug('Found no repetition for piggy bank for date ' . $journal->date->format('Y M d'));
+
+            return;
+        }
+
+        Log::debug('Found rep! ' . $repetition->id);
+        $repetition->currentamount += $amount;
+        $repetition->save();
+
+        PiggyBankEvent::create(
+            [
+                'piggy_bank_id'          => $piggyBank->id,
+                'transaction_journal_id' => $journal->id,
+                'date'                   => $journal->date,
+                'amount'                 => $amount
+            ]
+        );
+
+    }
+
+
+}

app/Handlers/Events/JournalDeletedHandler.php

@@ -0,0 +1,35 @@
+<?php namespace FireflyIII\Handlers\Events;
+
+use FireflyIII\Events\JournalDeleted;
+
+/**
+ * Class JournalDeletedHandler
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class JournalDeletedHandler
+{
+
+    /**
+     * Create the event handler.
+     *
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  JournalDeleted $event
+     *
+     * @return void
+     */
+    public function handle(JournalDeleted $event)
+    {
+        //
+
+    }
+
+}

app/Handlers/Events/RescanJournal.php

@@ -0,0 +1,53 @@
+<?php namespace FireflyIII\Handlers\Events;
+
+use App;
+use FireflyIII\Events\JournalSaved;
+use Log;
+
+/**
+ * Class RescanJournal
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class RescanJournal
+{
+
+    /**
+     * Create the event handler.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  JournalSaved $event
+     *
+     * @return void
+     */
+    public function handle(JournalSaved $event)
+    {
+        $journal = $event->journal;
+
+        Log::debug('Triggered saved event for journal #' . $journal->id . ' (' . $journal->description . ')');
+
+        /** @var \FireflyIII\Repositories\Bill\BillRepositoryInterface $repository */
+        $repository = App::make('FireflyIII\Repositories\Bill\BillRepositoryInterface');
+        $list       = $journal->user->bills()->where('active', 1)->where('automatch', 1)->get();
+
+        Log::debug('Found ' . $list->count() . ' bills to check.');
+
+        /** @var Bill $bill */
+        foreach ($list as $bill) {
+            Log::debug('Now calling bill #' . $bill->id . ' (' . $bill->name . ')');
+            $repository->scan($bill, $journal);
+        }
+
+        Log::debug('Done!');
+    }
+
+}

app/Handlers/Events/UpdateJournalConnection.php

@@ -0,0 +1,59 @@
+<?php namespace FireflyIII\Handlers\Events;
+
+use FireflyIII\Events\JournalSaved;
+use FireflyIII\Models\PiggyBankEvent;
+use FireflyIII\Models\Transaction;
+
+/**
+ * Class UpdateJournalConnection
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class UpdateJournalConnection
+{
+
+    /**
+     * Create the event handler.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  JournalSaved $event
+     *
+     * @return void
+     */
+    public function handle(JournalSaved $event)
+    {
+        $journal = $event->journal;
+
+        // get the event connected to this journal:
+        /** @var PiggyBankEvent $event */
+        $event = PiggyBankEvent::where('transaction_journal_id', $journal->id)->first();
+        if (is_null($event)) {
+            return;
+        }
+        $piggyBank  = $event->piggyBank()->first();
+        $repetition = $piggyBank->piggyBankRepetitions()->relevantOnDate($journal->date)->first();
+
+        if (is_null($repetition)) {
+            return;
+        }
+        $amount = $journal->amount;
+        $diff   = $amount - $event->amount;// update current repetition
+
+        $repetition->currentamount += $diff;
+        $repetition->save();
+
+
+        $event->amount = $amount;
+        $event->save();
+    }
+
+}

app/Helpers/Help/Help.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace FireflyIII\Helpers\Help;
+
+use Cache;
+use ErrorException;
+use League\CommonMark\CommonMarkConverter;
+use Log;
+use Route;
+
+/**
+ * Class Help
+ *
+ * @package FireflyIII\Helpers\Help
+ */
+class Help implements HelpInterface
+{
+
+    /**
+     * @param $key
+     *
+     * @return string
+     */
+    public function getFromCache($key)
+    {
+        return Cache::get($key);
+    }
+
+    /**
+     * @param $route
+     *
+     * @return array
+     */
+    public function getFromGithub($route)
+    {
+        $uri     = 'https://raw.githubusercontent.com/JC5/firefly-iii-help/master/' . e($route) . '.md';
+        $content = [
+            'text'  => '<p>There is no help for this route!</p>',
+            'title' => $route,
+        ];
+        try {
+            $content['text'] = file_get_contents($uri);
+        } catch (ErrorException $e) {
+            Log::error(trim($e->getMessage()));
+        }
+        if (strlen(trim($content['text'])) == 0) {
+            $content['text'] = '<p>There is no help for this route.</p>';
+        }
+        $converter       = new CommonMarkConverter();
+        $content['text'] = $converter->convertToHtml($content['text']);
+
+        return $content;
+
+    }
+
+    /**
+     * @return boolean
+     */
+    public function hasRoute($route)
+    {
+        return Route::has($route);
+    }
+
+    /**
+     * @param       $title
+     * @param array $content
+     *
+     * @return void
+     */
+    public function putInCache($route, array $content)
+    {
+        Cache::put('help.' . $route . '.text', $content['text'], 10080); // a week.
+        Cache::put('help.' . $route . '.title', $content['title'], 10080);
+    }
+
+    /**
+     * @param $route
+     *
+     * @return bool
+     */
+    public function inCache($route)
+    {
+        return Cache::has('help.' . $route . '.title') && Cache::has('help.' . $route . '.text');
+    }
+}

app/Helpers/Help/HelpInterface.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace FireflyIII\Helpers\Help;
+
+/**
+ * Interface HelpInterface
+ *
+ * @package FireflyIII\Helpers\Help
+ */
+interface HelpInterface
+{
+
+    /**
+     * @param $key
+     *
+     * @return string
+     */
+    public function getFromCache($key);
+
+    /**
+     * @return boolean
+     */
+    public function hasRoute($route);
+
+    /**
+     * @param $route
+     *
+     * @return array
+     */
+    public function getFromGithub($route);
+
+    /**
+     * @param       $route
+     * @param array $content
+     *
+     * @return void
+     */
+    public function putInCache($route, array $content);
+
+    /**
+     * @param $route
+     *
+     * @return bool
+     */
+    public function inCache($route);
+}

app/Helpers/Reminders/ReminderHelper.php

@@ -0,0 +1,145 @@
+<?php
+
+namespace FireflyIII\Helpers\Reminders;
+
+use Amount;
+use Auth;
+use Carbon\Carbon;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\Reminder;
+use Navigation;
+
+/**
+ * Class ReminderHelper
+ *
+ * @package FireflyIII\Helpers\Reminders
+ */
+class ReminderHelper implements ReminderHelperInterface
+{
+    /**
+     * @param PiggyBank $piggyBank
+     * @param Carbon    $start
+     * @param Carbon    $end
+     *
+     * @return Reminder
+     */
+    public function createReminder(PiggyBank $piggyBank, Carbon $start, Carbon $end)
+    {
+        $reminder = Auth::user()->reminders()->where('remindersable_id', $piggyBank->id)->onDates($start, $end)->first();
+        if (is_null($reminder)) {
+
+            if (!is_null($piggyBank->targetdate)) {
+                // get ranges again, but now for the start date
+                $ranges      = $this->getReminderRanges($piggyBank, $start);
+                $currentRep  = $piggyBank->currentRelevantRep();
+                $left        = $piggyBank->targetamount - $currentRep->currentamount;
+                $perReminder = $left / count($ranges);
+            } else {
+                $perReminder = null;
+                $ranges      = [];
+                $left        = 0;
+            }
+            $metaData = [
+                'perReminder' => $perReminder,
+                'rangesCount' => count($ranges),
+                'ranges'      => $ranges,
+                'leftToSave'  => $left,
+            ];
+
+
+            // create one:
+            $reminder = new Reminder;
+            $reminder->user()->associate(Auth::user());
+            $reminder->startdate = $start;
+            $reminder->enddate   = $end;
+            $reminder->active    = true;
+            $reminder->metadata  = $metaData;
+            $reminder->notnow    = false;
+            $reminder->remindersable()->associate($piggyBank);
+            $reminder->save();
+
+            return $reminder;
+
+        } else {
+            return $reminder;
+        }
+    }
+
+    /**
+     * This routine will return an array consisting of two dates which indicate the start
+     * and end date for each reminder that this piggy bank will have, if the piggy bank has
+     * any reminders. For example:
+     *
+     * [12 mar - 15 mar]
+     * [15 mar - 18 mar]
+     *
+     * etcetera.
+     *
+     * Array is filled with tiny arrays with Carbon objects in them.
+     *
+     * @param PiggyBank $piggyBank
+     * @param Carbon    $date ;
+     *
+     * @return array
+     */
+    public function getReminderRanges(PiggyBank $piggyBank, Carbon $date = null)
+    {
+        $ranges = [];
+        if (is_null($date)) {
+            $date = new Carbon;
+        }
+
+        if ($piggyBank->remind_me === false) {
+            return $ranges;
+        }
+
+        if (!is_null($piggyBank->targetdate)) {
+            // count back until now.
+            $start = $piggyBank->targetdate;
+            $end   = $piggyBank->startdate;
+
+            while ($start > $end) {
+                $currentEnd   = clone $start;
+                $start        = Navigation::subtractPeriod($start, $piggyBank->reminder, 1);
+                $currentStart = clone $start;
+                $ranges[]     = ['start' => clone $currentStart, 'end' => clone $currentEnd];
+            }
+        } else {
+            $start = clone $piggyBank->startdate;
+            while ($start < $date) {
+                $currentStart = clone $start;
+                $start        = Navigation::addPeriod($start, $piggyBank->reminder, 0);
+                $currentEnd   = clone $start;
+                $ranges[]     = ['start' => clone $currentStart, 'end' => clone $currentEnd];
+            }
+        }
+
+        return $ranges;
+    }
+
+    /**
+     * Takes a reminder, finds the piggy bank and tells you what to do now.
+     * Aka how much money to put in.
+     *
+     *
+     * @param Reminder $reminder
+     *
+     * @return string
+     */
+    public function getReminderText(Reminder $reminder)
+    {
+        /** @var PiggyBank $piggyBank */
+        $piggyBank = $reminder->remindersable;
+
+        if (is_null($piggyBank)) {
+            return 'Piggy bank no longer exists.';
+        }
+
+        if (is_null($piggyBank->targetdate)) {
+            return 'Add money to this piggy bank to reach your target of ' . Amount::format($piggyBank->targetamount);
+        }
+
+        return 'Add ' . Amount::format($reminder->metadata->perReminder) . ' to fill this piggy bank on ' . $piggyBank->targetdate->format('jS F Y');
+
+    }
+}

app/Helpers/Reminders/ReminderHelperInterface.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace FireflyIII\Helpers\Reminders;
+
+use Carbon\Carbon;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\Reminder;
+
+/**
+ * Interface ReminderHelperInterface
+ *
+ * @package FireflyIII\Helpers\Reminders
+ */
+interface ReminderHelperInterface
+{
+    /**
+     * Takes a reminder, finds the piggy bank and tells you what to do now.
+     * Aka how much money to put in.
+     *
+     * @param Reminder $reminder
+     *
+     * @return string
+     */
+    public function getReminderText(Reminder $reminder);
+
+    /**
+     * This routine will return an array consisting of two dates which indicate the start
+     * and end date for each reminder that this piggy bank will have, if the piggy bank has
+     * any reminders. For example:
+     *
+     * [12 mar - 15 mar]
+     * [15 mar - 18 mar]
+     *
+     * etcetera.
+     *
+     * Array is filled with tiny arrays with Carbon objects in them.
+     *
+     * @param PiggyBank $piggyBank
+     *
+     * @return array
+     */
+    public function getReminderRanges(PiggyBank $piggyBank);
+
+    /**
+     * @param PiggyBank $piggyBank
+     * @param Carbon    $start
+     * @param Carbon    $end
+     *
+     * @return Reminder
+     */
+    public function createReminder(PiggyBank $piggyBank, Carbon $start, Carbon $end);
+}

app/Helpers/Report/ReportHelper.php

@@ -0,0 +1,178 @@
+<?php
+
+namespace FireflyIII\Helpers\Report;
+
+use App;
+use Auth;
+use Carbon\Carbon;
+use FireflyIII\Models\Account;
+use Illuminate\Database\Query\JoinClause;
+use Illuminate\Support\Collection;
+use Steam;
+
+/**
+ * Class ReportHelper
+ *
+ * @package FireflyIII\Helpers\Report
+ */
+class ReportHelper implements ReportHelperInterface
+{
+
+    /**
+     * This methods fails to take in account transfers FROM shared accounts.
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     * @param int    $limit
+     *
+     * @return Collection
+     */
+    public function expensesGroupedByAccount(Carbon $start, Carbon $end, $limit = 15)
+    {
+        $result  = $this->_queries->journalsByExpenseAccount($start, $end);
+        $array   = $this->_helper->makeArray($result);
+        $limited = $this->_helper->limitArray($array, $limit);
+
+        return $limited;
+
+    }
+
+    /**
+     * This method gets some kind of list for a monthly overview.
+     *
+     * @param Carbon $date
+     * @param bool   $showSharedReports
+     *
+     * @return Collection
+     */
+    public function getBudgetsForMonth(Carbon $date, $showSharedReports = false)
+    {
+        /** @var \FireflyIII\Helpers\Report\ReportQueryInterface $query */
+        $query = App::make('FireflyIII\Helpers\Report\ReportQueryInterface');
+
+        $start = clone $date;
+        $start->startOfMonth();
+        $end = clone $date;
+        $end->endOfMonth();
+        $set = Auth::user()->budgets()->orderBy('budgets.name', 'ASC')
+                   ->leftJoin(
+                       'budget_limits', function (JoinClause $join) use ($date) {
+                       $join->on('budget_limits.budget_id', '=', 'budgets.id')->where('budget_limits.startdate', '=', $date->format('Y-m-d'));
+                   }
+                   )
+                   ->get(['budgets.*', 'budget_limits.amount as queryAmount']);
+
+        $budgets                   = Steam::makeArray($set);
+        $amountSet                 = $query->journalsByBudget($start, $end, $showSharedReports);
+        $amounts                   = Steam::makeArray($amountSet);
+        $budgets                   = Steam::mergeArrays($budgets, $amounts);
+        $budgets[0]['spent']       = isset($budgets[0]['spent']) ? $budgets[0]['spent'] : 0.0;
+        $budgets[0]['queryAmount'] = isset($budgets[0]['queryAmount']) ? $budgets[0]['queryAmount'] : 0.0;
+        $budgets[0]['name']        = 'No budget';
+
+        // find transactions to shared asset accounts, which are without a budget by default:
+        // which is only relevant when shared asset accounts are hidden.
+        if ($showSharedReports === false) {
+            $transfers = $query->sharedExpenses($start, $end)->sum('queryAmount');
+            $budgets[0]['spent'] += floatval($transfers) * -1;
+        }
+
+        return $budgets;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return array
+     */
+    public function listOfMonths(Carbon $date)
+    {
+        $start  = clone $date;
+        $end    = Carbon::now();
+        $months = [];
+        while ($start <= $end) {
+            $year            = $start->format('Y');
+            $months[$year][] = [
+                'formatted' => $start->format('F Y'),
+                'month'     => intval($start->format('m')),
+                'year'      => intval($start->format('Y')),
+            ];
+            $start->addMonth();
+        }
+
+        return $months;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return array
+     */
+    public function listOfYears(Carbon $date)
+    {
+        $start = clone $date;
+        $end   = Carbon::now();
+        $years = [];
+        while ($start <= $end) {
+            $years[] = $start->format('Y');
+            $start->addYear();
+        }
+        $years[] = Carbon::now()->format('Y');
+        // force the current year.
+        $years = array_unique($years);
+
+        return $years;
+    }
+
+    /**
+     * @param Carbon $date
+     * @param bool   $showSharedReports
+     *
+     * @return array
+     */
+    public function yearBalanceReport(Carbon $date, $showSharedReports = false)
+    {
+        $start          = clone $date;
+        $end            = clone $date;
+        $sharedAccounts = [];
+        if ($showSharedReports === false) {
+            $sharedCollection = \Auth::user()->accounts()
+                                     ->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id')
+                                     ->where('account_meta.name', '=', 'accountRole')
+                                     ->where('account_meta.data', '=', json_encode('sharedAsset'))
+                                     ->get(['accounts.id']);
+
+            foreach ($sharedCollection as $account) {
+                $sharedAccounts[] = $account->id;
+            }
+        }
+
+        $accounts = Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->orderBy('accounts.name', 'ASC')->get(['accounts.*'])
+                        ->filter(
+                            function (Account $account) use ($sharedAccounts) {
+                                if (!in_array($account->id, $sharedAccounts)) {
+                                    return $account;
+                                }
+
+                                return null;
+                            }
+                        );
+        $report   = [];
+        $start->startOfYear()->subDay();
+        $end->endOfYear();
+
+        foreach ($accounts as $account) {
+            $startBalance = Steam::balance($account, $start);
+            $endBalance   = Steam::balance($account, $end);
+            $report[]     = [
+                'start'   => $startBalance,
+                'end'     => $endBalance,
+                'hide'    => ($startBalance == 0 && $endBalance == 0),
+                'account' => $account,
+                'shared'  => $account->accountRole == 'sharedAsset'
+            ];
+        }
+
+        return $report;
+    }
+}

app/Helpers/Report/ReportHelperInterface.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace FireflyIII\Helpers\Report;
+
+use Carbon\Carbon;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface ReportHelperInterface
+ *
+ * @package FireflyIII\Helpers\Report
+ */
+interface ReportHelperInterface
+{
+
+
+    /**
+     * This methods fails to take in account transfers FROM shared accounts.
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     * @param int    $limit
+     *
+     * @return Collection
+     */
+    public function expensesGroupedByAccount(Carbon $start, Carbon $end, $limit = 15);
+
+    /**
+     * This method gets some kind of list for a monthly overview.
+     *
+     * @param Carbon $date
+     *
+     * @return Collection
+     */
+    public function getBudgetsForMonth(Carbon $date);
+
+    /**
+     * @param Carbon $date
+     *
+     * @return array
+     */
+    public function listOfMonths(Carbon $date);
+
+    /**
+     * @param Carbon $date
+     *
+     * @return array
+     */
+    public function listOfYears(Carbon $date);
+
+    /**
+     * @param Carbon $date
+     * @param bool   $showSharedReports
+     *
+     * @return array
+     */
+    public function yearBalanceReport(Carbon $date, $showSharedReports = false);
+}

app/Helpers/Report/ReportQuery.php

@@ -0,0 +1,605 @@
+<?php
+
+namespace FireflyIII\Helpers\Report;
+
+use Auth;
+use Carbon\Carbon;
+use Crypt;
+use DB;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Query\JoinClause;
+use Illuminate\Support\Collection;
+use Steam;
+
+/**
+ * Class ReportQuery
+ *
+ * @package FireflyIII\Helpers\Report
+ */
+class ReportQuery implements ReportQueryInterface
+{
+
+    /**
+     * This query retrieves a list of accounts that are active and not shared.
+     *
+     * @param bool $showSharedReports
+     *
+     * @return Collection
+     */
+    public function accountList($showSharedReports = false)
+    {
+        $query = Auth::user()->accounts();
+        if ($showSharedReports === false) {
+
+            $query->leftJoin(
+                'account_meta', function (JoinClause $join) {
+                $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', "accountRole");
+            }
+            )->where(
+                function (Builder $query) {
+                    $query->where('account_meta.data', '!=', '"sharedAsset"');
+                    $query->orWhereNull('account_meta.data');
+                }
+            );
+
+        }
+        $query->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
+              ->whereIn('account_types.type', ['Default account', 'Cash account', 'Asset account'])
+              ->where('active', 1)
+              ->orderBy('accounts.name', 'ASC');
+
+        return $query->get(['accounts.*']);
+    }
+
+    /**
+     * This method will get a list of all expenses in a certain time period that have no budget
+     * and are balanced by a transfer to make up for it.
+     *
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return Collection
+     */
+    public function balancedTransactionsList(Account $account, Carbon $start, Carbon $end)
+    {
+
+        $set = TransactionJournal::
+        leftJoin('transaction_group_transaction_journal', 'transaction_group_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
+                                 ->leftJoin(
+                                     'transaction_group_transaction_journal as otherFromGroup', function (JoinClause $join) {
+                                     $join->on('otherFromGroup.transaction_group_id', '=', 'transaction_group_transaction_journal.transaction_group_id')
+                                          ->on('otherFromGroup.transaction_journal_id', '!=', 'transaction_journals.id');
+                                 }
+                                 )
+                                 ->leftJoin('transaction_journals as otherJournals', 'otherJournals.id', '=', 'otherFromGroup.transaction_journal_id')
+                                 ->leftJoin('transaction_types', 'transaction_types.id', '=', 'otherJournals.transaction_type_id')
+                                 ->leftJoin(
+                                     'transactions', function (JoinClause $join) {
+                                     $join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('amount', '>', 0);
+                                 }
+                                 )
+                                 ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'otherJournals.id')
+                                 ->before($end)->after($start)
+                                 ->where('transaction_types.type', 'Withdrawal')
+                                 ->where('transaction_journals.user_id', Auth::user()->id)
+                                 ->whereNull('budget_transaction_journal.budget_id')->whereNull('transaction_journals.deleted_at')
+                                 ->whereNull('otherJournals.deleted_at')
+                                 ->where('transactions.account_id', $account->id)
+                                 ->orderBy('transaction_journals.date', 'DESC')
+                                 ->orderBy('transaction_journals.order', 'ASC')
+                                 ->orderBy('transaction_journals.id', 'DESC')
+                                 ->whereNotNull('transaction_group_transaction_journal.transaction_group_id')
+                                 ->get(
+                                     [
+                                         'transaction_journals.*',
+                                         'transactions.amount as queryAmount'
+                                     ]
+                                 );
+
+        return $set;
+    }
+
+    /**
+     * This method will get the sum of all expenses in a certain time period that have no budget
+     * and are balanced by a transfer to make up for it.
+     *
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return float
+     */
+    public function balancedTransactionsSum(Account $account, Carbon $start, Carbon $end)
+    {
+        return floatval($this->balancedTransactionsList($account, $start, $end)->sum('queryAmount'));
+    }
+
+    /**
+     * Get a users accounts combined with various meta-data related to the start and end date.
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     * @param bool   $showSharedReports
+     *
+     * @return Collection
+     */
+    public function getAllAccounts(Carbon $start, Carbon $end, $showSharedReports = false)
+    {
+        $query = Auth::user()->accounts()->orderBy('accounts.name', 'ASC')
+                     ->accountTypeIn(['Default account', 'Asset account', 'Cash account']);
+        if ($showSharedReports === false) {
+            $query->leftJoin(
+                'account_meta', function (JoinClause $join) {
+                $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
+            }
+            )
+                  ->orderBy('accounts.name', 'ASC')
+                  ->where(
+                      function (Builder $query) {
+
+                          $query->where('account_meta.data', '!=', '"sharedAsset"');
+                          $query->orWhereNull('account_meta.data');
+
+                      }
+                  );
+        }
+        $set = $query->get(['accounts.*']);
+        $set->each(
+            function (Account $account) use ($start, $end) {
+                /** @noinspection PhpParamsInspection */
+                $account->startBalance = Steam::balance($account, $start);
+                $account->endBalance   = Steam::balance($account, $end);
+            }
+        );
+
+        return $set;
+    }
+
+    /**
+     * Grabs a summary of all expenses grouped by budget, related to the account.
+     *
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return mixed
+     */
+    public function getBudgetSummary(Account $account, Carbon $start, Carbon $end)
+    {
+        $query = $this->queryJournalsNoBudget($account, $start, $end);
+
+        return $query->get(['budgets.id', 'budgets.name', DB::Raw('SUM(`transactions`.`amount`) as `queryAmount`')]);
+
+    }
+
+    /**
+     * Get a list of transaction journals that have no budget, filtered for the specified account
+     * and the specified date range.
+     *
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return Collection
+     */
+    public function getTransactionsWithoutBudget(Account $account, Carbon $start, Carbon $end)
+    {
+        $query = $this->queryJournalsNoBudget($account, $start, $end);
+
+        return $query->get(['budgets.name', 'transactions.amount as queryAmount', 'transaction_journals.*']);
+    }
+
+    /**
+     * This method returns all "income" journals in a certain period, which are both transfers from a shared account
+     * and "ordinary" deposits. The query used is almost equal to ReportQueryInterface::journalsByRevenueAccount but it does
+     * not group and returns different fields.
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     * @param bool   $showSharedReports
+     *
+     * @return Collection
+     */
+    public function incomeByPeriod(Carbon $start, Carbon $end, $showSharedReports = false)
+    {
+        $query = $this->queryJournalsWithTransactions($start, $end);
+        if ($showSharedReports === false) {
+            // only get deposits not to a shared account
+            // and transfers to a shared account.
+            $query->where(
+                function (Builder $query) {
+                    $query->where(
+                        function (Builder $q) {
+                            $q->where('transaction_types.type', 'Deposit');
+                            $q->where('acm_to.data', '!=', '"sharedAsset"');
+                        }
+                    );
+                    $query->orWhere(
+                        function (Builder $q) {
+                            $q->where('transaction_types.type', 'Transfer');
+                            $q->where('acm_from.data', '=', '"sharedAsset"');
+                        }
+                    );
+                }
+            );
+        } else {
+            // any deposit is fine.
+            $query->where('transaction_types.type', 'Deposit');
+        }
+        $query->groupBy('transaction_journals.id')->orderBy('transaction_journals.date');
+
+        // get everything, decrypt and return
+        $data = $query->get(
+            ['transaction_journals.id',
+             'transaction_journals.description',
+             'transaction_journals.encrypted',
+             'transaction_types.type',
+             DB::Raw('SUM(`t_to`.`amount`) as `queryAmount`'),
+             'transaction_journals.date',
+             't_from.account_id as account_id',
+             'ac_from.name as name',
+             'ac_from.encrypted as account_encrypted'
+            ]
+        );
+
+        $data->each(
+            function (Model $object) {
+                $object->name = intval($object->account_encrypted) == 1 ? Crypt::decrypt($object->name) : $object->name;
+            }
+        );
+
+        return $data;
+    }
+
+    /**
+     * Gets a list of expenses grouped by the budget they were filed under.
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     * @param bool   $showSharedReports
+     *
+     * @return Collection
+     */
+    public function journalsByBudget(Carbon $start, Carbon $end, $showSharedReports = false)
+    {
+        $query = Auth::user()->transactionjournals()
+                     ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
+                     ->leftJoin('budgets', 'budget_transaction_journal.budget_id', '=', 'budgets.id')
+                     ->leftJoin(
+                         'transactions', function (JoinClause $join) {
+                         $join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('transactions.amount', '<', 0);
+                     }
+                     )
+                     ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id');
+        if ($showSharedReports === false) {
+
+            $query->leftJoin(
+                'account_meta', function (JoinClause $join) {
+                $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
+            }
+            )->where('account_meta.data', '!=', '"sharedAsset"');
+        }
+        $query->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id')
+              ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
+              ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
+              ->where('transaction_types.type', 'Withdrawal')
+              ->groupBy('budgets.id')
+              ->orderBy('budgets.name', 'ASC');
+
+        return $query->get(['budgets.id', 'budgets.name', DB::Raw('SUM(`transactions`.`amount`) AS `spent`')]);
+    }
+
+    /**
+     * Gets a list of categories and the expenses therein, grouped by the relevant category.
+     * This result excludes transfers to shared accounts which are expenses, technically.
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     * @param bool   $showSharedReports
+     *
+     * @return Collection
+     */
+    public function journalsByCategory(Carbon $start, Carbon $end, $showSharedReports = false)
+    {
+        $query = Auth::user()->transactionjournals()
+                     ->leftJoin(
+                         'category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id'
+                     )
+                     ->leftJoin('categories', 'category_transaction_journal.category_id', '=', 'categories.id')
+                     ->leftJoin(
+                         'transactions', function (JoinClause $join) {
+                         $join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('transactions.amount', '<', 0);
+                     }
+                     )
+                     ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id');
+        if ($showSharedReports === false) {
+            $query->leftJoin(
+                'account_meta', function (JoinClause $join) {
+                $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
+            }
+            )->where('account_meta.data', '!=', '"sharedAsset"');
+        }
+        $query->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id')
+              ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
+              ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
+              ->where('transaction_types.type', 'Withdrawal')
+              ->groupBy('categories.id')
+              ->orderBy('queryAmount');
+
+        $data = $query->get(['categories.id', 'categories.encrypted', 'categories.name', DB::Raw('SUM(`transactions`.`amount`) AS `queryAmount`')]);
+        // decrypt data:
+        $data->each(
+            function (Model $object) {
+                $object->name = intval($object->encrypted) == 1 ? Crypt::decrypt($object->name) : $object->name;
+            }
+        );
+
+        return $data;
+
+    }
+
+    /**
+     * Gets a list of expense accounts and the expenses therein, grouped by that expense account.
+     * This result excludes transfers to shared accounts which are expenses, technically.
+     *
+     * So now it will include them!
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     * @param bool   $showSharedReports
+     *
+     * @return Collection
+     */
+    public function journalsByExpenseAccount(Carbon $start, Carbon $end, $showSharedReports = false)
+    {
+        $query = $this->queryJournalsWithTransactions($start, $end);
+        if ($showSharedReports === false) {
+            // get all withdrawals not from a shared accounts
+            // and all transfers to a shared account
+            $query->where(
+                function (Builder $query) {
+                    $query->where(
+                        function (Builder $q) {
+                            $q->where('transaction_types.type', 'Withdrawal');
+                            $q->where('acm_from.data', '!=', '"sharedAsset"');
+                        }
+                    );
+                    $query->orWhere(
+                        function (Builder $q) {
+                            $q->where('transaction_types.type', 'Transfer');
+                            $q->where('acm_to.data', '=', '"sharedAsset"');
+                        }
+                    );
+                }
+            );
+        } else {
+            // any withdrawal goes:
+            $query->where('transaction_types.type', 'Withdrawal');
+        }
+        $query->before($end)->after($start)
+              ->where('transaction_journals.user_id', Auth::user()->id)
+              ->groupBy('t_to.account_id')
+              ->orderBy('queryAmount', 'DESC');
+
+        $data = $query->get(['t_to.account_id as id', 'ac_to.name as name', 'ac_to.encrypted', DB::Raw('SUM(t_to.amount) as `queryAmount`')]);
+
+        // decrypt
+        $data->each(
+            function (Model $object) {
+                $object->name = intval($object->encrypted) == 1 ? Crypt::decrypt($object->name) : $object->name;
+            }
+        );
+
+        return $data;
+    }
+
+    /**
+     * This method returns all deposits into asset accounts, grouped by the revenue account,
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     * @param bool   $showSharedReports
+     *
+     * @return Collection
+     */
+    public function journalsByRevenueAccount(Carbon $start, Carbon $end, $showSharedReports = false)
+    {
+        $query = $this->queryJournalsWithTransactions($start, $end);
+        if ($showSharedReports === false) {
+
+            // show queries where transfer type is deposit, and its not to a shared account
+            // or where its a transfer and its from a shared account (both count as incomes)
+            $query->where(
+                function (Builder $query) {
+                    $query->where(
+                        function (Builder $q) {
+                            $q->where('transaction_types.type', 'Deposit');
+                            $q->where('acm_to.data', '!=', '"sharedAsset"');
+                        }
+                    );
+                    $query->orWhere(
+                        function (Builder $q) {
+                            $q->where('transaction_types.type', 'Transfer');
+                            $q->where('acm_from.data', '=', '"sharedAsset"');
+                        }
+                    );
+                }
+            );
+        } else {
+            // any deposit goes:
+            $query->where('transaction_types.type', 'Deposit');
+        }
+
+        $query->groupBy('t_from.account_id')->orderBy('queryAmount');
+
+        $data = $query->get(
+            ['t_from.account_id as account_id', 'ac_from.name as name', 'ac_from.encrypted as encrypted', DB::Raw('SUM(t_from.amount) as `queryAmount`')]
+        );
+        // decrypt
+        $data->each(
+            function (Model $object) {
+                $object->name = intval($object->encrypted) == 1 ? Crypt::decrypt($object->name) : $object->name;
+            }
+        );
+
+        return $data;
+    }
+
+    /**
+     * With an equally misleading name, this query returns are transfers to shared accounts. These are considered
+     * expenses.
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return Collection
+     */
+    public function sharedExpenses(Carbon $start, Carbon $end)
+    {
+        return TransactionJournal::
+        leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+                                 ->leftJoin(
+                                     'transactions', function (JoinClause $join) {
+                                     $join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')->where(
+                                         'transactions.amount', '>', 0
+                                     );
+                                 }
+                                 )
+                                 ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+                                 ->leftJoin(
+                                     'account_meta', function (JoinClause $join) {
+                                     $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
+                                 }
+                                 )
+                                 ->where('account_meta.data', '"sharedAsset"')
+                                 ->after($start)
+                                 ->before($end)
+                                 ->where('transaction_types.type', 'Transfer')
+                                 ->where('transaction_journals.user_id', Auth::user()->id)
+                                 ->get(
+                                     ['transaction_journals.id', 'transaction_journals.description', 'transactions.account_id', 'accounts.name',
+                                      'transactions.amount as queryAmount']
+                                 );
+
+    }
+
+    /**
+     * With a slightly misleading name, this query returns all transfers to shared accounts
+     * which are technically expenses, since it won't be just your money that gets spend.
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return Collection
+     */
+    public function sharedExpensesByCategory(Carbon $start, Carbon $end)
+    {
+        return TransactionJournal::
+        leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+                                 ->leftJoin(
+                                     'transactions', function (JoinClause $join) {
+                                     $join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')->where(
+                                         'transactions.amount', '>', 0
+                                     );
+                                 }
+                                 )
+                                 ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+                                 ->leftJoin(
+                                     'account_meta', function (JoinClause $join) {
+                                     $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
+                                 }
+                                 )
+                                 ->leftJoin(
+                                     'category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id'
+                                 )
+                                 ->leftJoin('categories', 'category_transaction_journal.category_id', '=', 'categories.id')
+                                 ->where('account_meta.data', '"sharedAsset"')
+                                 ->after($start)
+                                 ->before($end)
+                                 ->where('transaction_types.type', 'Transfer')
+                                 ->where('transaction_journals.user_id', Auth::user()->id)
+                                 ->groupBy('categories.name')
+                                 ->get(
+                                     [
+                                         'categories.id',
+                                         'categories.name as name',
+                                         DB::Raw('SUM(`transactions`.`amount`) * -1 AS `queryAmount`')
+                                     ]
+                                 );
+    }
+
+    /**
+     *
+     * This query will get all transaction journals and budget information for a specified account
+     * in a certain date range, where the transaction journal does not have a budget.
+     * There is no get() specified, this is up to the method itself.
+     *
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return Builder
+     */
+    protected function queryJournalsNoBudget(Account $account, Carbon $start, Carbon $end)
+    {
+        return TransactionJournal::
+        leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
+                                 ->leftJoin('budgets', 'budgets.id', '=', 'budget_transaction_journal.budget_id')
+                                 ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+                                 ->leftJoin(
+                                     'transactions', function (JoinClause $join) {
+                                     $join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')->where('transactions.amount', '<', 0);
+                                 }
+                                 )
+                                 ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+                                 ->before($end)
+                                 ->after($start)
+                                 ->where('accounts.id', $account->id)
+                                 ->where('transaction_journals.user_id', Auth::user()->id)
+                                 ->where('transaction_types.type', 'Withdrawal')
+                                 ->groupBy('budgets.id')
+                                 ->orderBy('budgets.name', 'ASC');
+    }
+
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return Builder
+     */
+    protected function queryJournalsWithTransactions(Carbon $start, Carbon $end)
+    {
+        $query = TransactionJournal::
+        leftJoin(
+            'transactions as t_from', function (JoinClause $join) {
+            $join->on('t_from.transaction_journal_id', '=', 'transaction_journals.id')->where('t_from.amount', '<', 0);
+        }
+        )
+                                   ->leftJoin('accounts as ac_from', 't_from.account_id', '=', 'ac_from.id')
+                                   ->leftJoin(
+                                       'account_meta as acm_from', function (JoinClause $join) {
+                                       $join->on('ac_from.id', '=', 'acm_from.account_id')->where('acm_from.name', '=', 'accountRole');
+                                   }
+                                   )
+                                   ->leftJoin(
+                                       'transactions as t_to', function (JoinClause $join) {
+                                       $join->on('t_to.transaction_journal_id', '=', 'transaction_journals.id')->where('t_to.amount', '>', 0);
+                                   }
+                                   )
+                                   ->leftJoin('accounts as ac_to', 't_to.account_id', '=', 'ac_to.id')
+                                   ->leftJoin(
+                                       'account_meta as acm_to', function (JoinClause $join) {
+                                       $join->on('ac_to.id', '=', 'acm_to.account_id')->where('acm_to.name', '=', 'accountRole');
+                                   }
+                                   )
+                                   ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id');
+        $query->before($end)->after($start)->where('transaction_journals.user_id', Auth::user()->id);
+
+        return $query;
+    }
+
+}

app/Helpers/Report/ReportQueryInterface.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace FireflyIII\Report;
+namespace FireflyIII\Helpers\Report;
 
 use Carbon\Carbon;
+use FireflyIII\Models\Account;
 use Illuminate\Support\Collection;
 
-
 /**
  * Interface ReportQueryInterface
  *
- * @package FireflyIII\Report
+ * @package FireflyIII\Helpers\Report
  */
 interface ReportQueryInterface
 {
@@ -17,74 +17,93 @@ interface ReportQueryInterface
     /**
      * This query retrieves a list of accounts that are active and not shared.
      *
+     * @param bool $showSharedReports
+     *
      * @return Collection
      */
-    public function accountList();
+    public function accountList($showSharedReports = false);
+
+    /**
+     * This method will get a list of all expenses in a certain time period that have no budget
+     * and are balanced by a transfer to make up for it.
+     *
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return Collection
+     */
+    public function balancedTransactionsList(Account $account, Carbon $start, Carbon $end);
+
+    /**
+     * This method will get the sum of all expenses in a certain time period that have no budget
+     * and are balanced by a transfer to make up for it.
+     *
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return float
+     */
+    public function balancedTransactionsSum(Account $account, Carbon $start, Carbon $end);
 
     /**
      * Get a users accounts combined with various meta-data related to the start and end date.
      *
      * @param Carbon $start
      * @param Carbon $end
+     * @param bool   $showSharedReports
      *
      * @return Collection
      */
-    public function getAllAccounts(Carbon $start, Carbon $end);
+    public function getAllAccounts(Carbon $start, Carbon $end, $showSharedReports = false);
 
     /**
      * Grabs a summary of all expenses grouped by budget, related to the account.
      *
-     * @param \Account $account
-     * @param Carbon   $start
-     * @param Carbon   $end
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
      *
      * @return mixed
      */
-    public function getBudgetSummary(\Account $account, Carbon $start, Carbon $end);
+    public function getBudgetSummary(Account $account, Carbon $start, Carbon $end);
 
     /**
-     * This method will sum up all expenses in a certain time period that have no budget
-     * and are balanced by a transfer to make up for it.
+     * Get a list of transaction journals that have no budget, filtered for the specified account
+     * and the specified date range.
      *
-     * @param \Account $account
-     * @param Carbon   $start
-     * @param Carbon   $end
-     *
-     * @return float
-     */
-    public function balancedTransactionsSum(\Account $account, Carbon $start, Carbon $end);
-
-    /**
-     * This method will get a list of all expenses in a certain time period that have no budget
-     * and are balanced by a transfer to make up for it.
-     *
-     * @param \Account $account
-     * @param Carbon   $start
-     * @param Carbon   $end
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
      *
      * @return Collection
      */
-    public function balancedTransactionsList(\Account $account, Carbon $start, Carbon $end);
+    public function getTransactionsWithoutBudget(Account $account, Carbon $start, Carbon $end);
 
     /**
-     * Gets a list of all budgets and if present, the amount of the current BudgetLimit
-     * as well
+     * This method returns all "income" journals in a certain period, which are both transfers from a shared account
+     * and "ordinary" deposits. The query used is almost equal to ReportQueryInterface::journalsByRevenueAccount but it does
+     * not group and returns different fields.
      *
-     * @param Carbon $date
+     * @param Carbon $start
+     * @param Carbon $end
+     * @param bool   $showSharedReports
      *
      * @return Collection
      */
-    public function getAllBudgets(Carbon $date);
+    public function incomeByPeriod(Carbon $start, Carbon $end, $showSharedReports = false);
 
     /**
      * Gets a list of expenses grouped by the budget they were filed under.
      *
      * @param Carbon $start
      * @param Carbon $end
+     * @param bool   $showSharedReports
      *
      * @return Collection
      */
-    public function journalsByBudget(Carbon $start, Carbon $end);
+    public function journalsByBudget(Carbon $start, Carbon $end, $showSharedReports = false);
 
     /**
      * Gets a list of categories and the expenses therein, grouped by the relevant category.
@@ -92,30 +111,36 @@ interface ReportQueryInterface
      *
      * @param Carbon $start
      * @param Carbon $end
+     * @param bool   $showSharedReports
      *
      * @return Collection
      */
-    public function journalsByCategory(Carbon $start, Carbon $end);
+    public function journalsByCategory(Carbon $start, Carbon $end, $showSharedReports = false);
 
     /**
      * Gets a list of expense accounts and the expenses therein, grouped by that expense account.
      * This result excludes transfers to shared accounts which are expenses, technically.
      *
+     * So now it will include them!
+     *
      * @param Carbon $start
      * @param Carbon $end
+     * @param bool   $showSharedReports
      *
      * @return Collection
      */
-    public function journalsByExpenseAccount(Carbon $start, Carbon $end);
+    public function journalsByExpenseAccount(Carbon $start, Carbon $end, $showSharedReports = false);
 
     /**
      * This method returns all deposits into asset accounts, grouped by the revenue account,
+     *
      * @param Carbon $start
      * @param Carbon $end
+     * @param bool   $showSharedReports
      *
      * @return Collection
      */
-    public function journalsByRevenueAccount(Carbon $start, Carbon $end);
+    public function journalsByRevenueAccount(Carbon $start, Carbon $end, $showSharedReports = false);
 
     /**
      * With an equally misleading name, this query returns are transfers to shared accounts. These are considered
@@ -130,7 +155,7 @@ interface ReportQueryInterface
 
     /**
      * With a slightly misleading name, this query returns all transfers to shared accounts
-     * grouped by category (which are technically expenses, since it won't be just your money that gets spend).
+     * which are technically expenses, since it won't be just your money that gets spend.
      *
      * @param Carbon $start
      * @param Carbon $end
@@ -138,5 +163,4 @@ interface ReportQueryInterface
      * @return Collection
      */
     public function sharedExpensesByCategory(Carbon $start, Carbon $end);
-
 }

app/Http/Controllers/AccountController.php

@@ -0,0 +1,229 @@
+<?php namespace FireflyIII\Http\Controllers;
+
+use Auth;
+use Carbon\Carbon;
+use Config;
+use FireflyIII\Http\Requests;
+use FireflyIII\Http\Requests\AccountFormRequest;
+use FireflyIII\Models\Account;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use Input;
+use Redirect;
+use Session;
+use Steam;
+use View;
+
+/**
+ * Class AccountController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class AccountController extends Controller
+{
+    /**
+     *
+     */
+    public function __construct()
+    {
+        View::share('mainTitleIcon', 'fa-credit-card');
+        View::share('title', 'Accounts');
+    }
+
+    /**
+     * @param string $what
+     *
+     * @return \Illuminate\View\View
+     */
+    public function create($what = 'asset')
+    {
+        $subTitleIcon = Config::get('firefly.subIconsByIdentifier.' . $what);
+        $subTitle     = 'Create a new ' . e($what) . ' account';
+
+        return view('accounts.create', compact('subTitleIcon', 'what', 'subTitle'));
+
+    }
+
+    /**
+     * @param Account $account
+     *
+     * @return \Illuminate\View\View
+     */
+    public function delete(Account $account)
+    {
+        $subTitle = 'Delete ' . strtolower(e($account->accountType->type)) . ' "' . e($account->name) . '"';
+
+        return view('accounts.delete', compact('account', 'subTitle'));
+    }
+
+    /**
+     * @param Account $account
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy(Account $account, AccountRepositoryInterface $repository)
+    {
+
+        $type     = $account->accountType->type;
+        $typeName = Config::get('firefly.shortNamesByFullName.' . $type);
+        $name     = $account->name;
+
+        $repository->destroy($account);
+
+        Session::flash('success', 'The ' . e($typeName) . ' account "' . e($name) . '" was deleted.');
+
+        return Redirect::route('accounts.index', $typeName);
+    }
+
+    /**
+     * @param Account                    $account
+     * @param AccountRepositoryInterface $repository
+     *
+     * @return View
+     */
+    public function edit(Account $account, AccountRepositoryInterface $repository)
+    {
+
+        $what           = Config::get('firefly.shortNamesByFullName')[$account->accountType->type];
+        $subTitle       = 'Edit ' . strtolower(e($account->accountType->type)) . ' "' . e($account->name) . '"';
+        $subTitleIcon   = Config::get('firefly.subIconsByIdentifier.' . $what);
+        $openingBalance = $repository->openingBalanceTransaction($account);
+
+        // pre fill some useful values.
+
+        // the opening balance is tricky:
+        $openingBalanceAmount = null;
+
+        if ($openingBalance) {
+            $transaction          = $repository->getFirstTransaction($openingBalance, $account);
+            $openingBalanceAmount = $transaction->amount;
+        }
+
+        $preFilled = [
+            'accountRole'          => $account->getMeta('accountRole'),
+            'ccType'               => $account->getMeta('ccType'),
+            'ccMonthlyPaymentDate' => $account->getMeta('ccMonthlyPaymentDate'),
+            'openingBalanceDate'   => $openingBalance ? $openingBalance->date->format('Y-m-d') : null,
+            'openingBalance'       => $openingBalanceAmount,
+            'virtualBalance'       => floatval($account->virtual_balance)
+        ];
+        Session::flash('preFilled', $preFilled);
+
+        return view('accounts.edit', compact('account', 'subTitle', 'subTitleIcon', 'openingBalance', 'what'));
+    }
+
+    /**
+     * @param                            $what
+     * @param AccountRepositoryInterface $repository
+     *
+     * @return View
+     */
+    public function index($what, AccountRepositoryInterface $repository)
+    {
+        $subTitle     = Config::get('firefly.subTitlesByIdentifier.' . $what);
+        $subTitleIcon = Config::get('firefly.subIconsByIdentifier.' . $what);
+        $types        = Config::get('firefly.accountTypesByIdentifier.' . $what);
+        $accounts     = $repository->getAccounts($types);
+        // last activity:
+        /**
+         * HERE WE ARE
+         */
+        $start = clone Session::get('start', Carbon::now()->startOfMonth());
+        $start->subDay();
+        $accounts->each(
+            function (Account $account) use ($start, $repository) {
+                $account->lastActivityDate = $repository->getLastActivity($account);
+                $account->startBalance     = Steam::balance($account, $start);
+                $account->endBalance       = Steam::balance($account, clone Session::get('end', Carbon::now()->endOfMonth()));
+            }
+        );
+
+        return view('accounts.index', compact('what', 'subTitleIcon', 'subTitle', 'accounts'));
+    }
+
+    /**
+     * @param Account                    $account
+     * @param AccountRepositoryInterface $repository
+     *
+     * @return View
+     */
+    public function show(Account $account, AccountRepositoryInterface $repository)
+    {
+        $page         = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page'));
+        $subTitleIcon = Config::get('firefly.subTitlesByIdentifier.' . $account->accountType->type);
+        $what         = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type);
+        $journals     = $repository->getJournals($account, $page);
+        $subTitle     = 'Details for ' . strtolower(e($account->accountType->type)) . ' "' . e($account->name) . '"';
+        $journals->setPath('accounts/show/' . $account->id);
+
+
+        return view('accounts.show', compact('account', 'what', 'subTitleIcon', 'journals', 'subTitle'));
+    }
+
+    /**
+     * @param AccountFormRequest         $request
+     * @param AccountRepositoryInterface $repository
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store(AccountFormRequest $request, AccountRepositoryInterface $repository)
+    {
+        $accountData = [
+            'name'                   => $request->input('name'),
+            'accountType'            => $request->input('what'),
+            'virtualBalance'         => floatval($request->input('virtualBalance')),
+            'active'                 => true,
+            'user'                   => Auth::user()->id,
+            'accountRole'            => $request->input('accountRole'),
+            'openingBalance'         => floatval($request->input('openingBalance')),
+            'openingBalanceDate'     => new Carbon($request->input('openingBalanceDate')),
+            'openingBalanceCurrency' => intval($request->input('balance_currency_id')),
+
+        ];
+        $account     = $repository->store($accountData);
+
+        Session::flash('success', 'New account "' . $account->name . '" stored!');
+
+        if (intval(Input::get('create_another')) === 1) {
+            return Redirect::route('accounts.create', $request->input('what'))->withInput();
+        }
+
+        return Redirect::route('accounts.index', $request->input('what'));
+
+    }
+
+    /**
+     * @param Account                    $account
+     * @param AccountFormRequest         $request
+     * @param AccountRepositoryInterface $repository
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function update(Account $account, AccountFormRequest $request, AccountRepositoryInterface $repository)
+    {
+        $what        = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type);
+        $accountData = [
+            'name'                   => $request->input('name'),
+            'active'                 => $request->input('active'),
+            'user'                   => Auth::user()->id,
+            'accountRole'            => $request->input('accountRole'),
+            'virtualBalance'         => floatval($request->input('virtualBalance')),
+            'openingBalance'         => floatval($request->input('openingBalance')),
+            'openingBalanceDate'     => new Carbon($request->input('openingBalanceDate')),
+            'openingBalanceCurrency' => intval($request->input('balance_currency_id')),
+            'ccType'                 => $request->input('ccType'),
+            'ccMonthlyPaymentDate'   => $request->input('ccMonthlyPaymentDate'),
+        ];
+
+        $repository->update($account, $accountData);
+
+        Session::flash('success', 'Account "' . $account->name . '" updated.');
+
+        if (intval(Input::get('return_to_edit')) === 1) {
+            return Redirect::route('accounts.edit', $account->id);
+        }
+
+        return Redirect::route('accounts.index', $what);
+
+    }
+
+}

app/Http/Controllers/Auth/AuthController.php

@@ -0,0 +1,91 @@
+<?php namespace FireflyIII\Http\Controllers\Auth;
+
+use FireflyIII\Http\Controllers\Controller;
+use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Contracts\Auth\Registrar;
+use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
+use Illuminate\Http\Request;
+use Illuminate\Mail\Message;
+use Mail;
+use Session;
+
+/**
+ * Class AuthController
+ *
+ * @package FireflyIII\Http\Controllers\Auth
+ */
+class AuthController extends Controller
+{
+
+    /*
+    |--------------------------------------------------------------------------
+    | Registration & Login Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller handles the registration of new users, as well as the
+    | authentication of existing users. By default, this controller uses
+    | a simple trait to add these behaviors. Why don't you explore it?
+    |
+    */
+
+    use AuthenticatesAndRegistersUsers;
+
+    public $redirectTo = '/';
+
+    /**
+     * Create a new authentication controller instance.
+     *
+     * @param  \Illuminate\Contracts\Auth\Guard     $auth
+     * @param  \Illuminate\Contracts\Auth\Registrar $registrar
+     *
+     */
+    public function __construct(Guard $auth, Registrar $registrar)
+    {
+        $this->auth      = $auth;
+        $this->registrar = $registrar;
+
+        $this->middleware('guest', ['except' => 'getLogout']);
+    }
+
+    /**
+     * Handle a registration request for the application.
+     *
+     * @param  Request $request
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function postRegister(Request $request)
+    {
+        $validator = $this->registrar->validator($request->all());
+
+        if ($validator->fails()) {
+            $this->throwValidationException(
+                $request, $validator
+            );
+        }
+
+        $data             = $request->all();
+        $data['password'] = bcrypt($data['password']);
+
+        $this->auth->login($this->registrar->create($data));
+
+        // get the email address
+        $email = $this->auth->user()->email;
+
+        // send email.
+        Mail::send(
+            'emails.registered', [], function (Message $message) use ($email) {
+            $message->to($email, $email)->subject('Welcome to Firefly III!');
+        }
+        );
+
+        // set flash message
+        Session::flash('success', 'You have registered successfully!');
+        Session::flash('gaEventCategory', 'user');
+        Session::flash('gaEventAction', 'new-registration');
+
+
+        return redirect($this->redirectPath());
+    }
+
+}

app/Http/Controllers/Auth/PasswordController.php

@@ -0,0 +1,48 @@
+<?php namespace FireflyIII\Http\Controllers\Auth;
+
+use FireflyIII\Http\Controllers\Controller;
+use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Contracts\Auth\PasswordBroker;
+use Illuminate\Foundation\Auth\ResetsPasswords;
+
+/**
+ * Class PasswordController
+ *
+ * @package FireflyIII\Http\Controllers\Auth
+ */
+class PasswordController extends Controller
+{
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password reset requests
+    | and uses a simple trait to include this behavior. You're free to
+    | explore this trait and override any methods you wish to tweak.
+    |
+    */
+
+    use ResetsPasswords;
+
+
+    protected $redirectPath = '/';
+
+    /**
+     * Create a new password controller instance.
+     *
+     * @param  \Illuminate\Contracts\Auth\Guard          $auth
+     * @param  \Illuminate\Contracts\Auth\PasswordBroker $passwords
+     *
+     */
+    public function __construct(Guard $auth, PasswordBroker $passwords)
+    {
+        $this->auth      = $auth;
+        $this->passwords = $passwords;
+
+
+        $this->middleware('guest');
+    }
+
+}

app/Http/Controllers/BillController.php

@@ -0,0 +1,220 @@
+<?php namespace FireflyIII\Http\Controllers;
+
+use Config;
+use FireflyIII\Http\Requests;
+use FireflyIII\Http\Requests\BillFormRequest;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use Input;
+use Redirect;
+use Session;
+use URL;
+use View;
+
+/**
+ * Class BillController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class BillController extends Controller
+{
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        View::share('title', 'Bills');
+        View::share('mainTitleIcon', 'fa-calendar-o');
+    }
+
+    /**
+     * @param Bill $bill
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function add(Bill $bill, AccountRepositoryInterface $repository)
+    {
+        $matches     = explode(',', $bill->match);
+        $description = [];
+        $expense     = null;
+
+        // get users expense accounts:
+        $accounts = $repository->getAccounts(Config::get('firefly.accountTypesByIdentifier.expense'));
+
+        foreach ($matches as $match) {
+            $match = strtolower($match);
+            // find expense account for each word if not found already:
+            if (is_null($expense)) {
+                /** @var Account $account */
+                foreach ($accounts as $account) {
+                    $name = strtolower($account->name);
+                    if (!(strpos($name, $match) === false)) {
+                        $expense = $account;
+                        break;
+                    }
+                }
+
+
+            }
+            if (is_null($expense)) {
+                $description[] = $match;
+            }
+        }
+        $parameters = [
+            'description'     => ucfirst(join(' ', $description)),
+            'expense_account' => is_null($expense) ? '' : $expense->name,
+            'amount'          => round(($bill->amount_min + $bill->amount_max), 2),
+        ];
+        Session::put('preFilled', $parameters);
+
+        return Redirect::to(route('transactions.create', 'withdrawal'));
+    }
+
+    /**
+     * @return $this
+     */
+    public function create()
+    {
+        $periods = Config::get('firefly.periods_to_text');
+
+        return view('bills.create')->with('periods', $periods)->with('subTitle', 'Create new');
+    }
+
+    /**
+     * @param Bill $bill
+     *
+     * @return $this
+     */
+    public function delete(Bill $bill)
+    {
+        return view('bills.delete')->with('bill', $bill)->with('subTitle', 'Delete "' . e($bill->name) . '"');
+    }
+
+    /**
+     * @param Bill $bill
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy(Bill $bill, BillRepositoryInterface $repository)
+    {
+        $repository->destroy($bill);
+
+        Session::flash('success', 'The bill was deleted.');
+
+        return Redirect::route('bills.index');
+
+    }
+
+    /**
+     * @param Bill $bill
+     *
+     * @return $this
+     */
+    public function edit(Bill $bill)
+    {
+        $periods = Config::get('firefly.periods_to_text');
+
+        return view('bills.edit')->with('periods', $periods)->with('bill', $bill)->with('subTitle', 'Edit "' . e($bill->name) . '"');
+    }
+
+    /**
+     * @param BillRepositoryInterface $repository
+     *
+     * @return \Illuminate\View\View
+     */
+    public function index(BillRepositoryInterface $repository)
+    {
+        $bills = $repository->getBills();
+        $bills->each(
+            function (Bill $bill) use ($repository) {
+                $bill->nextExpectedMatch = $repository->nextExpectedMatch($bill);
+                $bill->lastFoundMatch    = $repository->lastFoundMatch($bill);
+            }
+        );
+
+        return view('bills.index', compact('bills'));
+    }
+
+    /**
+     * @param Bill $bill
+     *
+     * @return mixed
+     */
+    public function rescan(Bill $bill, BillRepositoryInterface $repository)
+    {
+        if (intval($bill->active) == 0) {
+            Session::flash('warning', 'Inactive bills cannot be scanned.');
+
+            return Redirect::to(URL::previous());
+        }
+
+        $journals = $repository->getPossiblyRelatedJournals($bill);
+        /** @var TransactionJournal $journal */
+        foreach ($journals as $journal) {
+            $repository->scan($bill, $journal);
+        }
+
+
+        Session::flash('success', 'Rescanned everything.');
+
+        return Redirect::to(URL::previous());
+    }
+
+    /**
+     * @param Bill $bill
+     *
+     * @return mixed
+     */
+    public function show(Bill $bill, BillRepositoryInterface $repository)
+    {
+        $journals                = $repository->getJournals($bill);
+        $bill->nextExpectedMatch = $repository->nextExpectedMatch($bill);
+        $hideBill                = true;
+
+        return view('bills.show', compact('journals', 'hideBill', 'bill'))->with('subTitle', e($bill->name));
+    }
+
+    /**
+     * @return $this
+     */
+    public function store(BillFormRequest $request, BillRepositoryInterface $repository)
+    {
+        $billData = $request->getBillData();
+        $bill     = $repository->store($billData);
+        Session::flash('success', 'Bill "' . e($bill->name) . '" stored.');
+
+        if (intval(Input::get('create_another')) === 1) {
+            return Redirect::route('bills.create')->withInput();
+        }
+
+        return Redirect::route('bills.index');
+
+    }
+
+    /**
+     * @param Bill $bill
+     *
+     * @return $this
+     */
+    public function update(Bill $bill, BillFormRequest $request, BillRepositoryInterface $repository)
+    {
+        $billData = $request->getBillData();
+        $bill     = $repository->update($bill, $billData);
+
+        if (intval(Input::get('return_to_edit')) === 1) {
+            return Redirect::route('bills.edit', $bill->id);
+        }
+
+        Session::flash('success', 'Bill "' . e($bill->name) . '" updated.');
+
+        return Redirect::route('bills.index');
+
+    }
+
+}

app/Http/Controllers/BudgetController.php

@@ -0,0 +1,265 @@
+<?php namespace FireflyIII\Http\Controllers;
+
+use Auth;
+use Carbon\Carbon;
+use FireflyIII\Http\Requests;
+use FireflyIII\Http\Requests\BudgetFormRequest;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use Input;
+use Preferences;
+use Redirect;
+use Response;
+use Session;
+use URL;
+use View;
+
+/**
+ * Class BudgetController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class BudgetController extends Controller
+{
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        View::share('title', 'Budgets');
+        View::share('mainTitleIcon', 'fa-tasks');
+    }
+
+    /**
+     * @param Budget $budget
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function amount(Budget $budget, BudgetRepositoryInterface $repository)
+    {
+        $amount          = intval(Input::get('amount'));
+        $date            = Session::get('start', Carbon::now()->startOfMonth());
+        $limitRepetition = $repository->updateLimitAmount($budget, $date, $amount);
+
+        return Response::json(['name' => $budget->name, 'repetition' => $limitRepetition ? $limitRepetition->id : 0]);
+
+    }
+
+    /**
+     * @return $this
+     */
+    public function create()
+    {
+        // put previous url in session if not redirect from store (not "create another").
+        if (Session::get('budgets.create.fromStore') !== true) {
+            Session::put('budgets.create.url', URL::previous());
+        }
+        Session::forget('budgets.create.fromStore');
+
+        return view('budgets.create')->with('subTitle', 'Create a new budget');
+    }
+
+    /**
+     * @param Budget $budget
+     *
+     * @return \Illuminate\View\View
+     */
+    public function delete(Budget $budget)
+    {
+        $subTitle = 'Delete budget' . e($budget->name) . '"';
+
+        // put previous url in session
+        Session::put('budgets.delete.url', URL::previous());
+
+        return view('budgets.delete', compact('budget', 'subTitle'));
+    }
+
+    /**
+     * @param Budget $budget
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy(Budget $budget, BudgetRepositoryInterface $repository)
+    {
+
+        $name = $budget->name;
+        $repository->destroy($budget);
+
+
+        Session::flash('success', 'The  budget "' . e($name) . '" was deleted.');
+
+        return Redirect::to(Session::get('budgets.delete.url'));
+    }
+
+    /**
+     * @param Budget $budget
+     *
+     * @return $this
+     */
+    public function edit(Budget $budget)
+    {
+        $subTitle = 'Edit budget "' . e($budget->name) . '"';
+
+        // put previous url in session if not redirect from store (not "return_to_edit").
+        if (Session::get('budgets.edit.fromUpdate') !== true) {
+            Session::put('budgets.edit.url', URL::previous());
+        }
+        Session::forget('budgets.edit.fromUpdate');
+
+        return view('budgets.edit', compact('budget', 'subTitle'));
+
+    }
+
+    /**
+     * @return mixed
+     */
+    public function index(BudgetRepositoryInterface $repository)
+    {
+        $budgets  = $repository->getActiveBudgets();
+        $inactive = $repository->getInactiveBudgets();
+
+        /**
+         * Do some cleanup:
+         */
+        $repository->cleanupBudgets();
+
+
+        // loop the budgets:
+        $budgets->each(
+            function (Budget $budget) use ($repository) {
+                $date               = Session::get('start', Carbon::now()->startOfMonth());
+                $budget->spent      = $repository->spentInMonth($budget, $date);
+                $budget->currentRep = $repository->getCurrentRepetition($budget, $date);
+            }
+        );
+
+        $dateAsString  = Session::get('start', Carbon::now()->startOfMonth())->format('FY');
+        $spent         = $budgets->sum('spent');
+        $amount        = Preferences::get('budgetIncomeTotal' . $dateAsString, 1000)->data;
+        $overspent     = $spent > $amount;
+        $spentPCT      = $overspent ? ceil($amount / $spent * 100) : ceil($spent / $amount * 100);
+        $budgetMax     = Preferences::get('budgetMaximum', 1000);
+        $budgetMaximum = $budgetMax->data;
+
+        return view('budgets.index', compact('budgetMaximum', 'inactive', 'budgets', 'spent', 'spentPCT', 'overspent', 'amount'));
+    }
+
+    /**
+     * @return \Illuminate\View\View
+     */
+    public function noBudget(BudgetRepositoryInterface $repository)
+    {
+        $start    = Session::get('start', Carbon::now()->startOfMonth());
+        $end      = Session::get('end', Carbon::now()->startOfMonth());
+        $list     = $repository->getWithoutBudget($start, $end);
+        $subTitle = 'Transactions without a budget between ' . $start->format('jS F Y') . ' and ' . $end->format('jS F Y');
+
+        return view('budgets.noBudget', compact('list', 'subTitle'));
+    }
+
+    /**
+     * @return mixed
+     */
+    public function postUpdateIncome()
+    {
+
+        $date = Session::get('start', Carbon::now()->startOfMonth())->format('FY');
+        Preferences::set('budgetIncomeTotal' . $date, intval(Input::get('amount')));
+
+        return Redirect::route('budgets.index');
+    }
+
+    /**
+     *
+     * @param Budget          $budget
+     * @param LimitRepetition $repetition
+     *
+     * @return \Illuminate\View\View
+     */
+    public function show(Budget $budget, LimitRepetition $repetition = null, BudgetRepositoryInterface $repository)
+    {
+        if (!is_null($repetition->id) && $repetition->budgetLimit->budget->id != $budget->id) {
+            return view('error')->with('message', 'Invalid selection.');
+        }
+
+        $hideBudget = true; // used in transaction list.
+        $journals   = $repository->getJournals($budget, $repetition);
+        $limits     = !is_null($repetition->id) ? [$repetition->budgetLimit] : $repository->getBudgetLimits($budget);
+        $subTitle   = !is_null($repetition->id) ? e($budget->name) . ' in ' . $repetition->startdate->format('F Y') : e($budget->name);
+
+        return view('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle', 'hideBudget'));
+    }
+
+    /**
+     * @param BudgetFormRequest         $request
+     * @param BudgetRepositoryInterface $repository
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store(BudgetFormRequest $request, BudgetRepositoryInterface $repository)
+    {
+        $budgetData = [
+            'name' => $request->input('name'),
+            'user' => Auth::user()->id,
+        ];
+        $budget     = $repository->store($budgetData);
+
+        Session::flash('success', 'New budget "' . $budget->name . '" stored!');
+
+        if (intval(Input::get('create_another')) === 1) {
+            // set value so create routine will not overwrite URL:
+            Session::put('budgets.create.fromStore', true);
+
+            return Redirect::route('budgets.create')->withInput();
+        }
+
+        // redirect to previous URL.
+        return Redirect::to(Session::get('budgets.create.url'));
+
+    }
+
+    /**
+     * @param Budget                    $budget
+     * @param BudgetFormRequest         $request
+     * @param BudgetRepositoryInterface $repository
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function update(Budget $budget, BudgetFormRequest $request, BudgetRepositoryInterface $repository)
+    {
+        $budgetData = [
+            'name'   => $request->input('name'),
+            'active' => intval($request->input('active')) == 1
+        ];
+
+        $repository->update($budget, $budgetData);
+
+        Session::flash('success', 'Budget "' . $budget->name . '" updated.');
+
+        if (intval(Input::get('return_to_edit')) === 1) {
+            // set value so edit routine will not overwrite URL:
+            Session::put('budgets.edit.fromUpdate', true);
+
+            return Redirect::route('budgets.edit', $budget->id)->withInput(['return_to_edit' => 1]);
+        }
+
+        // redirect to previous URL.
+        return Redirect::to(Session::get('budgets.edit.url'));
+
+    }
+
+    /**
+     * @return $this
+     */
+    public function updateIncome()
+    {
+        $date         = Session::get('start', Carbon::now()->startOfMonth())->format('FY');
+        $budgetAmount = Preferences::get('budgetIncomeTotal' . $date, 1000);
+
+        return view('budgets.income')->with('amount', $budgetAmount);
+    }
+
+}

app/Http/Controllers/CategoryController.php

@@ -0,0 +1,198 @@
+<?php namespace FireflyIII\Http\Controllers;
+
+use Auth;
+use Carbon\Carbon;
+use FireflyIII\Http\Requests;
+use FireflyIII\Http\Requests\CategoryFormRequest;
+use FireflyIII\Models\Category;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Input;
+use Redirect;
+use Session;
+use URL;
+use View;
+
+/**
+ * Class CategoryController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class CategoryController extends Controller
+{
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        View::share('title', 'Categories');
+        View::share('mainTitleIcon', 'fa-bar-chart');
+    }
+
+    /**
+     * @return $this
+     */
+    public function create()
+    {
+        // put previous url in session if not redirect from store (not "create another").
+        if (Session::get('categories.create.fromStore') !== true) {
+            Session::put('categories.create.url', URL::previous());
+        }
+        Session::forget('categories.create.fromStore');
+
+        return view('categories.create')->with('subTitle', 'Create a new category');
+    }
+
+    /**
+     * @param Category $category
+     *
+     * @return \Illuminate\View\View
+     */
+    public function delete(Category $category)
+    {
+        $subTitle = 'Delete category' . e($category->name) . '"';
+
+        // put previous url in session
+        Session::put('categories.delete.url', URL::previous());
+
+        return view('categories.delete', compact('category', 'subTitle'));
+    }
+
+    /**
+     * @param Category $category
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy(Category $category, CategoryRepositoryInterface $repository)
+    {
+
+        $name = $category->name;
+        $repository->destroy($category);
+
+        Session::flash('success', 'The  category "' . e($name) . '" was deleted.');
+
+        return Redirect::to(Session::get('categories.delete.url'));
+    }
+
+    /**
+     * @param Category $category
+     *
+     * @return $this
+     */
+    public function edit(Category $category)
+    {
+        $subTitle = 'Edit category "' . e($category->name) . '"';
+
+        // put previous url in session if not redirect from store (not "return_to_edit").
+        if (Session::get('categories.edit.fromUpdate') !== true) {
+            Session::put('categories.edit.url', URL::previous());
+        }
+        Session::forget('categories.edit.fromUpdate');
+
+        return view('categories.edit', compact('category', 'subTitle'));
+
+    }
+
+    /**
+     * @return $this
+     *
+     */
+    public function index(CategoryRepositoryInterface $repository)
+    {
+        $categories = $repository->getCategories();
+
+        $categories->each(
+            function (Category $category) use ($repository) {
+                $category->lastActivity = $repository->getLatestActivity($category);
+            }
+        );
+
+        return view('categories.index', compact('categories'));
+    }
+
+    /**
+     * @return \Illuminate\View\View
+     */
+    public function noCategory(CategoryRepositoryInterface $repository)
+    {
+        $start    = Session::get('start', Carbon::now()->startOfMonth());
+        $end      = Session::get('end', Carbon::now()->startOfMonth());
+        $list     = $repository->getWithoutCategory($start, $end);
+        $subTitle = 'Transactions without a category between ' . $start->format('jS F Y') . ' and ' . $end->format('jS F Y');
+
+        return view('categories.noCategory', compact('list', 'subTitle'));
+    }
+
+    /**
+     * @param Category $category
+     *
+     * @return $this
+     */
+    public function show(Category $category, CategoryRepositoryInterface $repository)
+    {
+        $hideCategory = true; // used in list.
+        $page         = intval(Input::get('page'));
+        $set          = $repository->getJournals($category, $page);
+        $count        = $repository->countJournals($category);
+        $journals     = new LengthAwarePaginator($set, $count, 50, $page);
+        $journals->setPath('categories/show/' . $category->id);
+
+        return view('categories.show', compact('category', 'journals', 'hideCategory'));
+    }
+
+    /**
+     * @param CategoryFormRequest         $request
+     * @param CategoryRepositoryInterface $repository
+     *
+     * @return mixed
+     */
+    public function store(CategoryFormRequest $request, CategoryRepositoryInterface $repository)
+    {
+        $categoryData = [
+            'name' => $request->input('name'),
+            'user' => Auth::user()->id,
+        ];
+        $category     = $repository->store($categoryData);
+
+        Session::flash('success', 'New category "' . $category->name . '" stored!');
+
+        if (intval(Input::get('create_another')) === 1) {
+            Session::put('categories.create.fromStore', true);
+
+            return Redirect::route('categories.create')->withInput();
+        }
+
+        return Redirect::route('categories.index');
+    }
+
+
+    /**
+     * @param Category                    $category
+     * @param CategoryFormRequest         $request
+     * @param CategoryRepositoryInterface $repository
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function update(Category $category, CategoryFormRequest $request, CategoryRepositoryInterface $repository)
+    {
+        $categoryData = [
+            'name' => $request->input('name'),
+        ];
+
+        $repository->update($category, $categoryData);
+
+        Session::flash('success', 'Category "' . $category->name . '" updated.');
+
+        if (intval(Input::get('return_to_edit')) === 1) {
+            Session::put('categories.edit.fromUpdate', true);
+
+            return Redirect::route('categories.edit', $category->id);
+        }
+
+        // redirect to previous URL.
+        return Redirect::to(Session::get('categories.edit.url'));
+
+    }
+
+}

app/Http/Controllers/Controller.php

@@ -0,0 +1,17 @@
+<?php namespace FireflyIII\Http\Controllers;
+
+use Illuminate\Foundation\Bus\DispatchesCommands;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Routing\Controller as BaseController;
+
+/**
+ * Class Controller
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+abstract class Controller extends BaseController
+{
+
+    use DispatchesCommands, ValidatesRequests;
+
+}

app/Http/Controllers/CurrencyController.php

@@ -0,0 +1,192 @@
+<?php namespace FireflyIII\Http\Controllers;
+
+use Cache;
+use FireflyIII\Http\Requests;
+use FireflyIII\Http\Requests\CurrencyFormRequest;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use Input;
+use Preferences;
+use Redirect;
+use Session;
+use URL;
+use View;
+
+/**
+ * Class CurrencyController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class CurrencyController extends Controller
+{
+
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+
+        View::share('title', 'Currencies');
+        View::share('mainTitleIcon', 'fa-usd');
+    }
+
+    /**
+     * @return \Illuminate\View\View
+     */
+    public function create()
+    {
+        $subTitleIcon = 'fa-plus';
+        $subTitle     = 'Create a new currency';
+
+        // put previous url in session if not redirect from store (not "create another").
+        if (Session::get('currency.create.fromStore') !== true) {
+            Session::put('currency.create.url', URL::previous());
+        }
+        Session::forget('currency.create.fromStore');
+
+        return view('currency.create', compact('subTitleIcon', 'subTitle'));
+    }
+
+    /**
+     * @param TransactionCurrency $currency
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function defaultCurrency(TransactionCurrency $currency)
+    {
+
+        Preferences::set('currencyPreference', $currency->code);
+
+        Session::flash('success', $currency->name . ' is now the default currency.');
+        Cache::forget('FFCURRENCYSYMBOL');
+        Cache::forget('FFCURRENCYCODE');
+
+        return Redirect::route('currency.index');
+
+    }
+
+    /**
+     * @param TransactionCurrency $currency
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
+     */
+    public function delete(TransactionCurrency $currency, CurrencyRepositoryInterface $repository)
+    {
+
+        if ($repository->countJournals($currency) > 0) {
+            Session::flash('error', 'Cannot delete ' . e($currency->name) . ' because there are still transactions attached to it.');
+
+            return Redirect::route('currency.index');
+        }
+
+        // put previous url in session
+        Session::put('currency.delete.url', URL::previous());
+
+
+        return view('currency.delete', compact('currency'));
+    }
+
+    /**
+     * @param TransactionCurrency $currency
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy(TransactionCurrency $currency, CurrencyRepositoryInterface $repository)
+    {
+        if ($repository->countJournals($currency) > 0) {
+            Session::flash('error', 'Cannot destroy ' . e($currency->name) . ' because there are still transactions attached to it.');
+
+            return Redirect::route('currency.index');
+        }
+
+        Session::flash('success', 'Currency "' . e($currency->name) . '" deleted');
+
+        $currency->delete();
+
+        return Redirect::to(Session::get('currency.delete.url'));
+    }
+
+    /**
+     * @param TransactionCurrency $currency
+     *
+     * @return \Illuminate\View\View
+     */
+    public function edit(TransactionCurrency $currency)
+    {
+        $subTitleIcon     = 'fa-pencil';
+        $subTitle         = 'Edit currency "' . e($currency->name) . '"';
+        $currency->symbol = htmlentities($currency->symbol);
+
+        // put previous url in session if not redirect from store (not "return_to_edit").
+        if (Session::get('currency.edit.fromUpdate') !== true) {
+            Session::put('currency.edit.url', URL::previous());
+        }
+        Session::forget('currency.edit.fromUpdate');
+
+        return view('currency.edit', compact('currency', 'subTitle', 'subTitleIcon'));
+
+    }
+
+    /**
+     * @return \Illuminate\View\View
+     */
+    public function index(CurrencyRepositoryInterface $repository)
+    {
+        $currencies      = $repository->get();
+        $defaultCurrency = $repository->getCurrencyByPreference(Preferences::get('currencyPreference', 'EUR'));
+
+        return view('currency.index', compact('currencies', 'defaultCurrency'));
+    }
+
+    /**
+     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
+     *
+     * @return $this|\Illuminate\Http\RedirectResponse
+     */
+    public function store(CurrencyFormRequest $request, CurrencyRepositoryInterface $repository)
+    {
+        $data     = $request->getCurrencyData();
+        $currency = $repository->store($data);
+
+
+        Session::flash('success', 'Currency "' . $currency->name . '" created');
+
+        if (intval(Input::get('create_another')) === 1) {
+            Session::put('currency.create.fromStore', true);
+
+            return Redirect::route('currency.create')->withInput();
+        }
+
+        // redirect to previous URL.
+        return Redirect::to(Session::get('currency.create.url'));
+
+
+    }
+
+    /**
+     * @param TransactionCurrency $currency
+     *
+     * @return $this|\Illuminate\Http\RedirectResponse
+     */
+    public function update(TransactionCurrency $currency, CurrencyFormRequest $request, CurrencyRepositoryInterface $repository)
+    {
+        $data     = $request->getCurrencyData();
+        $currency = $repository->update($currency, $data);
+
+        Session::flash('success', 'Currency "' . e($currency->name) . '" updated.');
+
+
+        if (intval(Input::get('return_to_edit')) === 1) {
+            Session::put('currency.edit.fromUpdate', true);
+
+            return Redirect::route('currency.edit', $currency->id);
+        }
+
+        // redirect to previous URL.
+        return Redirect::to(Session::get('currency.edit.url'));
+
+    }
+
+}

app/Http/Controllers/GoogleChartController.php

@@ -0,0 +1,564 @@
+<?php namespace FireflyIII\Http\Controllers;
+
+use Carbon\Carbon;
+use Crypt;
+use FireflyIII\Helpers\Report\ReportQueryInterface;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\Category;
+use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\Preference;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
+use Grumpydictator\Gchart\GChart;
+use Illuminate\Support\Collection;
+use Navigation;
+use Preferences;
+use Response;
+use Session;
+use Steam;
+
+/**
+ * Class GoogleChartController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class GoogleChartController extends Controller
+{
+
+
+    /**
+     * @param Account $account
+     * @param string  $view
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function accountBalanceChart(Account $account, GChart $chart)
+    {
+        $chart->addColumn('Day of month', 'date');
+        $chart->addColumn('Balance for ' . $account->name, 'number');
+        $chart->addCertainty(1);
+
+        $start   = Session::get('start', Carbon::now()->startOfMonth());
+        $end     = Session::get('end', Carbon::now()->endOfMonth());
+        $current = clone $start;
+        $today   = new Carbon;
+
+        while ($end >= $current) {
+            $certain = $current < $today;
+            $chart->addRow(clone $current, Steam::balance($account, $current), $certain);
+            $current->addDay();
+        }
+
+
+        $chart->generate();
+
+        return Response::json($chart->getData());
+    }
+
+    /**
+     * @param GChart $chart
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function allAccountsBalanceChart(GChart $chart, AccountRepositoryInterface $repository)
+    {
+        $chart->addColumn('Day of the month', 'date');
+
+        $frontPage = Preferences::get('frontPageAccounts', []);
+        $start     = Session::get('start', Carbon::now()->startOfMonth());
+        $end       = Session::get('end', Carbon::now()->endOfMonth());
+        $accounts  = $repository->getFrontpageAccounts($frontPage);
+
+        $index = 1;
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $chart->addColumn('Balance for ' . $account->name, 'number');
+            $chart->addCertainty($index);
+            $index++;
+        }
+        $current = clone $start;
+        $current->subDay();
+        $today = Carbon::now();
+        while ($end >= $current) {
+            $row     = [clone $current];
+            $certain = $current < $today;
+            foreach ($accounts as $account) {
+                $row[] = Steam::balance($account, $current);
+                $row[] = $certain;
+            }
+            $chart->addRowArray($row);
+            $current->addDay();
+        }
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+    }
+
+    /**
+     * @param int $year
+     *
+     * @return $this|\Illuminate\Http\JsonResponse
+     */
+    public function allBudgetsAndSpending($year, GChart $chart, BudgetRepositoryInterface $repository)
+    {
+        $budgets = $repository->getBudgets();
+        $chart->addColumn('Month', 'date');
+        foreach ($budgets as $budget) {
+            $chart->addColumn($budget->name, 'number');
+        }
+
+        $start = Carbon::createFromDate(intval($year), 1, 1);
+        $end   = clone $start;
+        $end->endOfYear();
+
+        while ($start <= $end) {
+            $row = [clone $start];
+            foreach ($budgets as $budget) {
+                $spent = $repository->spentInMonth($budget, $start);
+                $row[] = $spent;
+            }
+            $chart->addRowArray($row);
+            $start->addMonth();
+        }
+
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+    }
+
+    /**
+     * @param GChart $chart
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function allBudgetsHomeChart(GChart $chart, BudgetRepositoryInterface $repository)
+    {
+        $chart->addColumn('Budget', 'string');
+        $chart->addColumn('Budgeted', 'number');
+        $chart->addColumn('Spent', 'number');
+
+        $budgets    = $repository->getBudgets();
+        $start      = Session::get('start', Carbon::now()->startOfMonth());
+        $end        = Session::get('end', Carbon::now()->endOfMonth());
+        $allEntries = new Collection;
+
+        foreach ($budgets as $budget) {
+            $repetitions = $repository->getBudgetLimitRepetitions($budget, $start, $end);
+            if ($repetitions->count() == 0) {
+                $expenses = $repository->sumBudgetExpensesInPeriod($budget, $start, $end);
+                $allEntries->push([$budget->name, 0, $expenses]);
+                continue;
+            }
+            /** @var LimitRepetition $repetition */
+            foreach ($repetitions as $repetition) {
+                $expenses = $repository->sumBudgetExpensesInPeriod($budget, $repetition->startdate, $repetition->enddate);
+                $allEntries->push([$budget->name . ' (' . $repetition->startdate->format('j M Y') . ')', floatval($repetition->amount), $expenses]);
+            }
+        }
+
+        $noBudgetExpenses = $repository->getWithoutBudgetSum($start, $end);
+        $allEntries->push(['(no budget)', 0, $noBudgetExpenses]);
+
+        foreach ($allEntries as $entry) {
+            if ($entry[2] > 0) {
+                $chart->addRow($entry[0], $entry[1], $entry[2]);
+            }
+        }
+
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+    }
+
+    /**
+     * @param GChart $chart
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function allCategoriesHomeChart(GChart $chart, CategoryRepositoryInterface $repository)
+    {
+        $chart->addColumn('Category', 'string');
+        $chart->addColumn('Spent', 'number');
+
+        $start = Session::get('start', Carbon::now()->startOfMonth());
+        $end   = Session::get('end', Carbon::now()->endOfMonth());
+        $set   = $repository->getCategoriesAndExpenses($start, $end);
+
+        foreach ($set as $entry) {
+            $isEncrypted = intval($entry->encrypted) == 1 ? true : false;
+            $name        = strlen($entry->name) == 0 ? '(no category)' : $entry->name;
+            $name        = $isEncrypted ? Crypt::decrypt($name) : $name;
+            $chart->addRow($name, floatval($entry->sum));
+        }
+
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+    }
+
+    /**
+     * @param Bill   $bill
+     * @param GChart $chart
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function billOverview(Bill $bill, GChart $chart, BillRepositoryInterface $repository)
+    {
+
+        $chart->addColumn('Date', 'date');
+        $chart->addColumn('Max amount', 'number');
+        $chart->addColumn('Min amount', 'number');
+        $chart->addColumn('Recorded bill entry', 'number');
+
+        // get first transaction or today for start:
+        $results = $repository->getJournals($bill);
+        /** @var TransactionJournal $result */
+        foreach ($results as $result) {
+            $chart->addRow(clone $result->date, floatval($bill->amount_max), floatval($bill->amount_min), floatval($result->amount));
+        }
+
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+    }
+
+    /**
+     * @param GChart $chart
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function billsOverview(GChart $chart, BillRepositoryInterface $repository, AccountRepositoryInterface $accounts)
+    {
+        $chart->addColumn('Name', 'string');
+        $chart->addColumn('Amount', 'number');
+
+        $start  = Session::get('start', Carbon::now()->startOfMonth());
+        $end    = Session::get('end', Carbon::now()->endOfMonth());
+        $bills  = $repository->getActiveBills();
+        $paid   = new Collection; // journals.
+        $unpaid = new Collection; // bills
+        // loop paid and create single entry:
+        $paidDescriptions   = [];
+        $paidAmount         = 0;
+        $unpaidDescriptions = [];
+        $unpaidAmount       = 0;
+
+        /** @var Bill $bill */
+        foreach ($bills as $bill) {
+            $ranges = $repository->getRanges($bill, $start, $end);
+
+            foreach ($ranges as $range) {
+                // paid a bill in this range?
+                $journals = $repository->getJournalsInRange($bill, $range['start'], $range['end']);
+                if ($journals->count() == 0) {
+                    $unpaid->push([$bill, $range['start']]);
+                } else {
+                    $paid = $paid->merge($journals);
+                }
+
+            }
+        }
+
+        $creditCards = $accounts->getCreditCards();
+        foreach ($creditCards as $creditCard) {
+            $balance = Steam::balance($creditCard, null, true);
+            $date    = new Carbon($creditCard->getMeta('ccMonthlyPaymentDate'));
+            if ($balance < 0) {
+                // unpaid! create a fake bill that matches the amount.
+                $description = $creditCard->name;
+                $amount      = $balance * -1;
+                $fakeBill    = $repository->createFakeBill($description, $date, $amount);
+                unset($description, $amount);
+                $unpaid->push([$fakeBill, $date]);
+            }
+            if ($balance == 0) {
+                // find transfer(s) TO the credit card which should account for
+                // anything paid. If not, the CC is not yet used.
+                $journals = $accounts->getTransfersInRange($creditCard, $start, $end);
+                $paid     = $paid->merge($journals);
+            }
+        }
+
+
+        /** @var TransactionJournal $entry */
+        foreach ($paid as $entry) {
+
+            $paidDescriptions[] = $entry->description;
+            $paidAmount += floatval($entry->amount);
+        }
+
+        // loop unpaid:
+        /** @var Bill $entry */
+        foreach ($unpaid as $entry) {
+            $description          = $entry[0]->name . ' (' . $entry[1]->format('jS M Y') . ')';
+            $amount               = ($entry[0]->amount_max + $entry[0]->amount_min) / 2;
+            $unpaidDescriptions[] = $description;
+            $unpaidAmount += $amount;
+            unset($amount, $description);
+        }
+
+        $chart->addRow('Unpaid: ' . join(', ', $unpaidDescriptions), $unpaidAmount);
+        $chart->addRow('Paid: ' . join(', ', $paidDescriptions), $paidAmount);
+        $chart->generate();
+
+        return Response::json($chart->getData());
+    }
+
+    /**
+     *
+     * @param Budget          $budget
+     * @param LimitRepetition $repetition
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function budgetLimitSpending(Budget $budget, LimitRepetition $repetition, GChart $chart, BudgetRepositoryInterface $repository)
+    {
+        $start = clone $repetition->startdate;
+        $end   = $repetition->enddate;
+
+        $chart->addColumn('Day', 'date');
+        $chart->addColumn('Left', 'number');
+
+
+        $amount = $repetition->amount;
+
+        while ($start <= $end) {
+            /*
+             * Sum of expenses on this day:
+             */
+            $sum = $repository->expensesOnDay($budget, $start);
+            $amount += $sum;
+            $chart->addRow(clone $start, $amount);
+            $start->addDay();
+        }
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+    }
+
+    /**
+     * @param Budget                    $budget
+     * @param int                       $year
+     * @param GChart                    $chart
+     * @param BudgetRepositoryInterface $repository
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function budgetsAndSpending(Budget $budget, $year = 0, GChart $chart, BudgetRepositoryInterface $repository)
+    {
+        $chart->addColumn('Month', 'date');
+        $chart->addColumn('Budgeted', 'number');
+        $chart->addColumn('Spent', 'number');
+
+        if ($year == 0) {
+            $start = $repository->getFirstBudgetLimitDate($budget);
+            $end   = $repository->getLastBudgetLimitDate($budget);
+        } else {
+            $start = Carbon::createFromDate(intval($year), 1, 1);
+            $end   = clone $start;
+            $end->endOfYear();
+        }
+
+        while ($start <= $end) {
+            $spent    = $repository->spentInMonth($budget, $start);
+            $budgeted = $repository->getLimitAmountOnDate($budget, $start);
+            $chart->addRow(clone $start, $budgeted, $spent);
+            $start->addMonth();
+        }
+
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+
+    }
+
+    /**
+     *
+     * @param Category $category
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function categoryOverviewChart(Category $category, GChart $chart, CategoryRepositoryInterface $repository)
+    {
+        // oldest transaction in category:
+        $start = $repository->getFirstActivityDate($category);
+
+        /** @var Preference $range */
+        $range = Preferences::get('viewRange', '1M');
+        // jump to start of week / month / year / etc (TODO).
+        $start = Navigation::startOfPeriod($start, $range->data);
+
+        $chart->addColumn('Period', 'date');
+        $chart->addColumn('Spent', 'number');
+
+        $end = new Carbon;
+        while ($start <= $end) {
+
+            $currentEnd = Navigation::endOfPeriod($start, $range->data);
+            $spent      = $repository->spentInPeriodSum($category, $start, $currentEnd);
+            $chart->addRow(clone $start, $spent);
+
+            $start = Navigation::addPeriod($start, $range->data, 0);
+        }
+
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+
+    }
+
+    /**
+     *
+     * @param Category $category
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function categoryPeriodChart(Category $category, GChart $chart, CategoryRepositoryInterface $repository)
+    {
+        $start = clone Session::get('start', Carbon::now()->startOfMonth());
+        $chart->addColumn('Period', 'date');
+        $chart->addColumn('Spent', 'number');
+
+        $end = Session::get('end', Carbon::now()->endOfMonth());
+        while ($start <= $end) {
+            $spent = $repository->spentOnDaySum($category, $start);
+            $chart->addRow(clone $start, $spent);
+            $start->addDay();
+        }
+
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+
+    }
+
+
+    /**
+     * @param PiggyBank $piggyBank
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function piggyBankHistory(PiggyBank $piggyBank, GChart $chart, PiggyBankRepositoryInterface $repository)
+    {
+        $chart->addColumn('Date', 'date');
+        $chart->addColumn('Balance', 'number');
+
+        /** @var Collection $set */
+        $set = $repository->getEventSummarySet($piggyBank);
+        $sum = 0;
+
+        foreach ($set as $entry) {
+            $sum += floatval($entry->sum);
+            $chart->addRow(new Carbon($entry->date), $sum);
+        }
+
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+    }
+
+    /**
+     *
+     * @param $year
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function yearInExp($year, GChart $chart, ReportQueryInterface $query)
+    {
+        $start = new Carbon('01-01-' . $year);
+        $chart->addColumn('Month', 'date');
+        $chart->addColumn('Income', 'number');
+        $chart->addColumn('Expenses', 'number');
+
+        $pref              = Preferences::get('showSharedReports', false);
+        $showSharedReports = $pref->data;
+
+        // get report query interface.
+
+        $end = clone $start;
+        $end->endOfYear();
+        while ($start < $end) {
+            $currentEnd = clone $start;
+            $currentEnd->endOfMonth();
+            // total income && total expenses:
+            $incomeSum  = floatval($query->incomeByPeriod($start, $currentEnd, $showSharedReports)->sum('queryAmount'));
+            $expenseSum = floatval($query->journalsByExpenseAccount($start, $currentEnd, $showSharedReports)->sum('queryAmount'));
+
+            $chart->addRow(clone $start, $incomeSum, $expenseSum);
+            $start->addMonth();
+        }
+
+
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+    }
+
+    /**
+     *
+     * @param $year
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function yearInExpSum($year, GChart $chart, ReportQueryInterface $query)
+    {
+        $start = new Carbon('01-01-' . $year);
+        $chart->addColumn('Summary', 'string');
+        $chart->addColumn('Income', 'number');
+        $chart->addColumn('Expenses', 'number');
+
+        $pref              = Preferences::get('showSharedReports', false);
+        $showSharedReports = $pref->data;
+
+        $income  = 0;
+        $expense = 0;
+        $count   = 0;
+
+        $end = clone $start;
+        $end->endOfYear();
+        while ($start < $end) {
+            $currentEnd = clone $start;
+            $currentEnd->endOfMonth();
+            // total income:
+            $incomeSum = floatval($query->incomeByPeriod($start, $currentEnd, $showSharedReports)->sum('queryAmount'));
+            // total expenses:
+            $expenseSum = floatval($query->journalsByExpenseAccount($start, $currentEnd, $showSharedReports)->sum('queryAmount'));
+
+            $income += $incomeSum;
+            $expense += $expenseSum;
+            $count++;
+            $start->addMonth();
+        }
+
+
+        $chart->addRow('Sum', $income, $expense);
+        $count = $count > 0 ? $count : 1;
+        $chart->addRow('Average', ($income / $count), ($expense / $count));
+
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+    }
+
+
+}

app/Http/Controllers/HelpController.php

@@ -0,0 +1,54 @@
+<?php namespace FireflyIII\Http\Controllers;
+
+use Cache;
+use ErrorException;
+use FireflyIII\Helpers\Help\HelpInterface;
+use League\CommonMark\CommonMarkConverter;
+use Log;
+use Response;
+use Route;
+
+/**
+ * Class HelpController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class HelpController extends Controller
+{
+
+    /**
+     * @param $route
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function show($route, HelpInterface $help)
+    {
+        $content = [
+            'text'  => '<p>There is no help for this route!</p>',
+            'title' => 'Help',
+        ];
+
+        if (!$help->hasRoute($route)) {
+            Log::error('No such route: ' . $route);
+
+            return Response::json($content);
+        }
+
+        if ($help->inCache($route)) {
+            $content = [
+                'text'  => $help->getFromCache('help.' . $route . '.text'),
+                'title' => $help->getFromCache('help.' . $route . '.title'),
+            ];
+
+            return Response::json($content);
+        }
+        $content = $help->getFromGithub($route);
+
+        $help->putInCache($route, $content);
+
+        return Response::json($content);
+
+    }
+
+
+}

app/Http/Controllers/HomeController.php

@@ -0,0 +1,93 @@
+<?php namespace FireflyIII\Http\Controllers;
+
+use Carbon\Carbon;
+use Config;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use Input;
+use Preferences;
+use Redirect;
+use Session;
+use Steam;
+
+/**
+ * Class HomeController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class HomeController extends Controller
+{
+
+    public function dateRange()
+    {
+        $start = new Carbon(Input::get('start'));
+        $end   = new Carbon(Input::get('end'));
+
+        $diff = $start->diffInDays($end);
+
+        if ($diff > 50) {
+            Session::flash('warning', $diff . ' days of data may take a while to load.');
+        }
+
+        Session::put('start', $start);
+        Session::put('end', $end);
+    }
+
+    /**
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function flush()
+    {
+        Session::clear();
+
+        return Redirect::route('index');
+    }
+
+    /**
+     * @param AccountRepositoryInterface $repository
+     *
+     * @return \Illuminate\View\View
+     */
+    public function index(AccountRepositoryInterface $repository)
+    {
+
+        $types             = Config::get('firefly.accountTypesByIdentifier.asset');
+        $count             = $repository->countAccounts($types);
+        $title             = 'Firefly';
+        $subTitle          = 'What\'s playing?';
+        $mainTitleIcon     = 'fa-fire';
+        $transactions      = [];
+        $frontPage         = Preferences::get('frontPageAccounts', []);
+        $start             = Session::get('start', Carbon::now()->startOfMonth());
+        $end               = Session::get('end', Carbon::now()->endOfMonth());
+        $accounts          = $repository->getFrontpageAccounts($frontPage);
+        $savings           = $repository->getSavingsAccounts();
+        $piggyBankAccounts = $repository->getPiggyBankAccounts();
+
+
+        $savingsTotal = 0;
+        foreach ($savings as $savingAccount) {
+            $savingsTotal += Steam::balance($savingAccount, $end);
+        }
+
+        // check if all books are correct.
+        $sum = $repository->sumOfEverything();
+        if ($sum != 0) {
+            Session::flash(
+                'error', 'Your transactions are unbalanced. This means a'
+                         . ' withdrawal, deposit or transfer was not stored properly. '
+                         . 'Please check your accounts and transactions for errors.'
+            );
+        }
+
+        foreach ($accounts as $account) {
+            $set = $repository->getFrontpageTransactions($account, $start, $end);
+            if (count($set) > 0) {
+                $transactions[] = [$set, $account];
+            }
+        }
+
+        return view('index', compact('count', 'title', 'savings', 'subTitle', 'mainTitleIcon', 'transactions', 'savingsTotal','piggyBankAccounts'));
+    }
+
+
+}

app/Http/Controllers/JsonController.php

@@ -0,0 +1,244 @@
+<?php namespace FireflyIII\Http\Controllers;
+
+use Amount;
+use Auth;
+use Carbon\Carbon;
+use FireflyIII\Helpers\Report\ReportQueryInterface;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use Illuminate\Support\Collection;
+use Preferences;
+use Response;
+use Session;
+use Steam;
+
+/**
+ * Class JsonController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class JsonController extends Controller
+{
+
+
+    /**
+     * @param BillRepositoryInterface $repository
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function boxBillsPaid(BillRepositoryInterface $repository, AccountRepositoryInterface $accountRepository)
+    {
+        $start  = Session::get('start', Carbon::now()->startOfMonth());
+        $end    = Session::get('end', Carbon::now()->endOfMonth());
+        $amount = 0;
+
+        // these two functions are the same as the chart TODO
+        $bills = $repository->getActiveBills();
+
+        /** @var Bill $bill */
+        foreach ($bills as $bill) {
+            $ranges = $repository->getRanges($bill, $start, $end);
+
+            foreach ($ranges as $range) {
+                // paid a bill in this range?
+                $amount += $repository->getJournalsInRange($bill, $range['start'], $range['end'])->sum('amount');
+            }
+        }
+        unset($ranges, $bill, $range, $bills);
+
+        /**
+         * Find credit card accounts and possibly unpaid credit card bills.
+         */
+        $creditCards = $accountRepository->getCreditCards();
+        // if the balance is not zero, the monthly payment is still underway.
+        /** @var Account $creditCard */
+        foreach ($creditCards as $creditCard) {
+            $balance = Steam::balance($creditCard, null, true);
+            if ($balance == 0) {
+                // find a transfer TO the credit card which should account for
+                // anything paid. If not, the CC is not yet used.
+                $amount += $accountRepository->getTransfersInRange($creditCard, $start, $end)->sum('amount');
+            }
+        }
+
+        return Response::json(['box' => 'bills-paid', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]);
+    }
+
+    /**
+     * @param BillRepositoryInterface    $repository
+     * @param AccountRepositoryInterface $accountRepository
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function boxBillsUnpaid(BillRepositoryInterface $repository, AccountRepositoryInterface $accountRepository)
+    {
+        $amount = 0;
+        $start  = Session::get('start', Carbon::now()->startOfMonth());
+        $end    = Session::get('end', Carbon::now()->endOfMonth());
+        $bills  = $repository->getActiveBills();
+        $unpaid = new Collection; // bills
+
+        /** @var Bill $bill */
+        foreach ($bills as $bill) {
+            $ranges = $repository->getRanges($bill, $start, $end);
+
+            foreach ($ranges as $range) {
+                $journals = $repository->getJournalsInRange($bill, $range['start'], $range['end']);
+                if ($journals->count() == 0) {
+                    $unpaid->push([$bill, $range['start']]);
+                }
+            }
+        }
+        unset($bill, $bills, $range, $ranges);
+
+        $creditCards = $accountRepository->getCreditCards();
+        foreach ($creditCards as $creditCard) {
+            $balance = Steam::balance($creditCard, null, true);
+            $date    = new Carbon($creditCard->getMeta('ccMonthlyPaymentDate'));
+            if ($balance < 0) {
+                // unpaid! create a fake bill that matches the amount.
+                $description = $creditCard->name;
+                $fakeAmount  = $balance * -1;
+                $fakeBill    = $repository->createFakeBill($description, $date, $fakeAmount);
+                $unpaid->push([$fakeBill, $date]);
+            }
+        }
+        /** @var Bill $entry */
+        foreach ($unpaid as $entry) {
+            $current = ($entry[0]->amount_max + $entry[0]->amount_min) / 2;
+            $amount += $current;
+        }
+
+        return Response::json(['box' => 'bills-unpaid', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]);
+    }
+
+    /**
+     * @param ReportQueryInterface $reportQuery
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function boxIn(ReportQueryInterface $reportQuery)
+    {
+        $start  = Session::get('start', Carbon::now()->startOfMonth());
+        $end    = Session::get('end', Carbon::now()->endOfMonth());
+        $amount = $reportQuery->incomeByPeriod($start, $end, true)->sum('queryAmount');
+
+        return Response::json(['box' => 'in', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]);
+    }
+
+    /**
+     * @param ReportQueryInterface $reportQuery
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function boxOut(ReportQueryInterface $reportQuery)
+    {
+        $start  = Session::get('start', Carbon::now()->startOfMonth());
+        $end    = Session::get('end', Carbon::now()->endOfMonth());
+        $amount = $reportQuery->journalsByExpenseAccount($start, $end, true)->sum('queryAmount');
+
+        return Response::json(['box' => 'out', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]);
+    }
+
+    /**
+     * Returns a list of categories.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function categories(CategoryRepositoryInterface $repository)
+    {
+        $list   = $repository->getCategories();
+        $return = [];
+        foreach ($list as $entry) {
+            $return[] = $entry->name;
+        }
+        sort($return);
+
+        return Response::json($return);
+    }
+
+    /**
+     * Returns a JSON list of all beneficiaries.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function expenseAccounts(AccountRepositoryInterface $accountRepository)
+    {
+        $list   = $accountRepository->getAccounts(['Expense account', 'Beneficiary account']);
+        $return = [];
+        foreach ($list as $entry) {
+            $return[] = $entry->name;
+        }
+
+        return Response::json($return);
+
+    }
+
+    /**
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function revenueAccounts(AccountRepositoryInterface $accountRepository)
+    {
+        $list   = $accountRepository->getAccounts(['Revenue account']);
+        $return = [];
+        foreach ($list as $entry) {
+            $return[] = $entry->name;
+        }
+
+        return Response::json($return);
+
+    }
+
+    /**
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function setSharedReports()
+    {
+        $pref = Preferences::get('showSharedReports', false);
+        $new  = !$pref->data;
+        Preferences::set('showSharedReports', $new);
+
+
+        return Response::json(['value' => $new]);
+    }
+
+    /**
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function showSharedReports()
+    {
+        $pref = Preferences::get('showSharedReports', false);
+
+        return Response::json(['value' => $pref->data]);
+    }
+
+    /**
+     * @param $what
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function transactionJournals($what, JournalRepositoryInterface $repository)
+    {
+        $descriptions = [];
+        $dbType       = $repository->getTransactionType($what);
+
+        $journals = $repository->getJournalsOfType($dbType);
+        foreach ($journals as $j) {
+            $descriptions[] = $j->description;
+        }
+
+        $descriptions = array_unique($descriptions);
+        sort($descriptions);
+
+        return Response::json($descriptions);
+
+
+    }
+
+}

app/Http/Controllers/PiggyBankController.php

@@ -0,0 +1,370 @@
+<?php namespace FireflyIII\Http\Controllers;
+
+use Amount;
+use Carbon\Carbon;
+use Config;
+use ExpandedForm;
+use FireflyIII\Http\Requests;
+use FireflyIII\Http\Requests\PiggyBankFormRequest;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\PiggyBankEvent;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
+use Illuminate\Support\Collection;
+use Input;
+use Redirect;
+use Session;
+use Steam;
+use URL;
+use View;
+
+/**
+ * Class PiggyBankController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class PiggyBankController extends Controller
+{
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        View::share('title', 'Piggy banks');
+        View::share('mainTitleIcon', 'fa-sort-amount-asc');
+    }
+
+    /**
+     * Add money to piggy bank
+     *
+     * @param PiggyBank $piggyBank
+     *
+     * @return $this
+     */
+    public function add(PiggyBank $piggyBank, AccountRepositoryInterface $repository)
+    {
+        $leftOnAccount = $repository->leftOnAccount($piggyBank->account);
+        $savedSoFar    = $piggyBank->currentRelevantRep()->currentamount;
+        $leftToSave    = $piggyBank->targetamount - $savedSoFar;
+        $maxAmount     = min($leftOnAccount, $leftToSave);
+
+        return view('piggy-banks.add', compact('piggyBank', 'maxAmount'));
+    }
+
+    /**
+     * @return mixed
+     */
+    public function create(AccountRepositoryInterface $repository)
+    {
+
+        $periods  = Config::get('firefly.piggy_bank_periods');
+        $accounts = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
+        //Auth::user()->accounts()->orderBy('accounts.name', 'ASC')->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*'])
+        //        );
+        $subTitle     = 'Create new piggy bank';
+        $subTitleIcon = 'fa-plus';
+
+        // put previous url in session if not redirect from store (not "create another").
+        if (Session::get('piggy-banks.create.fromStore') !== true) {
+            Session::put('piggy-banks.create.url', URL::previous());
+        }
+        Session::forget('piggy-banks.create.fromStore');
+
+        return view('piggy-banks.create', compact('accounts', 'periods', 'subTitle', 'subTitleIcon'));
+    }
+
+    /**
+     * @param PiggyBank $piggyBank
+     *
+     * @return $this
+     */
+    public function delete(PiggyBank $piggyBank)
+    {
+        $subTitle = 'Delete "' . e($piggyBank->name) . '"';
+
+        // put previous url in session
+        Session::put('piggy-banks.delete.url', URL::previous());
+
+        return view('piggy-banks.delete', compact('piggyBank', 'subTitle'));
+    }
+
+    /**
+     * @param PiggyBank $piggyBank
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy(PiggyBank $piggyBank, PiggyBankRepositoryInterface $repository)
+    {
+
+
+        Session::flash('success', 'Piggy bank "' . e($piggyBank->name) . '" deleted.');
+        $repository->destroy($piggyBank);
+
+        return Redirect::to(Session::get('piggy-banks.delete.url'));
+    }
+
+    /**
+     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
+     *
+     * @param PiggyBank $piggyBank
+     *
+     * @return $this
+     */
+    public function edit(PiggyBank $piggyBank, AccountRepositoryInterface $repository)
+    {
+
+        $periods      = Config::get('firefly.piggy_bank_periods');
+        $accounts     = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
+        $subTitle     = 'Edit piggy bank "' . e($piggyBank->name) . '"';
+        $subTitleIcon = 'fa-pencil';
+
+        /*
+         * Flash some data to fill the form.
+         */
+        if (is_null($piggyBank->targetdate) || $piggyBank->targetdate == '') {
+            $targetDate = null;
+        } else {
+            $targetDate = new Carbon($piggyBank->targetdate);
+            $targetDate = $targetDate->format('Y-m-d');
+        }
+        $preFilled = ['name'         => $piggyBank->name,
+                      'account_id'   => $piggyBank->account_id,
+                      'targetamount' => $piggyBank->targetamount,
+                      'targetdate'   => $targetDate,
+                      'reminder'     => $piggyBank->reminder,
+                      'remind_me'    => intval($piggyBank->remind_me) == 1 && !is_null($piggyBank->reminder) ? true : false
+        ];
+        Session::flash('preFilled', $preFilled);
+
+        // put previous url in session if not redirect from store (not "return_to_edit").
+        if (Session::get('piggy-banks.edit.fromUpdate') !== true) {
+            Session::put('piggy-banks.edit.url', URL::previous());
+        }
+        Session::forget('piggy-banks.edit.fromUpdate');
+
+        return view('piggy-banks.edit', compact('subTitle', 'subTitleIcon', 'piggyBank', 'accounts', 'periods', 'preFilled'));
+    }
+
+    /**
+     * @return $this
+     */
+    public function index(AccountRepositoryInterface $repository, PiggyBankRepositoryInterface $piggyRepository)
+    {
+        /** @var Collection $piggyBanks */
+        $piggyBanks = $piggyRepository->getPiggyBanks();
+
+        $accounts = [];
+        /** @var PiggyBank $piggyBank */
+        foreach ($piggyBanks as $piggyBank) {
+            $piggyBank->savedSoFar = floatval($piggyBank->currentRelevantRep()->currentamount);
+            $piggyBank->percentage = $piggyBank->savedSoFar != 0 ? intval($piggyBank->savedSoFar / $piggyBank->targetamount * 100) : 0;
+            $piggyBank->leftToSave = $piggyBank->targetamount - $piggyBank->savedSoFar;
+
+            /*
+             * Fill account information:
+             */
+            $account = $piggyBank->account;
+            if (!isset($accounts[$account->id])) {
+                $accounts[$account->id] = [
+                    'name'              => $account->name,
+                    'balance'           => Steam::balance($account, null, true),
+                    'leftForPiggyBanks' => $repository->leftOnAccount($account),
+                    'sumOfSaved'        => $piggyBank->savedSoFar,
+                    'sumOfTargets'      => floatval($piggyBank->targetamount),
+                    'leftToSave'        => $piggyBank->leftToSave
+                ];
+            } else {
+                $accounts[$account->id]['sumOfSaved'] += $piggyBank->savedSoFar;
+                $accounts[$account->id]['sumOfTargets'] += floatval($piggyBank->targetamount);
+                $accounts[$account->id]['leftToSave'] += $piggyBank->leftToSave;
+            }
+        }
+
+        return view('piggy-banks.index', compact('piggyBanks', 'accounts'));
+    }
+
+    /**
+     * Allow user to order piggy banks.
+     */
+    public function order(PiggyBankRepositoryInterface $repository)
+    {
+        $data = Input::get('order');
+
+        // set all users piggy banks to zero:
+        $repository->reset();
+
+        if (is_array($data)) {
+            foreach ($data as $order => $id) {
+                $repository->setOrder(intval($id), (intval($order) + 1));
+            }
+        }
+    }
+
+    /**
+     * POST add money to piggy bank
+     *
+     * @param PiggyBank $piggyBank
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postAdd(PiggyBank $piggyBank, PiggyBankRepositoryInterface $repository, AccountRepositoryInterface $accounts)
+    {
+        $amount        = round(floatval(Input::get('amount')), 2);
+        $leftOnAccount = $accounts->leftOnAccount($piggyBank->account);
+        $savedSoFar    = $piggyBank->currentRelevantRep()->currentamount;
+        $leftToSave    = $piggyBank->targetamount - $savedSoFar;
+        $maxAmount     = round(min($leftOnAccount, $leftToSave), 2);
+
+        if ($amount <= $maxAmount) {
+            $repetition = $piggyBank->currentRelevantRep();
+            $repetition->currentamount += $amount;
+            $repetition->save();
+
+            // create event
+            $repository->createEvent($piggyBank, $amount);
+
+            /*
+             * Create event!
+             */
+            //Event::fire('piggy_bank.addMoney', [$piggyBank, $amount]); // new and used.
+
+            Session::flash('success', 'Added ' . Amount::format($amount, false) . ' to "' . e($piggyBank->name) . '".');
+        } else {
+            Session::flash('error', 'Could not add ' . Amount::format($amount, false) . ' to "' . e($piggyBank->name) . '".');
+        }
+
+        return Redirect::route('piggy-banks.index');
+    }
+
+    /**
+     * @param PiggyBank $piggyBank
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postRemove(PiggyBank $piggyBank, PiggyBankRepositoryInterface $repository)
+    {
+        $amount = floatval(Input::get('amount'));
+
+        $savedSoFar = $piggyBank->currentRelevantRep()->currentamount;
+
+        if ($amount <= $savedSoFar) {
+            $repetition = $piggyBank->currentRelevantRep();
+            $repetition->currentamount -= $amount;
+            $repetition->save();
+
+            // create event
+            $repository->createEvent($piggyBank, $amount * -1);
+
+            Session::flash('success', 'Removed ' . Amount::format($amount, false) . ' from "' . e($piggyBank->name) . '".');
+        } else {
+            Session::flash('error', 'Could not remove ' . Amount::format($amount, false) . ' from "' . e($piggyBank->name) . '".');
+        }
+
+        return Redirect::route('piggy-banks.index');
+    }
+
+    /**
+     * @param PiggyBank $piggyBank
+     *
+     * @SuppressWarnings("Unused")
+     *
+     * @return \Illuminate\View\View
+     */
+    public function remove(PiggyBank $piggyBank)
+    {
+        return view('piggy-banks.remove', compact('piggyBank'));
+    }
+
+    /**
+     * @param PiggyBank $piggyBank
+     *
+     * @return $this
+     */
+    public function show(PiggyBank $piggyBank, PiggyBankRepositoryInterface $repository)
+    {
+        $events = $repository->getEvents($piggyBank);
+
+        /*
+         * Number of reminders:
+         */
+
+        $subTitle = e($piggyBank->name);
+
+        return view('piggy-banks.show', compact('piggyBank', 'events', 'subTitle'));
+
+    }
+
+    /**
+     * @param PiggyBankFormRequest         $request
+     * @param PiggyBankRepositoryInterface $repository
+     *
+     * @return $this|\Illuminate\Http\RedirectResponse
+     */
+    public function store(PiggyBankFormRequest $request, PiggyBankRepositoryInterface $repository)
+    {
+
+        $piggyBankData = [
+            'name'         => $request->get('name'),
+            'startdate'    => new Carbon,
+            'account_id'   => intval($request->get('account_id')),
+            'targetamount' => floatval($request->get('targetamount')),
+            'targetdate'   => strlen($request->get('targetdate')) > 0 ? new Carbon($request->get('targetdate')) : null,
+            'reminder'     => $request->get('reminder'),
+            'remind_me'    => $request->get('remind_me'),
+        ];
+
+        $piggyBank = $repository->store($piggyBankData);
+
+        Session::flash('success', 'Stored piggy bank "' . e($piggyBank->name) . '".');
+
+        if (intval(Input::get('create_another')) === 1) {
+            Session::put('piggy-banks.create.fromStore', true);
+
+            return Redirect::route('piggy-banks.create')->withInput();
+        }
+
+
+        // redirect to previous URL.
+        return Redirect::to(Session::get('piggy-banks.create.url'));
+    }
+
+    /**
+     * @param PiggyBank $piggyBank
+     *
+     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
+     *
+     * @return $this
+     */
+    public function update(PiggyBank $piggyBank, PiggyBankRepositoryInterface $repository, PiggyBankFormRequest $request)
+    {
+        $piggyBankData = [
+            'name'         => $request->get('name'),
+            'startdate'    => is_null($piggyBank->startdate) ? $piggyBank->created_at : $piggyBank->startdate,
+            'account_id'   => intval($request->get('account_id')),
+            'targetamount' => floatval($request->get('targetamount')),
+            'targetdate'   => strlen($request->get('targetdate')) > 0 ? new Carbon($request->get('targetdate')) : null,
+            'reminder'     => $request->get('reminder'),
+            'remind_me'    => $request->get('remind_me')
+        ];
+
+        $piggyBank = $repository->update($piggyBank, $piggyBankData);
+
+        Session::flash('success', 'Updated piggy bank "' . e($piggyBank->name) . '".');
+
+        if (intval(Input::get('return_to_edit')) === 1) {
+            Session::put('piggy-banks.edit.fromUpdate', true);
+
+            return Redirect::route('piggy-banks.edit', $piggyBank->id);
+        }
+
+
+        // redirect to previous URL.
+        return Redirect::to(Session::get('piggy-banks.edit.url'));
+
+
+    }
+
+
+}

app/Http/Controllers/PreferencesController.php

@@ -0,0 +1,74 @@
+<?php namespace FireflyIII\Http\Controllers;
+
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use Input;
+use Preferences;
+use Redirect;
+use Session;
+use View;
+
+/**
+ * Class PreferencesController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class PreferencesController extends Controller
+{
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+
+        View::share('title', 'Preferences');
+        View::share('mainTitleIcon', 'fa-gear');
+    }
+
+    /**
+     * @return $this|\Illuminate\View\View
+     */
+    public function index(AccountRepositoryInterface $repository)
+    {
+        $accounts       = $repository->getAccounts(['Default account', 'Asset account']);
+        $viewRange      = Preferences::get('viewRange', '1M');
+        $viewRangeValue = $viewRange->data;
+        $frontPage      = Preferences::get('frontPageAccounts', []);
+        $budgetMax      = Preferences::get('budgetMaximum', 1000);
+        $budgetMaximum  = $budgetMax->data;
+
+        return view('preferences.index', compact('budgetMaximum'))->with('accounts', $accounts)->with('frontPageAccounts', $frontPage)->with(
+            'viewRange', $viewRangeValue
+        );
+    }
+
+    /**
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postIndex()
+    {
+        // front page accounts
+        $frontPageAccounts = [];
+        foreach (Input::get('frontPageAccounts') as $id) {
+            $frontPageAccounts[] = intval($id);
+        }
+        Preferences::set('frontPageAccounts', $frontPageAccounts);
+
+        // view range:
+        Preferences::set('viewRange', Input::get('viewRange'));
+        // forget session values:
+        Session::forget('start');
+        Session::forget('end');
+        Session::forget('range');
+
+        // budget maximum:
+        $budgetMaximum = intval(Input::get('budgetMaximum'));
+        Preferences::set('budgetMaximum', $budgetMaximum);
+
+
+        Session::flash('success', 'Preferences saved!');
+
+        return Redirect::route('preferences');
+    }
+
+}

app/Http/Controllers/ProfileController.php

@@ -0,0 +1,121 @@
+<?php namespace FireflyIII\Http\Controllers;
+
+use Auth;
+use FireflyIII\Http\Requests;
+use FireflyIII\Http\Requests\DeleteAccountFormRequest;
+use FireflyIII\Http\Requests\ProfileFormRequest;
+use Hash;
+use Redirect;
+use Session;
+
+/**
+ * Class ProfileController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class ProfileController extends Controller
+{
+
+    /**
+     * @return \Illuminate\View\View
+     */
+    public function changePassword()
+    {
+        return view('profile.change-password')->with('title', Auth::user()->email)->with('subTitle', 'Change your password')->with(
+            'mainTitleIcon', 'fa-user'
+        );
+    }
+
+    /**
+     * @return \Illuminate\View\View
+     *
+     */
+    public function index()
+    {
+        return view('profile.index')->with('title', 'Profile')->with('subTitle', Auth::user()->email)->with('mainTitleIcon', 'fa-user');
+    }
+
+
+    /**
+     * @return \Illuminate\View\View
+     */
+    public function deleteAccount()
+    {
+        return view('profile.delete-account')->with('title', Auth::user()->email)->with('subTitle', 'Delete account')->with(
+            'mainTitleIcon', 'fa-user'
+        );
+    }
+
+    /**
+     *
+     */
+    public function postDeleteAccount(DeleteAccountFormRequest $request) {
+        // old, new1, new2
+        if (!Hash::check($request->get('password'), Auth::user()->password)) {
+            Session::flash('error', 'Invalid password!');
+
+            return Redirect::route('delete-account');
+        }
+
+        // DELETE!
+        Auth::user()->delete();
+        Session::flush();
+        return Redirect::route('index');
+    }
+
+
+
+    /**
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
+     */
+    public function postChangePassword(ProfileFormRequest $request)
+    {
+        // old, new1, new2
+        if (!Hash::check($request->get('current_password'), Auth::user()->password)) {
+            Session::flash('error', 'Invalid current password!');
+
+            return Redirect::route('change-password');
+        }
+        $result = $this->validatePassword($request->get('current_password'), $request->get('new_password'), $request->get('new_password_confirmation'));
+        if (!($result === true)) {
+            Session::flash('error', $result);
+
+            return Redirect::route('change-password');
+        }
+
+        // update the user with the new password.
+        Auth::user()->password = $request->get('new_password');
+        Auth::user()->save();
+
+        Session::flash('success', 'Password changed!');
+
+        return Redirect::route('profile');
+    }
+
+    /**
+     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
+     *
+     * @param string $old
+     * @param string $new1
+     * @param string $new2
+     *
+     * @return string|bool
+     */
+    protected function validatePassword($old, $new1, $new2)
+    {
+        if (strlen($new1) == 0 || strlen($new2) == 0) {
+            return 'Do fill in a password!';
+
+        }
+        if ($new1 == $old) {
+            return 'The idea is to change your password.';
+        }
+
+        if ($new1 !== $new2) {
+            return 'New passwords do not match!';
+        }
+
+        return true;
+
+    }
+}

app/Http/Controllers/RelatedController.php

@@ -1,22 +1,26 @@
-<?php
-use FireflyIII\Helper\Related\RelatedInterface;
+<?php namespace FireflyIII\Http\Controllers;
+
+use Auth;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionGroup;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use Illuminate\Support\Collection;
+use Input;
+use Redirect;
+use Response;
+use URL;
 
 /**
  * Class RelatedController
+ *
+ * @package FireflyIII\Http\Controllers
  */
-class RelatedController extends BaseController
+class RelatedController extends Controller
 {
 
-    protected $_repository;
-
-    public function __construct(RelatedInterface $repository)
-    {
-        $this->_repository = $repository;
-
-    }
-
     /**
+     *
      * @param TransactionJournal $journal
      *
      * @return \Illuminate\Http\JsonResponse
@@ -33,20 +37,42 @@ class RelatedController extends BaseController
                 }
             }
         }
-        $unique = array_unique($ids);
+        $unique   = array_unique($ids);
+        $journals = new Collection;
         if (count($unique) > 0) {
-
-            $set = $this->_repository->getJournalsByIds($unique);
-            $set->each(
-                function (TransactionJournal $journal) {
-                    $journal->amount = Amount::format($journal->getAmount());
-                }
-            );
-
-            return Response::json($set->toArray());
-        } else {
-            return Response::json((new Collection)->toArray());
+            $journals = Auth::user()->transactionjournals()->whereIn('id', $unique)->get();
         }
+        $parent = $journal;
+
+        return view('related.alreadyRelated', compact('parent', 'journals'));
+    }
+
+    /**
+     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
+     *
+     * @param TransactionJournal $parentJournal
+     * @param TransactionJournal $childJournal
+     *
+     * @return \Illuminate\Http\JsonResponse
+     * @throws Exception
+     */
+    public function getRemoveRelation(TransactionJournal $parentJournal, TransactionJournal $childJournal)
+    {
+        $groups = $parentJournal->transactiongroups()->get();
+        /** @var TransactionGroup $group */
+        foreach ($groups as $group) {
+            foreach ($group->transactionjournals()->get() as $loopJournal) {
+                if ($loopJournal->id == $childJournal->id) {
+                    // remove from group:
+                    $group->transactionjournals()->detach($childJournal);
+                }
+            }
+            if ($group->transactionjournals()->count() == 1) {
+                $group->delete();
+            }
+        }
+
+        return Redirect::to(URL::previous());
     }
 
     /**
@@ -59,7 +85,7 @@ class RelatedController extends BaseController
     {
         $group           = new TransactionGroup;
         $group->relation = 'balance';
-        $group->user_id  = $this->_repository->getUser()->id;
+        $group->user_id  = Auth::user()->id;
         $group->save();
         $group->transactionjournals()->save($parentJournal);
         $group->transactionjournals()->save($childJournal);
@@ -87,10 +113,12 @@ class RelatedController extends BaseController
             }
         }
 
-        return View::make('related.relate', compact('journal', 'members'));
+        return view('related.relate', compact('journal', 'members'));
     }
 
     /**
+     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
+     *
      * @param TransactionJournal $parentJournal
      * @param TransactionJournal $childJournal
      *
@@ -121,19 +149,16 @@ class RelatedController extends BaseController
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function search(TransactionJournal $journal)
+    public function search(TransactionJournal $journal, JournalRepositoryInterface $repository)
     {
 
         $search = e(trim(Input::get('searchValue')));
+        $parent = $journal;
 
-        $result = $this->_repository->search($search, $journal);
-        $result->each(
-            function (TransactionJournal $j) {
-                $j->amount = Amount::format($j->getAmount());
-            }
-        );
+        $journals = $repository->searchRelated($search, $journal);
+
+        return view('related.searchResult', compact('journals', 'search', 'parent'));
 
-        return Response::json($result->toArray());
     }
 
 }

app/Http/Controllers/ReminderController.php

@@ -0,0 +1,127 @@
+<?php namespace FireflyIII\Http\Controllers;
+
+use Auth;
+use Carbon\Carbon;
+use FireflyIII\Helpers\Reminders\ReminderHelperInterface;
+use FireflyIII\Models\Reminder;
+use Redirect;
+use Session;
+use URL;
+
+/**
+ * Class ReminderController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class ReminderController extends Controller
+{
+
+
+    /**
+     * @param Reminder $reminder
+     */
+    public function act(Reminder $reminder)
+    {
+        $data = [
+            'description'   => 'Money for piggy bank "' . $reminder->remindersable->name . '"',
+            'amount'        => round($reminder->metadata->perReminder, 2),
+            'account_to_id' => $reminder->remindersable->account_id,
+            'piggy_bank_id' => $reminder->remindersable_id,
+            'reminder_id'   => $reminder->id,
+        ];
+        Session::flash('_old_input', $data);
+
+        return Redirect::route('transactions.create', 'transfer');
+    }
+
+    /**
+     * @param Reminder $reminder
+     */
+    public function dismiss(Reminder $reminder)
+    {
+        $reminder->notnow = true;
+        $reminder->save();
+
+        return Redirect::to(URL::previous());
+
+
+    }
+
+    /**
+     *
+     */
+    public function index(ReminderHelperInterface $helper)
+    {
+
+        $reminders = Auth::user()->reminders()->get();
+
+        $reminders->each(
+            function (Reminder $reminder) use ($helper) {
+                $reminder->description = $helper->getReminderText($reminder);
+            }
+        );
+
+        $today = new Carbon;
+        // active reminders:
+        $active = $reminders->filter(
+            function (Reminder $reminder) use ($today) {
+                if ($reminder->notnow === false && $reminder->active === true && $reminder->startdate <= $today && $reminder->enddate >= $today) {
+                    return $reminder;
+                }
+            }
+        );
+
+        // expired reminders:
+        $expired = $reminders->filter(
+            function (Reminder $reminder) use ($today) {
+                if ($reminder->notnow === false && $reminder->active === true && $reminder->startdate > $today || $reminder->enddate < $today) {
+                    return $reminder;
+                }
+            }
+        );
+
+        // inactive reminders
+        $inactive = $reminders->filter(
+            function (Reminder $reminder) {
+                if ($reminder->active === false) {
+                    return $reminder;
+                }
+            }
+        );
+
+        // dismissed reminders
+        $dismissed = $reminders->filter(
+            function (Reminder $reminder) {
+                if ($reminder->notnow === true) {
+                    return $reminder;
+                }
+            }
+        );
+
+        $title         = 'Reminders';
+        $mainTitleIcon = 'fa-clock-o';
+
+        return view('reminders.index', compact('dismissed', 'expired', 'inactive', 'active', 'title', 'mainTitleIcon'));
+    }
+
+    /**
+     * @param Reminder $reminder
+     */
+    public function show(Reminder $reminder)
+    {
+        $title         = 'Reminder';
+        $mainTitleIcon = 'fa-clock-o';
+        if ($reminder->notnow === true) {
+            $subTitle = 'Dismissed reminder';
+        } else {
+            $subTitle = 'Reminder';
+        }
+        $subTitle .= ' for piggy bank "' . $reminder->remindersable->name . '"';
+
+
+        return view('reminders.show', compact('reminder', 'title', 'subTitle', 'mainTitleIcon'));
+
+
+    }
+
+}

app/Http/Controllers/ReportController.php

@@ -0,0 +1,354 @@
+<?php namespace FireflyIII\Http\Controllers;
+
+use Carbon\Carbon;
+use Exception;
+use FireflyIII\Helpers\Report\ReportHelperInterface;
+use FireflyIII\Helpers\Report\ReportQueryInterface;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\Preference;
+use FireflyIII\Models\TransactionJournal;
+use Preferences;
+use Session;
+use Steam;
+use View;
+
+/**
+ * Class ReportController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class ReportController extends Controller
+{
+
+    /** @var ReportHelperInterface */
+    protected $helper;
+    /** @var ReportQueryInterface */
+    protected $query;
+
+    /**
+     * @param ReportHelperInterface $helper
+     * @param ReportQueryInterface  $query
+     */
+    public function __construct(ReportHelperInterface $helper, ReportQueryInterface $query)
+    {
+        $this->query  = $query;
+        $this->helper = $helper;
+
+        View::share('title', 'Reports');
+        View::share('mainTitleIcon', 'fa-line-chart');
+
+    }
+
+    /**
+     * @param string $year
+     * @param string $month
+     *
+     * @return \Illuminate\View\View
+     */
+    public function budget($year = '2014', $month = '1')
+    {
+        try {
+            new Carbon($year . '-' . $month . '-01');
+        } catch (Exception $e) {
+            return view('error')->with('message', 'Invalid date');
+        }
+        $date  = new Carbon($year . '-' . $month . '-01');
+        $start = clone $date;
+        $start->startOfMonth();
+        $end = clone $date;
+        $end->endOfMonth();
+        $start->subDay();
+
+        /** @var Preference $pref */
+        $pref              = Preferences::get('showSharedReports', false);
+        $showSharedReports = $pref->data;
+
+
+        $dayEarly     = clone $date;
+        $subTitle     = 'Budget report for ' . $date->format('F Y');
+        $subTitleIcon = 'fa-calendar';
+        $dayEarly     = $dayEarly->subDay();
+        $accounts     = $this->query->getAllAccounts($start, $end, $showSharedReports);
+        $start->addDay();
+
+        $accounts->each(
+            function (Account $account) use ($start, $end) {
+                $budgets        = $this->query->getBudgetSummary($account, $start, $end);
+                $balancedAmount = $this->query->balancedTransactionsSum($account, $start, $end);
+                $array          = [];
+                $hide           = true;
+                foreach ($budgets as $budget) {
+                    $id         = intval($budget->id);
+                    $data       = $budget->toArray();
+                    $array[$id] = $data;
+                    if (floatval($data['queryAmount']) != 0) {
+                        $hide = false;
+                    }
+                }
+                $account->hide              = $hide;
+                $account->budgetInformation = $array;
+                $account->balancedAmount    = $balancedAmount;
+
+            }
+        );
+
+        /**
+         * Start getBudgetsForMonth DONE
+         */
+        $budgets = $this->helper->getBudgetsForMonth($date, $showSharedReports);
+
+        /**
+         * End getBudgetsForMonth DONE
+         */
+
+        return view('reports.budget', compact('subTitle', 'year', 'month', 'subTitleIcon', 'date', 'accounts', 'budgets', 'dayEarly'));
+
+    }
+
+    /**
+     * @param ReportHelperInterface $helper
+     *
+     * @return View
+     */
+    public function index()
+    {
+        $start         = Session::get('first');
+        $months        = $this->helper->listOfMonths($start);
+        $years         = $this->helper->listOfYears($start);
+        $title         = 'Reports';
+        $mainTitleIcon = 'fa-line-chart';
+
+        return view('reports.index', compact('years', 'months', 'title', 'mainTitleIcon'));
+    }
+
+    /**
+     * @param Account $account
+     * @param string  $year
+     * @param string  $month
+     *
+     * @return \Illuminate\View\View
+     */
+    public function modalBalancedTransfers(Account $account, $year = '2014', $month = '1')
+    {
+
+        try {
+            new Carbon($year . '-' . $month . '-01');
+        } catch (Exception $e) {
+            return view('error')->with('message', 'Invalid date');
+        }
+        $start = new Carbon($year . '-' . $month . '-01');
+        $end   = clone $start;
+        $end->endOfMonth();
+
+        $journals = $this->query->balancedTransactionsList($account, $start, $end);
+
+        return view('reports.modal-journal-list', compact('journals'));
+
+
+    }
+
+    /**
+     * @param Account              $account
+     * @param string               $year
+     * @param string               $month
+     * @param ReportQueryInterface $query
+     *
+     * @return View
+     */
+    public function modalLeftUnbalanced(Account $account, $year = '2014', $month = '1')
+    {
+        try {
+            new Carbon($year . '-' . $month . '-01');
+        } catch (Exception $e) {
+            return view('error')->with('message', 'Invalid date');
+        }
+        $start = new Carbon($year . '-' . $month . '-01');
+        $end   = clone $start;
+        $end->endOfMonth();
+        $set = $this->query->getTransactionsWithoutBudget($account, $start, $end);
+
+        $journals = $set->filter(
+            function (TransactionJournal $journal) {
+                $count = $journal->transactiongroups()->where('relation', 'balance')->count();
+                if ($count == 0) {
+                    return $journal;
+                }
+            }
+        );
+
+        return view('reports.modal-journal-list', compact('journals'));
+    }
+
+    /**
+     * @param Account $account
+     * @param string  $year
+     * @param string  $month
+     *
+     * @return \Illuminate\View\View
+     */
+    public function modalNoBudget(Account $account, $year = '2014', $month = '1')
+    {
+        try {
+            new Carbon($year . '-' . $month . '-01');
+        } catch (Exception $e) {
+            return view('error')->with('message', 'Invalid date');
+        }
+        $start = new Carbon($year . '-' . $month . '-01');
+        $end   = clone $start;
+        $end->endOfMonth();
+        $journals = $this->query->getTransactionsWithoutBudget($account, $start, $end);
+
+        return view('reports.modal-journal-list', compact('journals'));
+
+    }
+
+    /**
+     * @param string $year
+     * @param string $month
+     *
+     * @return \Illuminate\View\View
+     */
+    public function month($year = '2014', $month = '1')
+    {
+        try {
+            new Carbon($year . '-' . $month . '-01');
+        } catch (Exception $e) {
+            return view('error')->with('message', 'Invalid date.');
+        }
+        $date         = new Carbon($year . '-' . $month . '-01');
+        $subTitle     = 'Report for ' . $date->format('F Y');
+        $subTitleIcon = 'fa-calendar';
+        $displaySum   = true; // to show sums in report.
+        /** @var Preference $pref */
+        $pref              = Preferences::get('showSharedReports', false);
+        $showSharedReports = $pref->data;
+
+
+        /**
+         *
+         * get income for month (date)
+         *
+         */
+
+        $start = clone $date;
+        $start->startOfMonth();
+        $end = clone $date;
+        $end->endOfMonth();
+
+        /**
+         * Start getIncomeForMonth DONE
+         */
+        $income = $this->query->incomeByPeriod($start, $end, $showSharedReports);
+        /**
+         * End getIncomeForMonth DONE
+         */
+        /**
+         * Start getExpenseGroupedForMonth DONE
+         */
+        $set = $this->query->journalsByExpenseAccount($start, $end, $showSharedReports);
+
+        $expenses = Steam::makeArray($set);
+        $expenses = Steam::sortArray($expenses);
+        $expenses = Steam::limitArray($expenses, 10);
+        /**
+         * End getExpenseGroupedForMonth DONE
+         */
+        /**
+         * Start getBudgetsForMonth DONE
+         */
+        $budgets = $this->helper->getBudgetsForMonth($date, $showSharedReports);
+
+        /**
+         * End getBudgetsForMonth DONE
+         */
+        /**
+         * Start getCategoriesForMonth DONE
+         */
+        // all categories.
+        $result     = $this->query->journalsByCategory($start, $end);
+        $categories = Steam::makeArray($result);
+
+
+        // all transfers
+        if ($showSharedReports === false) {
+            $result    = $this->query->sharedExpensesByCategory($start, $end);
+            $transfers = Steam::makeArray($result);
+            $merged    = Steam::mergeArrays($categories, $transfers);
+        } else {
+            $merged = $categories;
+        }
+
+
+        // sort.
+        $sorted = Steam::sortNegativeArray($merged);
+
+        // limit to $limit:
+        $categories = Steam::limitArray($sorted, 10);
+        /**
+         * End getCategoriesForMonth DONE
+         */
+        /**
+         * Start getAccountsForMonth
+         */
+        $list     = $this->query->accountList($showSharedReports);
+        $accounts = [];
+        /** @var Account $account */
+        foreach ($list as $account) {
+            $id = intval($account->id);
+            /** @noinspection PhpParamsInspection */
+            $accounts[$id] = [
+                'name'         => $account->name,
+                'startBalance' => Steam::balance($account, $start),
+                'endBalance'   => Steam::balance($account, $end)
+            ];
+
+            $accounts[$id]['difference'] = $accounts[$id]['endBalance'] - $accounts[$id]['startBalance'];
+        }
+
+        /**
+         * End getAccountsForMonth
+         */
+
+
+        return view(
+            'reports.month',
+            compact(
+                'income', 'expenses', 'budgets', 'accounts', 'categories',
+                'date', 'subTitle', 'displaySum', 'subTitleIcon'
+            )
+        );
+    }
+
+    /**
+     * @param $year
+     *
+     * @return $this
+     */
+    public function year($year)
+    {
+        try {
+            new Carbon('01-01-' . $year);
+        } catch (Exception $e) {
+            return view('error')->with('message', 'Invalid date.');
+        }
+        /** @var Preference $pref */
+        $pref              = Preferences::get('showSharedReports', false);
+        $showSharedReports = $pref->data;
+        $date              = new Carbon('01-01-' . $year);
+        $end               = clone $date;
+        $end->endOfYear();
+        $title           = 'Reports';
+        $subTitle        = $year;
+        $subTitleIcon    = 'fa-bar-chart';
+        $mainTitleIcon   = 'fa-line-chart';
+        $balances        = $this->helper->yearBalanceReport($date, $showSharedReports);
+        $groupedIncomes  = $this->query->journalsByRevenueAccount($date, $end, $showSharedReports);
+        $groupedExpenses = $this->query->journalsByExpenseAccount($date, $end, $showSharedReports);
+
+        return view(
+            'reports.year', compact('date', 'groupedIncomes', 'groupedExpenses', 'year', 'balances', 'title', 'subTitle', 'subTitleIcon', 'mainTitleIcon')
+        );
+    }
+
+
+}

app/Http/Controllers/SearchController.php

@@ -1,19 +1,21 @@
-<?php
+<?php namespace FireflyIII\Http\Controllers;
+
+use FireflyIII\Support\Search\SearchInterface;
+use Input;
 
 /**
  * Class SearchController
+ *
+ * @package FireflyIII\Http\Controllers
  */
-class SearchController extends BaseController
+class SearchController extends Controller
 {
     /**
      * Results always come in the form of an array [results, count, fullCount]
      */
-    public function index()
+    public function index(SearchInterface $searcher)
     {
 
-        /** @var \FireflyIII\Search\Search $searcher */
-        $searcher = App::make('FireflyIII\Search\Search');
-
         $subTitle = null;
         $rawQuery = null;
         $result   = [];
@@ -31,8 +33,9 @@ class SearchController extends BaseController
 
         }
 
-        return View::make('search.index')->with('title', 'Search')->with('subTitle', $subTitle)->with(
+        return view('search.index')->with('title', 'Search')->with('subTitle', $subTitle)->with(
             'mainTitleIcon', 'fa-search'
         )->with('query', $rawQuery)->with('result', $result);
     }
+
 }

app/Http/Controllers/TransactionController.php

@@ -0,0 +1,332 @@
+<?php namespace FireflyIII\Http\Controllers;
+
+use Auth;
+use ExpandedForm;
+use FireflyIII\Events\JournalCreated;
+use FireflyIII\Events\JournalSaved;
+use FireflyIII\Http\Requests;
+use FireflyIII\Http\Requests\JournalFormRequest;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Input;
+use Redirect;
+use Response;
+use Session;
+use URL;
+use View;
+
+/**
+ * Class TransactionController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class TransactionController extends Controller
+{
+    /**
+     */
+    public function __construct()
+    {
+        View::share('title', 'Transactions');
+        View::share('mainTitleIcon', 'fa-repeat');
+    }
+
+    /**
+     * Shows the view helping the user to create a new transaction journal.
+     *
+     * @param string $what
+     *
+     * @return \Illuminate\View\View
+     */
+    public function create($what = 'deposit')
+    {
+        $accounts   = ExpandedForm::makeSelectList(
+            Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->orderBy('accounts.name', 'ASC')->orderBy('name', 'ASC')->where(
+                'active', 1
+            )->orderBy('name', 'DESC')->get(['accounts.*'])
+        );
+        $budgets    = ExpandedForm::makeSelectList(Auth::user()->budgets()->get());
+        $budgets[0] = '(no budget)';
+        $piggies    = ExpandedForm::makeSelectList(Auth::user()->piggyBanks()->get());
+        $piggies[0] = '(no piggy bank)';
+        $preFilled  = Session::has('preFilled') ? Session::get('preFilled') : [];
+        $respondTo  = ['account_id', 'account_from_id'];
+        $subTitle   = 'Add a new ' . e($what);
+
+        foreach ($respondTo as $r) {
+            if (!is_null(Input::get($r))) {
+                $preFilled[$r] = Input::get($r);
+            }
+        }
+        Session::put('preFilled', $preFilled);
+
+        // put previous url in session if not redirect from store (not "create another").
+        if (Session::get('transactions.create.fromStore') !== true) {
+            Session::put('transactions.create.url', URL::previous());
+        }
+        Session::forget('transactions.create.fromStore');
+
+        asort($piggies);
+
+
+        return view('transactions.create', compact('accounts', 'budgets', 'what', 'piggies', 'subTitle'));
+    }
+
+    /**
+     * Shows the form that allows a user to delete a transaction journal.
+     *
+     * @param TransactionJournal $journal
+     *
+     * @return $this
+     */
+    public function delete(TransactionJournal $journal)
+    {
+        $type     = strtolower($journal->transactionType->type);
+        $subTitle = 'Delete ' . e($type) . ' "' . e($journal->description) . '"';
+
+        // put previous url in session
+        Session::put('transactions.delete.url', URL::previous());
+
+        return view('transactions.delete', compact('journal', 'subTitle'));
+
+
+    }
+
+    /**
+     * @param TransactionJournal $transactionJournal
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy(TransactionJournal $transactionJournal)
+    {
+        Session::flash('success', 'Transaction "' . e($transactionJournal->description) . '" destroyed.');
+
+        $transactionJournal->delete();
+
+        // redirect to previous URL:
+        return Redirect::to(Session::get('transactions.delete.url'));
+    }
+
+    /**
+     * Shows the view to edit a transaction.
+     *
+     * @param TransactionJournal $journal
+     *
+     * @return $this
+     */
+    public function edit(TransactionJournal $journal, JournalRepositoryInterface $repository)
+    {
+        $what         = strtolower($journal->transactiontype->type);
+        $accounts     = ExpandedForm::makeSelectList(
+            Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->orderBy('accounts.name', 'ASC')->where('active', 1)->orderBy(
+                'name', 'DESC'
+            )->get(['accounts.*'])
+        );
+        $budgets      = ExpandedForm::makeSelectList(Auth::user()->budgets()->get());
+        $budgets[0]   = '(no budget)';
+        $transactions = $journal->transactions()->orderBy('amount', 'DESC')->get();
+        $piggies      = ExpandedForm::makeSelectList(Auth::user()->piggyBanks()->get());
+        $piggies[0]   = '(no piggy bank)';
+        $preFilled    = [
+            'date'          => $journal->date->format('Y-m-d'),
+            'category'      => '',
+            'budget_id'     => 0,
+            'piggy_bank_id' => 0
+        ];
+
+        $category = $journal->categories()->first();
+        if (!is_null($category)) {
+            $preFilled['category'] = $category->name;
+        }
+
+        $budget = $journal->budgets()->first();
+        if (!is_null($budget)) {
+            $preFilled['budget_id'] = $budget->id;
+        }
+
+        if ($journal->piggyBankEvents()->count() > 0) {
+            $preFilled['piggy_bank_id'] = $journal->piggyBankEvents()->orderBy('date', 'DESC')->first()->piggy_bank_id;
+        }
+
+        $preFilled['amount']          = $journal->amount;
+        $preFilled['account_id']      = $repository->getAssetAccount($journal);
+        $preFilled['expense_account'] = $transactions[0]->account->name;
+        $preFilled['revenue_account'] = $transactions[1]->account->name;
+        $preFilled['account_from_id'] = $transactions[1]->account->id;
+        $preFilled['account_to_id']   = $transactions[0]->account->id;
+
+        // put previous url in session if not redirect from store (not "return_to_edit").
+        if (Session::get('transactions.edit.fromUpdate') !== true) {
+            Session::put('transactions.edit.url', URL::previous());
+        }
+        Session::forget('transactions.edit.fromUpdate');
+
+
+        return View::make('transactions.edit', compact('journal', 'accounts', 'what', 'budgets', 'piggies', 'subTitle'))->with('data', $preFilled);
+    }
+
+    /**
+     * @param $what
+     *
+     * @return $this
+     */
+    public function index($what)
+    {
+        switch ($what) {
+            case 'expenses':
+            case 'withdrawal':
+                $subTitleIcon = 'fa-long-arrow-left';
+                $subTitle     = 'Expenses';
+                $types        = ['Withdrawal'];
+                break;
+            case 'revenue':
+            case 'deposit':
+                $subTitleIcon = 'fa-long-arrow-right';
+                $subTitle     = 'Revenue, income and deposits';
+                $types        = ['Deposit'];
+                break;
+            case 'transfer':
+            case 'transfers':
+                $subTitleIcon = 'fa-exchange';
+                $subTitle     = 'Transfers';
+                $types        = ['Transfer'];
+                break;
+        }
+
+        $page   = intval(\Input::get('page'));
+        $offset = $page > 0 ? ($page - 1) * 50 : 0;
+
+        $set      = Auth::user()->transactionJournals()->transactionTypes($types)->withRelevantData()->take(50)->offset($offset)
+                        ->orderBy('date', 'DESC')
+                        ->orderBy('order', 'ASC')
+                        ->orderBy('id', 'DESC')
+                        ->get(
+                            ['transaction_journals.*']
+                        );
+        $count    = Auth::user()->transactionJournals()->transactionTypes($types)->count();
+        $journals = new LengthAwarePaginator($set, $count, 50, $page);
+        $journals->setPath('transactions/' . $what);
+
+        return view('transactions.index', compact('subTitle', 'what', 'subTitleIcon', 'journals'));
+
+    }
+
+    /**
+     * Reorder transactions (which all must have the same date)
+     */
+    public function reorder()
+    {
+        $ids = Input::get('items');
+        if (count($ids) > 0) {
+            $order = 0;
+            foreach ($ids as $id) {
+                $journal = Auth::user()->transactionjournals()->where('id', $id)->where('date', Input::get('date'))->first();
+                if ($journal) {
+                    $journal->order = $order;
+                    $order++;
+                    $journal->save();
+                }
+            }
+        }
+
+        return Response::json(true);
+
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return $this
+     */
+    public function show(TransactionJournal $journal)
+    {
+        $journal->transactions->each(
+            function (Transaction $t) use ($journal) {
+                $t->before = floatval(
+                    $t->account->transactions()->leftJoin(
+                        'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'
+                    )
+                               ->where('transaction_journals.date', '<=', $journal->date->format('Y-m-d'))
+                               ->where('transaction_journals.order', '>=', $journal->order)
+                               ->where('transaction_journals.id', '!=', $journal->id)
+                               ->sum('transactions.amount')
+                );
+                $t->after  = $t->before + $t->amount;
+            }
+        );
+
+
+        return view('transactions.show', compact('journal'))->with(
+            'subTitle', e($journal->transactiontype->type) . ' "' . e($journal->description) . '"'
+        );
+    }
+
+    /**
+     * @param JournalFormRequest         $request
+     * @param JournalRepositoryInterface $repository
+     *
+     * @return $this|\Illuminate\Http\RedirectResponse
+     */
+    public function store(JournalFormRequest $request, JournalRepositoryInterface $repository)
+    {
+
+        $journalData = $request->getJournalData();
+        $journal     = $repository->store($journalData);
+
+        // rescan journal, UpdateJournalConnection
+        event(new JournalSaved($journal));
+        // ConnectJournalToPiggyBank
+        event(new JournalCreated($journal, intval($request->get('piggy_bank_id'))));
+
+        if (intval($request->get('reminder_id')) > 0) {
+            $reminder         = Auth::user()->reminders()->find($request->get('reminder_id'));
+            $reminder->active = 0;
+            $reminder->save();
+        }
+
+        Session::flash('success', 'New transaction "' . $journal->description . '" stored!');
+
+        if (intval(Input::get('create_another')) === 1) {
+            // set value so create routine will not overwrite URL:
+            Session::put('transactions.create.fromStore', true);
+
+            return Redirect::route('transactions.create', $request->input('what'))->withInput();
+        }
+
+        // redirect to previous URL.
+        return Redirect::to(Session::get('transactions.create.url'));
+
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
+     *
+     * @return $this
+     */
+    public function update(TransactionJournal $journal, JournalFormRequest $request, JournalRepositoryInterface $repository)
+    {
+
+        $journalData = $request->getJournalData();
+        $repository->update($journal, $journalData);
+
+        event(new JournalSaved($journal));
+        // update, get events by date and sort DESC
+
+        Session::flash('success', 'Transaction "' . e($journalData['description']) . '" updated.');
+
+        if (intval(Input::get('return_to_edit')) === 1) {
+            // set value so edit routine will not overwrite URL:
+            Session::put('transactions.edit.fromUpdate', true);
+
+            return Redirect::route('transactions.edit', $journal->id)->withInput(['return_to_edit' => 1]);
+        }
+
+        // redirect to previous URL.
+        return Redirect::to(Session::get('transactions.edit.url'));
+
+    }
+
+}

app/Http/Kernel.php

@@ -0,0 +1,45 @@
+<?php namespace FireflyIII\Http;
+
+use Illuminate\Foundation\Http\Kernel as HttpKernel;
+
+/**
+ * Class Kernel
+ *
+ * @package FireflyIII\Http
+ */
+class Kernel extends HttpKernel
+{
+
+    /**
+     * The application's global HTTP middleware stack.
+     *
+     * @var array
+     */
+    protected $middleware
+        = [
+            'Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode',
+            'Illuminate\Cookie\Middleware\EncryptCookies',
+            'Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse',
+            'Illuminate\Session\Middleware\StartSession',
+            'Illuminate\View\Middleware\ShareErrorsFromSession',
+            'FireflyIII\Http\Middleware\ReplaceTestVars',
+            'FireflyIII\Http\Middleware\VerifyCsrfToken',
+        ];
+
+    /**
+     * The application's route middleware.
+     *
+     * @var array
+     */
+    protected $routeMiddleware
+        = [
+            'auth'       => 'FireflyIII\Http\Middleware\Authenticate',
+            'auth.basic' => 'Illuminate\Auth\Middleware\AuthenticateWithBasicAuth',
+            'guest'      => 'FireflyIII\Http\Middleware\RedirectIfAuthenticated',
+            'range'      => 'FireflyIII\Http\Middleware\Range',
+            'reminders'  => 'FireflyIII\Http\Middleware\Reminders',
+            'piggybanks' => 'FireflyIII\Http\Middleware\PiggyBanks',
+
+        ];
+
+}

app/Http/Middleware/Authenticate.php

@@ -0,0 +1,54 @@
+<?php namespace FireflyIII\Http\Middleware;
+
+use Closure;
+use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Http\Request;
+
+/**
+ * Class Authenticate
+ *
+ * @package FireflyIII\Http\Middleware
+ */
+class Authenticate
+{
+
+    /**
+     * The Guard implementation.
+     *
+     * @var Guard
+     */
+    protected $auth;
+
+    /**
+     * Create a new filter instance.
+     *
+     * @param  Guard $auth
+     *
+     */
+    public function __construct(Guard $auth)
+    {
+        $this->auth = $auth;
+    }
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure                 $next
+     *
+     * @return mixed
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        if ($this->auth->guest()) {
+            if ($request->ajax()) {
+                return response('Unauthorized.', 401);
+            } else {
+                return redirect()->guest('auth/login');
+            }
+        }
+
+        return $next($request);
+    }
+
+}

app/Http/Middleware/PiggyBanks.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace FireflyIII\Http\Middleware;
+
+
+use App;
+use Closure;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\PiggyBankRepetition;
+use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+
+/**
+ * Class PiggyBanks
+ *
+ * @package FireflyIII\Http\Middleware
+ */
+class PiggyBanks
+{
+    /**
+     * The Guard implementation.
+     *
+     * @var Guard
+     */
+    protected $auth;
+
+    /**
+     * Create a new filter instance.
+     *
+     * @param  Guard $auth
+     *
+     */
+    public function __construct(Guard $auth)
+    {
+        $this->auth = $auth;
+    }
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure                 $next
+     *
+     * @return mixed
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        if ($this->auth->check() && !$request->isXmlHttpRequest() && App::environment() != 'testing') {
+            // get piggy banks without a repetition:
+            /** @var Collection $set */
+            $set = $this->auth->user()->piggybanks()
+                              ->leftJoin('piggy_bank_repetitions', 'piggy_banks.id', '=', 'piggy_bank_repetitions.piggy_bank_id')
+                              ->whereNull('piggy_bank_repetitions.id')
+                              ->get(['piggy_banks.id', 'piggy_banks.startdate', 'piggy_banks.targetdate']);
+            if ($set->count() > 0) {
+                /** @var PiggyBank $partialPiggy */
+                foreach ($set as $partialPiggy) {
+                    $repetition = new PiggyBankRepetition;
+                    $repetition->piggyBank()->associate($partialPiggy);
+                    $repetition->startdate     = is_null($partialPiggy->startdate) ? null : $partialPiggy->startdate;
+                    $repetition->targetdate    = is_null($partialPiggy->targetdate) ? null : $partialPiggy->targetdate;
+                    $repetition->currentamount = 0;
+                    $repetition->save();
+                }
+            }
+            unset($partialPiggy, $set, $repetition);
+        }
+
+        return $next($request);
+    }
+}

app/Http/Middleware/Range.php

@@ -0,0 +1,94 @@
+<?php
+
+
+namespace FireflyIII\Http\Middleware;
+
+use App;
+use Carbon\Carbon;
+use Closure;
+use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Http\Request;
+use Navigation;
+use Preferences;
+use Session;
+use View;
+
+/**
+ * Class SessionFilter
+ *
+ * @package FireflyIII\Http\Middleware
+ */
+class Range
+{
+    /**
+     * The Guard implementation.
+     *
+     * @var Guard
+     */
+    protected $auth;
+
+    /**
+     * Create a new filter instance.
+     *
+     * @param  Guard $auth
+     *
+     */
+    public function __construct(Guard $auth)
+    {
+        $this->auth = $auth;
+    }
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure                 $theNext
+     *
+     * @return mixed
+     */
+    public function handle(Request $request, Closure $theNext)
+    {
+        if ($this->auth->check() && App::environment() != 'testing') {
+
+            // ignore preference. set the range to be the current month:
+            if (!Session::has('start') && !Session::has('end')) {
+
+                /** @var \FireflyIII\Models\Preference $viewRange */
+                $viewRange = Preferences::get('viewRange', '1M');
+                $start     = new Carbon;
+                $start     = Navigation::updateStartDate($viewRange->data, $start);
+                $end       = Navigation::updateEndDate($viewRange->data, $start);
+
+                Session::put('start', $start);
+                Session::put('end', $end);
+            }
+            if (!Session::has('first')) {
+                /**
+                 * Get helper thing.
+                 */
+                /** @var \FireflyIII\Repositories\Journal\JournalRepositoryInterface $repository */
+                $repository = App::make('FireflyIII\Repositories\Journal\JournalRepositoryInterface');
+                $journal    = $repository->first();
+                if ($journal) {
+                    Session::put('first', $journal->date);
+                } else {
+                    Session::put('first', Carbon::now()->startOfYear());
+                }
+            }
+
+            // set current / next / prev month.
+            $current = Carbon::now()->format('F Y');
+            $next    = Carbon::now()->endOfMonth()->addDay()->format('F Y');
+            $prev    = Carbon::now()->startOfMonth()->subDay()->format('F Y');
+            View::share('currentMonthName', $current);
+            View::share('previousMonthName', $prev);
+            View::share('nextMonthName', $next);
+
+
+        }
+
+        return $theNext($request);
+
+    }
+
+}

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -0,0 +1,51 @@
+<?php namespace FireflyIII\Http\Middleware;
+
+use Closure;
+use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+
+/**
+ * Class RedirectIfAuthenticated
+ *
+ * @package FireflyIII\Http\Middleware
+ */
+class RedirectIfAuthenticated
+{
+
+    /**
+     * The Guard implementation.
+     *
+     * @var Guard
+     */
+    protected $auth;
+
+    /**
+     * Create a new filter instance.
+     *
+     * @param  Guard $auth
+     *
+     */
+    public function __construct(Guard $auth)
+    {
+        $this->auth = $auth;
+    }
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure                 $next
+     *
+     * @return mixed
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        if ($this->auth->check()) {
+            return new RedirectResponse(url('/'));
+        }
+
+        return $next($request);
+    }
+
+}

app/Http/Middleware/Reminders.php

@@ -0,0 +1,91 @@
+<?php
+
+namespace FireflyIII\Http\Middleware;
+
+use App;
+use Carbon\Carbon;
+use Closure;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\Reminder;
+use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Http\Request;
+use View;
+
+/**
+ * Class Reminders
+ *
+ * @package FireflyIII\Http\Middleware
+ */
+class Reminders
+{
+    /**
+     * The Guard implementation.
+     *
+     * @var Guard
+     */
+    protected $auth;
+
+    /**
+     * Create a new filter instance.
+     *
+     * @param  Guard $auth
+     *
+     */
+    public function __construct(Guard $auth)
+    {
+        $this->auth = $auth;
+    }
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure                 $next
+     *
+     * @return mixed
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        if ($this->auth->check() && !$request->isXmlHttpRequest() && App::environment() != 'testing') {
+            // do reminders stuff.
+            $piggyBanks = $this->auth->user()->piggyBanks()->where('remind_me', 1)->get();
+            $today      = new Carbon;
+            /** @var \FireflyIII\Helpers\Reminders\ReminderHelperInterface $helper */
+            $helper = App::make('FireflyIII\Helpers\Reminders\ReminderHelperInterface');
+
+            /** @var PiggyBank $piggyBank */
+            foreach ($piggyBanks as $piggyBank) {
+                $ranges = $helper->getReminderRanges($piggyBank);
+
+                foreach ($ranges as $range) {
+                    if ($today < $range['end'] && $today > $range['start']) {
+                        // create a reminder here!
+                        $helper->createReminder($piggyBank, $range['start'], $range['end']);
+                        // stop looping, we're done.
+                        break;
+                    }
+
+                }
+            }
+            // delete invalid reminders
+            $set = $this->auth->user()->reminders()->leftJoin('piggy_banks', 'piggy_banks.id', '=', 'remindersable_id')->whereNull('piggy_banks.id')->get(
+                ['reminders.id']
+            );
+            foreach ($set as $reminder) {
+                $reminder->delete();
+            }
+
+
+            // get and list active reminders:
+            $reminders = $this->auth->user()->reminders()->today()->get();
+            $reminders->each(
+                function (Reminder $reminder) use ($helper) {
+                    $reminder->description = $helper->getReminderText($reminder);
+                }
+            );
+            View::share('reminders', $reminders);
+        }
+
+        return $next($request);
+    }
+}

app/Http/Middleware/ReplaceTestVars.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace FireflyIII\Http\Middleware;
+
+use Closure;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Http\Request;
+use Log;
+
+/**
+ * Class ReplaceTestVars
+ *
+ * @package FireflyIII\Http\Middleware
+ */
+class ReplaceTestVars
+{
+    /**
+     * The application implementation.
+     *
+     * @var Application
+     */
+    protected $app;
+
+    /**
+     * Create a new filter instance.
+     *
+     * @param Application $app
+     *
+     */
+    public function __construct(Application $app)
+    {
+        $this->app = $app;
+    }
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
+     * @return mixed
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        if ('testing' === $this->app->environment() && $request->has('_token')) {
+            $input           = $request->all();
+            $input['_token'] = $request->session()->token();
+            // we need to update _token value to make sure we get the POST / PUT tests passed.
+            Log::debug('Input token replaced (' . $input['_token'] . ').');
+            $request->replace($input);
+        }
+
+        return $next($request);
+    }
+
+}

app/Http/Middleware/VerifyCsrfToken.php

@@ -0,0 +1,27 @@
+<?php namespace FireflyIII\Http\Middleware;
+
+use Closure;
+use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
+
+/**
+ * Class VerifyCsrfToken
+ *
+ * @package FireflyIII\Http\Middleware
+ */
+class VerifyCsrfToken extends BaseVerifier
+{
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure                 $next
+     *
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        return parent::handle($request, $next);
+    }
+
+}

app/Http/Requests/AccountFormRequest.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace FireflyIII\Http\Requests;
+
+use Auth;
+use Config;
+use FireflyIII\Models\Account;
+use Input;
+
+/**
+ * Class AccountFormRequest
+ *
+ * @package FireflyIII\Http\Requests
+ */
+class AccountFormRequest extends Request
+{
+    /**
+     * @return bool
+     */
+    public function authorize()
+    {
+        // Only allow logged in users
+        return Auth::check();
+    }
+
+    /**
+     * @return array
+     */
+    public function rules()
+    {
+        $accountRoles   = join(',', array_keys(Config::get('firefly.accountRoles')));
+        $types          = join(',', array_keys(Config::get('firefly.subTitlesByIdentifier')));
+        $ccPaymentTypes = join(',', array_keys(Config::get('firefly.ccTypes')));
+
+        $nameRule = 'required|min:1|uniqueAccountForUser';
+        $idRule   = '';
+        if (Account::find(Input::get('id'))) {
+            $idRule   = 'belongsToUser:accounts';
+            $nameRule = 'required|min:1|uniqueAccountForUser:' . Input::get('id');
+        }
+
+        return [
+            'id'                   => $idRule,
+            'name'                 => $nameRule,
+            'openingBalance'       => 'numeric',
+            'virtualBalance'       => 'numeric',
+            'openingBalanceDate'   => 'date',
+            'accountRole'          => 'in:' . $accountRoles,
+            'active'               => 'boolean',
+            'ccType'               => 'in:' . $ccPaymentTypes,
+            'ccMonthlyPaymentDate' => 'date',
+            'balance_currency_id'  => 'exists:transaction_currencies,id',
+            'what'                 => 'in:' . $types
+        ];
+    }
+}

app/Http/Requests/BillFormRequest.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace FireflyIII\Http\Requests;
+
+use Auth;
+use Carbon\Carbon;
+use Input;
+
+/**
+ * Class BillFormRequest
+ *
+ * @package FireflyIII\Http\Requests
+ */
+class BillFormRequest extends Request
+{
+    /**
+     * @return bool
+     */
+    public function authorize()
+    {
+        // Only allow logged in users
+        return Auth::check();
+    }
+
+    /**
+     * @return array
+     */
+    public function getBillData()
+    {
+        return [
+            'name'               => $this->get('name'),
+            'match'              => $this->get('match'),
+            'amount_min'         => floatval($this->get('amount_min')),
+            'amount_currency_id' => floatval($this->get('amount_currency_id')),
+            'amount_max'         => floatval($this->get('amount_max')),
+            'date'               => new Carbon($this->get('date')),
+            'user'               => Auth::user()->id,
+            'repeat_freq'        => $this->get('repeat_freq'),
+            'skip'               => intval($this->get('skip')),
+            'automatch'          => intval($this->get('automatch')) === 1,
+            'active'             => intval($this->get('active')) === 1,
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function rules()
+    {
+        $nameRule  = 'required|between:1,255|uniqueObjectForUser:bills,name,name_encrypted';
+        $matchRule = 'required|between:1,255|uniqueObjectForUser:bills,match,match_encrypted';
+        if (intval(Input::get('id')) > 0) {
+            $nameRule .= ',' . intval(Input::get('id'));
+            $matchRule .= ',' . intval(Input::get('id'));
+        }
+
+        $rules = [
+            'name'               => $nameRule,
+            'match'              => $matchRule,
+            'amount_min'         => 'required|numeric|min:0.01',
+            'amount_max'         => 'required|numeric|min:0.01',
+            'amount_currency_id' => 'required|exists:transaction_currencies,id',
+            'date'               => 'required|date',
+            'repeat_freq'        => 'required|in:weekly,monthly,quarterly,half-year,yearly',
+            'skip'               => 'required|between:0,31',
+            'automatch'          => 'in:1',
+            'active'             => 'in:1',
+        ];
+
+        return $rules;
+    }
+}

app/Http/Requests/BudgetFormRequest.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace FireflyIII\Http\Requests;
+
+use Auth;
+use FireflyIII\Models\Budget;
+use Input;
+
+/**
+ * Class BudgetFormRequest
+ *
+ * @package FireflyIII\Http\Requests
+ */
+class BudgetFormRequest extends Request
+{
+    /**
+     * @return bool
+     */
+    public function authorize()
+    {
+        // Only allow logged in users
+        return Auth::check();
+    }
+
+    /**
+     * @return array
+     */
+    public function rules()
+    {
+
+        $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name,encrypted';
+        if (Budget::find(Input::get('id'))) {
+            $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name,encrypted,' . intval(Input::get('id'));
+        }
+
+        return [
+            'name'   => $nameRule,
+            'active' => 'numeric|between:0,1'
+        ];
+    }
+}

app/Http/Requests/CategoryFormRequest.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace FireflyIII\Http\Requests;
+
+use Auth;
+use FireflyIII\Models\Category;
+use Input;
+
+/**
+ * Class CategoryFormRequest
+ *
+ * @package FireflyIII\Http\Requests
+ */
+class CategoryFormRequest extends Request
+{
+    /**
+     * @return bool
+     */
+    public function authorize()
+    {
+        // Only allow logged in users
+        return Auth::check();
+    }
+
+    /**
+     * @return array
+     */
+    public function rules()
+    {
+
+        $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,encrypted';
+        if (Category::find(Input::get('id'))) {
+            $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,encrypted,' . intval(Input::get('id'));
+        }
+
+        return [
+            'name' => $nameRule,
+        ];
+    }
+}

app/Http/Requests/CurrencyFormRequest.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace FireflyIII\Http\Requests;
+
+use Auth;
+use Input;
+
+/**
+ * Class BillFormRequest
+ *
+ * @package FireflyIII\Http\Requests
+ */
+class CurrencyFormRequest extends Request
+{
+    /**
+     * @return bool
+     */
+    public function authorize()
+    {
+        // Only allow logged in users
+        return Auth::check();
+    }
+
+    /**
+     * @return array
+     */
+    public function getCurrencyData()
+    {
+        return [
+            'name'   => $this->get('name'),
+            'code'   => $this->get('code'),
+            'symbol' => $this->get('symbol'),
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function rules()
+    {
+
+        $rules = [
+            'code'   => 'required|min:3|max:3|unique:transaction_currencies,code',
+            'name'   => 'required|max:48|min:1|unique:transaction_currencies,name',
+            'symbol' => 'required|min:1|max:8|unique:transaction_currencies,symbol',
+        ];
+        if (intval(Input::get('id')) > 0) {
+            $rules = [
+                'code'   => 'required|min:3|max:3',
+                'name'   => 'required|max:48|min:1',
+                'symbol' => 'required|min:1|max:8',
+            ];
+        }
+
+        return $rules;
+    }
+}

app/Http/Requests/DeleteAccountFormRequest.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace FireflyIII\Http\Requests;
+
+use Auth;
+
+/**
+ * Class DeleteAccountFormRequest
+ *
+ * @package FireflyIII\Http\Requests
+ */
+class DeleteAccountFormRequest extends Request
+{
+    /**
+     * @return bool
+     */
+    public function authorize()
+    {
+        // Only allow logged in users
+        return Auth::check();
+    }
+
+    /**
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'password'          => 'required',
+        ];
+    }
+}

app/Http/Requests/JournalFormRequest.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace FireflyIII\Http\Requests;
+
+use Auth;
+use Carbon\Carbon;
+use Exception;
+use Input;
+
+/**
+ * Class JournalFormRequest
+ *
+ * @package FireflyIII\Http\Requests
+ */
+class JournalFormRequest extends Request
+{
+    /**
+     * @return bool
+     */
+    public function authorize()
+    {
+        // Only allow logged in users
+        return Auth::check();
+    }
+
+    /**
+     * @return array
+     */
+    public function getJournalData()
+    {
+        return [
+            'what'               => $this->get('what'),
+            'description'        => $this->get('description'),
+            'account_id'         => intval($this->get('account_id')),
+            'account_from_id'    => intval($this->get('account_from_id')),
+            'account_to_id'      => intval($this->get('account_to_id')),
+            'expense_account'    => $this->get('expense_account'),
+            'revenue_account'    => $this->get('revenue_account'),
+            'amount'             => floatval($this->get('amount')),
+            'user'               => Auth::user()->id,
+            'amount_currency_id' => intval($this->get('amount_currency_id')),
+            'date'               => new Carbon($this->get('date')),
+            'budget_id'          => intval($this->get('budget_id')),
+            'category'           => $this->get('category'),
+        ];
+    }
+
+    /**
+     * @return array
+     * @throws Exception
+     */
+    public function rules()
+    {
+        // can we switch on the "what"?
+        $what = Input::get('what');
+
+        $rules = [
+            'description'        => 'required|min:1,max:255',
+            'what'               => 'required|in:withdrawal,deposit,transfer|exists:transaction_types,type',
+            'amount'             => 'numeric|required|min:0.01',
+            'date'               => 'required|date',
+            'reminder_id'        => 'numeric|exists:reminders,id',
+            'amount_currency_id' => 'required|exists:transaction_currencies,id',
+
+        ];
+
+        switch ($what) {
+            case 'withdrawal':
+                $rules['account_id']      = 'required|exists:accounts,id|belongsToUser:accounts';
+                $rules['expense_account'] = 'between:1,255';
+                $rules['category']        = 'between:1,255';
+                if (intval(Input::get('budget_id')) != 0) {
+                    $rules['budget_id'] = 'exists:budgets,id|belongsToUser:budgets';
+                }
+
+
+                break;
+            case 'deposit':
+                $rules['category']        = 'between:1,255';
+                $rules['account_id']      = 'required|exists:accounts,id|belongsToUser:accounts';
+                $rules['revenue_account'] = 'between:1,255';
+                break;
+            case 'transfer':
+                $rules['account_from_id'] = 'required|exists:accounts,id|belongsToUser:accounts|different:account_to_id';
+                $rules['account_to_id']   = 'required|exists:accounts,id|belongsToUser:accounts|different:account_from_id';
+                $rules['category']        = 'between:1,255';
+                break;
+            default:
+                throw new Exception('Cannot handle ' . $what);
+                break;
+        }
+
+        return $rules;
+
+
+    }
+}

app/Http/Requests/PiggyBankFormRequest.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace FireflyIII\Http\Requests;
+
+use Auth;
+use Input;
+
+/**
+ * Class PiggyBankFormRequest
+ *
+ * @package FireflyIII\Http\Requests
+ */
+class PiggyBankFormRequest extends Request
+{
+    /**
+     * @return bool
+     */
+    public function authorize()
+    {
+        // Only allow logged in users
+        return Auth::check();
+    }
+
+    /**
+     * @return array
+     */
+    public function rules()
+    {
+
+        $nameRule       = 'required|between:1,255|uniquePiggyBankForUser';
+        $targetDateRule = 'date';
+        if (intval(Input::get('id'))) {
+            $nameRule = 'required|between:1,255|uniquePiggyBankForUser:' . intval(Input::get('id'));
+        }
+
+
+        $rules = [
+            'name'               => $nameRule,
+            'account_id'         => 'required|belongsToUser:accounts',
+            'targetamount'       => 'required|min:0.01',
+            'amount_currency_id' => 'exists:transaction_currencies,id',
+            'startdate'          => 'date',
+            'targetdate'         => $targetDateRule,
+            'reminder'           => 'in:day,week,quarter,month,year',
+            'reminder_skip'      => 'integer|min:0|max:99',
+            'remind_me'          => 'boolean|piggyBankReminder',
+            'order'              => 'integer|min:1',
+
+        ];
+
+        return $rules;
+    }
+}

app/Http/Requests/ProfileFormRequest.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace FireflyIII\Http\Requests;
+
+use Auth;
+
+/**
+ * Class ProfileFormRequest
+ *
+ * @package FireflyIII\Http\Requests
+ */
+class ProfileFormRequest extends Request
+{
+    /**
+     * @return bool
+     */
+    public function authorize()
+    {
+        // Only allow logged in users
+        return Auth::check();
+    }
+
+    /**
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'current_password'          => 'required',
+            'new_password'              => 'required|confirmed',
+            'new_password_confirmation' => 'required',
+        ];
+    }
+}

app/Http/Requests/Request.php

@@ -0,0 +1,15 @@
+<?php namespace FireflyIII\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * Class Request
+ *
+ * @package FireflyIII\Http\Requests
+ */
+abstract class Request extends FormRequest
+{
+
+    //
+
+}

app/Http/breadcrumbs.php

@@ -1,7 +1,15 @@
 <?php
 use Carbon\Carbon;
 use DaveJamesMiller\Breadcrumbs\Generator;
-use FireflyIII\Exception\FireflyException;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\Category;
+use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\Reminder;
+use FireflyIII\Models\TransactionJournal;
 
 /*
  * Back home.
@@ -22,7 +30,7 @@ Breadcrumbs::register(
 }
 );
 Breadcrumbs::register(
-    'accounts.show', function (Generator $breadcrumbs, \Account $account) {
+    'accounts.show', function (Generator $breadcrumbs, Account $account) {
     switch ($account->accountType->type) {
         default:
             throw new FireflyException('Cannot handle account type "' . e($account->accountType->type) . '"');
@@ -47,14 +55,14 @@ Breadcrumbs::register(
 }
 );
 Breadcrumbs::register(
-    'accounts.delete', function (Generator $breadcrumbs, \Account $account) {
+    'accounts.delete', function (Generator $breadcrumbs, Account $account) {
     $breadcrumbs->parent('accounts.show', $account);
     $breadcrumbs->push('Delete ' . e($account->name), route('accounts.delete', $account->id));
 }
 );
 
 Breadcrumbs::register(
-    'accounts.edit', function (Generator $breadcrumbs, \Account $account) {
+    'accounts.edit', function (Generator $breadcrumbs, Account $account) {
     $breadcrumbs->parent('accounts.show', $account);
     $breadcrumbs->push('Edit ' . e($account->name), route('accounts.edit', $account->id));
 }
@@ -91,9 +99,9 @@ Breadcrumbs::register(
     'budgets.show', function (Generator $breadcrumbs, Budget $budget, LimitRepetition $repetition = null) {
     $breadcrumbs->parent('budgets.index');
     $breadcrumbs->push(e($budget->name), route('budgets.show', $budget->id));
-    if (!is_null($repetition)) {
+    if (!is_null($repetition) && !is_null($repetition->id)) {
         $breadcrumbs->push(
-            DateKit::periodShow($repetition->startdate, $repetition->budgetlimit->repeat_freq), route('budgets.show', $budget->id, $repetition->id)
+            Navigation::periodShow($repetition->startdate, $repetition->budgetlimit->repeat_freq), route('budgets.show', $budget->id, $repetition->id)
         );
     }
 }
@@ -137,35 +145,35 @@ Breadcrumbs::register(
 
 // piggy banks
 Breadcrumbs::register(
-    'piggyBanks.index', function (Generator $breadcrumbs) {
+    'piggy-banks.index', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('home');
-    $breadcrumbs->push('Piggy banks', route('piggyBanks.index'));
+    $breadcrumbs->push('Piggy banks', route('piggy-banks.index'));
 }
 );
 Breadcrumbs::register(
-    'piggyBanks.create', function (Generator $breadcrumbs) {
-    $breadcrumbs->parent('piggyBanks.index');
-    $breadcrumbs->push('Create new piggy bank', route('piggyBanks.create'));
+    'piggy-banks.create', function (Generator $breadcrumbs) {
+    $breadcrumbs->parent('piggy-banks.index');
+    $breadcrumbs->push('Create new piggy bank', route('piggy-banks.create'));
 }
 );
 
 Breadcrumbs::register(
-    'piggyBanks.edit', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
-    $breadcrumbs->parent('piggyBanks.show', $piggyBank);
-    $breadcrumbs->push('Edit ' . e($piggyBank->name), route('piggyBanks.edit', $piggyBank->id));
+    'piggy-banks.edit', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
+    $breadcrumbs->parent('piggy-banks.show', $piggyBank);
+    $breadcrumbs->push('Edit ' . e($piggyBank->name), route('piggy-banks.edit', $piggyBank->id));
 }
 );
 Breadcrumbs::register(
-    'piggyBanks.delete', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
-    $breadcrumbs->parent('piggyBanks.show', $piggyBank);
-    $breadcrumbs->push('Delete ' . e($piggyBank->name), route('piggyBanks.delete', $piggyBank->id));
+    'piggy-banks.delete', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
+    $breadcrumbs->parent('piggy-banks.show', $piggyBank);
+    $breadcrumbs->push('Delete ' . e($piggyBank->name), route('piggy-banks.delete', $piggyBank->id));
 }
 );
 
 Breadcrumbs::register(
-    'piggyBanks.show', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
-    $breadcrumbs->parent('piggyBanks.index');
-    $breadcrumbs->push(e($piggyBank->name), route('piggyBanks.show', $piggyBank->id));
+    'piggy-banks.show', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
+    $breadcrumbs->parent('piggy-banks.index');
+    $breadcrumbs->push(e($piggyBank->name), route('piggy-banks.show', $piggyBank->id));
 
 }
 );
@@ -232,47 +240,22 @@ Breadcrumbs::register(
 
 // reminders
 Breadcrumbs::register(
-    'reminders.show', function (Generator $breadcrumbs, Reminder $reminder) {
+    'reminders.index', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('home');
+    $breadcrumbs->push('Reminders', route('reminders.index'));
+
+}
+);
+
+// reminders
+Breadcrumbs::register(
+    'reminders.show', function (Generator $breadcrumbs, Reminder $reminder) {
+    $breadcrumbs->parent('reminders.index');
     $breadcrumbs->push('Reminder #' . $reminder->id, route('reminders.show', $reminder->id));
 
 }
 );
 
-// repeated expenses
-Breadcrumbs::register(
-    'repeated.index', function (Generator $breadcrumbs) {
-    $breadcrumbs->parent('home');
-    $breadcrumbs->push('Repeated expenses', route('repeated.index'));
-}
-);
-Breadcrumbs::register(
-    'repeated.create', function (Generator $breadcrumbs) {
-    $breadcrumbs->parent('repeated.index');
-    $breadcrumbs->push('Create new repeated expense', route('repeated.create'));
-}
-);
-
-Breadcrumbs::register(
-    'repeated.edit', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
-    $breadcrumbs->parent('repeated.show', $piggyBank);
-    $breadcrumbs->push('Edit ' . e($piggyBank->name), route('repeated.edit', $piggyBank->id));
-}
-);
-Breadcrumbs::register(
-    'repeated.delete', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
-    $breadcrumbs->parent('repeated.show', $piggyBank);
-    $breadcrumbs->push('Delete ' . e($piggyBank->name), route('repeated.delete', $piggyBank->id));
-}
-);
-
-Breadcrumbs::register(
-    'repeated.show', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
-    $breadcrumbs->parent('repeated.index');
-    $breadcrumbs->push(e($piggyBank->name), route('repeated.show', $piggyBank->id));
-
-}
-);
 
 // reports
 Breadcrumbs::register(
@@ -342,7 +325,7 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'transactions.create', function (Generator $breadcrumbs, $what) {
     $breadcrumbs->parent('transactions.index', $what);
-    $breadcrumbs->push('Create new ' .e($what), route('transactions.create', $what));
+    $breadcrumbs->push('Create new ' . e($what), route('transactions.create', $what));
 }
 );
 

app/Http/routes.php

@@ -1,12 +1,21 @@
 <?php
+use FireflyIII\Models\Account;
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\Category;
+use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\Reminder;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Models\TransactionJournal;
+
 
 // models
 Route::bind(
     'account',
     function ($value, $route) {
         if (Auth::check()) {
-            $account = Account::
-            leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
+            $account = Account::leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
                               ->where('account_types.editable', 1)
                               ->where('accounts.id', $value)
                               ->where('user_id', Auth::user()->id)
@@ -20,66 +29,9 @@ Route::bind(
 );
 
 Route::bind(
-    'accountname', function ($value, $route) {
+    'tjSecond', function ($value, $route) {
     if (Auth::check()) {
-        return Account::
-        leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')->where('account_types.editable', 1)->where('name', $value)->where(
-            'user_id', Auth::user()->id
-        )->first();
-    }
-
-    return null;
-}
-);
-
-
-Route::bind(
-    'bill', function ($value, $route) {
-    if (Auth::check()) {
-        return Bill::
-        where('id', $value)->where('user_id', Auth::user()->id)->first();
-    }
-
-    return null;
-}
-);
-Route::bind(
-    'budget', function ($value, $route) {
-    if (Auth::check()) {
-        return Budget::
-        where('id', $value)->where('user_id', Auth::user()->id)->first();
-    }
-
-    return null;
-}
-);
-
-Route::bind(
-    'component', function ($value, $route) {
-    if (Auth::check()) {
-        return Component::
-        where('id', $value)->where('user_id', Auth::user()->id)->first();
-    }
-
-    return null;
-}
-);
-
-Route::bind(
-    'reminder', function ($value, $route) {
-    if (Auth::check()) {
-        return Reminder::
-        where('id', $value)->where('user_id', Auth::user()->id)->first();
-    }
-
-    return null;
-}
-);
-
-Route::bind(
-    'category', function ($value, $route) {
-    if (Auth::check()) {
-        return Category::
+        return TransactionJournal::
         where('id', $value)->where('user_id', Auth::user()->id)->first();
     }
 
@@ -97,11 +49,17 @@ Route::bind(
     return null;
 }
 );
+
 Route::bind(
-    'tjSecond', function ($value, $route) {
+    'currency', function ($value, $route) {
+    return TransactionCurrency::find($value);
+}
+);
+
+Route::bind(
+    'bill', function ($value, $route) {
     if (Auth::check()) {
-        return TransactionJournal::
-        where('id', $value)->where('user_id', Auth::user()->id)->first();
+        return Bill::where('id', $value)->where('user_id', Auth::user()->id)->first();
     }
 
     return null;
@@ -109,8 +67,22 @@ Route::bind(
 );
 
 Route::bind(
-    'currency', function ($value, $route) {
-    return TransactionCurrency::find($value);
+    'budget', function ($value, $route) {
+    if (Auth::check()) {
+        return Budget::where('id', $value)->where('user_id', Auth::user()->id)->first();
+    }
+
+    return null;
+}
+);
+
+Route::bind(
+    'reminder', function ($value, $route) {
+    if (Auth::check()) {
+        return Reminder::where('id', $value)->where('user_id', Auth::user()->id)->first();
+    }
+
+    return null;
 }
 );
 
@@ -135,7 +107,7 @@ Route::bind(
         where('piggy_banks.id', $value)
                         ->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')
                         ->where('accounts.user_id', Auth::user()->id)
-                        ->where('repeats', 0)->first(['piggy_banks.*']);
+                        ->first(['piggy_banks.*']);
     }
 
     return null;
@@ -143,158 +115,221 @@ Route::bind(
 );
 
 Route::bind(
-    'repeatedExpense', function ($value, $route) {
+    'category', function ($value, $route) {
     if (Auth::check()) {
-        return PiggyBank::
-        where('piggy_banks.id', $value)
-                        ->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')
-                        ->where('accounts.user_id', Auth::user()->id)
-                        ->where('repeats', 1)->first(['piggy_banks.*']);
+        return Category::where('id', $value)->where('user_id', Auth::user()->id)->first();
     }
 
     return null;
 }
 );
 
-Route::bind(
-    'repeated', function ($value, $route) {
-    if (Auth::check()) {
-        return PiggyBank::
-        where('piggy_banks.id', $value)
-                        ->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')
-                        ->where('accounts.user_id', Auth::user()->id)
-                        ->where('repeats', 1)->first(['piggy_banks.*']);
-    }
 
-    return null;
-}
+/**
+ * Auth\AuthController
+ */
+Route::get('/register', ['uses' => 'Auth\AuthController@getRegister', 'as' => 'register']);
+
+Route::controllers(
+    [
+        'auth'     => 'Auth\AuthController',
+        'password' => 'Auth\PasswordController',
+    ]
 );
 
-// protected routes:
+
+/**
+ * Home Controller
+ */
 Route::group(
-    ['before' => 'auth'], function () {
-
-
-    // some date routes used for (well duh) date-based navigation.
-    Route::get('/prev', ['uses' => 'HomeController@sessionPrev', 'as' => 'sessionPrev']);
-    Route::get('/next', ['uses' => 'HomeController@sessionNext', 'as' => 'sessionNext']);
-    Route::get('/jump/{range}', ['uses' => 'HomeController@rangeJump', 'as' => 'rangeJump']);
-
-
-    // account controller:
+    ['middleware' => ['auth', 'range', 'reminders', 'piggybanks']], function () {
+    Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index']);
+    Route::get('/home', ['uses' => 'HomeController@index', 'as' => 'home']);
+    Route::post('/daterange', ['uses' => 'HomeController@dateRange', 'as' => 'daterange']);
+    Route::get('/flush', ['uses' => 'HomeController@flush', 'as' => 'flush']);
+    /**
+     * Account Controller
+     */
     Route::get('/accounts/{what}', ['uses' => 'AccountController@index', 'as' => 'accounts.index'])->where('what', 'revenue|asset|expense');
     Route::get('/accounts/create/{what}', ['uses' => 'AccountController@create', 'as' => 'accounts.create'])->where('what', 'revenue|asset|expense');
     Route::get('/accounts/edit/{account}', ['uses' => 'AccountController@edit', 'as' => 'accounts.edit']);
     Route::get('/accounts/delete/{account}', ['uses' => 'AccountController@delete', 'as' => 'accounts.delete']);
     Route::get('/accounts/show/{account}/{view?}', ['uses' => 'AccountController@show', 'as' => 'accounts.show']);
 
+    Route::post('/accounts/store', ['uses' => 'AccountController@store', 'as' => 'accounts.store']);
+    Route::post('/accounts/update/{account}', ['uses' => 'AccountController@update', 'as' => 'accounts.update']);
+    Route::post('/accounts/destroy/{account}', ['uses' => 'AccountController@destroy', 'as' => 'accounts.destroy']);
 
-    // budget controller:
+    /**
+     * Bills Controller
+     */
+    Route::get('/bills', ['uses' => 'BillController@index', 'as' => 'bills.index']);
+    Route::get('/bills/rescan/{bill}', ['uses' => 'BillController@rescan', 'as' => 'bills.rescan']); # rescan for matching.
+    Route::get('/bills/create', ['uses' => 'BillController@create', 'as' => 'bills.create']);
+    Route::get('/bills/edit/{bill}', ['uses' => 'BillController@edit', 'as' => 'bills.edit']);
+    Route::get('/bills/add/{bill}', ['uses' => 'BillController@add', 'as' => 'bills.add']);
+    Route::get('/bills/delete/{bill}', ['uses' => 'BillController@delete', 'as' => 'bills.delete']);
+    Route::get('/bills/show/{bill}', ['uses' => 'BillController@show', 'as' => 'bills.show']);
+    Route::post('/bills/store', ['uses' => 'BillController@store', 'as' => 'bills.store']);
+    Route::post('/bills/update/{bill}', ['uses' => 'BillController@update', 'as' => 'bills.update']);
+    Route::post('/bills/destroy/{bill}', ['uses' => 'BillController@destroy', 'as' => 'bills.destroy']);
+
+    /**
+     * Budget Controller
+     */
     Route::get('/budgets', ['uses' => 'BudgetController@index', 'as' => 'budgets.index']);
     Route::get('/budgets/income', ['uses' => 'BudgetController@updateIncome', 'as' => 'budgets.income']); # extra.
     Route::get('/budgets/create', ['uses' => 'BudgetController@create', 'as' => 'budgets.create']);
     Route::get('/budgets/edit/{budget}', ['uses' => 'BudgetController@edit', 'as' => 'budgets.edit']);
     Route::get('/budgets/delete/{budget}', ['uses' => 'BudgetController@delete', 'as' => 'budgets.delete']);
     Route::get('/budgets/show/{budget}/{limitrepetition?}', ['uses' => 'BudgetController@show', 'as' => 'budgets.show']);
+    Route::get('/budgets/list/noBudget', ['uses' => 'BudgetController@noBudget', 'as' => 'budgets.noBudget']);
+    Route::post('/budgets/income', ['uses' => 'BudgetController@postUpdateIncome', 'as' => 'budgets.postIncome']);
+    Route::post('/budgets/store', ['uses' => 'BudgetController@store', 'as' => 'budgets.store']);
+    Route::post('/budgets/update/{budget}', ['uses' => 'BudgetController@update', 'as' => 'budgets.update']);
+    Route::post('/budgets/destroy/{budget}', ['uses' => 'BudgetController@destroy', 'as' => 'budgets.destroy']);
+    Route::post('budgets/amount/{budget}', ['uses' => 'BudgetController@amount']);
 
-    // category controller:
+    /**
+     * Category Controller
+     */
     Route::get('/categories', ['uses' => 'CategoryController@index', 'as' => 'categories.index']);
     Route::get('/categories/create', ['uses' => 'CategoryController@create', 'as' => 'categories.create']);
     Route::get('/categories/edit/{category}', ['uses' => 'CategoryController@edit', 'as' => 'categories.edit']);
     Route::get('/categories/delete/{category}', ['uses' => 'CategoryController@delete', 'as' => 'categories.delete']);
     Route::get('/categories/show/{category}', ['uses' => 'CategoryController@show', 'as' => 'categories.show']);
+    Route::get('/categories/list/noCategory', ['uses' => 'CategoryController@noCategory', 'as' => 'categories.noCategory']);
+    Route::post('/categories/store', ['uses' => 'CategoryController@store', 'as' => 'categories.store']);
+    Route::post('/categories/update/{category}', ['uses' => 'CategoryController@update', 'as' => 'categories.update']);
+    Route::post('/categories/destroy/{category}', ['uses' => 'CategoryController@destroy', 'as' => 'categories.destroy']);
 
-    // currency controller
+    /**
+     * Currency Controller
+     */
     Route::get('/currency', ['uses' => 'CurrencyController@index', 'as' => 'currency.index']);
     Route::get('/currency/create', ['uses' => 'CurrencyController@create', 'as' => 'currency.create']);
     Route::get('/currency/edit/{currency}', ['uses' => 'CurrencyController@edit', 'as' => 'currency.edit']);
     Route::get('/currency/delete/{currency}', ['uses' => 'CurrencyController@delete', 'as' => 'currency.delete']);
     Route::get('/currency/default/{currency}', ['uses' => 'CurrencyController@defaultCurrency', 'as' => 'currency.default']);
+    Route::post('/currency/store', ['uses' => 'CurrencyController@store', 'as' => 'currency.store']);
+    Route::post('/currency/update/{currency}', ['uses' => 'CurrencyController@update', 'as' => 'currency.update']);
+    Route::post('/currency/destroy/{currency}', ['uses' => 'CurrencyController@destroy', 'as' => 'currency.destroy']);
 
-    // google chart controller
+
+    /**
+     * Google Chart Controller
+     */
     Route::get('/chart/home/account', ['uses' => 'GoogleChartController@allAccountsBalanceChart']);
     Route::get('/chart/home/budgets', ['uses' => 'GoogleChartController@allBudgetsHomeChart']);
     Route::get('/chart/home/categories', ['uses' => 'GoogleChartController@allCategoriesHomeChart']);
     Route::get('/chart/home/bills', ['uses' => 'GoogleChartController@billsOverview']);
     Route::get('/chart/account/{account}/{view?}', ['uses' => 'GoogleChartController@accountBalanceChart']);
+    Route::get('/chart/budget/{budget}/spending/{year?}', ['uses' => 'GoogleChartController@budgetsAndSpending']);
+    Route::get('/chart/budgets/spending/{year?}', ['uses' => 'GoogleChartController@allBudgetsAndSpending'])->where(['year' => '[0-9]+']);
+    Route::get('/chart/budget/{budget}/{limitrepetition}', ['uses' => 'GoogleChartController@budgetLimitSpending']);
     Route::get('/chart/reports/income-expenses/{year}', ['uses' => 'GoogleChartController@yearInExp']);
     Route::get('/chart/reports/income-expenses-sum/{year}', ['uses' => 'GoogleChartController@yearInExpSum']);
     Route::get('/chart/bills/{bill}', ['uses' => 'GoogleChartController@billOverview']);
-    Route::get('/chart/budget/{budget}/{limitrepetition}', ['uses' => 'GoogleChartController@budgetLimitSpending']);
-    Route::get('/chart/piggy_history/{piggyBank}', ['uses' => 'GoogleChartController@piggyBankHistory']);
+    Route::get('/chart/piggy-history/{piggyBank}', ['uses' => 'GoogleChartController@piggyBankHistory']);
+    Route::get('/chart/category/{category}/period', ['uses' => 'GoogleChartController@categoryPeriodChart']);
+    Route::get('/chart/category/{category}/overview', ['uses' => 'GoogleChartController@categoryOverviewChart']);
 
-    // google chart for components (categories + budgets combined)
-    Route::get('/chart/budget/{budget}/spending/{year}', ['uses' => 'GoogleChartController@budgetsAndSpending']);
-    Route::get('/chart/category/{category}/spending/{year}', ['uses' => 'GoogleChartController@categoriesAndSpending']);
-
-    // help controller
+    /**
+     * Help Controller
+     */
     Route::get('/help/{route}', ['uses' => 'HelpController@show', 'as' => 'help.show']);
 
-    // home controller
-    Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index']);
-    Route::get('/flush', ['uses' => 'HomeController@flush', 'as' => 'flush']); # even though nothing is cached.
-
-    // JSON controller
+    /**
+     * JSON Controller
+     */
     Route::get('/json/expense-accounts', ['uses' => 'JsonController@expenseAccounts', 'as' => 'json.expense-accounts']);
     Route::get('/json/revenue-accounts', ['uses' => 'JsonController@revenueAccounts', 'as' => 'json.revenue-accounts']);
     Route::get('/json/categories', ['uses' => 'JsonController@categories', 'as' => 'json.categories']);
+    Route::get('/json/box/in', ['uses' => 'JsonController@boxIn', 'as' => 'json.box.in']);
+    Route::get('/json/box/out', ['uses' => 'JsonController@boxOut', 'as' => 'json.box.out']);
+    Route::get('/json/box/bills-unpaid', ['uses' => 'JsonController@boxBillsUnpaid', 'as' => 'json.box.paid']);
+    Route::get('/json/box/bills-paid', ['uses' => 'JsonController@boxBillsPaid', 'as' => 'json.box.unpaid']);
+    Route::get('/json/show-shared-reports', 'JsonController@showSharedReports');
+    Route::get('/json/transaction-journals/{what}', 'JsonController@transactionJournals');
+    Route::get('/json/show-shared-reports/set', 'JsonController@setSharedReports');
 
 
-    // piggy bank controller
-    Route::get('/piggy_banks', ['uses' => 'PiggyBankController@index', 'as' => 'piggy_banks.index']);
-    Route::get('/piggy_banks/add/{piggyBank}', ['uses' => 'PiggyBankController@add']); # add money
-    Route::get('/piggy_banks/remove/{piggyBank}', ['uses' => 'PiggyBankController@remove']); #remove money
+    /**
+     * Piggy Bank Controller
+     */
+    Route::get('/piggy-banks', ['uses' => 'PiggyBankController@index', 'as' => 'piggy-banks.index']);
+    Route::get('/piggy-banks/add/{piggyBank}', ['uses' => 'PiggyBankController@add', 'as' => 'piggy-banks.addMoney']); # add money
+    Route::get('/piggy-banks/remove/{piggyBank}', ['uses' => 'PiggyBankController@remove', 'as' => 'piggy-banks.removeMoney']); #remove money
+    Route::get('/piggy-banks/create', ['uses' => 'PiggyBankController@create', 'as' => 'piggy-banks.create']);
+    Route::get('/piggy-banks/edit/{piggyBank}', ['uses' => 'PiggyBankController@edit', 'as' => 'piggy-banks.edit']);
+    Route::get('/piggy-banks/delete/{piggyBank}', ['uses' => 'PiggyBankController@delete', 'as' => 'piggy-banks.delete']);
+    Route::get('/piggy-banks/show/{piggyBank}', ['uses' => 'PiggyBankController@show', 'as' => 'piggy-banks.show']);
+    Route::post('/piggy-banks/store', ['uses' => 'PiggyBankController@store', 'as' => 'piggy-banks.store']);
+    Route::post('/piggy-banks/update/{piggyBank}', ['uses' => 'PiggyBankController@update', 'as' => 'piggy-banks.update']);
+    Route::post('/piggy-banks/destroy/{piggyBank}', ['uses' => 'PiggyBankController@destroy', 'as' => 'piggy-banks.destroy']);
+    Route::post('/piggy-banks/add/{piggyBank}', ['uses' => 'PiggyBankController@postAdd', 'as' => 'piggy-banks.add']); # add money
+    Route::post('/piggy-banks/remove/{piggyBank}', ['uses' => 'PiggyBankController@postRemove', 'as' => 'piggy-banks.remove']); # remove money.
+    Route::post('/piggy-banks/sort', ['uses' => 'PiggyBankController@order', 'as' => 'piggy-banks.order']);
 
-    Route::get('/piggy_banks/create', ['uses' => 'PiggyBankController@create', 'as' => 'piggy_banks.create']);
-    Route::get('/piggy_banks/edit/{piggyBank}', ['uses' => 'PiggyBankController@edit', 'as' => 'piggy_banks.edit']);
-    Route::get('/piggy_banks/delete/{piggyBank}', ['uses' => 'PiggyBankController@delete', 'as' => 'piggy_banks.delete']);
-    Route::get('/piggy_banks/show/{piggyBank}', ['uses' => 'PiggyBankController@show', 'as' => 'piggy_banks.show']);
-
-    // preferences controller
+    /**
+     * Preferences Controller
+     */
     Route::get('/preferences', ['uses' => 'PreferencesController@index', 'as' => 'preferences']);
+    Route::post('/preferences', ['uses' => 'PreferencesController@postIndex']);
 
-    //profile controller
+    /**
+     * Profile Controller
+     */
     Route::get('/profile', ['uses' => 'ProfileController@index', 'as' => 'profile']);
     Route::get('/profile/change-password', ['uses' => 'ProfileController@changePassword', 'as' => 'change-password']);
+    Route::get('/profile/delete-account', ['uses' => 'ProfileController@deleteAccount', 'as' => 'delete-account']);
+    Route::post('/profile/delete-account', ['uses' => 'ProfileController@postDeleteAccount', 'as' => 'delete-account-post']);
+    Route::post('/profile/change-password', ['uses' => 'ProfileController@postChangePassword', 'as' => 'change-password-post']);
 
-    // related controller:
-    Route::get('/related/alreadyRelated/{tj}', ['uses' => 'RelatedController@alreadyRelated','as' => 'related.alreadyRelated']);
-    Route::post('/related/relate/{tj}/{tjSecond}', ['uses' => 'RelatedController@relate','as' => 'related.relate']);
-    Route::get('/related/removeRelation/{tj}/{tjSecond}', ['uses' => 'RelatedController@removeRelation','as' => 'related.removeRelation']);
-    Route::get('/related/related/{tj}', ['uses' => 'RelatedController@related','as' => 'related.related']);
-    Route::post('/related/search/{tj}', ['uses' => 'RelatedController@search','as' => 'related.search']);
+    /**
+     * Related transactions controller
+     */
+    Route::get('/related/alreadyRelated/{tj}', ['uses' => 'RelatedController@alreadyRelated', 'as' => 'related.alreadyRelated']);
+    Route::post('/related/relate/{tj}/{tjSecond}', ['uses' => 'RelatedController@relate', 'as' => 'related.relate']);
+    Route::post('/related/removeRelation/{tj}/{tjSecond}', ['uses' => 'RelatedController@removeRelation', 'as' => 'related.removeRelation']);
+    Route::get('/related/remove/{tj}/{tjSecond}', ['uses' => 'RelatedController@getRemoveRelation', 'as' => 'related.getRemoveRelation']);
+    Route::get('/related/related/{tj}', ['uses' => 'RelatedController@related', 'as' => 'related.related']);
+    Route::post('/related/search/{tj}', ['uses' => 'RelatedController@search', 'as' => 'related.search']);
 
-    // bills controller
-    Route::get('/bills', ['uses' => 'BillController@index', 'as' => 'bills.index']);
-    Route::get('/bills/rescan/{bill}', ['uses' => 'BillController@rescan', 'as' => 'bills.rescan']); # rescan for matching.
-    Route::get('/bills/create', ['uses' => 'BillController@create', 'as' => 'bills.create']);
-    Route::get('/bills/edit/{bill}', ['uses' => 'BillController@edit', 'as' => 'bills.edit']);
-    Route::get('/bills/delete/{bill}', ['uses' => 'BillController@delete', 'as' => 'bills.delete']);
-    Route::get('/bills/show/{bill}', ['uses' => 'BillController@show', 'as' => 'bills.show']);
+    /**
+     * Reminder Controller
+     */
+    Route::get('/reminders', ['uses' => 'ReminderController@index', 'as' => 'reminders.index']);
+    Route::get('/reminder/dismiss/{reminder}', ['uses' => 'ReminderController@dismiss', 'as' => 'reminders.dismiss']);
+    Route::get('/reminder/act/{reminder}', ['uses' => 'ReminderController@act', 'as' => 'reminders.act']);
+    Route::get('/reminder/{reminder}', ['uses' => 'ReminderController@show', 'as' => 'reminders.show']);
 
-    // repeated expenses controller:
-    Route::get('/repeatedexpenses', ['uses' => 'RepeatedExpenseController@index', 'as' => 'repeated.index']);
-    Route::get('/repeatedexpenses/create', ['uses' => 'RepeatedExpenseController@create', 'as' => 'repeated.create']);
-    Route::get('/repeatedexpenses/edit/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@edit', 'as' => 'repeated.edit']);
-    Route::get('/repeatedexpenses/delete/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@delete', 'as' => 'repeated.delete']);
-    Route::get('/repeatedexpenses/show/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@show', 'as' => 'repeated.show']);
-
-    // report controller:
+    /**
+     * Report Controller
+     */
     Route::get('/reports', ['uses' => 'ReportController@index', 'as' => 'reports.index']);
     Route::get('/reports/{year}', ['uses' => 'ReportController@year', 'as' => 'reports.year']);
     Route::get('/reports/{year}/{month}', ['uses' => 'ReportController@month', 'as' => 'reports.month']);
     Route::get('/reports/budget/{year}/{month}', ['uses' => 'ReportController@budget', 'as' => 'reports.budget']);
 
-    // reminder controller
-    Route::get('/reminders/{reminder}', ['uses' => 'ReminderController@show', 'as' => 'reminders.show']);
-    Route::get('/reminders/{reminder}/dismiss', ['uses' => 'ReminderController@dismiss', 'as' => 'reminders.dismiss']);
-    Route::get('/reminders/{reminder}/notNow', ['uses' => 'ReminderController@notNow', 'as' => 'reminders.notNow']);
-    Route::get('/reminders/{reminder}/act', ['uses' => 'ReminderController@act', 'as' => 'reminders.act']);
+    // pop ups for budget report:
+    Route::get('/reports/modal/{account}/{year}/{month}/no-budget', ['uses' => 'ReportController@modalNoBudget', 'as' => 'reports.no-budget']);
+    Route::get(
+        '/reports/modal/{account}/{year}/{month}/balanced-transfers',
+        ['uses' => 'ReportController@modalBalancedTransfers', 'as' => 'reports.balanced-transfers']
+    );
+    Route::get(
+        '/reports/modal/{account}/{year}/{month}/left-unbalanced', ['uses' => 'ReportController@modalLeftUnbalanced', 'as' => 'reports.left-unbalanced']
+    );
 
-    // search controller:
+    /**
+     * Search Controller
+     */
     Route::get('/search', ['uses' => 'SearchController@index', 'as' => 'search']);
 
-    // transaction controller:
+    /**
+     * Transaction Controller
+     */
     Route::get('/transactions/{what}', ['uses' => 'TransactionController@index', 'as' => 'transactions.index'])->where(
         ['what' => 'expenses|revenue|withdrawal|deposit|transfer|transfers']
     );
@@ -304,98 +339,20 @@ Route::group(
     Route::get('/transaction/edit/{tj}', ['uses' => 'TransactionController@edit', 'as' => 'transactions.edit']);
     Route::get('/transaction/delete/{tj}', ['uses' => 'TransactionController@delete', 'as' => 'transactions.delete']);
     Route::get('/transaction/show/{tj}', ['uses' => 'TransactionController@show', 'as' => 'transactions.show']);
-    Route::get('/transaction/relate/{tj}', ['uses' => 'TransactionController@relate', 'as' => 'transactions.relate']);
-    Route::post('/transactions/relatedSearch/{tj}', ['uses' => 'TransactionController@relatedSearch', 'as' => 'transactions.relatedSearch']);
-    Route::post('/transactions/alreadyRelated/{tj}', ['uses' => 'TransactionController@alreadyRelated', 'as' => 'transactions.alreadyRelated']);
-    Route::post('/transactions/doRelate', ['uses' => 'TransactionController@doRelate', 'as' => 'transactions.doRelate']);
-    Route::any('/transactions/unrelate/{tj}', ['uses' => 'TransactionController@unrelate', 'as' => 'transactions.unrelate']);
-
-    // user controller
-    Route::get('/logout', ['uses' => 'UserController@logout', 'as' => 'logout']);
-
-    Route::post('budgets/amount/{budget}', ['uses' => 'BudgetController@amount']);
-
-
-}
-);
-
-// protected + csrf routes (POST)
-Route::group(
-    ['before' => 'csrf|auth'], function () {
-    // account controller:
-    Route::post('/accounts/store', ['uses' => 'AccountController@store', 'as' => 'accounts.store']);
-    Route::post('/accounts/update/{account}', ['uses' => 'AccountController@update', 'as' => 'accounts.update']);
-    Route::post('/accounts/destroy/{account}', ['uses' => 'AccountController@destroy', 'as' => 'accounts.destroy']);
-
-    // budget controller:
-    Route::post('/budgets/income', ['uses' => 'BudgetController@postUpdateIncome', 'as' => 'budgets.postIncome']);
-    Route::post('/budgets/store', ['uses' => 'BudgetController@store', 'as' => 'budgets.store']);
-    Route::post('/budgets/update/{budget}', ['uses' => 'BudgetController@update', 'as' => 'budgets.update']);
-    Route::post('/budgets/destroy/{budget}', ['uses' => 'BudgetController@destroy', 'as' => 'budgets.destroy']);
-
-    // category controller
-    Route::post('/categories/store', ['uses' => 'CategoryController@store', 'as' => 'categories.store']);
-    Route::post('/categories/update/{category}', ['uses' => 'CategoryController@update', 'as' => 'categories.update']);
-    Route::post('/categories/destroy/{category}', ['uses' => 'CategoryController@destroy', 'as' => 'categories.destroy']);
-
-    // currency controller
-    Route::post('/currency/store', ['uses' => 'CurrencyController@store', 'as' => 'currency.store']);
-    Route::post('/currency/update/{currency}', ['uses' => 'CurrencyController@update', 'as' => 'currency.update']);
-    Route::post('/currency/destroy/{currency}', ['uses' => 'CurrencyController@destroy', 'as' => 'currency.destroy']);
-
-    // piggy bank controller
-    Route::post('/piggy_banks/store', ['uses' => 'PiggyBankController@store', 'as' => 'piggy_banks.store']);
-    Route::post('/piggy_banks/update/{piggyBank}', ['uses' => 'PiggyBankController@update', 'as' => 'piggy_banks.update']);
-    Route::post('/piggy_banks/destroy/{piggyBank}', ['uses' => 'PiggyBankController@destroy', 'as' => 'piggy_banks.destroy']);
-    Route::post('/piggy_banks/add/{piggyBank}', ['uses' => 'PiggyBankController@postAdd', 'as' => 'piggy_banks.add']); # add money
-    Route::post('/piggy_banks/remove/{piggyBank}', ['uses' => 'PiggyBankController@postRemove', 'as' => 'piggy_banks.remove']); # remove money.
-
-    // repeated expense controller
-    Route::post('/repeatedexpense/store', ['uses' => 'RepeatedExpenseController@store', 'as' => 'repeated.store']);
-    Route::post('/repeatedexpense/update/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@update', 'as' => 'repeated.update']);
-    Route::post('/repeatedexpense/destroy/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@destroy', 'as' => 'repeated.destroy']);
-
-    // preferences controller
-    Route::post('/preferences', ['uses' => 'PreferencesController@postIndex']);
-
-    // profile controller
-    Route::post('/profile/change-password', ['uses' => 'ProfileController@postChangePassword']);
-
-    // bills controller
-    Route::post('/bills/store', ['uses' => 'BillController@store', 'as' => 'bills.store']);
-    Route::post('/bills/update/{bill}', ['uses' => 'BillController@update', 'as' => 'bills.update']);
-    Route::post('/bills/destroy/{bill}', ['uses' => 'BillController@destroy', 'as' => 'bills.destroy']);
-
     // transaction controller:
     Route::post('/transactions/store/{what}', ['uses' => 'TransactionController@store', 'as' => 'transactions.store'])->where(
         ['what' => 'expenses|revenue|withdrawal|deposit|transfer|transfers']
     );
     Route::post('/transaction/update/{tj}', ['uses' => 'TransactionController@update', 'as' => 'transactions.update']);
     Route::post('/transaction/destroy/{tj}', ['uses' => 'TransactionController@destroy', 'as' => 'transactions.destroy']);
+    Route::post('/transaction/reorder', ['uses' => 'TransactionController@reorder', 'as' => 'transactions.reorder']);
 
-}
-);
-
-// guest routes:
-Route::group(
-    ['before' => 'guest'], function () {
-    // user controller
-    Route::get('/login', ['uses' => 'UserController@login', 'as' => 'login']);
-    Route::get('/register', ['uses' => 'UserController@register', 'as' => 'register','before' => 'allow-register']);
-    Route::get('/reset/{reset}', ['uses' => 'UserController@reset', 'as' => 'reset']);
-    Route::get('/remindMe', ['uses' => 'UserController@remindMe', 'as' => 'remindMe']);
+    /**
+     * Auth\Auth Controller
+     */
+    Route::get('/logout', ['uses' => 'Auth\AuthController@getLogout', 'as' => 'logout']);
 
 
 }
 );
 
-// guest + csrf routes:
-Route::group(
-    ['before' => 'csrf|guest'], function () {
-
-    // user controller
-    Route::post('/login', ['uses' => 'UserController@postLogin', 'as' => 'login.post']);
-    Route::post('/register', ['uses' => 'UserController@postRegister', 'as' => 'register.post','before' => 'allow-register']);
-    Route::post('/remindMe', ['uses' => 'UserController@postRemindMe', 'as' => 'remindMe.post']);
-}
-);

app/Models/Account.php

@@ -0,0 +1,183 @@
+<?php namespace FireflyIII\Models;
+
+use App;
+use Crypt;
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Query\JoinClause;
+use Watson\Validating\ValidatingTrait;
+
+/**
+ * Class Account
+ *
+ * @package FireflyIII\Models
+ */
+class Account extends Model
+{
+    use SoftDeletes, ValidatingTrait;
+
+    protected $fillable = ['user_id', 'account_type_id', 'name', 'active', 'virtual_balance'];
+    protected $rules
+                        = [
+            'user_id'         => 'required|exists:users,id',
+            'account_type_id' => 'required|exists:account_types,id',
+            'name'            => 'required|between:1,1024|uniqueAccountForUser',
+            'active'          => 'required|boolean'
+        ];
+
+    /**
+     * @param array $fields
+     *
+     * @return Account|null
+     */
+    public static function firstOrCreateEncrypted(array $fields)
+    {
+        // everything but the name:
+        $query = Account::orderBy('id');
+        foreach ($fields as $name => $value) {
+            if ($name != 'name') {
+                $query->where($name, $value);
+            }
+        }
+        $set = $query->get(['accounts.*']);
+        /** @var Account $account */
+        foreach ($set as $account) {
+            if ($account->name == $fields['name']) {
+                return $account;
+            }
+        }
+        // create it!
+        $account = Account::create($fields);
+        if (is_null($account->id)) {
+            // could not create account:
+            App::abort(500, 'Could not create new account with data: ' . json_encode($fields).' because ' . json_encode($account->getErrors()));
+
+
+        }
+
+        return $account;
+
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function accountMeta()
+    {
+        return $this->hasMany('FireflyIII\Models\AccountMeta');
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function accountType()
+    {
+        return $this->belongsTo('FireflyIII\Models\AccountType');
+    }
+
+    /**
+     * @return array
+     */
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'deleted_at'];
+    }
+
+    /**
+     * @param $fieldName
+     *
+     * @return string|null
+     */
+    public function getMeta($fieldName)
+    {
+        foreach ($this->accountMeta as $meta) {
+            if ($meta->name == $fieldName) {
+                return $meta->data;
+            }
+        }
+
+        return null;
+
+    }
+
+    /**
+     * @param $value
+     *
+     * @return string
+     */
+    public function getNameAttribute($value)
+    {
+
+        if (intval($this->encrypted) == 1) {
+            return Crypt::decrypt($value);
+        }
+
+        // @codeCoverageIgnoreStart
+        return $value;
+        // @codeCoverageIgnoreEnd
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function piggyBanks()
+    {
+        return $this->hasMany('FireflyIII\Models\PiggyBank');
+    }
+
+    /**
+     * @param EloquentBuilder $query
+     * @param array           $types
+     */
+    public function scopeAccountTypeIn(EloquentBuilder $query, array $types)
+    {
+        if (is_null($this->joinedAccountTypes)) {
+            $query->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id');
+            $this->joinedAccountTypes = true;
+        }
+        $query->whereIn('account_types.type', $types);
+    }
+
+    /**
+     * @param EloquentBuilder $query
+     * @param string          $name
+     * @param string          $value
+     */
+    public function scopeHasMetaValue(EloquentBuilder $query, $name, $value)
+    {
+        $joinName = str_replace('.', '_', $name);
+        $query->leftJoin(
+            'account_meta as ' . $joinName, function (JoinClause $join) use ($joinName, $name) {
+            $join->on($joinName . '.account_id', '=', 'accounts.id')->where($joinName . '.name', '=', $name);
+        }
+        );
+        $query->where($joinName . '.data', json_encode($value));
+    }
+
+    /**
+     * @param $value
+     */
+    public function setNameAttribute($value)
+    {
+        $this->attributes['name']      = Crypt::encrypt($value);
+        $this->attributes['encrypted'] = true;
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function transactions()
+    {
+        return $this->hasMany('FireflyIII\Models\Transaction');
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function user()
+    {
+        return $this->belongsTo('FireflyIII\User');
+    }
+
+}

app/Models/AccountMeta.php

@@ -1,25 +1,24 @@
-<?php
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
 use Watson\Validating\ValidatingTrait;
-use \Illuminate\Database\Eloquent\Model as Eloquent;
+
 /**
  * Class AccountMeta
+ *
+ * @package FireflyIII\Models
  */
-class AccountMeta extends Eloquent
+class AccountMeta extends Model
 {
+
     use ValidatingTrait;
-    /**
-     * @var array
-     */
-    public static $rules
-        = [
-            'account_id' => 'numeric|required|exists:accounts,id',
-            'name'       => 'required|between:1,250',
+    protected $fillable = ['account_id', 'name', 'data'];
+    protected $rules
+                        = [
+            'account_id' => 'required|exists:accounts,id',
+            'name'       => 'required|between:1,100',
             'data'       => 'required'
         ];
-    /**
-     * @var array
-     */
-    protected $fillable = ['account_id', 'name', 'date'];
     protected $table    = 'account_meta';
 
     /**
@@ -27,9 +26,10 @@ class AccountMeta extends Eloquent
      */
     public function account()
     {
-        return $this->belongsTo('Account');
+        return $this->belongsTo('FireflyIII\Models\Account');
     }
 
+
     /**
      * @param $value
      *
@@ -40,6 +40,14 @@ class AccountMeta extends Eloquent
         return json_decode($value);
     }
 
+    /**
+     * @return array
+     */
+    public function getDates()
+    {
+        return ['created_at', 'updated_at'];
+    }
+
     /**
      * @param $value
      */

app/Models/AccountType.php

@@ -0,0 +1,29 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Class AccountType
+ *
+ * @package FireflyIII\Models
+ */
+class AccountType extends Model
+{
+
+    //
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function accounts()
+    {
+        return $this->hasMany('FireflyIII\Models\Account');
+    }
+
+    /**
+     * @return array
+     */
+    public function getDates()
+    {
+        return ['created_at', 'updated_at'];
+    }
+}

app/Models/Bill.php

@@ -0,0 +1,94 @@
+<?php namespace FireflyIII\Models;
+
+use Crypt;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Class Bill
+ *
+ * @package FireflyIII\Models
+ */
+class Bill extends Model
+{
+
+    protected $fillable
+        = ['name', 'match', 'amount_min', 'match_encrypted', 'name_encrypted', 'user_id', 'amount_max', 'date', 'repeat_freq', 'skip', 'automatch', 'active',];
+
+    /**
+     * @return array
+     */
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'date'];
+    }
+
+    /**
+     * @param $value
+     *
+     * @return string
+     */
+    public function getMatchAttribute($value)
+    {
+
+        if (intval($this->match_encrypted) == 1) {
+            return Crypt::decrypt($value);
+        }
+
+        // @codeCoverageIgnoreStart
+        return $value;
+        // @codeCoverageIgnoreEnd
+    }
+
+    /**
+     * @param $value
+     *
+     * @return string
+     */
+    public function getNameAttribute($value)
+    {
+
+        if (intval($this->name_encrypted) == 1) {
+            return Crypt::decrypt($value);
+        }
+
+        // @codeCoverageIgnoreStart
+        return $value;
+        // @codeCoverageIgnoreEnd
+    }
+
+    /**
+     * @param $value
+     */
+    public function setMatchAttribute($value)
+    {
+        $this->attributes['match']           = Crypt::encrypt($value);
+        $this->attributes['match_encrypted'] = true;
+    }
+
+    /**
+     * @param $value
+     */
+    public function setNameAttribute($value)
+    {
+        $this->attributes['name']           = Crypt::encrypt($value);
+        $this->attributes['name_encrypted'] = true;
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function transactionjournals()
+    {
+        return $this->hasMany('FireflyIII\Models\TransactionJournal');
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function user()
+    {
+        return $this->belongsTo('FireflyIII\User');
+    }
+
+
+}

app/Models/Budget.php

@@ -0,0 +1,86 @@
+<?php namespace FireflyIII\Models;
+
+use Crypt;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+/**
+ * Class Budget
+ *
+ * @package FireflyIII\Models
+ */
+class Budget extends Model
+{
+
+    use SoftDeletes;
+
+    protected $fillable = ['user_id', 'name'];
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function budgetlimits()
+    {
+        return $this->hasMany('FireflyIII\Models\BudgetLimit');
+    }
+
+    /**
+     * @return array
+     */
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'deleted_at'];
+    }
+
+    /**
+     * @param $value
+     *
+     * @return string
+     */
+    public function getNameAttribute($value)
+    {
+
+        if (intval($this->encrypted) == 1) {
+            return Crypt::decrypt($value);
+        }
+
+        // @codeCoverageIgnoreStart
+        return $value;
+        // @codeCoverageIgnoreEnd
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
+     */
+    public function limitrepetitions()
+    {
+        return $this->hasManyThrough('FireflyIII\Models\LimitRepetition', 'FireflyIII\Models\BudgetLimit', 'budget_id');
+    }
+
+    /**
+     * @param $value
+     */
+    public function setNameAttribute($value)
+    {
+        $this->attributes['name']      = Crypt::encrypt($value);
+        $this->attributes['encrypted'] = true;
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     */
+    public function transactionjournals()
+    {
+        return $this->belongsToMany('FireflyIII\Models\TransactionJournal', 'budget_transaction_journal', 'budget_id');
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function user()
+    {
+        return $this->belongsTo('FireflyIII\User');
+    }
+
+
+}

app/Models/BudgetLimit.php

@@ -0,0 +1,37 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Class BudgetLimit
+ *
+ * @package FireflyIII\Models
+ */
+class BudgetLimit extends Model
+{
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function budget()
+    {
+        return $this->belongsTo('FireflyIII\Models\Budget');
+    }
+
+    /**
+     * @return array
+     */
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'startdate'];
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function limitrepetitions()
+    {
+        return $this->hasMany('FireflyIII\Models\LimitRepetition');
+    }
+
+}

app/Models/Category.php

@@ -0,0 +1,101 @@
+<?php namespace FireflyIII\Models;
+
+use Crypt;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use App;
+/**
+ * Class Category
+ *
+ * @package FireflyIII\Models
+ */
+class Category extends Model
+{
+    use SoftDeletes;
+
+    protected $fillable = ['user_id', 'name'];
+
+    /**
+     * @return array
+     */
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'deleted_at'];
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     */
+    public function transactionjournals()
+    {
+        return $this->belongsToMany('FireflyIII\Models\TransactionJournal', 'category_transaction_journal', 'category_id');
+    }
+
+    /**
+     * @param array $fields
+     *
+     * @return Account|null
+     */
+    public static function firstOrCreateEncrypted(array $fields)
+    {
+        // everything but the name:
+        $query = Category::orderBy('id');
+        foreach ($fields as $name => $value) {
+            if ($name != 'name') {
+                $query->where($name, $value);
+            }
+        }
+        $set = $query->get(['categories.*']);
+        /** @var Category $category */
+        foreach ($set as $category) {
+            if ($category->name == $fields['name']) {
+                return $category;
+            }
+        }
+        // create it!
+        $category = Category::create($fields);
+        if (is_null($category->id)) {
+            // could not create account:
+            App::abort(500, 'Could not create new category with data: ' . json_encode($fields));
+
+        }
+
+        return $category;
+
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function user()
+    {
+        return $this->belongsTo('FireflyIII\User');
+    }
+
+    /**
+     * @param $value
+     */
+    public function setNameAttribute($value)
+    {
+        $this->attributes['name']      = Crypt::encrypt($value);
+        $this->attributes['encrypted'] = true;
+    }
+
+    /**
+     * @param $value
+     *
+     * @return string
+     */
+    public function getNameAttribute($value)
+    {
+
+        if (intval($this->encrypted) == 1) {
+            return Crypt::decrypt($value);
+        }
+
+        // @codeCoverageIgnoreStart
+        return $value;
+        // @codeCoverageIgnoreEnd
+    }
+
+}

app/Models/Component.php

@@ -0,0 +1,24 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+/**
+ * Class Component
+ *
+ * @package FireflyIII\Models
+ */
+class Component extends Model
+{
+    use SoftDeletes;
+
+    protected $fillable = ['user_id', 'name', 'class'];
+
+    /**
+     * @return array
+     */
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'deleted_at'];
+    }
+}

app/Models/LimitRepetition.php

@@ -0,0 +1,52 @@
+<?php namespace FireflyIII\Models;
+
+use Auth;
+use DB;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Class LimitRepetition
+ *
+ * @package FireflyIII\Models
+ */
+class LimitRepetition extends Model
+{
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function budgetLimit()
+    {
+        return $this->belongsTo('FireflyIII\Models\BudgetLimit');
+    }
+
+    /**
+     * @return array
+     */
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'startdate', 'enddate'];
+    }
+
+    /**
+     * @return float
+     */
+    public function spentInRepetition()
+    {
+        $sum = DB::table('transactions')
+                 ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+                 ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
+                 ->leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budget_transaction_journal.budget_id')
+                 ->leftJoin('limit_repetitions', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id')
+                 ->where('transaction_journals.date', '>=', $this->startdate->format('Y-m-d'))
+                 ->where('transaction_journals.date', '<=', $this->enddate->format('Y-m-d'))
+                 ->where('transaction_journals.user_id', Auth::user()->id)
+                 ->whereNull('transactions.deleted_at')
+                 ->where('transactions.amount', '>', 0)
+                 ->where('limit_repetitions.id', '=', $this->id)
+                 ->sum('transactions.amount');
+
+        return floatval($sum);
+    }
+
+}

app/Models/PiggyBank.php

@@ -0,0 +1,113 @@
+<?php namespace FireflyIII\Models;
+
+use Crypt;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+/**
+ * Class PiggyBank
+ *
+ * @package FireflyIII\Models
+ */
+class PiggyBank extends Model
+{
+    use SoftDeletes;
+
+    protected $fillable
+        = ['name', 'account_id', 'reminder_skip', 'targetamount', 'startdate', 'targetdate', 'reminder', 'remind_me'];
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function account()
+    {
+        return $this->belongsTo('FireflyIII\Models\Account');
+    }
+
+    /**
+     * Grabs the PiggyBankRepetition that's currently relevant / active
+     *
+     * @returns PiggyBankRepetition
+     */
+    public function currentRelevantRep()
+    {
+        if (!is_null($this->currentRep)) {
+            return $this->currentRep;
+        }
+        // repeating piggy banks are no longer supported.
+        $rep              = $this->piggyBankRepetitions()->first(['piggy_bank_repetitions.*']);
+        $this->currentRep = $rep;
+
+        return $rep;
+
+
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function piggyBankRepetitions()
+    {
+        return $this->hasMany('FireflyIII\Models\PiggyBankRepetition');
+    }
+
+    /**
+     * @return array
+     */
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'deleted_at', 'startdate', 'targetdate'];
+    }
+
+    /**
+     * @param $value
+     *
+     * @return int
+     */
+    public function getRemindMeAttribute($value)
+    {
+        return intval($value) == 1;
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function piggyBankEvents()
+    {
+        return $this->hasMany('FireflyIII\Models\PiggyBankEvent');
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
+     */
+    public function reminders()
+    {
+        return $this->morphMany('FireflyIII\Models\Reminder', 'remindersable');
+    }
+
+    /**
+     * @param $value
+     */
+    public function setNameAttribute($value)
+    {
+        $this->attributes['name']      = Crypt::encrypt($value);
+        $this->attributes['encrypted'] = true;
+    }
+
+    /**
+     * @param $value
+     *
+     * @return string
+     */
+    public function getNameAttribute($value)
+    {
+
+        if (intval($this->encrypted) == 1) {
+            return Crypt::decrypt($value);
+        }
+
+        // @codeCoverageIgnoreStart
+        return $value;
+        // @codeCoverageIgnoreEnd
+    }
+}

app/Models/PiggyBankEvent.php

@@ -0,0 +1,39 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Class PiggyBankEvent
+ *
+ * @package FireflyIII\Models
+ */
+class PiggyBankEvent extends Model
+{
+
+    protected $fillable = ['piggy_bank_id', 'transaction_journal_id', 'date', 'amount'];
+
+    /**
+     * @return array
+     */
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'date'];
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function piggyBank()
+    {
+        return $this->belongsTo('FireflyIII\Models\PiggyBank');
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function transactionJournal()
+    {
+        return $this->belongsTo('FireflyIII\Models\TransactionJournal');
+    }
+
+}

app/Models/PiggyBankRepetition.php

@@ -0,0 +1,66 @@
+<?php namespace FireflyIII\Models;
+
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Class PiggyBankRepetition
+ *
+ * @package FireflyIII\Models
+ */
+class PiggyBankRepetition extends Model
+{
+
+    /**
+     * @return array
+     */
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'startdate', 'targetdate'];
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function piggyBank()
+    {
+        return $this->belongsTo('FireflyIII\Models\PiggyBank');
+    }
+
+    /**
+     * @param EloquentBuilder $query
+     * @param Carbon          $start
+     * @param Carbon          $target
+     *
+     * @return $this
+     */
+    public function scopeOnDates(EloquentBuilder $query, Carbon $start, Carbon $target)
+    {
+        return $query->where('startdate', $start->format('Y-m-d'))->where('targetdate', $target->format('Y-m-d'));
+    }
+
+    /**
+     * @param EloquentBuilder $query
+     * @param Carbon          $date
+     *
+     * @return mixed
+     */
+    public function scopeRelevantOnDate(EloquentBuilder $query, Carbon $date)
+    {
+        return $query->where(
+            function (EloquentBuilder $q) use ($date) {
+                $q->where('startdate', '<=', $date->format('Y-m-d 00:00:00'));
+                $q->orWhereNull('startdate');
+            }
+        )
+                     ->where(
+                         function (EloquentBuilder $q) use ($date) {
+
+                             $q->where('targetdate', '>=', $date->format('Y-m-d 00:00:00'));
+                             $q->orWhereNull('targetdate');
+                         }
+                     );
+    }
+
+}

app/Models/Preference.php

@@ -1,16 +1,16 @@
-<?php
-use Illuminate\Database\Eloquent\Model as Eloquent;
-use Watson\Validating\ValidatingTrait;
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
 
 /**
  * Class Preference
+ *
+ * @package FireflyIII\Models
  */
-class Preference extends Eloquent
+class Preference extends Model
 {
-    use ValidatingTrait;
-    protected $fillable = ['name', 'data', 'user_id'];
-    protected $rules
-                        = ['user_id' => 'required|exists:users,id', 'name' => 'required|between:1,255', 'data' => 'required'];
+
+    protected $fillable = ['user_id', 'data', 'name'];
 
     /**
      * @param $value
@@ -22,6 +22,14 @@ class Preference extends Eloquent
         return json_decode($value);
     }
 
+    /**
+     * @return array
+     */
+    public function getDates()
+    {
+        return ['created_at', 'updated_at'];
+    }
+
     /**
      * @param $value
      */
@@ -35,7 +43,7 @@ class Preference extends Eloquent
      */
     public function user()
     {
-        return $this->belongsTo('User');
+        return $this->belongsTo('FireflyIII\User');
     }
 
 }

app/Models/Reminder.php

@@ -0,0 +1,106 @@
+<?php namespace FireflyIII\Models;
+
+use Carbon\Carbon;
+use Crypt;
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Class Reminder
+ *
+ * @package FireflyIII\Models
+ */
+class Reminder extends Model
+{
+
+
+    protected $fillable = ['user_id', 'startdate', 'metadata', 'enddate', 'active', 'notnow', 'remindersable_id', 'remindersable_type',];
+
+    /**
+     * @param $value
+     *
+     * @return int
+     */
+    public function getActiveAttribute($value)
+    {
+        return intval($value) == 1;
+    }
+
+    /**
+     * @return array
+     */
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'startdate', 'enddate'];
+    }
+
+    /**
+     * @param $value
+     *
+     * @return mixed
+     */
+    public function getMetadataAttribute($value)
+    {
+        if (intval($this->encrypted) == 1) {
+            return json_decode(Crypt::decrypt($value));
+        }
+
+        return json_decode($value);
+    }
+
+    /**
+     * @param $value
+     *
+     * @return bool
+     */
+    public function getNotnowAttribute($value)
+    {
+        return intval($value) == 1;
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
+     */
+    public function remindersable()
+    {
+        return $this->morphTo();
+    }
+
+    /**
+     * @param EloquentBuilder $query
+     * @param Carbon          $start
+     * @param Carbon          $end
+     *
+     * @return $this
+     */
+    public function scopeOnDates(EloquentBuilder $query, Carbon $start, Carbon $end)
+    {
+        return $query->where('reminders.startdate', '=', $start->format('Y-m-d 00:00:00'))->where('reminders.enddate', '=', $end->format('Y-m-d 00:00:00'));
+    }
+
+    public function scopeToday(EloquentBuilder $query)
+    {
+        $today = new Carbon;
+
+        return $query->where('startdate', '<=', $today->format('Y-m-d 00:00:00'))->where('enddate', '>=', $today->format('Y-m-d 00:00:00'))->where('active', 1)
+                     ->where('notnow', 0);
+    }
+
+    /**
+     * @param $value
+     */
+    public function setMetadataAttribute($value)
+    {
+        $this->attributes['encrypted'] = true;
+        $this->attributes['metadata']  = Crypt::encrypt(json_encode($value));
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function user()
+    {
+        return $this->belongsTo('FireflyIII\User');
+    }
+
+}

app/Models/Transaction.php

@@ -0,0 +1,72 @@
+<?php namespace FireflyIII\Models;
+
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Watson\Validating\ValidatingTrait;
+
+/**
+ * Class Transaction
+ *
+ * @package FireflyIII\Models
+ */
+class Transaction extends Model
+{
+
+    protected $fillable = ['account_id', 'transaction_journal_id', 'description', 'amount'];
+    protected $rules
+                        = [
+            'account_id'             => 'required|exists:accounts,id',
+            'transaction_journal_id' => 'required|exists:transaction_journals,id',
+            'description'            => 'between:1,255',
+            'amount'                 => 'required|numeric'
+        ];
+    use SoftDeletes, ValidatingTrait;
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function account()
+    {
+        return $this->belongsTo('FireflyIII\Models\Account');
+    }
+
+    /**
+     * @param EloquentBuilder $query
+     * @param Carbon          $date
+     *
+     * @return mixed
+     */
+    public function scopeAfter(EloquentBuilder $query, Carbon $date)
+    {
+        return $query->where('transaction_journals.date', '>=', $date->format('Y-m-d 00:00:00'));
+    }
+
+    /**
+     * @param EloquentBuilder $query
+     * @param Carbon          $date
+     *
+     * @return mixed
+     */
+    public function scopeBefore(EloquentBuilder $query, Carbon $date)
+    {
+        return $query->where('transaction_journals.date', '<=', $date->format('Y-m-d 00:00:00'));
+    }
+
+    /**
+     * @return array
+     */
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'deleted_at'];
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function transactionJournal()
+    {
+        return $this->belongsTo('FireflyIII\Models\TransactionJournal');
+    }
+}

app/Models/TransactionCurrency.php

@@ -0,0 +1,33 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+/**
+ * Class TransactionCurrency
+ *
+ * @package FireflyIII\Models
+ */
+class TransactionCurrency extends Model
+{
+    use SoftDeletes;
+
+
+    protected $fillable = ['name', 'code', 'symbol'];
+
+    /**
+     * @return array
+     */
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'deleted_at'];
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function transactionJournals()
+    {
+        return $this->hasMany('FireflyIII\Models\TransactionJournal');
+    }
+}

app/Models/TransactionGroup.php

@@ -0,0 +1,39 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+/**
+ * Class TransactionGroup
+ *
+ * @package FireflyIII\Models
+ */
+class TransactionGroup extends Model
+{
+    use SoftDeletes;
+
+    /**
+     * @return array
+     */
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'deleted_at'];
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     */
+    public function transactionjournals()
+    {
+        return $this->belongsToMany('FireflyIII\Models\TransactionJournal');
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function user()
+    {
+        return $this->belongsTo('FireflyIII\User');
+    }
+
+}

app/Models/TransactionJournal.php

@@ -1,35 +1,42 @@
-<?php
+<?php namespace FireflyIII\Models;
 
 use Carbon\Carbon;
+use Crypt;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
-use Illuminate\Database\Eloquent\Model as Eloquent;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\SoftDeletingTrait;
+use Illuminate\Database\Eloquent\SoftDeletes;
 use Watson\Validating\ValidatingTrait;
 
 /**
  * Class TransactionJournal
+ *
+ * @package FireflyIII\Models
  */
-class TransactionJournal extends Eloquent
+class TransactionJournal extends Model
 {
-    use SoftDeletingTrait, ValidatingTrait;
+    use SoftDeletes, ValidatingTrait;
+
+    protected $fillable = ['user_id', 'transaction_type_id', 'bill_id', 'transaction_currency_id', 'description', 'completed', 'date', 'encrypted'];
 
-    protected $fillable
-        = ['transaction_type_id', 'transaction_currency_id', 'user_id',
-           'description', 'date', 'completed'];
     protected $rules
-        = ['transaction_type_id'     => 'required|exists:transaction_types,id',
-           'transaction_currency_id' => 'required|exists:transaction_currencies,id',
-           'description'             => 'required|between:1,255',
-           'date'                    => 'required|date',
-           'completed'               => 'required|between:0,1'];
+        = [
+            'user_id'                 => 'required|exists:users,id',
+            'transaction_type_id'     => 'required|exists:transaction_types,id',
+            'bill_id'                 => 'exists:bills,id',
+            'transaction_currency_id' => 'required|exists:transaction_currencies,id',
+            'description'             => 'required|between:1,1024',
+            'completed'               => 'required|boolean',
+            'date'                    => 'required|date',
+            'encrypted'               => 'required|boolean'
+        ];
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function bill()
     {
-        return $this->belongsTo('Bill');
+        return $this->belongsTo('FireflyIII\Models\Bill');
     }
 
     /**
@@ -37,9 +44,7 @@ class TransactionJournal extends Eloquent
      */
     public function budgets()
     {
-        return $this->belongsToMany(
-            'Budget'
-        );
+        return $this->belongsToMany('FireflyIII\Models\Budget');
     }
 
     /**
@@ -47,24 +52,17 @@ class TransactionJournal extends Eloquent
      */
     public function categories()
     {
-        return $this->belongsToMany(
-            'Category'
-        );
+        return $this->belongsToMany('FireflyIII\Models\Category');
     }
 
     /**
-     * @param Account $account
-     *
      * @return float
      */
-    public function getAmount(\Account $account = null)
+    public function getAmountAttribute()
     {
-
+        /** @var Transaction $t */
         foreach ($this->transactions as $t) {
-            if (!is_null($account) && $account->id == $t->account_id) {
-                return floatval($t->amount);
-            }
-            if (floatval($t->amount) > 0) {
+            if ($t->amount > 0) {
                 return floatval($t->amount);
             }
         }
@@ -75,7 +73,23 @@ class TransactionJournal extends Eloquent
      */
     public function getDates()
     {
-        return ['created_at', 'updated_at', 'date'];
+        return ['created_at', 'updated_at', 'date', 'deleted_at'];
+    }
+
+    /**
+     * @param $value
+     *
+     * @return string
+     */
+    public function getDescriptionAttribute($value)
+    {
+        if ($this->encrypted) {
+            return Crypt::decrypt($value);
+        }
+
+        // @codeCoverageIgnoreStart
+        return $value;
+        // @codeCoverageIgnoreEnd
     }
 
     /**
@@ -83,14 +97,14 @@ class TransactionJournal extends Eloquent
      */
     public function piggyBankEvents()
     {
-        return $this->hasMany('PiggyBankEvent');
+        return $this->hasMany('FireflyIII\Models\PiggyBankEvent');
     }
 
     /**
      * @param EloquentBuilder $query
      * @param Account         $account
      */
-    public function scopeAccountIs(EloquentBuilder $query, \Account $account)
+    public function scopeAccountIs(EloquentBuilder $query, Account $account)
     {
         if (!isset($this->joinedTransactions)) {
             $query->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id');
@@ -137,22 +151,6 @@ class TransactionJournal extends Eloquent
         $query->where('transactions.amount', '<=', $amount);
     }
 
-    /**
-     * @param EloquentBuilder $query
-     * @param                 $amount
-     */
-    public function scopeMoreThan(EloquentBuilder $query, $amount)
-    {
-        if (is_null($this->joinedTransactions)) {
-            $query->leftJoin(
-                'transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id'
-            );
-            $this->joinedTransactions = true;
-        }
-
-        $query->where('transactions.amount', '>=', $amount);
-    }
-
     /**
      * @param EloquentBuilder $query
      * @param Carbon          $date
@@ -190,16 +188,25 @@ class TransactionJournal extends Eloquent
         $query->with(
             ['transactions' => function (HasMany $q) {
                 $q->orderBy('amount', 'ASC');
-            }, 'transactiontype', 'budgets', 'categories', 'transactions.account.accounttype', 'bill', 'budgets', 'categories']
+            }, 'transactiontype', 'transactioncurrency', 'budgets', 'categories', 'transactions.account.accounttype', 'bill', 'budgets', 'categories']
         );
     }
 
+    /**
+     * @param $value
+     */
+    public function setDescriptionAttribute($value)
+    {
+        $this->attributes['description'] = \Crypt::encrypt($value);
+        $this->attributes['encrypted']   = true;
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function transactionCurrency()
     {
-        return $this->belongsTo('TransactionCurrency');
+        return $this->belongsTo('FireflyIII\Models\TransactionCurrency');
     }
 
     /**
@@ -207,7 +214,7 @@ class TransactionJournal extends Eloquent
      */
     public function transactionType()
     {
-        return $this->belongsTo('TransactionType');
+        return $this->belongsTo('FireflyIII\Models\TransactionType');
     }
 
     /**
@@ -215,7 +222,7 @@ class TransactionJournal extends Eloquent
      */
     public function transactiongroups()
     {
-        return $this->belongsToMany('TransactionGroup');
+        return $this->belongsToMany('FireflyIII\Models\TransactionGroup');
     }
 
     /**
@@ -223,17 +230,15 @@ class TransactionJournal extends Eloquent
      */
     public function transactions()
     {
-        return $this->hasMany('Transaction');
+        return $this->hasMany('FireflyIII\Models\Transaction');
     }
 
     /**
-     * User
-     *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function user()
     {
-        return $this->belongsTo('User');
+        return $this->belongsTo('FireflyIII\User');
     }
 
 }

app/Models/TransactionRelation.php

@@ -0,0 +1,21 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Class TransactionRelation
+ *
+ * @package FireflyIII\Models
+ */
+class TransactionRelation extends Model
+{
+
+    /**
+     * @return array
+     */
+    public function getDates()
+    {
+        return ['created_at', 'updated_at'];
+    }
+
+}

app/Models/TransactionType.php

@@ -0,0 +1,30 @@
+<?php namespace FireflyIII\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+/**
+ * Class TransactionType
+ *
+ * @package FireflyIII\Models
+ */
+class TransactionType extends Model
+{
+    use SoftDeletes;
+
+    /**
+     * @return array
+     */
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'deleted_at'];
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function transactionJournals()
+    {
+        return $this->hasMany('FireflyIII\Models\TransactionJournal');
+    }
+}

app/Providers/AppServiceProvider.php

@@ -0,0 +1,40 @@
+<?php namespace FireflyIII\Providers;
+
+use Illuminate\Support\ServiceProvider;
+
+/**
+ * Class AppServiceProvider
+ *
+ * @package FireflyIII\Providers
+ */
+class AppServiceProvider extends ServiceProvider
+{
+
+    /**
+     * Bootstrap any application services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        //
+    }
+
+    /**
+     * Register any application services.
+     *
+     * This service provider is a great spot to register your various container
+     * bindings with the application. As you can see, we are registering our
+     * "Registrar" implementation here. You can add your own bindings too!
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->app->bind(
+            'Illuminate\Contracts\Auth\Registrar',
+            'FireflyIII\Services\Registrar'
+        );
+    }
+
+}

app/Providers/BusServiceProvider.php

@@ -0,0 +1,42 @@
+<?php namespace FireflyIII\Providers;
+
+use Illuminate\Bus\Dispatcher;
+use Illuminate\Support\ServiceProvider;
+
+/**
+ * Class BusServiceProvider
+ *
+ * @package FireflyIII\Providers
+ */
+class BusServiceProvider extends ServiceProvider
+{
+
+    /**
+     * Bootstrap any application services.
+     *
+     * @param  \Illuminate\Bus\Dispatcher $dispatcher
+     *
+     * @return void
+     */
+    public function boot(Dispatcher $dispatcher)
+    {
+        $dispatcher->mapUsing(
+            function ($command) {
+                return Dispatcher::simpleMapping(
+                    $command, 'FireflyIII\Commands', 'FireflyIII\Handlers\Commands'
+                );
+            }
+        );
+    }
+
+    /**
+     * Register any application services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        //
+    }
+
+}

app/Providers/ConfigServiceProvider.php

@@ -0,0 +1,31 @@
+<?php namespace FireflyIII\Providers;
+
+use Illuminate\Support\ServiceProvider;
+
+/**
+ * Class ConfigServiceProvider
+ *
+ * @package FireflyIII\Providers
+ */
+class ConfigServiceProvider extends ServiceProvider
+{
+
+    /**
+     * Overwrite any vendor / package configuration.
+     *
+     * This service provider is intended to provide a convenient location for you
+     * to overwrite any "vendor" or package configuration that you may want to
+     * modify before the application handles the incoming request / command.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        config(
+            [
+                //
+            ]
+        );
+    }
+
+}

app/Providers/EventServiceProvider.php

@@ -0,0 +1,141 @@
+<?php namespace FireflyIII\Providers;
+
+use FireflyIII\Models\Account;
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\PiggyBankRepetition;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Support\Facades\Navigation;
+use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
+use Illuminate\Database\QueryException;
+use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
+use Log;
+use FireflyIII\Models\Reminder;
+
+/**
+ * Class EventServiceProvider
+ *
+ * @package FireflyIII\Providers
+ */
+class EventServiceProvider extends ServiceProvider
+{
+
+    /**
+     * The event handler mappings for the application.
+     *
+     * @var array
+     */
+    protected $listen
+        = [
+            'FireflyIII\Events\JournalSaved'   => [
+                'FireflyIII\Handlers\Events\RescanJournal',
+                'FireflyIII\Handlers\Events\UpdateJournalConnection',
+
+            ],
+            'FireflyIII\Events\JournalCreated' => [
+                'FireflyIII\Handlers\Events\ConnectJournalToPiggyBank',
+            ]
+        ];
+
+    /**
+     * Register any other events for your application.
+     *
+     * @param  \Illuminate\Contracts\Events\Dispatcher $events
+     *
+     * @return void
+     */
+    public function boot(DispatcherContract $events)
+    {
+        parent::boot($events);
+
+        TransactionJournal::deleted(
+            function (TransactionJournal $journal) {
+
+                /** @var Transaction $transaction */
+                foreach ($journal->transactions()->get() as $transaction) {
+                    $transaction->delete();
+                }
+            }
+        );
+
+
+        PiggyBank::deleting(
+            function (PiggyBank $piggyBank) {
+                $reminders = $piggyBank->reminders()->get();
+                /** @var Reminder $reminder */
+                foreach ($reminders as $reminder) {
+                    $reminder->delete();
+                }
+            }
+        );
+
+        Account::deleted(
+            function (Account $account) {
+
+                /** @var Transaction $transaction */
+                foreach ($account->transactions()->get() as $transaction) {
+                    $journal = $transaction->transactionJournal()->first();
+                    $journal->delete();
+                }
+            }
+        );
+
+        // move this routine to a filter
+        // in case of repeated piggy banks and/or other problems.
+        PiggyBank::created(
+            function (PiggyBank $piggyBank) {
+                $repetition = new PiggyBankRepetition;
+                $repetition->piggyBank()->associate($piggyBank);
+                $repetition->startdate     = is_null($piggyBank->startdate) ? null : $piggyBank->startdate;
+                $repetition->targetdate    = is_null($piggyBank->targetdate) ? null : $piggyBank->targetdate;
+                $repetition->currentamount = 0;
+                $repetition->save();
+            }
+        );
+
+        BudgetLimit::saved(
+            function (BudgetLimit $budgetLimit) {
+
+                $end = Navigation::addPeriod(clone $budgetLimit->startdate, $budgetLimit->repeat_freq, 0);
+                $end->subDay();
+
+                $set = $budgetLimit->limitrepetitions()->where('startdate', $budgetLimit->startdate->format('Y-m-d'))->where('enddate', $end->format('Y-m-d'))
+                                   ->get();
+                /*
+                 * Create new LimitRepetition:
+                 */
+                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!');
+                        \Log::error($e->getMessage());
+                    }
+                } else {
+                    if ($set->count() == 1) {
+                        /*
+                         * Update existing one.
+                         */
+                        $repetition         = $set->first();
+                        $repetition->amount = $budgetLimit->amount;
+                        $repetition->save();
+
+                    }
+                }
+            }
+        );
+
+
+    }
+
+}

app/Providers/FireflyServiceProvider.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace FireflyIII\Providers;
+
+use FireflyIII\Support\Amount;
+use FireflyIII\Support\ExpandedForm;
+use FireflyIII\Support\Navigation;
+use FireflyIII\Support\Preferences;
+use FireflyIII\Support\Steam;
+use FireflyIII\Validation\FireflyValidator;
+use Illuminate\Support\ServiceProvider;
+use Validator;
+
+/**
+ * Class FireflyServiceProvider
+ *
+ * @package FireflyIII\Providers
+ */
+class FireflyServiceProvider extends ServiceProvider
+{
+    public function boot()
+    {
+        Validator::resolver(
+            function ($translator, $data, $rules, $messages) {
+                return new FireflyValidator($translator, $data, $rules, $messages);
+            }
+        );
+    }
+
+    public function register()
+    {
+        $this->app->bind(
+            'preferences', function () {
+            return new Preferences;
+        }
+        );
+        $this->app->bind(
+            'navigation', function () {
+            return new Navigation;
+        }
+        );
+        $this->app->bind(
+            'amount', function () {
+            return new Amount;
+        }
+        );
+
+        $this->app->bind(
+            'steam', function () {
+            return new Steam;
+        }
+        );
+        $this->app->bind(
+            'expandedform', function () {
+            return new ExpandedForm;
+        }
+        );
+
+        $this->app->bind('FireflyIII\Repositories\Account\AccountRepositoryInterface', 'FireflyIII\Repositories\Account\AccountRepository');
+        $this->app->bind('FireflyIII\Repositories\Budget\BudgetRepositoryInterface', 'FireflyIII\Repositories\Budget\BudgetRepository');
+        $this->app->bind('FireflyIII\Repositories\Category\CategoryRepositoryInterface', 'FireflyIII\Repositories\Category\CategoryRepository');
+        $this->app->bind('FireflyIII\Repositories\Journal\JournalRepositoryInterface', 'FireflyIII\Repositories\Journal\JournalRepository');
+        $this->app->bind('FireflyIII\Repositories\Bill\BillRepositoryInterface', 'FireflyIII\Repositories\Bill\BillRepository');
+        $this->app->bind('FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface', 'FireflyIII\Repositories\PiggyBank\PiggyBankRepository');
+        $this->app->bind('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface', 'FireflyIII\Repositories\Currency\CurrencyRepository');
+        $this->app->bind('FireflyIII\Support\Search\SearchInterface', 'FireflyIII\Support\Search\Search');
+
+
+        $this->app->bind('FireflyIII\Helpers\Help\HelpInterface', 'FireflyIII\Helpers\Help\Help');
+        $this->app->bind('FireflyIII\Helpers\Reminders\ReminderHelperInterface', 'FireflyIII\Helpers\Reminders\ReminderHelper');
+        $this->app->bind('FireflyIII\Helpers\Report\ReportHelperInterface', 'FireflyIII\Helpers\Report\ReportHelper');
+        $this->app->bind('FireflyIII\Helpers\Report\ReportQueryInterface', 'FireflyIII\Helpers\Report\ReportQuery');
+
+    }
+
+}

app/Providers/RouteServiceProvider.php

@@ -0,0 +1,53 @@
+<?php namespace FireflyIII\Providers;
+
+use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Routing\Router;
+
+/**
+ * Class RouteServiceProvider
+ *
+ * @package FireflyIII\Providers
+ */
+class RouteServiceProvider extends ServiceProvider
+{
+
+    /**
+     * This namespace is applied to the controller routes in your routes file.
+     *
+     * In addition, it is set as the URL generator's root namespace.
+     *
+     * @var string
+     */
+    protected $namespace = 'FireflyIII\Http\Controllers';
+
+    /**
+     * Define your route model bindings, pattern filters, etc.
+     *
+     * @param  \Illuminate\Routing\Router $router
+     *
+     * @return void
+     */
+    public function boot(Router $router)
+    {
+        parent::boot($router);
+
+    }
+
+    /**
+     * Define the routes for the application.
+     *
+     * @param  \Illuminate\Routing\Router $router
+     *
+     * @return void
+     */
+    public function map(Router $router)
+    {
+        $router->group(
+            ['namespace' => $this->namespace], function ($router) {
+            /** @noinspection PhpIncludeInspection */
+            require app_path('Http/routes.php');
+        }
+        );
+    }
+
+}

app/Providers/TestingServiceProvider.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace FireflyIII\Providers;
+
+
+use Illuminate\Support\ServiceProvider;
+
+/**
+ * Class TestingServiceProvider
+ *
+ * @package FireflyIII\Providers
+ */
+class TestingServiceProvider extends ServiceProvider
+{
+
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        if ($this->app->environment() == 'testing') {
+            $this->app['config']['session.driver'] = 'native';
+        }
+    }
+
+}

app/Repositories/Account/AccountRepository.php

@@ -0,0 +1,605 @@
+<?php
+
+namespace FireflyIII\Repositories\Account;
+
+use App;
+use Auth;
+use Carbon\Carbon;
+use Config;
+use DB;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountMeta;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\Preference;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionType;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
+use Log;
+use Session;
+use Steam;
+
+/**
+ * Class AccountRepository
+ *
+ * @package FireflyIII\Repositories\Account
+ */
+class AccountRepository implements AccountRepositoryInterface
+{
+
+    /**
+     * @param array $types
+     *
+     * @return int
+     */
+    public function countAccounts(array $types)
+    {
+        return Auth::user()->accounts()->accountTypeIn($types)->count();
+    }
+
+    /**
+     * @param Account $account
+     *
+     * @return boolean
+     */
+    public function destroy(Account $account)
+    {
+        $account->delete();
+
+        return true;
+    }
+
+    /**
+     * @param array $types
+     *
+     * @return Collection
+     */
+    public function getAccounts(array $types)
+    {
+        $result = Auth::user()->accounts()->with(
+            ['accountmeta' => function (HasMany $query) {
+                $query->where('name', 'accountRole');
+            }]
+        )->accountTypeIn($types)->orderBy('accounts.name', 'ASC')->get(['accounts.*'])->sortBy('name');
+
+        return $result;
+    }
+
+
+    /**
+     * @return Collection
+     */
+    public function getCreditCards()
+    {
+        return Auth::user()->accounts()
+                   ->hasMetaValue('accountRole', 'ccAsset')
+                   ->hasMetaValue('ccType', 'monthlyFull')
+                   ->get(
+                       [
+                           'accounts.*',
+                           'ccType.data as ccType',
+                           'accountRole.data as accountRole'
+                       ]
+                   );
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     * @param Account            $account
+     *
+     * @return Transaction
+     */
+    public function getFirstTransaction(TransactionJournal $journal, Account $account)
+    {
+
+        return $journal->transactions()->where('account_id', $account->id)->first();
+    }
+
+    /**
+     * @param Preference $preference
+     *
+     * @return Collection
+     */
+    public function getFrontpageAccounts(Preference $preference)
+    {
+        if ($preference->data == []) {
+            $accounts = Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->orderBy('accounts.name', 'ASC')->get(['accounts.*']);
+        } else {
+            $accounts = Auth::user()->accounts()->whereIn('id', $preference->data)->orderBy('accounts.name', 'ASC')->get(['accounts.*']);
+        }
+
+        return $accounts;
+    }
+
+    /**
+     * This method is used on the front page where (in turn) its viewed journals-tiny.php which (in turn)
+     * is almost the only place where formatJournal is used. Aka, we can use some custom querying to get some specific.
+     * fields using left joins.
+     *
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return mixed
+     */
+    public function getFrontpageTransactions(Account $account, Carbon $start, Carbon $end)
+    {
+        return Auth::user()
+                   ->transactionjournals()
+                   ->with(['transactions'])
+                   ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                   ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')->where('accounts.id', $account->id)
+                   ->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transaction_journals.transaction_currency_id')
+                   ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+                   ->before($end)
+                   ->after($start)
+                   ->orderBy('transaction_journals.date', 'DESC')
+                   ->orderBy('transaction_journals.id', 'DESC')
+                   ->take(10)
+                   ->get(['transaction_journals.*', 'transaction_currencies.symbol', 'transaction_types.type']);
+    }
+
+    /**
+     * @param Account $account
+     * @param int     $page
+     *
+     * @return LengthAwarePaginator
+     */
+    public function getJournals(Account $account, $page)
+    {
+        $offset = ($page - 1) * 50;
+        $query  = Auth::user()
+                      ->transactionJournals()
+                      ->withRelevantData()
+                      ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                      ->where('transactions.account_id', $account->id)
+                      ->orderBy('transaction_journals.date', 'DESC')
+                      ->orderBy('transaction_journals.order', 'ASC')
+                      ->orderBy('transaction_journals.id', 'DESC');
+
+        $query->before(Session::get('end', Carbon::now()->endOfMonth()));
+        $query->after(Session::get('start', Carbon::now()->startOfMonth()));
+        $count     = $query->count();
+        $set       = $query->take(50)->offset($offset)->get(['transaction_journals.*']);
+        $paginator = new LengthAwarePaginator($set, $count, 50, $page);
+
+        return $paginator;
+
+
+    }
+
+    /**
+     * @param Account $account
+     *
+     * @return Carbon|null
+     */
+    public function getLastActivity(Account $account)
+    {
+        $lastTransaction = $account->transactions()->leftJoin(
+            'transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id'
+        )->orderBy('transaction_journals.date', 'DESC')->first(['transactions.*', 'transaction_journals.date']);
+        if ($lastTransaction) {
+            return $lastTransaction->transactionjournal->date;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the accounts of a user that have piggy banks connected to them.
+     *
+     * @return Collection
+     */
+    public function getPiggyBankAccounts()
+    {
+        $ids        = [];
+        $start      = clone Session::get('start', new Carbon);
+        $end        = clone Session::get('end', new Carbon);
+        $accountIds = DB::table('piggy_banks')->distinct()->get(['piggy_banks.account_id']);
+        $accounts   = new Collection;
+
+        foreach ($accountIds as $id) {
+            $ids[] = intval($id->account_id);
+        }
+
+        $ids = array_unique($ids);
+        if (count($ids) > 0) {
+            $accounts = Auth::user()->accounts()->whereIn('id', $ids)->get();
+        }
+
+        $accounts->each(
+            function (Account $account) use ($start, $end) {
+                $account->startBalance = Steam::balance($account, $start, true);
+                $account->endBalance   = Steam::balance($account, $end, true);
+                $account->piggyBalance = 0;
+                /** @var PiggyBank $piggyBank */
+                foreach ($account->piggyBanks as $piggyBank) {
+                    $account->piggyBalance += $piggyBank->currentRelevantRep()->currentamount;
+                }
+                // sum of piggy bank amounts on this account:
+                // diff between endBalance and piggyBalance.
+                // then, percentage.
+                $difference          = $account->endBalance - $account->piggyBalance;
+                $account->difference = $difference;
+                $account->percentage = $difference != 0 ? round((($difference / $account->endBalance) * 100)) : 100;
+
+            }
+        );
+
+        return $accounts;
+
+    }
+
+    /**
+     * Get savings accounts and the balance difference in the period.
+     *
+     * @return Collection
+     */
+    public function getSavingsAccounts()
+    {
+        $accounts = Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->orderBy('accounts.name', 'ASC')
+                        ->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id')
+                        ->where('account_meta.name', 'accountRole')
+                        ->where('account_meta.data', '"savingAsset"')
+                        ->get(['accounts.*']);
+        $start    = clone Session::get('start', new Carbon);
+        $end      = clone Session::get('end', new Carbon);
+
+        $accounts->each(
+            function (Account $account) use ($start, $end) {
+                $account->startBalance = Steam::balance($account, $start);
+                $account->endBalance   = Steam::balance($account, $end);
+
+                // diff (negative when lost, positive when gained)
+                $diff = $account->endBalance - $account->startBalance;
+
+                if ($diff < 0 && $account->startBalance > 0) {
+                    // percentage lost compared to start.
+                    $pct = (($diff * -1) / $account->startBalance) * 100;
+                } else {
+                    if ($diff >= 0 && $account->startBalance > 0) {
+                        $pct = ($diff / $account->startBalance) * 100;
+                    } else {
+                        $pct = 100;
+                    }
+                }
+                $pct                 = $pct > 100 ? 100 : $pct;
+                $account->difference = $diff;
+                $account->percentage = round($pct);
+            }
+        );
+
+        return $accounts;
+    }
+
+    /**
+     * Get all transfers TO this account in this range.
+     *
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return Collection
+     */
+    public function getTransfersInRange(Account $account, Carbon $start, Carbon $end)
+    {
+        return TransactionJournal::whereIn(
+            'id', function ($q) use ($account, $start, $end) {
+            $q->select('transaction_journals.id')
+              ->from('transactions')
+              ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+              ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+              ->where('transactions.account_id', $account->id)
+              ->where('transaction_journals.user_id', Auth::user()->id)
+              ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
+              ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
+              ->where('transactions.amount', '>', 0)
+              ->where('transaction_types.type', 'Transfer');
+
+        }
+        )->get();
+    }
+
+    /**
+     * @param Account $account
+     *
+     * @return float
+     */
+    public function leftOnAccount(Account $account)
+    {
+        $balance = \Steam::balance($account, null, true);
+        /** @var PiggyBank $p */
+        foreach ($account->piggybanks()->get() as $p) {
+            $balance -= $p->currentRelevantRep()->currentamount;
+        }
+
+        return $balance;
+
+    }
+
+    /**
+     * @param Account $account
+     *
+     * @return TransactionJournal|null
+     */
+    public function openingBalanceTransaction(Account $account)
+    {
+        return TransactionJournal::accountIs($account)
+                                 ->orderBy('transaction_journals.date', 'ASC')
+                                 ->orderBy('created_at', 'ASC')
+                                 ->first(['transaction_journals.*']);
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return Account;
+     */
+    public function store(array $data)
+    {
+        $newAccount = $this->storeAccount($data);
+        $this->storeMetadata($newAccount, $data);
+
+
+        // continue with the opposing account:
+        if ($data['openingBalance'] != 0) {
+            $type         = $data['openingBalance'] < 0 ? 'expense' : 'revenue';
+            $opposingData = [
+                'user'            => $data['user'],
+                'accountType'     => $type,
+                'virtual_balance' => $data['virtualBalance'],
+                'name'            => $data['name'] . ' initial balance',
+                'active'          => false,
+            ];
+            $opposing     = $this->storeAccount($opposingData);
+            $this->storeInitialBalance($newAccount, $opposing, $data);
+
+        }
+
+        return $newAccount;
+
+    }
+
+    /**
+     * @return float
+     */
+    public function sumOfEverything()
+    {
+        return floatval(Auth::user()->transactions()->sum('amount'));
+    }
+
+    /**
+     * @param Account $account
+     * @param array   $data
+     */
+    public function update(Account $account, array $data)
+    {
+        // update the account:
+        $account->name            = $data['name'];
+        $account->active          = $data['active'] == '1' ? true : false;
+        $account->virtual_balance = $data['virtualBalance'];
+        $account->save();
+
+        // update meta data:
+        $this->updateMetadata($account, $data);
+
+        $openingBalance = $this->openingBalanceTransaction($account);
+
+        // if has openingbalance?
+        if ($data['openingBalance'] != 0) {
+            // if opening balance, do an update:
+            if ($openingBalance) {
+                // update existing opening balance.
+                $this->updateInitialBalance($account, $openingBalance, $data);
+            } else {
+                // create new opening balance.
+                $type         = $data['openingBalance'] < 0 ? 'expense' : 'revenue';
+                $opposingData = [
+                    'user'        => $data['user'],
+                    'accountType' => $type,
+                    'name'        => $data['name'] . ' initial balance',
+                    'active'      => false,
+                ];
+                $opposing     = $this->storeAccount($opposingData);
+                $this->storeInitialBalance($account, $opposing, $data);
+            }
+
+        } else {
+            // opening balance is zero, should we delete it?
+            if ($openingBalance) {
+                // delete existing opening balance.
+                $openingBalance->delete();
+            }
+        }
+
+        return $account;
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return Account
+     */
+    protected function storeAccount(array $data)
+    {
+        $type        = Config::get('firefly.accountTypeByIdentifier.' . $data['accountType']);
+        $accountType = AccountType::whereType($type)->first();
+        $newAccount  = new Account(
+            [
+                'user_id'         => $data['user'],
+                'account_type_id' => $accountType->id,
+                'name'            => $data['name'],
+                'active'          => $data['active'] === true ? true : false,
+            ]
+        );
+
+        if (!$newAccount->isValid()) {
+            // does the account already exist?
+            $existingAccount = Account::where('user_id', $data['user'])->where('account_type_id', $accountType->id)->where('name', $data['name'])->first();
+            if (!$existingAccount) {
+                Log::error('Account create error: ' . $newAccount->getErrors()->toJson());
+                App::abort(500);
+
+            }
+            $newAccount = $existingAccount;
+        }
+        $newAccount->save();
+
+        return $newAccount;
+    }
+
+    /**
+     * @param Account $account
+     * @param array   $data
+     */
+    protected function storeMetadata(Account $account, array $data)
+    {
+        $validFields = ['accountRole', 'ccMonthlyPaymentDate', 'ccType'];
+        foreach ($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 Account $opposing
+     * @param array   $data
+     *
+     * @return TransactionJournal
+     */
+    protected function storeInitialBalance(Account $account, Account $opposing, array $data)
+    {
+        $type            = $data['openingBalance'] < 0 ? 'Withdrawal' : 'Deposit';
+        $transactionType = TransactionType::whereType($type)->first();
+
+        $journal = new TransactionJournal(
+            [
+                'user_id'                 => $data['user'],
+                'transaction_type_id'     => $transactionType->id,
+                'bill_id'                 => null,
+                'transaction_currency_id' => $data['openingBalanceCurrency'],
+                'description'             => 'Initial balance for "' . $account->name . '"',
+                'completed'               => true,
+                'date'                    => $data['openingBalanceDate'],
+                'encrypted'               => true
+            ]
+        );
+        if (!$journal->isValid()) {
+            App::abort(500);
+        }
+        $journal->save();
+
+
+        if ($data['openingBalance'] < 0) {
+            $firstAccount  = $opposing;
+            $secondAccount = $account;
+            $firstAmount   = $data['openingBalance'] * -1;
+            $secondAmount  = $data['openingBalance'];
+        } else {
+            $firstAccount  = $account;
+            $secondAccount = $opposing;
+            $firstAmount   = $data['openingBalance'];
+            $secondAmount  = $data['openingBalance'] * -1;
+        }
+
+        // first transaction: from
+        $one = new Transaction(
+            [
+                'account_id'             => $firstAccount->id,
+                'transaction_journal_id' => $journal->id,
+                'amount'                 => $firstAmount
+            ]
+        );
+        if (!$one->isValid()) {
+            App::abort(500);
+        }
+        $one->save();
+
+        // second transaction: to
+        $two = new Transaction(
+            [
+                'account_id'             => $secondAccount->id,
+                'transaction_journal_id' => $journal->id,
+                'amount'                 => $secondAmount
+            ]
+        );
+        if (!$two->isValid()) {
+            App::abort(500);
+        }
+        $two->save();
+
+        return $journal;
+
+    }
+
+    /**
+     * @param Account $account
+     * @param array   $data
+     */
+    protected function updateMetadata(Account $account, array $data)
+    {
+        $validFields = ['accountRole', 'ccMonthlyPaymentDate', 'ccType'];
+
+        foreach ($validFields as $field) {
+            $entry = $account->accountMeta()->where('name', $field)->first();
+
+            // update if new data is present:
+            if ($entry && isset($data[$field])) {
+                $entry->data = $data[$field];
+                $entry->save();
+            }
+            // no entry but data present?
+            if (!$entry && isset($data[$field])) {
+                $metaData = new AccountMeta(
+                    [
+                        'account_id' => $account->id,
+                        'name'       => $field,
+                        'data'       => $data[$field]
+                    ]
+                );
+                $metaData->save();
+            }
+        }
+
+    }
+
+    /**
+     * @param Account            $account
+     * @param TransactionJournal $journal
+     * @param array              $data
+     *
+     * @return TransactionJournal
+     */
+    protected function updateInitialBalance(Account $account, TransactionJournal $journal, array $data)
+    {
+        $journal->date = $data['openingBalanceDate'];
+
+        /** @var Transaction $transaction */
+        foreach ($journal->transactions()->get() as $transaction) {
+            if ($account->id == $transaction->account_id) {
+                $transaction->amount = $data['openingBalance'];
+                $transaction->save();
+            }
+            if ($account->id != $transaction->account_id) {
+                $transaction->amount = $data['openingBalance'] * -1;
+                $transaction->save();
+            }
+        }
+
+        return $journal;
+    }
+}

app/Repositories/Account/AccountRepositoryInterface.php

@@ -0,0 +1,144 @@
+<?php
+
+namespace FireflyIII\Repositories\Account;
+
+use Carbon\Carbon;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\Preference;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface AccountRepositoryInterface
+ *
+ * @package FireflyIII\Repositories\Account
+ */
+interface AccountRepositoryInterface
+{
+    /**
+     * @param array $types
+     *
+     * @return int
+     */
+    public function countAccounts(array $types);
+
+    /**
+     * @param Account $account
+     *
+     * @return boolean
+     */
+    public function destroy(Account $account);
+
+    /**
+     * @param array $types
+     *
+     * @return mixed
+     */
+    public function getAccounts(array $types);
+
+    /**
+     * @param TransactionJournal $journal
+     * @param Account            $account
+     *
+     * @return Transaction
+     */
+    public function getFirstTransaction(TransactionJournal $journal, Account $account);
+
+    /**
+     * @return Collection
+     */
+    public function getCreditCards();
+
+    /**
+     * Get the accounts of a user that have piggy banks connected to them.
+     *
+     * @return Collection
+     */
+    public function getPiggyBankAccounts();
+
+
+    /**
+     * Get all transfers TO this account in this range.
+     *
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return Collection
+     */
+    public function getTransfersInRange(Account $account, Carbon $start, Carbon $end);
+
+    /**
+     * @param Preference $preference
+     *
+     * @return Collection
+     */
+    public function getFrontpageAccounts(Preference $preference);
+
+    /**
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return mixed
+     */
+    public function getFrontpageTransactions(Account $account, Carbon $start, Carbon $end);
+
+    /**
+     * @param Account $account
+     * @param string  $range
+     *
+     * @return LengthAwarePaginator
+     */
+    public function getJournals(Account $account, $page);
+
+    /**
+     * @param Account $account
+     *
+     * @return Carbon|null
+     */
+    public function getLastActivity(Account $account);
+
+    /**
+     * @return float
+     */
+    public function sumOfEverything();
+
+    /**
+     * Get savings accounts and the balance difference in the period.
+     *
+     * @return Collection
+     */
+    public function getSavingsAccounts();
+
+    /**
+     * @param Account $account
+     *
+     * @return float
+     */
+    public function leftOnAccount(Account $account);
+
+    /**
+     * @param Account $account
+     *
+     * @return TransactionJournal|null
+     */
+    public function openingBalanceTransaction(Account $account);
+
+    /**
+     * @param array $data
+     *
+     * @return Account
+     */
+    public function store(array $data);
+
+    /**
+     * @param Account $account
+     * @param array   $data
+     *
+     * @return Account
+     */
+    public function update(Account $account, array $data);
+}

app/Repositories/Bill/BillRepository.php

@@ -0,0 +1,378 @@
+<?php
+
+namespace FireflyIII\Repositories\Bill;
+
+use Auth;
+use Carbon\Carbon;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Database\Query\JoinClause;
+use Illuminate\Support\Collection;
+use Log;
+use Navigation;
+
+/**
+ * Class BillRepository
+ *
+ * @package FireflyIII\Repositories\Bill
+ */
+class BillRepository implements BillRepositoryInterface
+{
+    /**
+     * Create a fake bill to help the chart controller.
+     *
+     * @param string $description
+     * @param Carbon $date
+     * @param float  $amount
+     *
+     * @return Bill
+     */
+    public function createFakeBill($description, Carbon $date, $amount)
+    {
+        $bill              = new Bill;
+        $bill->name        = $description;
+        $bill->match       = $description;
+        $bill->amount_min  = $amount;
+        $bill->amount_max  = $amount;
+        $bill->date        = $date;
+        $bill->repeat_freq = 'monthly';
+        $bill->skip        = 0;
+        $bill->automatch   = false;
+        $bill->active      = false;
+
+        return $bill;
+    }
+
+    /**
+     * @param Bill $bill
+     *
+     * @return mixed
+     */
+    public function destroy(Bill $bill)
+    {
+        return $bill->delete();
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getActiveBills()
+    {
+        /** @var Collection $set */
+        $set = Auth::user()->bills()->orderBy('name', 'ASC')->where('active', 1)->get()->sortBy('name');
+
+        return $set;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getBills()
+    {
+        /** @var Collection $set */
+        $set = Auth::user()->bills()->orderBy('name', 'ASC')->get()->sortBy('name');
+
+        return $set;
+    }
+
+    /**
+     * @param Bill $bill
+     *
+     * @return Collection
+     */
+    public function getJournals(Bill $bill)
+    {
+        return $bill->transactionjournals()->withRelevantData()
+                    ->leftJoin(
+                        'transactions', function (JoinClause $join) {
+                        $join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                             ->where('transactions.amount', '>', 0);
+                    }
+                    )
+                    ->orderBy('transaction_journals.date', 'DESC')
+                    ->orderBy('transaction_journals.order', 'ASC')
+                    ->orderBy('transaction_journals.id', 'DESC')
+                    ->get(['transaction_journals.*', 'transactions.amount']);
+    }
+
+    /**
+     * Get all journals that were recorded on this bill between these dates.
+     *
+     * @param Bill   $bill
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return Collection
+     */
+    public function getJournalsInRange(Bill $bill, Carbon $start, Carbon $end)
+    {
+        return $bill->transactionjournals()->before($end)->after($start)->get();
+    }
+
+    /**
+     * @param Bill $bill
+     *
+     * @return Collection
+     */
+    public function getPossiblyRelatedJournals(Bill $bill)
+    {
+        $set = \DB::table('transactions')->where('amount', '>', 0)->where('amount', '>=', $bill->amount_min)->where('amount', '<=', $bill->amount_max)->get(
+            ['transaction_journal_id']
+        );
+        $ids = [];
+
+        /** @var Transaction $entry */
+        foreach ($set as $entry) {
+            $ids[] = intval($entry->transaction_journal_id);
+        }
+        $journals = new Collection;
+        if (count($ids) > 0) {
+            $journals = Auth::user()->transactionjournals()->whereIn('id', $ids)->get();
+        }
+
+        return $journals;
+    }
+
+    /**
+     * Every bill repeats itself weekly, monthly or yearly (or whatever). This method takes a date-range (usually the view-range of Firefly itself)
+     * and returns date ranges that fall within the given range; those ranges are the bills expected. When a bill is due on the 14th of the month and
+     * you give 1st and the 31st of that month as argument, you'll get one response, matching the range of your bill.
+     *
+     * @param Bill   $bill
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return mixed
+     */
+    public function getRanges(Bill $bill, Carbon $start, Carbon $end)
+    {
+        $startOfBill = $bill->date;
+        $startOfBill = Navigation::startOfPeriod($startOfBill, $bill->repeat_freq);
+
+
+        // all periods of this bill up until the current period:
+        $billStarts = [];
+        while ($startOfBill < $end) {
+
+            $endOfBill = Navigation::endOfPeriod($startOfBill, $bill->repeat_freq);
+
+            $billStarts[] = [
+                'start' => clone $startOfBill,
+                'end'   => clone $endOfBill,
+            ];
+            // actually the next one:
+            $startOfBill = Navigation::addPeriod($startOfBill, $bill->repeat_freq, $bill->skip);
+
+        }
+        // for each
+        $validRanges = [];
+        foreach ($billStarts as $dateEntry) {
+            if ($dateEntry['end'] > $start && $dateEntry['start'] < $end) {
+                // count transactions for bill in this range (not relevant yet!):
+                $validRanges[] = $dateEntry;
+            }
+        }
+
+        return $validRanges;
+    }
+
+    /**
+     * @param Bill $bill
+     *
+     * @return Carbon|null
+     */
+    public function lastFoundMatch(Bill $bill)
+    {
+        $last = $bill->transactionjournals()->orderBy('date', 'DESC')->first();
+        if ($last) {
+            return $last->date;
+        }
+
+        return null;
+    }
+
+    /**
+     * @param Bill $bill
+     *
+     * @return Carbon
+     */
+    public function nextExpectedMatch(Bill $bill)
+    {
+
+        $finalDate = null;
+        if ($bill->active == 0) {
+            return $finalDate;
+        }
+
+        /*
+         * $today is the start of the next period, to make sure FF3 won't miss anything
+         * when the current period has a transaction journal.
+         */
+        $today = Navigation::addPeriod(new Carbon, $bill->repeat_freq, 0);
+
+        $skip  = $bill->skip + 1;
+        $start = Navigation::startOfPeriod(new Carbon, $bill->repeat_freq);
+        /*
+         * go back exactly one month/week/etc because FF3 does not care about 'next'
+         * bills if they're too far into the past.
+         */
+
+        $counter = 0;
+        while ($start <= $today) {
+            if (($counter % $skip) == 0) {
+                // do something.
+                $end          = Navigation::endOfPeriod(clone $start, $bill->repeat_freq);
+                $journalCount = $bill->transactionjournals()->before($end)->after($start)->count();
+                if ($journalCount == 0) {
+                    $finalDate = clone $start;
+                    break;
+                }
+            }
+
+            // add period for next round!
+            $start = Navigation::addPeriod($start, $bill->repeat_freq, 0);
+            $counter++;
+        }
+
+        return $finalDate;
+    }
+
+    /**
+     * @param Bill               $bill
+     * @param TransactionJournal $journal
+     *
+     * @return bool
+     */
+    public function scan(Bill $bill, TransactionJournal $journal)
+    {
+        /*
+         * Match words.
+         */
+        $wordMatch   = false;
+        $matches     = explode(',', $bill->match);
+        $description = strtolower($journal->description);
+        Log::debug('Now scanning ' . $description);
+
+        /*
+         * Attach expense account to description for more narrow matching.
+         */
+        if (count($journal->transactions) < 2) {
+            $transactions = $journal->transactions()->get();
+        } else {
+            $transactions = $journal->transactions;
+        }
+        /** @var Transaction $transaction */
+        foreach ($transactions as $transaction) {
+            /** @var Account $account */
+            $account = $transaction->account()->first();
+            /** @var AccountType $type */
+            $type = $account->accountType()->first();
+            if ($type->type == 'Expense account' || $type->type == 'Beneficiary account') {
+                $description .= ' ' . strtolower($account->name);
+            }
+        }
+        Log::debug('Final description: ' . $description);
+        Log::debug('Matches searched: ' . join(':', $matches));
+
+        $count = 0;
+        foreach ($matches as $word) {
+            if (!(strpos($description, strtolower($word)) === false)) {
+                $count++;
+            }
+        }
+        if ($count >= count($matches)) {
+            $wordMatch = true;
+            Log::debug('word match is true');
+        } else {
+            Log::debug('Count: ' . $count . ', count(matches): ' . count($matches));
+        }
+
+
+        /*
+         * Match amount.
+         */
+
+        $amountMatch = false;
+        if (count($transactions) > 1) {
+
+            $amount = max(floatval($transactions[0]->amount), floatval($transactions[1]->amount));
+            $min    = floatval($bill->amount_min);
+            $max    = floatval($bill->amount_max);
+            if ($amount >= $min && $amount <= $max) {
+                $amountMatch = true;
+                Log::debug('Amount match is true!');
+            }
+        }
+
+
+        /*
+         * If both, update!
+         */
+        if ($wordMatch && $amountMatch) {
+            Log::debug('TOTAL match is true!');
+            $journal->bill()->associate($bill);
+            $journal->save();
+        } else {
+            if ((!$wordMatch || !$amountMatch) && $bill->id == $journal->bill_id) {
+                // if no match, but bill used to match, remove it:
+                $journal->bill_id = null;
+                $journal->save();
+            }
+        }
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return Bill
+     */
+    public function store(array $data)
+    {
+
+
+        $bill = Bill::create(
+            [
+                'name'        => $data['name'],
+                'match'       => $data['match'],
+                'amount_min'  => $data['amount_min'],
+                'user_id'     => $data['user'],
+                'amount_max'  => $data['amount_max'],
+                'date'        => $data['date'],
+                'repeat_freq' => $data['repeat_freq'],
+                'skip'        => $data['skip'],
+                'automatch'   => $data['automatch'],
+                'active'      => $data['active'],
+
+            ]
+        );
+
+        return $bill;
+    }
+
+    /**
+     * @param Bill  $bill
+     * @param array $data
+     *
+     * @return Bill|static
+     */
+    public function update(Bill $bill, array $data)
+    {
+
+
+        $bill->name        = $data['name'];
+        $bill->match       = $data['match'];
+        $bill->amount_min  = $data['amount_min'];
+        $bill->amount_max  = $data['amount_max'];
+        $bill->date        = $data['date'];
+        $bill->repeat_freq = $data['repeat_freq'];
+        $bill->skip        = $data['skip'];
+        $bill->automatch   = $data['automatch'];
+        $bill->active      = $data['active'];
+        $bill->save();
+
+        return $bill;
+    }
+}