Merge branch 'release/3.4.0.7'

Add savings total for savings widget on dashboard

.coveralls.yml

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

.env.example

@@ -1,5 +1,5 @@
-APP_ENV=local
-APP_DEBUG=true
+APP_ENV=production
+APP_DEBUG=false
 APP_KEY=SomeRandomString
 
 DB_CONNECTION=mysql
@@ -12,5 +12,8 @@ CACHE_DRIVER=file
 SESSION_DRIVER=file
 
 EMAIL_SMTP=
+EMAIL_DRIVER=smtp
 EMAIL_USERNAME=
 EMAIL_PASSWORD=
+ANALYTICS_ID=
+EMAIL_PRETEND=false

.env.testing

@@ -8,6 +8,11 @@ DB_DATABASE=homestead
 DB_USERNAME=homestead
 DB_PASSWORD=secret
 
-CACHE_DRIVER=file
-SESSION_DRIVER=file
+CACHE_DRIVER=array
+SESSION_DRIVER=array
 
+EMAIL_SMTP=
+EMAIL_USERNAME=
+EMAIL_PASSWORD=
+ANALYTICS_ID=ABC
+EMAIL_PRETEND=true

.gitignore

@@ -26,4 +26,8 @@ db.sqlite-journal
 tests/_output/*
 .env
 clover.xml
-node_modules/
+node_modules/
+addNewLines.php
+.phpstorm.meta.php
+.env.backup
+.env.local

.travis.yml

@@ -11,15 +11,12 @@ addons:
     repo_token: 26489f9e854fcdf7e7660ba29c1455694685465b1f90329a79f7d2bf448acb61
 
 install:
-  - rm composer.lock
-  - composer install
+  - composer update
   - php artisan env
   - mv -v .env.testing .env
-  - touch tests/database/db.sqlite
-  - php artisan migrate --seed
 
 script:
-  - phpunit --debug
+  - phpunit
 
 after_script:
   - php vendor/bin/coveralls

README.md

@@ -1,76 +1,97 @@
-Firefly III (v3.3.3)
-===========
+# Firefly III
+#### v3.4.0.7
 
 [![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)
 [![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)
-[![Test Coverage](https://codeclimate.com/github/JC5/firefly-iii/badges/coverage.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)
 [![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)
+![GA](https://ga-beacon.appspot.com/UA-58172398-6/firefly-iii/readme)
+## About
 
-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 III" is a financial manager. It can help you keep track of expenses, income, budgets and everything in between. It even supports credit cards, shared 
+household accounts and savings accounts! It's pretty fancy. You should use it to save and organise money.
+ 
+_Firefly is a system you'll have install yourself on webhosting of your choosing._
 
-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.
+Personal financial management is pretty difficult, and everybody has their own approach to it. Some people
+make budgets, other people limit their cashflow by throwing away their credit cards, others try to increase
+their current cashflow. There are tons of ways to save and earn money.
+
+Firefly works on the principle that if you know where you're money is going, you can stop it from going there.
+
+ 
+To get to know Firefly, and to see if it fits you, check out these resources:
+
+- The screenshots below on this very page.
+- The featurelist below, also on this very page.
+- The [full description](https://github.com/JC5/firefly-iii/wiki/full-description), which will tell you how Firefly works,
+and the philosophy behind it.
+
+
+#### About the name (if you care)
+
+It's III, or 3, because [version 2](https://github.com/JC5/Firefly) and version 1 (not online) preceded it. It has been growing steadily ever since.
 
 ## Current features
 
-- [A double-entry bookkeeping system](http://en.wikipedia.org/wiki/Double-entry_bookkeeping_system);
-- You can store, edit and remove withdrawals, deposits and transfers. This allows you full financial management;
-- It's possible to create, change and manage money using _budgets_;
+- [A double-entry bookkeeping system](https://en.wikipedia.org/wiki/Double-entry_bookkeeping_system);
+- You can store, edit and remove [withdrawals, deposits and transfers](https://en.wikipedia.org/wiki/Financial_transaction). This allows you full financial management;
+- You can manage different types of accounts;
+  - [Asset](https://en.wikipedia.org/wiki/Asset) accounts
+  - Shared [asset accounts](https://en.wikipedia.org/wiki/Asset) ([household accounts](https://en.wikipedia.org/wiki/Household))
+  - Saving accounts
+  - Credit cards
+- It's possible to create, change and manage money using _[budgets](https://en.wikipedia.org/wiki/Envelope_system)_;
 - Organize transactions using categories;
-- Save towards a goal using piggy banks;
-- Predict and anticipate large expenses using "repeated expenses" (ie. yearly taxes);
-- Predict and anticipate bills using "recurring transactions" (rent for example);
-- View basic income / expense reports.
-- Lots of help text in case you don't get it;
+- Save towards a goal using [piggy banks](https://en.wikipedia.org/wiki/Piggy_bank);
+- Predict and anticipate [bills](https://en.wikipedia.org/wiki/Invoice);
+- View income / expense [reports](https://en.wikipedia.org/wiki/Financial_statement);
+- Organize expenses using tags;
+- Lots of help text in case you don't get it.
 
 Everything is organised:
 
 - Clear views that should show you how you're doing;
 - Easy navigation through your records;
 - Browse back and forth to see previous months or even years;
-- Lots of charts because we all love them.
-- Financial reporting showing you how well you are doing;
-
-## Changes
-
-Firefly III will feature, but does not feature yet:
-
-
-- 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.
-- Any other features I might not have thought of.
-
-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.
+- Lots of charts because we all love them;
+- Financial reporting showing you how well you are doing.
 
 ## Screenshots
 
-![Index](http://i.imgur.com/TkZNIer.png)
+_Please note that everything in these screenshots is fictional and may not be realistic._
 
-![Accounts](http://i.imgur.com/YE8WavP.png)
+![Index](https://i.nder.be/c09vfw90)
 
-![Budgets](http://i.imgur.com/Go0M6Nd.png)
+![Accounts](https://i.nder.be/hkn0vhcg)
+
+![Budgets](https://i.nder.be/h2snx2mw)
+
+![Reports 1](https://i.nder.be/c9f8zy5c)
+
+![Reports 2](https://i.nder.be/ghvs5png)
+
+![Bills](https://i.nder.be/h58kh00p)
+
+![Piggy banks](https://i.nder.be/hkud0h53)
+
+## Running and installing
+
+If you're still interested please read [the installation guide](https://github.com/JC5/firefly-iii/wiki/Installation), 
+[the upgrade guide](https://github.com/JC5/firefly-iii/wiki/Upgrade-instructions) (if applicable) 
+and the **[first use guide](https://github.com/JC5/firefly-iii/wiki/First-use)**.
+ 
+If you want to try out Firefly III, you can do so on [this dedicated website](https://geld.nder.be/). 
+This site always runs the latest version of Firefly III. If you want to use it, please read the [privacy considerations](https://github.com/JC5/firefly-iii/wiki/Privacy-on-demo-site) for this demo-site.
 
-![Reports](http://i.imgur.com/EnEIyQI.png)
 
 ## Current state
-I have the basics up and running. Test coverage is currently coming, slowly.
 
-Although I have not checked extensively, some forms and views have CSRF vulnerabilities. This is because not all
-views escape all characters by default. Will be fixed.
+Firefly III is pretty much all grown up. Full test coverage (nerd alert!) is coming. One of the things on the todo-list
+is adding translations.
 
-Questions, ideas or other things to contribute? [Let me know](https://github.com/JC5/firefly-iii/issues/new)!
+Questions, ideas, bugs or other things to contribute? [Let me know](https://github.com/JC5/firefly-iii/issues/new)!
+
+If you like this tool, feel free to [donate me some beer money](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=2ZMV952UUSCLU&lc=NL&item_name=Development%20of%20Firefly&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted).

app/Commands/Command.php

@@ -2,6 +2,7 @@
 /**
  * Class Command
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Commands
  */
 abstract class Command

app/Console/Commands/Inspire.php

@@ -1,37 +0,0 @@
-<?php namespace FireflyIII\Console\Commands;
-
-use Illuminate\Console\Command;
-use Illuminate\Foundation\Inspiring;
-
-/**
- * Class Inspire
- *
- * @package FireflyIII\Console\Commands
- */
-class Inspire extends Command
-{
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Display an inspiring quote';
-    /**
-     * The console command name.
-     *
-     * @var string
-     */
-    protected $name = 'inspire';
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        $this->comment(PHP_EOL . Inspiring::quote() . PHP_EOL);
-    }
-
-}

app/Console/Kernel.php

@@ -6,6 +6,7 @@ use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 /**
  * Class Kernel
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Console
  */
 class Kernel extends ConsoleKernel
@@ -18,7 +19,6 @@ class Kernel extends ConsoleKernel
      */
     protected $commands
         = [
-            'FireflyIII\Console\Commands\Inspire',
         ];
 
     /**
@@ -26,12 +26,12 @@ class Kernel extends ConsoleKernel
      *
      * @param  \Illuminate\Console\Scheduling\Schedule $schedule
      *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     *
      * @return void
      */
     protected function schedule(Schedule $schedule)
     {
-        $schedule->command('inspire')
-                 ->hourly();
     }
 
 }

app/Events/Event.php

@@ -3,6 +3,7 @@
 /**
  * Class Event
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Events
  */
 abstract class Event

app/Events/JournalCreated.php

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

app/Events/JournalDeleted.php

@@ -2,6 +2,12 @@
 
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * Class JournalDeleted
+ *
+ * @codeCoverageIgnore
+ * @package FireflyIII\Events
+ */
 class JournalDeleted extends Event
 {
 
@@ -10,7 +16,6 @@ class JournalDeleted extends Event
     /**
      * Create a new event instance.
      *
-     * @return void
      */
     public function __construct()
     {

app/Events/JournalSaved.php

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

app/Exceptions/FireflyException.php

@@ -6,6 +6,7 @@ namespace FireflyIII\Exceptions;
 /**
  * Class FireflyException
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Exceptions
  */
 class FireflyException extends \Exception

app/Exceptions/Handler.php

@@ -6,6 +6,7 @@ use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 /**
  * Class Handler
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Exceptions
  */
 class Handler extends ExceptionHandler
@@ -26,6 +27,7 @@ class Handler extends ExceptionHandler
      *
      * @param  \Illuminate\Http\Request $request
      * @param  \Exception               $e
+     * @SuppressWarnings(PHPMD.ShortVariable)
      *
      * @return \Illuminate\Http\Response
      */
@@ -42,6 +44,7 @@ class Handler extends ExceptionHandler
      * Report or log an exception.
      *
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
+     * @SuppressWarnings(PHPMD.ShortVariable)
      *
      * @param  \Exception $e
      *
@@ -49,8 +52,7 @@ class Handler extends ExceptionHandler
      */
     public function report(Exception $e)
     {
-        /** @noinspection PhpInconsistentReturnPointsInspection */
-        return parent::report($e);
+        parent::report($e);
     }
 
 }

app/Exceptions/NotImplementedException.php

@@ -5,6 +5,7 @@ namespace FireflyIII\Exceptions;
 /**
  * Class NotImplementedException
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Exceptions
  */
 class NotImplementedException extends \Exception

app/Exceptions/ValidationException.php

@@ -4,6 +4,7 @@ namespace FireflyIII\Exceptions;
 /**
  * Class ValidationExceptions
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Exception
  */
 class ValidationException extends \Exception

app/Handlers/Events/ConnectJournalToPiggyBank.php

@@ -6,7 +6,6 @@ use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
-use Log;
 
 /**
  * Class ConnectJournalToPiggyBank
@@ -19,7 +18,6 @@ class ConnectJournalToPiggyBank
     /**
      * Create the event handler.
      *
-     * @return void
      */
     public function __construct()
     {
@@ -29,59 +27,46 @@ class ConnectJournalToPiggyBank
     /**
      * Handle the event when journal is saved.
      *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     *
      * @param  JournalCreated $event
      *
-     * @return void
+     * @return boolean
      */
     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 = 0;
-        /** @var Transaction $transaction */
-        foreach ($journal->transactions()->get() as $transaction) {
-            if ($transaction->account_id === $piggyBank->account_id) {
-                // this transaction is the relevant one.
-                $amount = floatval($transaction->amount);
-            }
-        }
-        Log::debug('Amount: ' . $amount);
-        if ($amount == 0) {
-            return;
+        if (is_null($piggyBank)) {
+            return false;
         }
         // 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;
+            return false;
+        }
+
+        $amount = $journal->amount;
+        /** @var Transaction $transaction */
+        foreach ($journal->transactions()->get() as $transaction) {
+            if ($transaction->account_id == $piggyBank->account_id) {
+                if ($transaction->amount < 0) {
+                    $amount = $transaction->amount * -1;
+                }
+            }
         }
 
-        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
-            ]
-        );
+        PiggyBankEvent::create(['piggy_bank_id' => $piggyBank->id, 'transaction_journal_id' => $journal->id, 'date' => $journal->date, 'amount' => $amount]);
+
+        return true;
 
     }
 

app/Handlers/Events/JournalDeletedHandler.php

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

app/Handlers/Events/RescanJournal.php

@@ -1,12 +1,13 @@
 <?php namespace FireflyIII\Handlers\Events;
 
+use App;
 use FireflyIII\Events\JournalSaved;
 use Log;
-use App;
 
 /**
  * Class RescanJournal
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Handlers\Events
  */
 class RescanJournal
@@ -15,7 +16,6 @@ class RescanJournal
     /**
      * Create the event handler.
      *
-     * @return void
      */
     public function __construct()
     {
@@ -41,7 +41,7 @@ class RescanJournal
 
         Log::debug('Found ' . $list->count() . ' bills to check.');
 
-        /** @var Bill $bill */
+        /** @var \FireflyIII\Models\Bill $bill */
         foreach ($list as $bill) {
             Log::debug('Now calling bill #' . $bill->id . ' (' . $bill->name . ')');
             $repository->scan($bill, $journal);

app/Handlers/Events/UpdateJournalConnection.php

@@ -2,16 +2,20 @@
 
 use FireflyIII\Events\JournalSaved;
 use FireflyIII\Models\PiggyBankEvent;
-use FireflyIII\Models\Transaction;
-use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\PiggyBankRepetition;
 
+/**
+ * Class UpdateJournalConnection
+ *
+ * @codeCoverageIgnore
+ * @package FireflyIII\Handlers\Events
+ */
 class UpdateJournalConnection
 {
 
     /**
      * Create the event handler.
      *
-     * @return void
      */
     public function __construct()
     {
@@ -31,27 +35,22 @@ class UpdateJournalConnection
 
         // get the event connected to this journal:
         /** @var PiggyBankEvent $event */
-        $event      = PiggyBankEvent::where('transaction_journal_id', $journal->id)->first();
-        if(is_null($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();
+        $repetition = null;
+        if ($piggyBank) {
+            /** @var PiggyBankRepetition $repetition */
+            $repetition = $piggyBank->piggyBankRepetitions()->relevantOnDate($journal->date)->first();
+        }
 
         if (is_null($repetition)) {
             return;
         }
-        $amount = 0;
-        /** @var Transaction $transaction */
-        foreach ($journal->transactions()->get() as $transaction) {
-            if ($transaction->account_id === $piggyBank->account_id) {
-                // this transaction is the relevant one.
-                $amount = floatval($transaction->amount);
-            }
-        }
-
-        // update current repetition:
-        $diff = $amount - $event->amount;
+        $amount = $journal->amount;
+        $diff   = $amount - $event->amount;// update current repetition
 
         $repetition->currentamount += $diff;
         $repetition->save();

app/Helpers/Collection/Account.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace FireflyIII\Helpers\Collection;
+
+use Illuminate\Support\Collection;
+
+/**
+ * @codeCoverageIgnore
+ * Class Account
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class Account
+{
+
+    /** @var Collection */
+    protected $accounts;
+    /** @var float */
+    protected $difference;
+    /** @var float */
+    protected $end;
+    /** @var float */
+    protected $start;
+
+    /**
+     * @return \Illuminate\Support\Collection
+     */
+    public function getAccounts()
+    {
+        return $this->accounts;
+    }
+
+    /**
+     * @param \Illuminate\Support\Collection $accounts
+     */
+    public function setAccounts($accounts)
+    {
+        $this->accounts = $accounts;
+    }
+
+    /**
+     * @return float
+     */
+    public function getDifference()
+    {
+        return $this->difference;
+    }
+
+    /**
+     * @param float $difference
+     */
+    public function setDifference($difference)
+    {
+        $this->difference = $difference;
+    }
+
+    /**
+     * @return float
+     */
+    public function getEnd()
+    {
+        return $this->end;
+    }
+
+    /**
+     * @param float $end
+     */
+    public function setEnd($end)
+    {
+        $this->end = $end;
+    }
+
+    /**
+     * @return float
+     */
+    public function getStart()
+    {
+        return $this->start;
+    }
+
+    /**
+     * @param float $start
+     */
+    public function setStart($start)
+    {
+        $this->start = $start;
+    }
+
+
+}

app/Helpers/Collection/Balance.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace FireflyIII\Helpers\Collection;
+use Illuminate\Support\Collection;
+
+/**
+ * @codeCoverageIgnore
+ *
+ * Class Balance
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class Balance
+{
+
+    /** @var  BalanceHeader */
+    protected $balanceHeader;
+
+    /** @var  Collection */
+    protected $balanceLines;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->balanceLines = new Collection;
+    }
+
+    /**
+     * @param BalanceLine $line
+     */
+    public function addBalanceLine(BalanceLine $line)
+    {
+        $this->balanceLines->push($line);
+    }
+
+    /**
+     * @return BalanceHeader
+     */
+    public function getBalanceHeader()
+    {
+        return $this->balanceHeader;
+    }
+
+    /**
+     * @param BalanceHeader $balanceHeader
+     */
+    public function setBalanceHeader($balanceHeader)
+    {
+        $this->balanceHeader = $balanceHeader;
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection
+     */
+    public function getBalanceLines()
+    {
+        return $this->balanceLines;
+    }
+
+
+
+
+}

app/Helpers/Collection/BalanceEntry.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace FireflyIII\Helpers\Collection;
+
+use FireflyIII\Models\Account as AccountModel;
+
+/**
+ * @codeCoverageIgnore
+ *
+ * Class BalanceEntry
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class BalanceEntry
+{
+
+
+    /** @var  AccountModel */
+    protected $account;
+
+    /** @var float */
+    protected $spent = 0.0;
+
+    /** @var float  */
+    protected $left = 0.0;
+
+
+    /**
+     * @return AccountModel
+     */
+    public function getAccount()
+    {
+        return $this->account;
+    }
+
+    /**
+     * @param AccountModel $account
+     */
+    public function setAccount($account)
+    {
+        $this->account = $account;
+    }
+
+    /**
+     * @return float
+     */
+    public function getSpent()
+    {
+        return $this->spent;
+    }
+
+    /**
+     * @param float $spent
+     */
+    public function setSpent($spent)
+    {
+        $this->spent = $spent;
+    }
+
+    /**
+     * @return float
+     */
+    public function getLeft()
+    {
+        return $this->left;
+    }
+
+    /**
+     * @param float $left
+     */
+    public function setLeft($left)
+    {
+        $this->left = $left;
+    }
+
+
+
+
+}

app/Helpers/Collection/BalanceHeader.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace FireflyIII\Helpers\Collection;
+
+use FireflyIII\Models\Account as AccountModel;
+use Illuminate\Support\Collection;
+
+/**
+ * @codeCoverageIgnore
+ *
+ * Class BalanceHeader
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class BalanceHeader
+{
+
+    /** @var  Collection */
+    protected $accounts;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->accounts = new Collection;
+    }
+
+    /**
+     * @param AccountModel $account
+     */
+    public function addAccount(AccountModel $account)
+    {
+        $this->accounts->push($account);
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getAccounts()
+    {
+        return $this->accounts;
+    }
+
+
+
+}

app/Helpers/Collection/BalanceLine.php

@@ -0,0 +1,170 @@
+<?php
+
+namespace FireflyIII\Helpers\Collection;
+
+use FireflyIII\Models\Budget as BudgetModel;
+use FireflyIII\Models\LimitRepetition;
+use Illuminate\Support\Collection;
+
+/**
+ * @codeCoverageIgnore
+ *
+ * Class BalanceLine
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class BalanceLine
+{
+
+    const ROLE_DEFAULTROLE = 1;
+    const ROLE_TAGROLE     = 2;
+    const ROLE_DIFFROLE    = 3;
+
+    /** @var  Collection */
+    protected $balanceEntries;
+
+    /** @var BudgetModel */
+    protected $budget;
+
+    /** @var  LimitRepetition */
+    protected $repetition;
+
+    protected $role = self::ROLE_DEFAULTROLE;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->balanceEntries = new Collection;
+    }
+
+    /**
+     * @param BalanceEntry $balanceEntry
+     */
+    public function addBalanceEntry(BalanceEntry $balanceEntry)
+    {
+        $this->balanceEntries->push($balanceEntry);
+    }
+
+    /**
+     * @return string
+     */
+    public function getTitle()
+    {
+        if ($this->getBudget() instanceof BudgetModel) {
+            return $this->getBudget()->name;
+        }
+        if ($this->getRole() == self::ROLE_DEFAULTROLE) {
+            return trans('firefly.noBudget');
+        }
+        if ($this->getRole() == self::ROLE_TAGROLE) {
+            return trans('firefly.coveredWithTags');
+        }
+        if ($this->getRole() == self::ROLE_DIFFROLE) {
+            return trans('firefly.leftUnbalanced');
+        }
+    }
+
+    /**
+     * @return BudgetModel
+     */
+    public function getBudget()
+    {
+        return $this->budget;
+    }
+
+    /**
+     * @param BudgetModel $budget
+     */
+    public function setBudget($budget)
+    {
+        $this->budget = $budget;
+    }
+
+    /**
+     * @return int
+     */
+    public function getRole()
+    {
+        return $this->role;
+    }
+
+    /**
+     * @param int $role
+     */
+    public function setRole($role)
+    {
+        $this->role = $role;
+    }
+
+    /**
+     * If a BalanceLine has a budget/repetition, each BalanceEntry in this BalanceLine
+     * should have a "spent" value, which is the amount of money that has been spent
+     * on the given budget/repetition. If you subtract all those amounts from the budget/repetition's
+     * total amount, this is returned:
+     *
+     * @return float
+     */
+    public function leftOfRepetition()
+    {
+        $start = $this->getRepetition() ? $this->getRepetition()->amount : 0;
+        /** @var BalanceEntry $balanceEntry */
+        foreach ($this->getBalanceEntries() as $balanceEntry) {
+            $start += $balanceEntry->getSpent();
+        }
+
+        return $start;
+    }
+
+    /**
+     * @return LimitRepetition
+     */
+    public function getRepetition()
+    {
+        return $this->repetition;
+    }
+
+    /**
+     * @param LimitRepetition $repetition
+     */
+    public function setRepetition($repetition)
+    {
+        $this->repetition = $repetition;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getBalanceEntries()
+    {
+        return $this->balanceEntries;
+    }
+
+    /**
+     * @param Collection $balanceEntries
+     */
+    public function setBalanceEntries($balanceEntries)
+    {
+        $this->balanceEntries = $balanceEntries;
+    }
+
+    /**
+     * If the BalanceEntries for a BalanceLine have a "left" value, the amount
+     * of money left in the entire BalanceLine is returned here:
+     *
+     * @return float
+     */
+    public function sumOfLeft()
+    {
+        $sum = 0.0;
+        /** @var BalanceEntry $balanceEntry */
+        foreach ($this->getBalanceEntries() as $balanceEntry) {
+            $sum += $balanceEntry->getLeft();
+        }
+
+        return $sum;
+    }
+
+
+}

app/Helpers/Collection/Bill.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace FireflyIII\Helpers\Collection;
+
+
+use FireflyIII\Models\Bill as BillModel;
+use Illuminate\Support\Collection;
+
+/**
+ * Class Bill
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class Bill
+{
+
+    /**
+     * @var Collection
+     */
+    protected $bills;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->bills = new Collection;
+    }
+
+    /**
+     * @param BillLine $bill
+     */
+    public function addBill(BillLine $bill)
+    {
+        $this->bills->push($bill);
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getBills()
+    {
+        $this->bills->sortBy(
+            function (BillLine $bill) {
+                $active = intval($bill->getBill()->active) == 0 ? 1 : 0;
+                $name = $bill->getBill()->name;
+                return $active.$name;
+            }
+        );
+
+
+        return $this->bills;
+    }
+
+}

app/Helpers/Collection/BillLine.php

@@ -0,0 +1,125 @@
+<?php
+
+namespace FireflyIII\Helpers\Collection;
+
+use FireflyIII\Models\Bill as BillModel;
+
+/**
+ * Class BillLine
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class BillLine
+{
+
+    /** @var  bool */
+    protected $active;
+    /** @var  float */
+    protected $amount;
+    /** @var  BillModel */
+    protected $bill;
+    /** @var  bool */
+    protected $hit;
+    /** @var  float */
+    protected $max;
+    /** @var  float */
+    protected $min;
+
+    /**
+     * @return float
+     */
+    public function getAmount()
+    {
+        return $this->amount;
+    }
+
+    /**
+     * @param float $amount
+     */
+    public function setAmount($amount)
+    {
+        $this->amount = $amount;
+    }
+
+    /**
+     * @return BillModel
+     */
+    public function getBill()
+    {
+        return $this->bill;
+    }
+
+    /**
+     * @param BillModel $bill
+     */
+    public function setBill($bill)
+    {
+        $this->bill = $bill;
+    }
+
+    /**
+     * @return float
+     */
+    public function getMax()
+    {
+        return $this->max;
+    }
+
+    /**
+     * @param float $max
+     */
+    public function setMax($max)
+    {
+        $this->max = $max;
+    }
+
+    /**
+     * @return float
+     */
+    public function getMin()
+    {
+        return $this->min;
+    }
+
+    /**
+     * @param float $min
+     */
+    public function setMin($min)
+    {
+        $this->min = $min;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function isActive()
+    {
+        return $this->active;
+    }
+
+    /**
+     * @param boolean $active
+     */
+    public function setActive($active)
+    {
+        $this->active = $active;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function isHit()
+    {
+        return $this->hit;
+    }
+
+    /**
+     * @param boolean $hit
+     */
+    public function setHit($hit)
+    {
+        $this->hit = $hit;
+    }
+
+
+}

app/Helpers/Collection/Budget.php

@@ -0,0 +1,149 @@
+<?php
+
+namespace FireflyIII\Helpers\Collection;
+use Illuminate\Support\Collection;
+
+/**
+ * @codeCoverageIgnore
+ *
+ * Class Budget
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class Budget
+{
+    /** @var  Collection */
+    protected $budgetLines;
+    /** @var float */
+    protected $budgeted = 0;
+    /** @var float */
+    protected $left = 0;
+    /** @var float */
+    protected $overspent = 0;
+    /** @var float */
+    protected $spent = 0;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->budgetLines = new Collection;
+    }
+
+    /**
+     * @param BudgetLine $budgetLine
+     */
+    public function addBudgetLine(BudgetLine $budgetLine)
+    {
+        $this->budgetLines->push($budgetLine);
+    }
+
+    /**
+     * @param float $add
+     */
+    public function addBudgeted($add)
+    {
+        $this->budgeted += floatval($add);
+    }
+
+    /**
+     * @param float $add
+     */
+    public function addLeft($add)
+    {
+        $this->left += floatval($add);
+    }
+
+    /**
+     * @param float $add
+     */
+    public function addOverspent($add)
+    {
+        $this->overspent += floatval($add);
+    }
+
+    /**
+     * @param float $add
+     */
+    public function addSpent($add)
+    {
+        $this->spent += floatval($add);
+    }
+
+    /**
+     * @return float
+     */
+    public function getBudgeted()
+    {
+        return $this->budgeted;
+    }
+
+    /**
+     * @param float $budgeted
+     */
+    public function setBudgeted($budgeted)
+    {
+        $this->budgeted = $budgeted;
+    }
+
+    /**
+     * @return float
+     */
+    public function getLeft()
+    {
+        return $this->left;
+    }
+
+    /**
+     * @param float $left
+     */
+    public function setLeft($left)
+    {
+        $this->left = $left;
+    }
+
+    /**
+     * @return float
+     */
+    public function getOverspent()
+    {
+        return $this->overspent;
+    }
+
+    /**
+     * @param float $overspent
+     */
+    public function setOverspent($overspent)
+    {
+        $this->overspent = $overspent;
+    }
+
+    /**
+     * @return float
+     */
+    public function getSpent()
+    {
+        return $this->spent;
+    }
+
+    /**
+     * @param float $spent
+     */
+    public function setSpent($spent)
+    {
+        $this->spent = $spent;
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection
+     */
+    public function getBudgetLines()
+    {
+        return $this->budgetLines;
+    }
+
+
+
+
+}

app/Helpers/Collection/BudgetLine.php

@@ -0,0 +1,134 @@
+<?php
+
+namespace FireflyIII\Helpers\Collection;
+
+use FireflyIII\Models\Budget as BudgetModel;
+use FireflyIII\Models\LimitRepetition;
+
+/**
+ * @codeCoverageIgnore
+ *
+ * Class BudgetLine
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class BudgetLine
+{
+
+    /** @var  BudgetModel */
+    protected $budget;
+
+    /** @var  LimitRepetition */
+    protected $repetition;
+
+    /** @var float */
+    protected $budgeted  = 0;
+    /** @var float */
+    protected $left      = 0;
+    /** @var float */
+    protected $overspent = 0;
+    /** @var float */
+    protected $spent     = 0;
+
+    /**
+     * @return BudgetModel
+     */
+    public function getBudget()
+    {
+        return $this->budget;
+    }
+
+    /**
+     * @param BudgetModel $budget
+     */
+    public function setBudget($budget)
+    {
+        $this->budget = $budget;
+    }
+
+    /**
+     * @return float
+     */
+    public function getBudgeted()
+    {
+        return $this->budgeted;
+    }
+
+    /**
+     * @param float $budgeted
+     */
+    public function setBudgeted($budgeted)
+    {
+        $this->budgeted = $budgeted;
+    }
+
+    /**
+     * @return float
+     */
+    public function getLeft()
+    {
+        return $this->left;
+    }
+
+    /**
+     * @param float $left
+     */
+    public function setLeft($left)
+    {
+        $this->left = $left;
+    }
+
+    /**
+     * @return float
+     */
+    public function getOverspent()
+    {
+        return $this->overspent;
+    }
+
+    /**
+     * @param float $overspent
+     */
+    public function setOverspent($overspent)
+    {
+        $this->overspent = $overspent;
+    }
+
+    /**
+     * @return float
+     */
+    public function getSpent()
+    {
+        return $this->spent;
+    }
+
+    /**
+     * @param float $spent
+     */
+    public function setSpent($spent)
+    {
+        $this->spent = $spent;
+    }
+
+    /**
+     * @return LimitRepetition
+     */
+    public function getRepetition()
+    {
+        return $this->repetition;
+    }
+
+    /**
+     * @param LimitRepetition $repetition
+     */
+    public function setRepetition($repetition)
+    {
+        $this->repetition = $repetition;
+    }
+
+
+
+
+
+
+}

app/Helpers/Collection/Category.php

@@ -0,0 +1,80 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: sander
+ * Date: 16/05/15
+ * Time: 13:09
+ */
+
+namespace FireflyIII\Helpers\Collection;
+
+use FireflyIII\Models\Category as CategoryModel;
+use Illuminate\Support\Collection;
+
+
+/**
+ * @codeCoverageIgnore
+ *
+ * Class Category
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class Category
+{
+
+    /** @var  Collection */
+    protected $categories;
+    /** @var float */
+    protected $total = 0;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->categories = new Collection;
+    }
+
+    /**
+     * @param CategoryModel $category
+     */
+    public function addCategory(CategoryModel $category)
+    {
+        if ($category->spent > 0) {
+            $this->categories->push($category);
+        }
+    }
+
+    /**
+     * @param float $add
+     */
+    public function addTotal($add)
+    {
+        $this->total += floatval($add);
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getCategories()
+    {
+        $this->categories->sortByDesc(
+            function (CategoryModel $category) {
+                return $category->spent;
+            }
+        );
+
+
+        return $this->categories;
+    }
+
+    /**
+     * @return float
+     */
+    public function getTotal()
+    {
+        return $this->total;
+    }
+
+
+}

app/Helpers/Collection/Expense.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace FireflyIII\Helpers\Collection;
+
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Support\Collection;
+use stdClass;
+
+/**
+ * @codeCoverageIgnore
+ *
+ * Class Expense
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class Expense
+{
+    /** @var Collection */
+    protected $expenses;
+    /** @var float */
+    protected $total;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->expenses = new Collection;
+    }
+
+    /**
+     * @param TransactionJournal $entry
+     */
+    public function addOrCreateExpense(TransactionJournal $entry)
+    {
+
+        $accountId = $entry->account_id;
+        if (!$this->expenses->has($accountId)) {
+            $newObject         = new stdClass;
+            $newObject->amount = floatval($entry->queryAmount);
+            $newObject->name   = $entry->name;
+            $newObject->count  = 1;
+            $newObject->id     = $accountId;
+            $this->expenses->put($accountId, $newObject);
+        } else {
+            $existing = $this->expenses->get($accountId);
+            $existing->amount += floatval($entry->queryAmount);
+            $existing->count++;
+            $this->expenses->put($accountId, $existing);
+        }
+    }
+
+    /**
+     * @param $add
+     */
+    public function addToTotal($add)
+    {
+        $this->total += floatval($add);
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getExpenses()
+    {
+        $this->expenses->sortBy(
+            function (stdClass $object) {
+                return $object->amount;
+            }
+        );
+
+        return $this->expenses;
+    }
+
+    /**
+     * @return float
+     */
+    public function getTotal()
+    {
+        return $this->total;
+    }
+}

app/Helpers/Collection/Income.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace FireflyIII\Helpers\Collection;
+
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Support\Collection;
+use stdClass;
+
+/**
+ * @codeCoverageIgnore
+ *
+ * Class Income
+ *
+ * @package FireflyIII\Helpers\Collection
+ */
+class Income
+{
+
+    /** @var Collection */
+    protected $incomes;
+    /** @var float */
+    protected $total;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->incomes = new Collection;
+    }
+
+    /**
+     * @param TransactionJournal $entry
+     */
+    public function addOrCreateIncome(TransactionJournal $entry)
+    {
+
+        $accountId = $entry->account_id;
+        if (!$this->incomes->has($accountId)) {
+            $newObject         = new stdClass;
+            $newObject->amount = floatval($entry->queryAmount);
+            $newObject->name   = $entry->name;
+            $newObject->count  = 1;
+            $newObject->id     = $accountId;
+            $this->incomes->put($accountId, $newObject);
+        } else {
+            $existing = $this->incomes->get($accountId);
+            $existing->amount += floatval($entry->queryAmount);
+            $existing->count++;
+            $this->incomes->put($accountId, $existing);
+        }
+    }
+
+    /**
+     * @param $add
+     */
+    public function addToTotal($add)
+    {
+        $this->total += floatval($add);
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getIncomes()
+    {
+        $this->incomes->sortByDesc(
+            function (stdClass $object) {
+                return $object->amount;
+            }
+        );
+
+        return $this->incomes;
+    }
+
+    /**
+     * @return float
+     */
+    public function getTotal()
+    {
+        return $this->total;
+    }
+
+
+}

app/Helpers/Help/Help.php

@@ -0,0 +1,97 @@
+<?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
+{
+
+    /**
+     * @codeCoverageIgnore
+     *
+     * @param $key
+     *
+     * @return string
+     */
+    public function getFromCache($key)
+    {
+        return Cache::get($key);
+    }
+
+    /**
+     * @codeCoverageIgnore
+     *
+     * @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;
+
+    }
+
+    /**
+     * @codeCoverageIgnore
+     *
+     * @param $route
+     *
+     * @return bool
+     */
+    public function hasRoute($route)
+    {
+        return Route::has($route);
+    }
+
+    /**
+     * @codeCoverageIgnore
+     *
+     * @param       $route
+     * @param array $content
+     *
+     * @internal param $title
+     */
+    public function putInCache($route, array $content)
+    {
+        Cache::put('help.' . $route . '.text', $content['text'], 10080); // a week.
+        Cache::put('help.' . $route . '.title', $content['title'], 10080);
+    }
+
+    /**
+     * @codeCoverageIgnore
+     *
+     * @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,48 @@
+<?php
+
+namespace FireflyIII\Helpers\Help;
+
+/**
+ * Interface HelpInterface
+ *
+ * @package FireflyIII\Helpers\Help
+ */
+interface HelpInterface
+{
+
+    /**
+     * @param $key
+     *
+     * @return string
+     */
+    public function getFromCache($key);
+
+    /**
+     * @param $route
+     *
+     * @return array
+     */
+    public function getFromGithub($route);
+
+    /**
+     * @param $route
+     *
+     * @return bool
+     */
+    public function hasRoute($route);
+
+    /**
+     * @param $route
+     *
+     * @return bool
+     */
+    public function inCache($route);
+
+    /**
+     * @param       $route
+     * @param array $content
+     *
+     * @return void
+     */
+    public function putInCache($route, array $content);
+}

app/Helpers/Reminders/ReminderHelper.php

@@ -33,7 +33,7 @@ class ReminderHelper implements ReminderHelperInterface
                 $ranges      = $this->getReminderRanges($piggyBank, $start);
                 $currentRep  = $piggyBank->currentRelevantRep();
                 $left        = $piggyBank->targetamount - $currentRep->currentamount;
-                $perReminder = $left / count($ranges);
+                $perReminder = count($ranges) == 0 ? $left : $left / count($ranges);
             } else {
                 $perReminder = null;
                 $ranges      = [];
@@ -46,8 +46,6 @@ class ReminderHelper implements ReminderHelperInterface
                 'leftToSave'  => $left,
             ];
 
-
-            // create one:
             $reminder = new Reminder;
             $reminder->user()->associate(Auth::user());
             $reminder->startdate = $start;
@@ -65,6 +63,30 @@ class ReminderHelper implements ReminderHelperInterface
         }
     }
 
+    /**
+     * Create all reminders for a piggy bank for a given date.
+     *
+     * @param PiggyBank $piggyBank
+     *
+     * @param Carbon    $date
+     *
+     * @return mixed
+     */
+    public function createReminders(PiggyBank $piggyBank, Carbon $date)
+    {
+        $ranges = $this->getReminderRanges($piggyBank);
+
+        foreach ($ranges as $range) {
+            if ($date < $range['end'] && $date > $range['start']) {
+                // create a reminder here!
+                $this->createReminder($piggyBank, $range['start'], $range['end']);
+                // stop looping, we're done.
+                break;
+            }
+
+        }
+    }
+
     /**
      * 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
@@ -95,7 +117,6 @@ class ReminderHelper implements ReminderHelperInterface
 
         if (!is_null($piggyBank->targetdate)) {
             // count back until now.
-            //                    echo 'Count back!<br>';
             $start = $piggyBank->targetdate;
             $end   = $piggyBank->startdate;
 
@@ -143,4 +164,4 @@ class ReminderHelper implements ReminderHelperInterface
         return 'Add ' . Amount::format($reminder->metadata->perReminder) . ' to fill this piggy bank on ' . $piggyBank->targetdate->format('jS F Y');
 
     }
-}
+}

app/Helpers/Reminders/ReminderHelperInterface.php

@@ -2,16 +2,18 @@
 
 namespace FireflyIII\Helpers\Reminders;
 
-use FireflyIII\Models\Reminder;
-use FireflyIII\Models\PiggyBank;
 use Carbon\Carbon;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\PiggyBankRepetition;
+use FireflyIII\Models\Reminder;
 
 /**
  * Interface ReminderHelperInterface
  *
  * @package FireflyIII\Helpers\Reminders
  */
-interface ReminderHelperInterface {
+interface ReminderHelperInterface
+{
     /**
      * Takes a reminder, finds the piggy bank and tells you what to do now.
      * Aka how much money to put in.
@@ -48,4 +50,15 @@ interface ReminderHelperInterface {
      * @return Reminder
      */
     public function createReminder(PiggyBank $piggyBank, Carbon $start, Carbon $end);
-}
+
+    /**
+     * Create all reminders for a piggy bank for a given date.
+     *
+     * @param PiggyBank $piggyBank
+     *
+     * @param Carbon    $date
+     *
+     * @return mixed
+     */
+    public function createReminders(PiggyBank $piggyBank, Carbon $date);
+}

app/Helpers/Report/ReportHelper.php

@@ -2,12 +2,24 @@
 
 namespace FireflyIII\Helpers\Report;
 
-use Auth;
+use App;
 use Carbon\Carbon;
+use FireflyIII\Helpers\Collection\Account as AccountCollection;
+use FireflyIII\Helpers\Collection\Balance;
+use FireflyIII\Helpers\Collection\BalanceEntry;
+use FireflyIII\Helpers\Collection\BalanceHeader;
+use FireflyIII\Helpers\Collection\BalanceLine;
+use FireflyIII\Helpers\Collection\Bill as BillCollection;
+use FireflyIII\Helpers\Collection\BillLine;
+use FireflyIII\Helpers\Collection\Budget as BudgetCollection;
+use FireflyIII\Helpers\Collection\BudgetLine;
+use FireflyIII\Helpers\Collection\Category as CategoryCollection;
+use FireflyIII\Helpers\Collection\Expense;
+use FireflyIII\Helpers\Collection\Income;
 use FireflyIII\Models\Account;
-use Illuminate\Database\Query\JoinClause;
-use Illuminate\Support\Collection;
-use Steam;
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\Budget as BudgetModel;
+use FireflyIII\Models\LimitRepetition;
 
 /**
  * Class ReportHelper
@@ -17,63 +29,337 @@ use Steam;
 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);
+    /** @var ReportQueryInterface */
+    protected $query;
 
-        return $limited;
+    /**
+     * @param ReportQueryInterface $query
+     *
+     */
+    public function __construct(ReportQueryInterface $query)
+    {
+        $this->query = $query;
+
+    }
+
+
+    /**
+     * This method generates a full report for the given period on all
+     * the users asset and cash accounts.
+     *
+     * @param Carbon $date
+     * @param Carbon $end
+     * @param        $shared
+     *
+     * @return Account
+     */
+    public function getAccountReport(Carbon $date, Carbon $end, $shared)
+    {
+
+
+        $accounts = $this->query->getAllAccounts($date, $end, $shared);
+        $start    = 0;
+        $end      = 0;
+        $diff     = 0;
+
+        // summarize:
+        foreach ($accounts as $account) {
+            $start += $account->startBalance;
+            $end += $account->endBalance;
+            $diff += ($account->endBalance - $account->startBalance);
+        }
+
+        $object = new AccountCollection;
+        $object->setStart($start);
+        $object->setEnd($end);
+        $object->setDifference($diff);
+        $object->setAccounts($accounts);
+
+        return $object;
+    }
+
+    /**
+     *
+     * The balance report contains a Balance object which in turn contains:
+     *
+     * A BalanceHeader object which contains all relevant user asset accounts for the report.
+     *
+     * A number of BalanceLine objects, which hold:
+     * - A budget
+     * - A number of BalanceEntry objects.
+     *
+     * The BalanceEntry object holds:
+     *   - The same budget (again)
+     *   - A user asset account as mentioned in the BalanceHeader
+     *   - The amount of money spent on the budget by the user asset account
+     *
+     * @param Carbon  $start
+     * @param Carbon  $end
+     * @param boolean $shared
+     *
+     * @return Balance
+     */
+    public function getBalanceReport(Carbon $start, Carbon $end, $shared)
+    {
+        $repository    = App::make('FireflyIII\Repositories\Budget\BudgetRepositoryInterface');
+        $tagRepository = App::make('FireflyIII\Repositories\Tag\TagRepositoryInterface');
+        $balance       = new Balance;
+
+        // build a balance header:
+        $header = new BalanceHeader;
+
+        $accounts = $this->query->getAllAccounts($start, $end, $shared);
+        $budgets  = $repository->getBudgets();
+        foreach ($accounts as $account) {
+            $header->addAccount($account);
+        }
+
+        /** @var BudgetModel $budget */
+        foreach ($budgets as $budget) {
+            $line = new BalanceLine;
+            $line->setBudget($budget);
+
+            // get budget amount for current period:
+            $rep = $repository->getCurrentRepetition($budget, $start);
+            $line->setRepetition($rep);
+
+            // loop accounts:
+            foreach ($accounts as $account) {
+                $balanceEntry = new BalanceEntry;
+                $balanceEntry->setAccount($account);
+
+                // get spent:
+                $spent = $this->query->spentInBudget($account, $budget, $start, $end); // I think shared is irrelevant.
+
+                $balanceEntry->setSpent($spent);
+                $line->addBalanceEntry($balanceEntry);
+            }
+            // add line to balance:
+            $balance->addBalanceLine($line);
+        }
+
+        // then a new line for without budget.
+        // and one for the tags:
+        $empty    = new BalanceLine;
+        $tags     = new BalanceLine;
+        $diffLine = new BalanceLine;
+
+        $tags->setRole(BalanceLine::ROLE_TAGROLE);
+        $diffLine->setRole(BalanceLine::ROLE_DIFFROLE);
+
+        foreach ($accounts as $account) {
+            $spent = $this->query->spentNoBudget($account, $start, $end);
+            $left  = $tagRepository->coveredByBalancingActs($account, $start, $end);
+            $diff  = $spent + $left;
+
+            // budget
+            $budgetEntry = new BalanceEntry;
+            $budgetEntry->setAccount($account);
+            $budgetEntry->setSpent($spent);
+            $empty->addBalanceEntry($budgetEntry);
+
+            // balanced by tags
+            $tagEntry = new BalanceEntry;
+            $tagEntry->setAccount($account);
+            $tagEntry->setLeft($left);
+            $tags->addBalanceEntry($tagEntry);
+
+            // difference:
+            $diffEntry = new BalanceEntry;
+            $diffEntry->setAccount($account);
+            $diffEntry->setSpent($diff);
+            $diffLine->addBalanceEntry($diffEntry);
+
+        }
+
+        $balance->addBalanceLine($empty);
+        $balance->addBalanceLine($tags);
+        $balance->addBalanceLine($diffLine);
+
+        $balance->setBalanceHeader($header);
+
+        return $balance;
+    }
+
+    /**
+     * This method generates a full report for the given period on all
+     * the users bills and their payments.
+     *
+     * @param Carbon  $start
+     * @param Carbon  $end
+     * @param boolean $shared
+     *
+     * @return BillCollection
+     */
+    public function getBillReport(Carbon $start, Carbon $end, $shared)
+    {
+        /** @var \FireflyIII\Repositories\Bill\BillRepositoryInterface $repository */
+        $repository = App::make('FireflyIII\Repositories\Bill\BillRepositoryInterface');
+        $bills      = $repository->getBills();
+        $collection = new BillCollection;
+
+        /** @var Bill $bill */
+        foreach ($bills as $bill) {
+            $billLine = new BillLine;
+            $billLine->setBill($bill);
+            $billLine->setActive(intval($bill->active) == 1);
+            $billLine->setMin(floatval($bill->amount_min));
+            $billLine->setMax(floatval($bill->amount_max));
+
+            // is hit in period?
+            $set = $repository->getJournalsInRange($bill, $start, $end);
+            if ($set->count() == 0) {
+                $billLine->setHit(false);
+            } else {
+                $billLine->setHit(true);
+                $amount = 0;
+                foreach ($set as $entry) {
+                    $amount += $entry->amount;
+                }
+                $billLine->setAmount($amount);
+            }
+
+            $collection->addBill($billLine);
+
+        }
+
+        return $collection;
 
     }
 
     /**
-     * This method gets some kind of list for a monthly overview.
+     * @param Carbon  $start
+     * @param Carbon  $end
+     * @param boolean $shared
      *
-     * @param Carbon $date
-     *
-     * @return Collection
+     * @return BudgetCollection
      */
-    public function getBudgetsForMonth(Carbon $date)
+    public function getBudgetReport(Carbon $start, Carbon $end, $shared)
     {
-        $start = clone $date;
-        $start->startOfMonth();
-        $end = clone $date;
-        $end->endOfMonth();
-        // all budgets
-        $set = Auth::user()->budgets()
-                    ->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 amount']);
+        $object = new BudgetCollection;
+        /** @var \FireflyIII\Repositories\Budget\BudgetRepositoryInterface $repository */
+        $repository = App::make('FireflyIII\Repositories\Budget\BudgetRepositoryInterface');
+        $set        = $repository->getBudgets();
 
+        foreach ($set as $budget) {
 
-        $budgets               = $this->_helper->makeArray($set);
-        $amountSet             = $this->_queries->journalsByBudget($start, $end);
-        $amounts               = $this->_helper->makeArray($amountSet);
-        $combined              = $this->_helper->mergeArrays($budgets, $amounts);
-        $combined[0]['spent']  = isset($combined[0]['spent']) ? $combined[0]['spent'] : 0.0;
-        $combined[0]['amount'] = isset($combined[0]['amount']) ? $combined[0]['amount'] : 0.0;
-        $combined[0]['name']   = 'No budget';
+            $repetitions = $repository->getBudgetLimitRepetitions($budget, $start, $end);
+
+            // no repetition(s) for this budget:
+            if ($repetitions->count() == 0) {
+                $spent      = $repository->spentInPeriod($budget, $start, $end, $shared);
+                $budgetLine = new BudgetLine;
+                $budgetLine->setBudget($budget);
+                $budgetLine->setOverspent($spent);
+                $object->addOverspent($spent);
+                $object->addBudgetLine($budgetLine);
+                continue;
+            }
+
+            // one or more repetitions for budget:
+            /** @var LimitRepetition $repetition */
+            foreach ($repetitions as $repetition) {
+                $budgetLine = new BudgetLine;
+                $budgetLine->setBudget($budget);
+                $budgetLine->setRepetition($repetition);
+                $expenses  = $repository->spentInPeriod($budget, $repetition->startdate, $repetition->enddate, $shared);
+                $left      = $expenses < floatval($repetition->amount) ? floatval($repetition->amount) - $expenses : 0;
+                $spent     = $expenses > floatval($repetition->amount) ? 0 : $expenses;
+                $overspent = $expenses > floatval($repetition->amount) ? $expenses - floatval($repetition->amount) : 0;
+
+                $budgetLine->setLeft($left);
+                $budgetLine->setSpent($spent);
+                $budgetLine->setOverspent($overspent);
+                $budgetLine->setBudgeted($repetition->amount);
+
+                $object->addBudgeted($repetition->amount);
+                $object->addSpent($spent);
+                $object->addLeft($left);
+                $object->addOverspent($overspent);
+                $object->addBudgetLine($budgetLine);
+
+            }
 
-        // find transactions to shared expense accounts, which are without a budget by default:
-        $transfers = $this->_queries->sharedExpenses($start, $end);
-        foreach ($transfers as $transfer) {
-            $combined[0]['spent'] += floatval($transfer->amount) * -1;
         }
 
-        return $combined;
+        // stuff outside of budgets:
+        $noBudget   = $repository->getWithoutBudgetSum($start, $end);
+        $budgetLine = new BudgetLine;
+        $budgetLine->setOverspent($noBudget);
+        $object->addOverspent($noBudget);
+        $object->addBudgetLine($budgetLine);
+
+        return $object;
+    }
+
+    /**
+     * @param Carbon  $start
+     * @param Carbon  $end
+     * @param boolean $shared
+     *
+     * @return CategoryCollection
+     */
+    public function getCategoryReport(Carbon $start, Carbon $end, $shared)
+    {
+        $object = new CategoryCollection;
+
+
+        /**
+         * GET CATEGORIES:
+         */
+        /** @var \FireflyIII\Repositories\Category\CategoryRepositoryInterface $repository */
+        $repository = App::make('FireflyIII\Repositories\Category\CategoryRepositoryInterface');
+        $set        = $repository->getCategories();
+        foreach ($set as $category) {
+            $spent           = $repository->spentInPeriod($category, $start, $end, $shared);
+            $category->spent = $spent;
+            $object->addCategory($category);
+            $object->addTotal($spent);
+        }
+
+        return $object;
+    }
+
+    /**
+     * Get a full report on the users expenses during the period.
+     *
+     * @param Carbon  $start
+     * @param Carbon  $end
+     * @param boolean $shared
+     *
+     * @return Expense
+     */
+    public function getExpenseReport($start, $end, $shared)
+    {
+        $object = new Expense;
+        $set    = $this->query->expenseInPeriod($start, $end, $shared);
+        foreach ($set as $entry) {
+            $object->addToTotal($entry->queryAmount);
+            $object->addOrCreateExpense($entry);
+        }
+
+        return $object;
+    }
+
+    /**
+     * Get a full report on the users incomes during the period.
+     *
+     * @param Carbon  $start
+     * @param Carbon  $end
+     * @param boolean $shared
+     *
+     * @return Income
+     */
+    public function getIncomeReport($start, $end, $shared)
+    {
+        $object = new Income;
+        $set    = $this->query->incomeInPeriod($start, $end, $shared);
+        foreach ($set as $entry) {
+            $object->addToTotal($entry->queryAmount);
+            $object->addOrCreateIncome($entry);
+        }
+
+        return $object;
     }
 
     /**
@@ -83,86 +369,20 @@ class ReportHelper implements ReportHelperInterface
      */
     public function listOfMonths(Carbon $date)
     {
+
         $start  = clone $date;
         $end    = Carbon::now();
         $months = [];
         while ($start <= $end) {
-            $year            = $start->format('Y');
+            $year            = $start->year;
             $months[$year][] = [
-                'formatted' => $start->format('F Y'),
-                'month'     => intval($start->format('m')),
-                'year'      => intval($start->format('Y')),
+                'formatted' => $start->formatLocalized('%B %Y'),
+                'month'     => $start->month,
+                'year'      => $year,
             ];
             $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();
-        }
-
-        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) {
-            $report[] = [
-                'start'   => Steam::balance($account, $start),
-                'end'     => Steam::balance($account, $end),
-                'account' => $account,
-                'shared'  => $account->accountRole == 'sharedAsset'
-            ];
-        }
-
-        return $report;
-    }
-}
+}

app/Helpers/Report/ReportHelperInterface.php

@@ -3,7 +3,12 @@
 namespace FireflyIII\Helpers\Report;
 
 use Carbon\Carbon;
-use Illuminate\Support\Collection;
+use FireflyIII\Helpers\Collection\Account;
+use FireflyIII\Helpers\Collection\Balance;
+use FireflyIII\Helpers\Collection\Budget as BudgetCollection;
+use FireflyIII\Helpers\Collection\Category as CategoryCollection;
+use FireflyIII\Helpers\Collection\Expense;
+use FireflyIII\Helpers\Collection\Income;
 
 /**
  * Interface ReportHelperInterface
@@ -13,26 +18,78 @@ use Illuminate\Support\Collection;
 interface ReportHelperInterface
 {
 
+    /**
+     * This method generates a full report for the given period on all
+     * the users asset and cash accounts.
+     *
+     * @param Carbon  $date
+     * @param Carbon  $end
+     * @param boolean $shared
+     *
+     * @return Account
+     */
+    public function getAccountReport(Carbon $date, Carbon $end, $shared);
 
     /**
-     * This methods fails to take in account transfers FROM shared accounts.
+     * This method generates a full report for the given period on all
+     * the users bills and their payments.
      *
-     * @param Carbon $start
-     * @param Carbon $end
-     * @param int    $limit
+     * @param Carbon  $start
+     * @param Carbon  $end
+     * @param boolean $shared
      *
-     * @return Collection
+     * @return Account
      */
-    public function expensesGroupedByAccount(Carbon $start, Carbon $end, $limit = 15);
+    public function getBillReport(Carbon $start, Carbon $end, $shared);
 
     /**
-     * This method gets some kind of list for a monthly overview.
+     * @param Carbon  $start
+     * @param Carbon  $end
+     * @param boolean $shared
      *
-     * @param Carbon $date
-     *
-     * @return Collection
+     * @return Balance
      */
-    public function getBudgetsForMonth(Carbon $date);
+    public function getBalanceReport(Carbon $start, Carbon $end, $shared);
+
+    /**
+     * @param Carbon  $start
+     * @param Carbon  $end
+     * @param boolean $shared
+     *
+     * @return BudgetCollection
+     */
+    public function getBudgetReport(Carbon $start, Carbon $end, $shared);
+
+    /**
+     * @param Carbon  $start
+     * @param Carbon  $end
+     * @param boolean $shared
+     *
+     * @return CategoryCollection
+     */
+    public function getCategoryReport(Carbon $start, Carbon $end, $shared);
+
+    /**
+     * Get a full report on the users expenses during the period.
+     *
+     * @param Carbon  $start
+     * @param Carbon  $end
+     * @param boolean $shared
+     *
+     * @return Expense
+     */
+    public function getExpenseReport($start, $end, $shared);
+
+    /**
+     * Get a full report on the users incomes during the period.
+     *
+     * @param Carbon  $start
+     * @param Carbon  $end
+     * @param boolean $shared
+     *
+     * @return Income
+     */
+    public function getIncomeReport($start, $end, $shared);
 
     /**
      * @param Carbon $date
@@ -41,18 +98,4 @@ interface ReportHelperInterface
      */
     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

@@ -4,10 +4,13 @@ namespace FireflyIII\Helpers\Report;
 
 use Auth;
 use Carbon\Carbon;
+use Crypt;
 use DB;
 use FireflyIII\Models\Account;
+use FireflyIII\Models\Budget;
 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;
@@ -20,106 +23,57 @@ use Steam;
 class ReportQuery implements ReportQueryInterface
 {
 
+
     /**
-     * This query retrieves a list of accounts that are active and not shared.
+     * This method returns all "expense" journals in a certain period, which are both transfers to a shared account
+     * and "ordinary" withdrawals. The query used is almost equal to ReportQueryInterface::journalsByRevenueAccount but it does
+     * not group and returns different fields.
      *
-     * @param bool $showSharedReports
+     * @param Carbon $start
+     * @param Carbon $end
+     * @param bool   $includeShared
      *
      * @return Collection
+     *
      */
-    public function accountList($showSharedReports = false)
+    public function expenseInPeriod(Carbon $start, Carbon $end, $includeShared = 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(
+        $query = $this->queryJournalsWithTransactions($start, $end);
+        if ($includeShared === false) {
+            $query->where(
                 function (Builder $query) {
-                    $query->where('account_meta.data', '!=', '"sharedAsset"');
-                    $query->orWhereNull('account_meta.data');
+                    $query->where(
+                        function (Builder $q) { // only get withdrawals not from a shared account
+                            $q->where('transaction_types.type', 'Withdrawal');
+                            $q->where('acm_from.data', '!=', '"sharedAsset"');
+                        }
+                    );
+                    $query->orWhere(
+                        function (Builder $q) { // and transfers from a shared account.
+                            $q->where('transaction_types.type', 'Transfer');
+                            $q->where('acm_to.data', '=', '"sharedAsset"');
+                        }
+                    );
                 }
             );
-
+        } else {
+            $query->where('transaction_types.type', 'Withdrawal'); // any withdrawal is fine.
         }
-        $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');
+        $query->groupBy('transaction_journals.id')->orderBy('transaction_journals.date');
 
-        return $query->get(['accounts.*']);
-    }
+        // get everything, decrypt and return
+        $data = $query->get(['transaction_journals.id', 'transaction_journals.description', 'transaction_journals.encrypted', 'transaction_types.type',
+             DB::Raw('SUM(`t_from`.`amount`) as `queryAmount`'),
+             'transaction_journals.date', 't_to.account_id as account_id', 'ac_to.name as name', 'ac_to.encrypted as account_encrypted']);
 
-    /**
-     * 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)
-    {
+        $data->each(
+            function (Model $object) {
+                $object->name = intval($object->account_encrypted) == 1 ? Crypt::decrypt($object->name) : $object->name;
+            }
+        );
+        $data->sortByDesc('queryAmount');
 
-        $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'
-                                     ]
-                                 );
-
-        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 Collection
-     */
-    public function balancedTransactionsSum(Account $account, Carbon $start, Carbon $end)
-    {
-        $set = $this->balancedTransactionsList($account, $start, $end);
-        $sum = 0;
-        foreach ($set as $entry) {
-            $sum += floatval($entry->amount);
-        }
-
-        return $sum;
+        return $data;
     }
 
     /**
@@ -127,15 +81,15 @@ class ReportQuery implements ReportQueryInterface
      *
      * @param Carbon $start
      * @param Carbon $end
-     * @param bool   $showSharedReports
+     * @param bool   $includeShared
      *
      * @return Collection
      */
-    public function getAllAccounts(Carbon $start, Carbon $end, $showSharedReports = false)
+    public function getAllAccounts(Carbon $start, Carbon $end, $includeShared = false)
     {
         $query = Auth::user()->accounts()->orderBy('accounts.name', 'ASC')
                      ->accountTypeIn(['Default account', 'Asset account', 'Cash account']);
-        if ($showSharedReports === false) {
+        if ($includeShared === false) {
             $query->leftJoin(
                 'account_meta', function (JoinClause $join) {
                 $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
@@ -143,7 +97,7 @@ class ReportQuery implements ReportQueryInterface
             )
                   ->orderBy('accounts.name', 'ASC')
                   ->where(
-                      function (Builder $query) use ($showSharedReports) {
+                      function (Builder $query) {
 
                           $query->where('account_meta.data', '!=', '"sharedAsset"');
                           $query->orWhereNull('account_meta.data');
@@ -154,8 +108,16 @@ class ReportQuery implements ReportQueryInterface
         $set = $query->get(['accounts.*']);
         $set->each(
             function (Account $account) use ($start, $end) {
+                /**
+                 * The balance for today always incorporates transactions
+                 * made on today. So to get todays "start" balance, we sub one
+                 * day.
+                 */
+                $yesterday = clone $start;
+                $yesterday->subDay();
+
                 /** @noinspection PhpParamsInspection */
-                $account->startBalance = Steam::balance($account, $start);
+                $account->startBalance = Steam::balance($account, $yesterday);
                 $account->endBalance   = Steam::balance($account, $end);
             }
         );
@@ -163,73 +125,6 @@ class ReportQuery implements ReportQueryInterface
         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)
-    {
-        $set = 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')
-                                 ->get(['budgets.id', 'budgets.name', DB::Raw('SUM(`transactions`.`amount`) as `amount`')]);
-
-        return $set;
-
-    }
-
-    /**
-     * 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)
-    {
-        $set = 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')
-                                 ->whereNull('budgets.id')
-                                 ->orderBy('transaction_journals.date', 'ASC')
-                                 ->get(['budgets.name', 'transactions.amount', 'transaction_journals.*']);
-
-        return $set;
-    }
 
     /**
      * This method returns all "income" journals in a certain period, which are both transfers from a shared account
@@ -238,49 +133,26 @@ class ReportQuery implements ReportQueryInterface
      *
      * @param Carbon $start
      * @param Carbon $end
-     * @param bool   $showSharedReports
+     * @param bool   $includeShared
      *
      * @return Collection
      */
-    public function incomeByPeriod(Carbon $start, Carbon $end, $showSharedReports = false)
+    public function incomeInPeriod(Carbon $start, Carbon $end, $includeShared = false)
     {
-        $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');
-        if ($showSharedReports === false) {
+        $query = $this->queryJournalsWithTransactions($start, $end);
+        if ($includeShared === false) {
             // only get deposits not to a shared account
             // and transfers to a shared account.
             $query->where(
-                function ($query) {
+                function (Builder $query) {
                     $query->where(
-                        function ($q) {
+                        function (Builder $q) {
                             $q->where('transaction_types.type', 'Deposit');
                             $q->where('acm_to.data', '!=', '"sharedAsset"');
                         }
                     );
                     $query->orWhere(
-                        function ($q) {
+                        function (Builder $q) {
                             $q->where('transaction_types.type', 'Transfer');
                             $q->where('acm_from.data', '=', '"sharedAsset"');
                         }
@@ -291,180 +163,90 @@ class ReportQuery implements ReportQueryInterface
             // any deposit is fine.
             $query->where('transaction_types.type', 'Deposit');
         }
-        $query->before($end)->after($start)
-              ->where('transaction_journals.user_id', Auth::user()->id)
-              ->groupBy('t_from.account_id')->orderBy('transaction_journals.date');
+        $query->groupBy('transaction_journals.id')->orderBy('transaction_journals.date');
 
-        return $query->get(
+        // 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 `amount`'),
+             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.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;
+            }
+        );
+        $data->sortByDesc('queryAmount');
+
+        return $data;
+    }
+
+
+
+    /**
+     * @param Account $account
+     * @param Budget  $budget
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return float
+     */
+    public function spentInBudget(Account $account, Budget $budget, Carbon $start, Carbon $end)
+    {
+
+        return floatval(
+            Auth::user()->transactionjournals()
+                ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
+                ->transactionTypes(['Withdrawal'])
+                ->where('transactions.amount', '<', 0)
+                ->where('transactions.account_id', $account->id)
+                ->before($end)
+                ->after($start)
+                ->where('budget_transaction_journal.budget_id', $budget->id)
+                ->sum('transactions.amount')
         );
     }
 
     /**
-     * Gets a list of expenses grouped by the budget they were filed under.
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     * @param bool    $shared
      *
-     * @param Carbon $start
-     * @param Carbon $end
-     * @param bool   $showSharedReports
-     *
-     * @return Collection
+     * @return float
      */
-    public function journalsByBudget(Carbon $start, Carbon $end, $showSharedReports = false)
+    public function spentNoBudget(Account $account, Carbon $start, Carbon $end, $shared = 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`')]);
+        return floatval(
+            Auth::user()->transactionjournals()
+                ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
+                ->where('transactions.amount', '<', 0)
+                ->transactionTypes(['Withdrawal'])
+                ->where('transactions.account_id', $account->id)
+                ->before($end)
+                ->after($start)
+                ->whereNull('budget_transaction_journal.budget_id')
+                ->sum('transactions.amount')
+        );
     }
 
     /**
-     * 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
+     * @return Builder
      */
-    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('amount');
-
-        return $query->get(['categories.id', 'categories.name', DB::Raw('SUM(`transactions`.`amount`) AS `amount`')]);
-
-    }
-
-    /**
-     * 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 = 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');
-
-        if ($showSharedReports === false) {
-            // get all withdrawals not from a shared accounts
-            // and all transfers to a shared account
-            $query->where(
-                function ($query) {
-                    $query->where(
-                        function ($q) {
-                            $q->where('transaction_types.type', 'Withdrawal');
-                            $q->where('acm_from.data', '!=', '"sharedAsset"');
-                        }
-                    );
-                    $query->orWhere(
-                        function ($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('amount', 'DESC');
-
-        return $query->get(['t_to.account_id as id', 'ac_to.name as name', DB::Raw('SUM(t_to.amount) as `amount`')]);
-    }
-
-    /**
-     * 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)
+    protected function queryJournalsWithTransactions(Carbon $start, Carbon $end)
     {
         $query = TransactionJournal::
         leftJoin(
@@ -490,118 +272,8 @@ class ReportQuery implements ReportQueryInterface
                                    }
                                    )
                                    ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id');
-        if ($showSharedReports === false) {
+        $query->before($end)->after($start)->where('transaction_journals.user_id', Auth::user()->id);
 
-            // 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 ($query) {
-                    $query->where(
-                        function ($q) {
-                            $q->where('transaction_types.type', 'Deposit');
-                            $q->where('acm_to.data', '!=', '"sharedAsset"');
-                        }
-                    );
-                    $query->orWhere(
-                        function ($q) {
-                            $q->where('transaction_types.type', 'Transfer');
-                            $q->where('acm_from.data', '=', '"sharedAsset"');
-                        }
-                    );
-                }
-            );
-        } else {
-            // any deposit goes:
-            $query->where('transaction_types.type', 'Deposit');
-        }
-        $query->before($end)->after($start)
-              ->where('transaction_journals.user_id', Auth::user()->id)
-              ->groupBy('t_from.account_id')->orderBy('amount');
-
-        return $query->get(['t_from.account_id as account_id', 'ac_from.name as name', DB::Raw('SUM(t_from.amount) as `amount`')]);
+        return $query;
     }
-
-    /**
-     * 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']
-                                 );
-
-    }
-
-    /**
-     * 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 `amount`')
-                                     ]
-                                 );
-    }
-
-}
+}

app/Helpers/Report/ReportQueryInterface.php

@@ -4,6 +4,7 @@ namespace FireflyIII\Helpers\Report;
 
 use Carbon\Carbon;
 use FireflyIII\Models\Account;
+use FireflyIII\Models\Budget;
 use Illuminate\Support\Collection;
 
 /**
@@ -14,72 +15,17 @@ use Illuminate\Support\Collection;
 interface ReportQueryInterface
 {
 
-    /**
-     * This query retrieves a list of accounts that are active and not shared.
-     *
-     * @param bool $showSharedReports
-     *
-     * @return Collection
-     */
-    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 Collection
-     */
-    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
+     * @param bool   $includeShared
      *
      * @return Collection
      */
-    public function getAllAccounts(Carbon $start, Carbon $end, $showSharedReports = false);
+    public function getAllAccounts(Carbon $start, Carbon $end, $includeShared = false);
 
-    /**
-     * 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);
-
-    /**
-     * 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);
 
     /**
      * This method returns all "income" journals in a certain period, which are both transfers from a shared account
@@ -88,79 +34,47 @@ interface ReportQueryInterface
      *
      * @param Carbon $start
      * @param Carbon $end
-     * @param bool   $showSharedReports
+     * @param bool   $includeShared
      *
      * @return Collection
+     *
      */
-    public function incomeByPeriod(Carbon $start, Carbon $end, $showSharedReports = false);
+    public function incomeInPeriod(Carbon $start, Carbon $end, $includeShared = false);
 
     /**
-     * Gets a list of expenses grouped by the budget they were filed under.
+     * This method returns all "expense" journals in a certain period, which are both transfers to a shared account
+     * and "ordinary" withdrawals. The query used is almost equal to ReportQueryInterface::journalsByRevenueAccount but it does
+     * not group and returns different fields.
      *
      * @param Carbon $start
      * @param Carbon $end
-     * @param bool   $showSharedReports
+     * @param bool   $includeShared
      *
      * @return Collection
+     *
      */
-    public function journalsByBudget(Carbon $start, Carbon $end, $showSharedReports = false);
+    public function expenseInPeriod(Carbon $start, Carbon $end, $includeShared = false);
+
 
     /**
-     * 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 Account $account
+     * @param Budget  $budget
+     * @param Carbon  $start
+     * @param Carbon  $end
      *
-     * @param Carbon $start
-     * @param Carbon $end
-     * @param bool   $showSharedReports
-     *
-     * @return Collection
+     * @return float
      */
-    public function journalsByCategory(Carbon $start, Carbon $end, $showSharedReports = false);
+    public function spentInBudget(Account $account, Budget $budget, Carbon $start, Carbon $end);
 
     /**
-     * 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.
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     * @param bool    $shared
      *
-     * So now it will include them!
-     *
-     * @param Carbon $start
-     * @param Carbon $end
-     * @param bool   $showSharedReports
-     *
-     * @return Collection
+     * @return float
      */
-    public function journalsByExpenseAccount(Carbon $start, Carbon $end, $showSharedReports = false);
+    public function spentNoBudget(Account $account, Carbon $start, Carbon $end, $shared = 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, $showSharedReports = false);
 
-    /**
-     * 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);
-
-    /**
-     * 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);
-}
+}

app/Http/Controllers/AccountController.php

@@ -7,11 +7,11 @@ use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\AccountFormRequest;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use Illuminate\Pagination\LengthAwarePaginator;
 use Input;
 use Redirect;
 use Session;
 use Steam;
+use URL;
 use View;
 
 /**
@@ -26,8 +26,9 @@ class AccountController extends Controller
      */
     public function __construct()
     {
+        parent::__construct();
         View::share('mainTitleIcon', 'fa-credit-card');
-        View::share('title', 'Accounts');
+        View::share('title', trans('firefly.accounts'));
     }
 
     /**
@@ -37,9 +38,15 @@ class AccountController extends Controller
      */
     public function create($what = 'asset')
     {
-        $subTitleIcon = Config::get('firefly.subTitlesByIdentifier.' . $what);
+        $subTitleIcon = Config::get('firefly.subIconsByIdentifier.' . $what);
         $subTitle     = 'Create a new ' . e($what) . ' account';
 
+        // put previous url in session if not redirect from store (not "create another").
+        if (Session::get('accounts.create.fromStore') !== true) {
+            Session::put('accounts.create.url', URL::previous());
+        }
+        Session::forget('accounts.create.fromStore');
+
         return view('accounts.create', compact('subTitleIcon', 'what', 'subTitle'));
 
     }
@@ -53,15 +60,19 @@ class AccountController extends Controller
     {
         $subTitle = 'Delete ' . strtolower(e($account->accountType->type)) . ' "' . e($account->name) . '"';
 
+        // put previous url in session
+        Session::put('accounts.delete.url', URL::previous());
+
         return view('accounts.delete', compact('account', 'subTitle'));
     }
 
     /**
-     * @param Account $account
+     * @param AccountRepositoryInterface $repository
+     * @param Account                    $account
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function destroy(Account $account, AccountRepositoryInterface $repository)
+    public function destroy(AccountRepositoryInterface $repository, Account $account)
     {
 
         $type     = $account->accountType->type;
@@ -72,35 +83,46 @@ class AccountController extends Controller
 
         Session::flash('success', 'The ' . e($typeName) . ' account "' . e($name) . '" was deleted.');
 
-        return Redirect::route('accounts.index', $typeName);
+        return Redirect::to(Session::get('accounts.delete.url'));
     }
 
     /**
-     * @param Account                    $account
      * @param AccountRepositoryInterface $repository
+     * @param Account                    $account
      *
      * @return View
      */
-    public function edit(Account $account, AccountRepositoryInterface $repository)
+    public function edit(AccountRepositoryInterface $repository, Account $account)
     {
+
         $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);
 
+        // put previous url in session if not redirect from store (not "return_to_edit").
+        if (Session::get('accounts.edit.fromUpdate') !== true) {
+            Session::put('accounts.edit.url', URL::previous());
+        }
+        Session::forget('accounts.edit.fromUpdate');
+
         // pre fill some useful values.
 
         // the opening balance is tricky:
         $openingBalanceAmount = null;
+
         if ($openingBalance) {
-            $transaction          = $openingBalance->transactions()->where('account_id', $account->id)->first();
+            $transaction          = $repository->getFirstTransaction($openingBalance, $account);
             $openingBalanceAmount = $transaction->amount;
         }
 
         $preFilled = [
-            'accountRole'        => $account->getMeta('accountRole'),
-            'openingBalanceDate' => $openingBalance ? $openingBalance->date->format('Y-m-d') : null,
-            'openingBalance'     => $openingBalanceAmount
+            '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);
 
@@ -108,67 +130,50 @@ class AccountController extends Controller
     }
 
     /**
-     * @param string $what
+     * @param AccountRepositoryInterface $repository
+     * @param                            $what
      *
      * @return View
      */
-    public function index($what = 'default')
+    public function index(AccountRepositoryInterface $repository, $what)
     {
-        $subTitle     = Config::get('firefly.subTitlesByIdentifier.' . $what);
+        $subTitle     = trans('firefly.' . $what . '_accounts');
         $subTitleIcon = Config::get('firefly.subIconsByIdentifier.' . $what);
         $types        = Config::get('firefly.accountTypesByIdentifier.' . $what);
-        $size         = 50;
-        $page         = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page'));
-        $offset       = ($page - 1) * $size;
-
-
-        // move to repository:
-        $set   = Auth::user()->accounts()->with(
-            ['accountmeta' => function ($query) {
-                $query->where('name', 'accountRole');
-            }]
-        )->accountTypeIn($types)->take($size)->offset($offset)->orderBy('accounts.name', 'ASC')->get(['accounts.*']);
-        $total = Auth::user()->accounts()->accountTypeIn($types)->count();
-
+        $accounts     = $repository->getAccounts($types);
         // last activity:
-        $start = clone Session::get('start');
+        /**
+         * HERE WE ARE
+         */
+        $start = clone Session::get('start', Carbon::now()->startOfMonth());
         $start->subDay();
-        $set->each(
-            function (Account $account) use ($start) {
-                $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) {
-                    $account->lastActivityDate = $lastTransaction->transactionjournal->date;
-                } else {
-                    $account->lastActivityDate = null;
-                }
-                $account->startBalance = Steam::balance($account, $start);
-                $account->endBalance   = Steam::balance($account, Session::get('end'));
+        $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()));
             }
         );
 
-        $accounts = new LengthAwarePaginator($set, $total, $size, $page);
-        $accounts->setPath(route('accounts.index', $what));
-
-
         return view('accounts.index', compact('what', 'subTitleIcon', 'subTitle', 'accounts'));
     }
 
     /**
-     * @param Account                    $account
      * @param AccountRepositoryInterface $repository
+     * @param Account                    $account
      *
      * @return View
      */
-    public function show(Account $account, AccountRepositoryInterface $repository)
+    public function show(AccountRepositoryInterface $repository, Account $account)
     {
         $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);
+        $journals->setPath('accounts/show/' . $account->id);
+
+
         return view('accounts.show', compact('account', 'what', 'subTitleIcon', 'journals', 'subTitle'));
     }
 
@@ -183,6 +188,7 @@ class AccountController extends Controller
         $accountData = [
             'name'                   => $request->input('name'),
             'accountType'            => $request->input('what'),
+            'virtualBalance'         => floatval($request->input('virtualBalance')),
             'active'                 => true,
             'user'                   => Auth::user()->id,
             'accountRole'            => $request->input('accountRole'),
@@ -196,31 +202,39 @@ class AccountController extends Controller
         Session::flash('success', 'New account "' . $account->name . '" stored!');
 
         if (intval(Input::get('create_another')) === 1) {
-            return Redirect::route('accounts.create', $request->input('what'))->withInput();
+            // set value so create routine will not overwrite URL:
+            Session::put('accounts.create.fromStore', true);
+
+            return Redirect::route('accounts.create')->withInput();
         }
 
-        return Redirect::route('accounts.index', $request->input('what'));
+        // redirect to previous URL.
+        return Redirect::to(Session::get('accounts.create.url'));
+
 
     }
 
     /**
-     * @param Account                    $account
      * @param AccountFormRequest         $request
      * @param AccountRepositoryInterface $repository
+     * @param Account                    $account
      *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return $this|\Illuminate\Http\RedirectResponse
      */
-    public function update(Account $account, AccountFormRequest $request, AccountRepositoryInterface $repository)
+    public function update(AccountFormRequest $request, AccountRepositoryInterface $repository, Account $account)
     {
-        $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);
@@ -228,10 +242,14 @@ class AccountController extends Controller
         Session::flash('success', 'Account "' . $account->name . '" updated.');
 
         if (intval(Input::get('return_to_edit')) === 1) {
-            return Redirect::route('accounts.edit', $account->id);
+            // set value so edit routine will not overwrite URL:
+            Session::put('accounts.edit.fromUpdate', true);
+
+            return Redirect::route('accounts.edit', $account->id)->withInput(['return_to_edit' => 1]);
         }
 
-        return Redirect::route('accounts.index', $what);
+        // redirect to previous URL.
+        return Redirect::to(Session::get('accounts.edit.url'));
 
     }
 

app/Http/Controllers/Auth/AuthController.php

@@ -5,8 +5,10 @@ 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;
+use Twig;
 
 /**
  * Class AuthController
@@ -37,6 +39,8 @@ class AuthController extends Controller
      * @param  \Illuminate\Contracts\Auth\Guard     $auth
      * @param  \Illuminate\Contracts\Auth\Registrar $registrar
      *
+     * @codeCoverageIgnore
+     *
      */
     public function __construct(Guard $auth, Registrar $registrar)
     {
@@ -46,6 +50,18 @@ class AuthController extends Controller
         $this->middleware('guest', ['except' => 'getLogout']);
     }
 
+    /**
+     * Show the application login form.
+     *
+     * @codeCoverageIgnore
+     * @return \Illuminate\Http\Response
+     *
+     */
+    public function getLogin()
+    {
+        return Twig::render('auth.login');
+    }
+
     /**
      * Handle a registration request for the application.
      *
@@ -61,9 +77,11 @@ class AuthController extends Controller
             $this->throwValidationException(
                 $request, $validator
             );
+            // @codeCoverageIgnoreStart
         }
+        // @codeCoverageIgnoreEnd
 
-        $data  =$request->all();
+        $data             = $request->all();
         $data['password'] = bcrypt($data['password']);
 
         $this->auth->login($this->registrar->create($data));
@@ -73,13 +91,15 @@ class AuthController extends Controller
 
         // send email.
         Mail::send(
-            'emails.registered', [], function ($message) use ($email) {
+            '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

@@ -8,6 +8,7 @@ use Illuminate\Foundation\Auth\ResetsPasswords;
 /**
  * Class PasswordController
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Http\Controllers\Auth
  */
 class PasswordController extends Controller

app/Http/Controllers/BillController.php

@@ -1,12 +1,13 @@
 <?php namespace FireflyIII\Http\Controllers;
 
-use Auth;
-use Carbon\Carbon;
+use Config;
 use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\BillFormRequest;
+use FireflyIII\Models\Account;
 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;
@@ -22,9 +23,13 @@ use View;
 class BillController extends Controller
 {
 
+    /**
+     *
+     */
     public function __construct()
     {
-        View::share('title', 'Bills');
+        parent::__construct();
+        View::share('title', trans('firefly.bills'));
         View::share('mainTitleIcon', 'fa-calendar-o');
     }
 
@@ -33,9 +38,16 @@ class BillController extends Controller
      */
     public function create()
     {
-        $periods = \Config::get('firefly.periods_to_text');
+        $periods = Config::get('firefly.periods_to_text');
 
-        return view('bills.create')->with('periods', $periods)->with('subTitle', 'Create new');
+        // put previous url in session if not redirect from store (not "create another").
+        if (Session::get('bills.create.fromStore') !== true) {
+            Session::put('bills.create.url', URL::previous());
+        }
+        Session::forget('bills.create.fromStore');
+        $subTitle = 'Create new bill';
+
+        return view('bills.create', compact('periods', 'subTitle'));
     }
 
     /**
@@ -45,20 +57,26 @@ class BillController extends Controller
      */
     public function delete(Bill $bill)
     {
-        return view('bills.delete')->with('bill', $bill)->with('subTitle', 'Delete "' . e($bill->name) . '"');
+        // put previous url in session
+        Session::put('bills.delete.url', URL::previous());
+        $subTitle = 'Delete "' . e($bill->name) . '"';
+
+        return view('bills.delete', compact('bill', 'subTitle'));
     }
 
     /**
-     * @param Bill $bill
+     * @param BillRepositoryInterface $repository
+     * @param Bill                    $bill
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function destroy(Bill $bill)
+    public function destroy(BillRepositoryInterface $repository, Bill $bill)
     {
-        $bill->delete();
+        $repository->destroy($bill);
+
         Session::flash('success', 'The bill was deleted.');
 
-        return Redirect::route('bills.index');
+        return Redirect::to(Session::get('bills.delete.url'));
 
     }
 
@@ -69,9 +87,16 @@ class BillController extends Controller
      */
     public function edit(Bill $bill)
     {
-        $periods = \Config::get('firefly.periods_to_text');
+        $periods  = Config::get('firefly.periods_to_text');
+        $subTitle = 'Edit "' . e($bill->name) . '"';
 
-        return view('bills.edit')->with('periods', $periods)->with('bill', $bill)->with('subTitle', 'Edit "' . e($bill->name) . '"');
+        // put previous url in session if not redirect from store (not "return_to_edit").
+        if (Session::get('bills.edit.fromUpdate') !== true) {
+            Session::put('bills.edit.url', URL::previous());
+        }
+        Session::forget('bills.edit.fromUpdate');
+
+        return view('bills.edit', compact('subTitle', 'periods', 'bill'));
     }
 
     /**
@@ -81,15 +106,11 @@ class BillController extends Controller
      */
     public function index(BillRepositoryInterface $repository)
     {
-        $bills = Auth::user()->bills()->orderBy('name', 'ASC')->get();
+        $bills = $repository->getBills();
         $bills->each(
             function (Bill $bill) use ($repository) {
                 $bill->nextExpectedMatch = $repository->nextExpectedMatch($bill);
-                $last                    = $bill->transactionjournals()->orderBy('date', 'DESC')->first();
-                $bill->lastFoundMatch    = null;
-                if ($last) {
-                    $bill->lastFoundMatch = $last->date;
-                }
+                $bill->lastFoundMatch    = $repository->lastFoundMatch($bill);
             }
         );
 
@@ -97,34 +118,25 @@ class BillController extends Controller
     }
 
     /**
-     * @param Bill $bill
+     * @param BillRepositoryInterface $repository
+     * @param Bill                    $bill
      *
-     * @return mixed
+     * @return \Illuminate\Http\RedirectResponse
      */
-    public function rescan(Bill $bill, BillRepositoryInterface $repository)
+    public function rescan(BillRepositoryInterface $repository, Bill $bill)
     {
         if (intval($bill->active) == 0) {
             Session::flash('warning', 'Inactive bills cannot be scanned.');
 
-            return Redirect::intended('/');
+            return Redirect::to(URL::previous());
         }
 
-        $set = \DB::table('transactions')->where('amount', '>', 0)->where('amount', '>=', $bill->amount_min)->where('amount', '<=', $bill->amount_max)->get(
-            ['transaction_journal_id']
-        );
-        $ids = [];
+        $journals = $repository->getPossiblyRelatedJournals($bill);
+        /** @var TransactionJournal $journal */
+        foreach ($journals as $journal) {
+            $repository->scan($bill, $journal);
+        }
 
-        /** @var Transaction $entry */
-        foreach ($set as $entry) {
-            $ids[] = intval($entry->transaction_journal_id);
-        }
-        if (count($ids) > 0) {
-            $journals = Auth::user()->transactionjournals()->whereIn('id', $ids)->get();
-            /** @var TransactionJournal $journal */
-            foreach ($journals as $journal) {
-                $repository->scan($bill, $journal);
-            }
-        }
 
         Session::flash('success', 'Rescanned everything.');
 
@@ -132,88 +144,68 @@ class BillController extends Controller
     }
 
     /**
-     * @param Bill $bill
+     * @param BillRepositoryInterface $repository
+     * @param Bill                    $bill
      *
      * @return mixed
      */
-    public function show(Bill $bill, BillRepositoryInterface $repository)
+    public function show(BillRepositoryInterface $repository, Bill $bill)
     {
-        $journals                = $bill->transactionjournals()->withRelevantData()
-            ->orderBy('transaction_journals.date', 'DESC')
-            ->orderBy('transaction_journals.order','ASC')
-            ->orderBy('transaction_journals.id','DESC')
-
-            ->get();
+        $journals                = $repository->getJournals($bill);
         $bill->nextExpectedMatch = $repository->nextExpectedMatch($bill);
         $hideBill                = true;
+        $subTitle                = e($bill->name);
 
-
-        return view('bills.show', compact('journals', 'hideBill', 'bill'))->with('subTitle', e($bill->name));
+        return view('bills.show', compact('journals', 'hideBill', 'bill', 'subTitle'));
     }
 
     /**
-     * @return $this
+     * @param BillFormRequest         $request
+     * @param BillRepositoryInterface $repository
+     *
+     * @return $this|\Illuminate\Http\RedirectResponse
      */
     public function store(BillFormRequest $request, BillRepositoryInterface $repository)
     {
-
-        var_dump($request->all());
-
-        $billData = [
-            'name'               => $request->get('name'),
-            'match'              => $request->get('match'),
-            'amount_min'         => floatval($request->get('amount_min')),
-            'amount_currency_id' => floatval($request->get('amount_currency_id')),
-            'amount_max'         => floatval($request->get('amount_max')),
-            'date'               => new Carbon($request->get('date')),
-            'user'               => Auth::user()->id,
-            'repeat_freq'        => $request->get('repeat_freq'),
-            'skip'               => intval($request->get('skip')),
-            'automatch'          => intval($request->get('automatch')) === 1,
-            'active'             => intval($request->get('active')) === 1,
-        ];
-
-        $bill = $repository->store($billData);
+        $billData = $request->getBillData();
+        $bill     = $repository->store($billData);
         Session::flash('success', 'Bill "' . e($bill->name) . '" stored.');
 
         if (intval(Input::get('create_another')) === 1) {
+            // set value so create routine will not overwrite URL:
+            Session::put('bills.create.fromStore', true);
+
             return Redirect::route('bills.create')->withInput();
         }
 
-        return Redirect::route('bills.index');
+        // redirect to previous URL.
+        return Redirect::to(Session::get('bills.create.url'));
 
     }
 
     /**
-     * @param Bill $bill
+     * @param BillFormRequest         $request
+     * @param BillRepositoryInterface $repository
+     * @param Bill                    $bill
      *
-     * @return $this
+     * @return $this|\Illuminate\Http\RedirectResponse
      */
-    public function update(Bill $bill, BillFormRequest $request, BillRepositoryInterface $repository)
+    public function update(BillFormRequest $request, BillRepositoryInterface $repository, Bill $bill)
     {
-        $billData = [
-            'name'               => $request->get('name'),
-            'match'              => $request->get('match'),
-            'amount_min'         => floatval($request->get('amount_min')),
-            'amount_currency_id' => floatval($request->get('amount_currency_id')),
-            'amount_max'         => floatval($request->get('amount_max')),
-            'date'               => new Carbon($request->get('date')),
-            'user'               => Auth::user()->id,
-            'repeat_freq'        => $request->get('repeat_freq'),
-            'skip'               => intval($request->get('skip')),
-            'automatch'          => intval($request->get('automatch')) === 1,
-            'active'             => intval($request->get('active')) === 1,
-        ];
-
-        $bill = $repository->update($bill, $billData);
-
-        if (intval(Input::get('return_to_edit')) === 1) {
-            return Redirect::route('bills.edit', $bill->id);
-        }
+        $billData = $request->getBillData();
+        $bill     = $repository->update($bill, $billData);
 
         Session::flash('success', 'Bill "' . e($bill->name) . '" updated.');
 
-        return Redirect::route('bills.index');
+        if (intval(Input::get('return_to_edit')) === 1) {
+            // set value so edit routine will not overwrite URL:
+            Session::put('bills.edit.fromUpdate', true);
+
+            return Redirect::route('bills.edit', $bill->id)->withInput(['return_to_edit' => 1]);
+        }
+
+        // redirect to previous URL.
+        return Redirect::to(Session::get('bills.edit.url'));
 
     }
 

app/Http/Controllers/BudgetController.php

@@ -12,6 +12,7 @@ use Preferences;
 use Redirect;
 use Response;
 use Session;
+use URL;
 use View;
 
 /**
@@ -22,19 +23,24 @@ use View;
 class BudgetController extends Controller
 {
 
+    /**
+     *
+     */
     public function __construct()
     {
-        View::share('title', 'Budgets');
+        parent::__construct();
+        View::share('title', trans('firefly.budgets'));
         View::share('mainTitleIcon', 'fa-tasks');
+        View::share('hideBudgets', true);
     }
 
     /**
-     * @param Budget $budget
+     * @param BudgetRepositoryInterface $repository
+     * @param Budget                    $budget
      *
-     * @return \Illuminate\Http\JsonResponse
-     * @throws Exception
+     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function amount(Budget $budget, BudgetRepositoryInterface $repository)
+    public function amount(BudgetRepositoryInterface $repository, Budget $budget)
     {
         $amount          = intval(Input::get('amount'));
         $date            = Session::get('start', Carbon::now()->startOfMonth());
@@ -49,7 +55,14 @@ class BudgetController extends Controller
      */
     public function create()
     {
-        return view('budgets.create')->with('subTitle', 'Create a new budget');
+        // 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');
+        $subTitle = 'Create a new budget';
+
+        return view('budgets.create', compact('subTitle'));
     }
 
     /**
@@ -61,11 +74,15 @@ class BudgetController extends Controller
     {
         $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
+     * @param Budget                    $budget
+     * @param BudgetRepositoryInterface $repository
      *
      * @return \Illuminate\Http\RedirectResponse
      */
@@ -75,9 +92,10 @@ class BudgetController extends Controller
         $name = $budget->name;
         $repository->destroy($budget);
 
+
         Session::flash('success', 'The  budget "' . e($name) . '" was deleted.');
 
-        return Redirect::route('budgets.index');
+        return Redirect::to(Session::get('budgets.delete.url'));
     }
 
     /**
@@ -89,61 +107,70 @@ class BudgetController extends Controller
     {
         $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
+     * @param BudgetRepositoryInterface $repository
+     *
+     * @return View
      */
     public function index(BudgetRepositoryInterface $repository)
     {
-        $budgets = Auth::user()->budgets()->get();
+        $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 = $budget->limitrepetitions()->where('limit_repetitions.startdate', $date)->first(['limit_repetitions.*']);
+                $end                = Session::get('end', Carbon::now()->endOfMonth());
+                $budget->spent      = $repository->spentInPeriod($budget, $date, $end);
+                $budget->currentRep = $repository->getCurrentRepetition($budget, $date);
             }
         );
 
-        $date          = Session::get('start', Carbon::now()->startOfMonth())->format('FY');
+        $dateAsString  = Session::get('start', Carbon::now()->startOfMonth())->format('FY');
         $spent         = $budgets->sum('spent');
-        $amount        = Preferences::get('budgetIncomeTotal' . $date, 1000)->data;
+        $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', 'budgets', 'spent', 'spentPCT', 'overspent', 'amount'));
+        return view('budgets.index', compact('budgetMaximum', 'inactive', 'budgets', 'spent', 'spentPCT', 'overspent', 'amount'));
     }
 
     /**
-     * @return \Illuminate\View\View
+     * @param BudgetRepositoryInterface $repository
+     *
+     * @return View
      */
-    public function noBudget()
+    public function noBudget(BudgetRepositoryInterface $repository)
     {
-        $start    = \Session::get('start', Carbon::now()->startOfMonth());
-        $end      = \Session::get('end', Carbon::now()->startOfMonth());
-        $list     = Auth::user()
-                        ->transactionjournals()
-                        ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
-                        ->whereNull('budget_transaction_journal.id')
-                        ->before($end)
-                        ->after($start)
-            ->orderBy('transaction_journals.date', 'DESC')
-            ->orderBy('transaction_journals.order','ASC')
-            ->orderBy('transaction_journals.id','DESC')
-                        ->get(['transaction_journals.*']);
-        $subTitle = 'Transactions without a budget in ' . $start->format('F Y');
+        $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
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function postUpdateIncome()
     {
@@ -154,6 +181,29 @@ class BudgetController extends Controller
         return Redirect::route('budgets.index');
     }
 
+    /**
+     * @param BudgetRepositoryInterface $repository
+     * @param Budget                    $budget
+     * @param LimitRepetition           $repetition
+     *
+     * @return View
+     */
+    public function show(BudgetRepositoryInterface $repository, Budget $budget, LimitRepetition $repetition = null)
+    {
+        if (!is_null($repetition->id) && $repetition->budgetLimit->budget->id != $budget->id) {
+            $message = 'Invalid selection.';
+
+            return view('error', compact('message'));
+        }
+
+        $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);
+        $journals->setPath('/budgets/show/' . $budget->id);
+
+        return view('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle'));
+    }
+
     /**
      * @param BudgetFormRequest         $request
      * @param BudgetRepositoryInterface $repository
@@ -170,42 +220,30 @@ class BudgetController extends Controller
 
         Session::flash('success', 'New budget "' . $budget->name . '" stored!');
 
-        return Redirect::route('budgets.index');
+        if (intval(Input::get('create_another')) === 1) {
+            // set value so create routine will not overwrite URL:
+            Session::put('budgets.create.fromStore', true);
 
-    }
-
-    /**
-     *
-     * @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.');
+            return Redirect::route('budgets.create')->withInput();
         }
 
-        $hideBudget = true; // used in transaction list.
-        $journals   = $repository->getJournals($budget, $repetition);
-        $limits     = !is_null($repetition->id) ? [$repetition->budgetLimit] : $budget->budgetLimits()->orderBy('startdate', 'DESC')->get();
-        $subTitle   = !is_null($repetition->id) ? e($budget->name) . ' in ' . $repetition->startdate->format('F Y') : e($budget->name);
+        // redirect to previous URL.
+        return Redirect::to(Session::get('budgets.create.url'));
 
-        return view('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle', 'hideBudget'));
     }
 
     /**
-     * @param Budget                    $budget
      * @param BudgetFormRequest         $request
      * @param BudgetRepositoryInterface $repository
+     * @param Budget                    $budget
      *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return $this|\Illuminate\Http\RedirectResponse
      */
-    public function update(Budget $budget, BudgetFormRequest $request, BudgetRepositoryInterface $repository)
+    public function update(BudgetFormRequest $request, BudgetRepositoryInterface $repository, Budget $budget)
     {
         $budgetData = [
-            'name' => $request->input('name'),
+            'name'   => $request->input('name'),
+            'active' => intval($request->input('active')) == 1
         ];
 
         $repository->update($budget, $budgetData);
@@ -213,22 +251,26 @@ class BudgetController extends Controller
         Session::flash('success', 'Budget "' . $budget->name . '" updated.');
 
         if (intval(Input::get('return_to_edit')) === 1) {
-            return Redirect::route('budgets.edit', $budget->id);
+            // 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]);
         }
 
-        return Redirect::route('budgets.index');
+        // redirect to previous URL.
+        return Redirect::to(Session::get('budgets.edit.url'));
 
     }
 
     /**
-     * @return $this
+     * @return View
      */
     public function updateIncome()
     {
-        $date         = Session::get('start', Carbon::now()->startOfMonth())->format('FY');
-        $budgetAmount = Preferences::get('budgetIncomeTotal' . $date, 1000);
+        $date   = Session::get('start', Carbon::now()->startOfMonth())->format('FY');
+        $amount = Preferences::get('budgetIncomeTotal' . $date, 1000);
 
-        return view('budgets.income')->with('amount', $budgetAmount);
+        return view('budgets.income', compact('amount'));
     }
 
 }

app/Http/Controllers/CategoryController.php

@@ -2,7 +2,6 @@
 
 use Auth;
 use Carbon\Carbon;
-use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\CategoryFormRequest;
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
@@ -10,9 +9,9 @@ use Illuminate\Pagination\LengthAwarePaginator;
 use Input;
 use Redirect;
 use Session;
+use URL;
 use View;
 
-
 /**
  * Class CategoryController
  *
@@ -26,7 +25,8 @@ class CategoryController extends Controller
      */
     public function __construct()
     {
-        View::share('title', 'Categories');
+        parent::__construct();
+        View::share('title', trans('firefly.categories'));
         View::share('mainTitleIcon', 'fa-bar-chart');
     }
 
@@ -35,7 +35,14 @@ class CategoryController extends Controller
      */
     public function create()
     {
-        return view('categories.create')->with('subTitle', 'Create a new category');
+        // 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');
+        $subTitle = 'Create a new category';
+
+        return view('categories.create', compact('subTitle'));
     }
 
     /**
@@ -45,17 +52,21 @@ class CategoryController extends Controller
      */
     public function delete(Category $category)
     {
-        $subTitle = 'Delete category' . e($category->name) . '"';
+        $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
+     * @param CategoryRepositoryInterface $repository
+     * @param Category                    $category
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function destroy(Category $category, CategoryRepositoryInterface $repository)
+    public function destroy(CategoryRepositoryInterface $repository, Category $category)
     {
 
         $name = $category->name;
@@ -63,7 +74,7 @@ class CategoryController extends Controller
 
         Session::flash('success', 'The  category "' . e($name) . '" was deleted.');
 
-        return Redirect::route('categories.index');
+        return Redirect::to(Session::get('categories.delete.url'));
     }
 
     /**
@@ -75,27 +86,28 @@ class CategoryController extends Controller
     {
         $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'));
 
     }
 
     /**
+     * @param CategoryRepositoryInterface $repository
+     *
      * @return $this
      */
-    public function index()
+    public function index(CategoryRepositoryInterface $repository)
     {
-        $categories = Auth::user()->categories()->orderBy('name', 'ASC')->get();
+        $categories = $repository->getCategories();
 
         $categories->each(
-            function (Category $category) {
-                $latest = $category->transactionjournals()
-                    ->orderBy('transaction_journals.date', 'DESC')
-                    ->orderBy('transaction_journals.order','ASC')
-                    ->orderBy('transaction_journals.id','DESC')
-                    ->first();
-                if ($latest) {
-                    $category->lastActivity = $latest->date;
-                }
+            function (Category $category) use ($repository) {
+                $category->lastActivity = $repository->getLatestActivity($category);
             }
         );
 
@@ -103,50 +115,34 @@ class CategoryController extends Controller
     }
 
     /**
+     * @param CategoryRepositoryInterface $repository
+     *
      * @return \Illuminate\View\View
      */
-    public function noCategory()
+    public function noCategory(CategoryRepositoryInterface $repository)
     {
-        $start = Session::get('start', Carbon::now()->startOfMonth());
-        $end   = Session::get('end', Carbon::now()->startOfMonth());
-        $list  = Auth::user()
-                     ->transactionjournals()
-                     ->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
-                     ->whereNull('category_transaction_journal.id')
-                     ->before($end)
-                     ->after($start)
-            ->orderBy('transaction_journals.date', 'DESC')
-            ->orderBy('transaction_journals.order','ASC')
-            ->orderBy('transaction_journals.id','DESC')
-                     ->get(['transaction_journals.*']);
-
+        $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
+     * @param CategoryRepositoryInterface $repository
+     * @param Category                    $category
      *
-     * @return $this
+     * @return View
      */
-    public function show(Category $category, CategoryRepositoryInterface $repository)
+    public function show(CategoryRepositoryInterface $repository, Category $category)
     {
         $hideCategory = true; // used in list.
         $page         = intval(Input::get('page'));
-        $offset       = $page > 0 ? $page * 50 : 0;
-        $set          = $category->transactionJournals()->withRelevantData()->take(50)->offset($offset)
-
-            ->orderBy('transaction_journals.date', 'DESC')
-            ->orderBy('transaction_journals.order','ASC')
-            ->orderBy('transaction_journals.id','DESC')
-
-            ->get(
-            ['transaction_journals.*']
-        );
-        $count        = $category->transactionJournals()->count();
-
-        $journals = new LengthAwarePaginator($set, $count, 50, $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'));
     }
@@ -166,28 +162,25 @@ class CategoryController extends Controller
         $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();
         }
 
-        if (intval(Input::get('create_another')) === 1) {
-            return Redirect::route('categories.create');
-        }
-
         return Redirect::route('categories.index');
-
     }
 
 
     /**
-     * @param Category                    $category
      * @param CategoryFormRequest         $request
      * @param CategoryRepositoryInterface $repository
+     * @param Category                    $category
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function update(Category $category, CategoryFormRequest $request, CategoryRepositoryInterface $repository)
+    public function update(CategoryFormRequest $request, CategoryRepositoryInterface $repository, Category $category)
     {
         $categoryData = [
             'name' => $request->input('name'),
@@ -198,10 +191,13 @@ class CategoryController extends Controller
         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);
         }
 
-        return Redirect::route('categories.index');
+        // redirect to previous URL.
+        return Redirect::to(Session::get('categories.edit.url'));
 
     }
 

app/Http/Controllers/Chart/AccountController.php

@@ -0,0 +1,150 @@
+<?php
+
+namespace FireflyIII\Http\Controllers\Chart;
+
+use Carbon\Carbon;
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Models\Account;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use Grumpydictator\Gchart\GChart;
+use Illuminate\Support\Collection;
+use Preferences;
+use Response;
+use Session;
+use Steam;
+
+/**
+ * Class AccountController
+ *
+ * @package FireflyIII\Http\Controllers\Chart
+ */
+class AccountController extends Controller
+{
+    /**
+     * Shows the balances for all the user's accounts.
+     *
+     * @param GChart                     $chart
+     * @param AccountRepositoryInterface $repository
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function all(GChart $chart, AccountRepositoryInterface $repository, $year, $month, $shared = false)
+    {
+        $start = new Carbon($year . '-' . $month . '-01');
+        $end   = clone $start;
+        $end->endOfMonth();
+        $chart->addColumn(trans('firefly.dayOfMonth'), 'date');
+
+        /** @var Collection $accounts */
+        $accounts = $repository->getAccounts(['Default account', 'Asset account']);
+        if ($shared === false) {
+            // remove the shared accounts from the collection:
+            /** @var Account $account */
+            foreach ($accounts as $index => $account) {
+                if ($account->getMeta('accountRole') == 'sharedAsset') {
+                    $accounts->forget($index);
+                }
+            }
+        }
+
+
+        $index = 1;
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $chart->addColumn(trans('firefly.balanceFor', ['name' => $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());
+
+    }
+
+    /**
+     * Shows the balances for all the user's frontpage accounts.
+     *
+     * @param GChart                     $chart
+     * @param AccountRepositoryInterface $repository
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function frontpage(GChart $chart, AccountRepositoryInterface $repository)
+    {
+        $chart->addColumn(trans('firefly.dayOfMonth'), '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(trans('firefly.balanceFor', ['name' => $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());
+
+    }
+
+    /**
+     * Shows an account's balance for a single month.
+     *
+     * @param GChart  $chart
+     * @param Account $account
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function single(GChart $chart, Account $account)
+    {
+        $chart->addColumn(trans('firefly.dayOfMonth'), 'date');
+        $chart->addColumn(trans('firefly.balanceFor', ['name' => $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());
+    }
+}

app/Http/Controllers/Chart/BillController.php

@@ -0,0 +1,141 @@
+<?php
+
+namespace FireflyIII\Http\Controllers\Chart;
+
+use Carbon\Carbon;
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use Grumpydictator\Gchart\GChart;
+use Illuminate\Support\Collection;
+use Response;
+use Session;
+use Steam;
+
+/**
+ * Class BillController
+ *
+ * @package FireflyIII\Http\Controllers\Chart
+ */
+class BillController extends Controller
+{
+    /**
+     * Shows the overview for a bill. The min/max amount and matched journals.
+     *
+     * @param GChart                  $chart
+     * @param BillRepositoryInterface $repository
+     * @param Bill                    $bill
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function single(GChart $chart, BillRepositoryInterface $repository, Bill $bill)
+    {
+
+        $chart->addColumn(trans('firefly.date'), 'date');
+        $chart->addColumn(trans('firefly.maxAmount'), 'number');
+        $chart->addColumn(trans('firefly.minAmount'), 'number');
+        $chart->addColumn(trans('firefly.billEntry'), '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());
+
+    }
+
+    /**
+     * Shows all bills and whether or not theyve been paid this month (pie chart).
+     *
+     * @param GChart                     $chart
+     *
+     * @param BillRepositoryInterface    $repository
+     * @param AccountRepositoryInterface $accounts
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function frontpage(GChart $chart, BillRepositoryInterface $repository, AccountRepositoryInterface $accounts)
+    {
+        $chart->addColumn(trans('firefly.name'), 'string');
+        $chart->addColumn(trans('firefly.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, $end, 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(trans('firefly.unpaid') . ': ' . join(', ', $unpaidDescriptions), $unpaidAmount);
+        $chart->addRow(trans('firefly.paid') . ': ' . join(', ', $paidDescriptions), $paidAmount);
+        $chart->generate();
+
+        return Response::json($chart->getData());
+    }
+}

app/Http/Controllers/Chart/BudgetController.php

@@ -0,0 +1,160 @@
+<?php
+
+namespace FireflyIII\Http\Controllers\Chart;
+
+use Carbon\Carbon;
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use Grumpydictator\Gchart\GChart;
+use Illuminate\Support\Collection;
+use Response;
+use Session;
+
+/**
+ * Class BudgetController
+ *
+ * @package FireflyIII\Http\Controllers\Chart
+ */
+class BudgetController extends Controller
+{
+    /**
+     * Shows the amount left in a specific budget limit.
+     *
+     * @param GChart                    $chart
+     * @param BudgetRepositoryInterface $repository
+     * @param Budget                    $budget
+     * @param LimitRepetition           $repetition
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function budgetLimit(GChart $chart, BudgetRepositoryInterface $repository, Budget $budget, LimitRepetition $repetition)
+    {
+        $start = clone $repetition->startdate;
+        $end   = $repetition->enddate;
+
+        $chart->addColumn(trans('firefly.day'), 'date');
+        $chart->addColumn(trans('firefly.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());
+
+    }
+
+    /**
+     * Shows a budget list with spent/left/overspent.
+     *
+     * @param GChart                    $chart
+     * @param BudgetRepositoryInterface $repository
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function frontpage(GChart $chart, BudgetRepositoryInterface $repository)
+    {
+        $chart->addColumn(trans('firefly.budget'), 'string');
+        $chart->addColumn(trans('firefly.left'), 'number');
+        $chart->addColumn(trans('firefly.spent'), 'number');
+        $chart->addColumn(trans('firefly.overspent'), '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->spentInPeriod($budget, $start, $end, true);
+                $allEntries->push([$budget->name, 0, 0, $expenses]);
+                continue;
+            }
+            /** @var LimitRepetition $repetition */
+            foreach ($repetitions as $repetition) {
+                $expenses  = $repository->spentInPeriod($budget, $repetition->startdate, $repetition->enddate, true);
+                $left      = $expenses < floatval($repetition->amount) ? floatval($repetition->amount) - $expenses : 0;
+                $spent     = $expenses > floatval($repetition->amount) ? 0 : $expenses;
+                $overspent = $expenses > floatval($repetition->amount) ? $expenses - floatval($repetition->amount) : 0;
+                $allEntries->push(
+                    [$budget->name . ' (' . $repetition->startdate->formatLocalized($this->monthAndDayFormat) . ')',
+                     $left,
+                     $spent,
+                     $overspent
+                    ]
+                );
+            }
+        }
+
+        $noBudgetExpenses = $repository->getWithoutBudgetSum($start, $end);
+        $allEntries->push([trans('firefly.noBudget'), 0, 0, $noBudgetExpenses]);
+
+        foreach ($allEntries as $entry) {
+            if ($entry[1] != 0 || $entry[2] != 0 || $entry[3] != 0) {
+                $chart->addRow($entry[0], $entry[1], $entry[2], $entry[3]);
+            }
+        }
+
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+    }
+
+    /**
+     * Show a yearly overview for a budget.
+     *
+     * @param GChart                    $chart
+     * @param BudgetRepositoryInterface $repository
+     * @param                           $year
+     * @param bool                      $shared
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function year(GChart $chart, BudgetRepositoryInterface $repository, $year, $shared = false)
+    {
+        $start   = new Carbon($year . '-01-01');
+        $end     = new Carbon($year . '-12-31');
+        $shared  = $shared == 'shared' ? true : false;
+        $budgets = $repository->getBudgets();
+
+        // add columns:
+        $chart->addColumn(trans('firefly.month'), 'date');
+        foreach ($budgets as $budget) {
+            $chart->addColumn($budget->name, 'number');
+        }
+
+        while ($start < $end) {
+            // month is the current end of the period:
+            $month = clone $start;
+            $month->endOfMonth();
+            // make a row:
+            $row = [clone $start];
+
+            // each budget, fill the row:
+            foreach ($budgets as $budget) {
+                $spent = $repository->spentInPeriod($budget, $start, $month, $shared);
+                $row[] = $spent;
+            }
+            $chart->addRowArray($row);
+
+            $start->addMonth();
+        }
+
+        $chart->generate();
+
+        return Response::json($chart->getData());
+    }
+}

app/Http/Controllers/Chart/CategoryController.php

@@ -0,0 +1,168 @@
+<?php
+
+namespace FireflyIII\Http\Controllers\Chart;
+
+
+use Carbon\Carbon;
+use Crypt;
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Models\Category;
+use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Models\Preference;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use Grumpydictator\Gchart\GChart;
+use Navigation;
+use Preferences;
+use Response;
+use Session;
+
+/**
+ * Class CategoryController
+ *
+ * @package FireflyIII\Http\Controllers\Chart
+ */
+class CategoryController extends Controller
+{
+
+
+    /**
+     * Show an overview for a category for all time, per month/week/year.
+     *
+     * @param GChart                      $chart
+     * @param CategoryRepositoryInterface $repository
+     * @param Category                    $category
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function all(GChart $chart, CategoryRepositoryInterface $repository, Category $category)
+    {
+        // oldest transaction in category:
+        $start = $repository->getFirstActivityDate($category);
+        $range = Preferences::get('viewRange', '1M')->data;
+        // jump to start of week / month / year / etc
+        $start = Navigation::startOfPeriod($start, $range);
+
+        $chart->addColumn(trans('firefly.period'), 'date');
+        $chart->addColumn(trans('firefly.spent'), 'number');
+
+
+        $end = new Carbon;
+        while ($start <= $end) {
+
+            $currentEnd = Navigation::endOfPeriod($start, $range);
+            $spent      = $repository->spentInPeriod($category, $start, $currentEnd);
+            $chart->addRow(clone $start, $spent);
+
+            $start = Navigation::addPeriod($start, $range, 0);
+        }
+
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+
+    }
+
+    /**
+     * Show this month's category overview.
+     *
+     * @param GChart                      $chart
+     * @param CategoryRepositoryInterface $repository
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function frontpage(GChart $chart, CategoryRepositoryInterface $repository)
+    {
+        $chart->addColumn(trans('firefly.category'), 'string');
+        $chart->addColumn(trans('firefly.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 ? trans('firefly.noCategory') : $entry->name;
+            $name        = $isEncrypted ? Crypt::decrypt($name) : $name;
+            $chart->addRow($name, floatval($entry->sum));
+        }
+
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+    }
+
+    /**
+     * @param GChart                      $chart
+     * @param CategoryRepositoryInterface $repository
+     * @param Category                    $category
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function month(GChart $chart, CategoryRepositoryInterface $repository, Category $category)
+    {
+        $start = clone Session::get('start', Carbon::now()->startOfMonth());
+        $end   = Session::get('end', Carbon::now()->endOfMonth());
+
+        $chart->addColumn(trans('firefly.period'), 'date');
+        $chart->addColumn(trans('firefly.spent'), 'number');
+
+        while ($start <= $end) {
+            $spent = $repository->spentOnDaySum($category, $start);
+            $chart->addRow(clone $start, $spent);
+            $start->addDay();
+        }
+
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+
+    }
+
+    /**
+     * This chart will only show expenses.
+     *
+     * @param GChart                      $chart
+     * @param CategoryRepositoryInterface $repository
+     * @param                             $year
+     * @param bool                        $shared
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function year(GChart $chart, CategoryRepositoryInterface $repository, $year, $shared = false)
+    {
+        $start      = new Carbon($year . '-01-01');
+        $end        = new Carbon($year . '-12-31');
+        $shared     = $shared == 'shared' ? true : false;
+        $categories = $repository->getCategories();
+
+        // add columns:
+        $chart->addColumn(trans('firefly.month'), 'date');
+        foreach ($categories as $category) {
+            $chart->addColumn($category->name, 'number');
+        }
+
+        while ($start < $end) {
+            // month is the current end of the period:
+            $month = clone $start;
+            $month->endOfMonth();
+            // make a row:
+            $row = [clone $start];
+
+            // each budget, fill the row:
+            foreach ($categories as $category) {
+                $spent = $repository->spentInPeriod($category, $start, $month, $shared);
+                $row[] = $spent;
+            }
+            $chart->addRowArray($row);
+
+            $start->addMonth();
+        }
+
+        $chart->generate();
+
+        return Response::json($chart->getData());
+    }
+}

app/Http/Controllers/Chart/PiggyBankController.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: sander
+ * Date: 16/05/15
+ * Time: 09:36
+ */
+
+namespace FireflyIII\Http\Controllers\Chart;
+
+use Carbon\Carbon;
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
+use Grumpydictator\Gchart\GChart;
+use Illuminate\Support\Collection;
+use Response;
+
+
+/**
+ * Class PiggyBankController
+ *
+ * @package FireflyIII\Http\Controllers\Chart
+ */
+class PiggyBankController extends Controller
+{
+    /**
+     * Shows the piggy bank history.
+     *
+     * @param GChart                       $chart
+     * @param PiggyBankRepositoryInterface $repository
+     * @param PiggyBank                    $piggyBank
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function history(GChart $chart, PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank)
+    {
+        $chart->addColumn(trans('firefly.date'), 'date');
+        $chart->addColumn(trans('firefly.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());
+
+    }
+}

app/Http/Controllers/Chart/ReportController.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace FireflyIII\Http\Controllers\Chart;
+
+
+use Carbon\Carbon;
+use FireflyIII\Helpers\Report\ReportQueryInterface;
+use FireflyIII\Http\Controllers\Controller;
+use Grumpydictator\Gchart\GChart;
+use Response;
+
+/**
+ * Class ReportController
+ *
+ * @package FireflyIII\Http\Controllers\Chart
+ */
+class ReportController extends Controller
+{
+
+
+    /**
+     * Summarizes all income and expenses, per month, for a given year.
+     *
+     * @param GChart               $chart
+     * @param ReportQueryInterface $query
+     * @param                      $year
+     * @param bool                 $shared
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function yearInOut(GChart $chart, ReportQueryInterface $query, $year, $shared = false)
+    {
+        // get start and end of year
+        $start  = new Carbon($year . '-01-01');
+        $end    = new Carbon($year . '-12-31');
+        $shared = $shared == 'shared' ? true : false;
+
+        $chart->addColumn(trans('firefly.month'), 'date');
+        $chart->addColumn(trans('firefly.income'), 'number');
+        $chart->addColumn(trans('firefly.expenses'), 'number');
+
+        while ($start < $end) {
+            $month = clone $start;
+            $month->endOfMonth();
+            // total income and total expenses:
+            $incomeSum  = floatval($query->incomeInPeriod($start, $month, $shared)->sum('queryAmount'));
+            $expenseSum = floatval($query->expenseInPeriod($start, $month, $shared)->sum('queryAmount')) * -1;
+
+            $chart->addRow(clone $start, $incomeSum, $expenseSum);
+            $start->addMonth();
+        }
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+    }
+
+    /**
+     * Summarizes all income and expenses for a given year. Gives a total and an average.
+     *
+     * @param GChart               $chart
+     * @param ReportQueryInterface $query
+     * @param                      $year
+     * @param bool                 $shared
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function yearInOutSummarized(GChart $chart, ReportQueryInterface $query, $year, $shared = false)
+    {
+        $start   = new Carbon($year . '-01-01');
+        $end     = new Carbon($year . '-12-31');
+        $shared  = $shared == 'shared' ? true : false;
+        $income  = 0;
+        $expense = 0;
+        $count   = 0;
+
+        $chart->addColumn(trans('firefly.summary'), 'string');
+        $chart->addColumn(trans('firefly.income'), 'number');
+        $chart->addColumn(trans('firefly.expenses'), 'number');
+
+        while ($start < $end) {
+            $month = clone $start;
+            $month->endOfMonth();
+            // total income and total expenses:
+            $income += floatval($query->incomeInPeriod($start, $month, $shared)->sum('queryAmount'));
+            $expense += floatval($query->expenseInPeriod($start, $month, $shared)->sum('queryAmount')) * -1;
+            $count++;
+            $start->addMonth();
+        }
+
+        // add total + average:
+        $chart->addRow(trans('firefly.sum'), $income, $expense);
+        $count = $count > 0 ? $count : 1;
+        $chart->addRow(trans('firefly.average'), ($income / $count), ($expense / $count));
+
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+    }
+}

app/Http/Controllers/Controller.php

@@ -1,8 +1,12 @@
 <?php namespace FireflyIII\Http\Controllers;
 
+use Auth;
+use Config;
 use Illuminate\Foundation\Bus\DispatchesCommands;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
+use Preferences;
+use View;
 
 /**
  * Class Controller
@@ -14,4 +18,30 @@ abstract class Controller extends BaseController
 
     use DispatchesCommands, ValidatesRequests;
 
+    /** @var string */
+    protected $monthAndDayFormat;
+    /** @var string */
+    protected $monthFormat;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        View::share('hideBudgets', false);
+        View::share('hideCategories', false);
+        View::share('hideBills', false);
+        View::share('hideTags', false);
+
+        if (Auth::check()) {
+            $pref                    = Preferences::get('language', 'en');
+            $lang                    = $pref->data;
+            $this->monthFormat       = Config::get('firefly.month.' . $lang);
+            $this->monthAndDayFormat = Config::get('firefly.monthAndDay.' . $lang);
+
+            View::share('monthFormat', $this->monthFormat);
+            View::share('monthAndDayFormat', $this->monthAndDayFormat);
+            View::share('language', $lang);
+        }
+    }
 }

app/Http/Controllers/CurrencyController.php

@@ -5,13 +5,14 @@ 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
  *
@@ -26,8 +27,8 @@ class CurrencyController extends Controller
      */
     public function __construct()
     {
-
-        View::share('title', 'Currencies');
+        parent::__construct();
+        View::share('title', trans('firefly.currencies'));
         View::share('mainTitleIcon', 'fa-usd');
     }
 
@@ -39,6 +40,12 @@ class CurrencyController extends Controller
         $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'));
     }
 
@@ -50,9 +57,7 @@ class CurrencyController extends Controller
     public function defaultCurrency(TransactionCurrency $currency)
     {
 
-        $currencyPreference       = Preferences::get('currencyPreference', 'EUR');
-        $currencyPreference->data = $currency->code;
-        $currencyPreference->save();
+        Preferences::set('currencyPreference', $currency->code);
 
         Session::flash('success', $currency->name . ' is now the default currency.');
         Cache::forget('FFCURRENCYSYMBOL');
@@ -63,31 +68,38 @@ class CurrencyController extends Controller
     }
 
     /**
-     * @param TransactionCurrency $currency
+     * @param CurrencyRepositoryInterface $repository
+     * @param TransactionCurrency         $currency
      *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
+     * @return \Illuminate\Http\RedirectResponse|View
      */
-    public function delete(TransactionCurrency $currency)
+    public function delete(CurrencyRepositoryInterface $repository, TransactionCurrency $currency)
     {
-        if ($currency->transactionJournals()->count() > 0) {
+
+        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
+     * @param CurrencyRepositoryInterface $repository
+     * @param TransactionCurrency         $currency
      *
      * @return \Illuminate\Http\RedirectResponse
+     * @throws \Exception
      */
-    public function destroy(TransactionCurrency $currency)
+    public function destroy(CurrencyRepositoryInterface $repository, TransactionCurrency $currency)
     {
-        if ($currency->transactionJournals()->count() > 0) {
-            Session::flash('error', 'Cannot delete ' . e($currency->name) . ' because there are still transactions attached to it.');
+        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');
         }
@@ -96,7 +108,7 @@ class CurrencyController extends Controller
 
         $currency->delete();
 
-        return Redirect::route('currency.index');
+        return Redirect::to(Session::get('currency.delete.url'));
     }
 
     /**
@@ -110,73 +122,79 @@ class CurrencyController extends Controller
         $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'));
 
     }
 
     /**
+     * @param CurrencyRepositoryInterface $repository
+     *
      * @return \Illuminate\View\View
      */
-    public function index()
+    public function index(CurrencyRepositoryInterface $repository)
     {
-        $currencies         = TransactionCurrency::get();
-        $currencyPreference = Preferences::get('currencyPreference', 'EUR');
-        $defaultCurrency    = TransactionCurrency::whereCode($currencyPreference->data)->first();
-
+        $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.
+     *
+     * @param CurrencyFormRequest         $request
+     * @param CurrencyRepositoryInterface $repository
      *
      * @return $this|\Illuminate\Http\RedirectResponse
      */
-    public function store(CurrencyFormRequest $request)
+    public function store(CurrencyFormRequest $request, CurrencyRepositoryInterface $repository)
     {
+        $data     = $request->getCurrencyData();
+        $currency = $repository->store($data);
 
 
-        // no repository, because the currency controller is relatively simple.
-        $currency = TransactionCurrency::create(
-            [
-                'name'   => $request->get('name'),
-                'code'   => $request->get('code'),
-                'symbol' => $request->get('symbol'),
-            ]
-        );
-
         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();
         }
 
-        return Redirect::route('currency.index');
+        // redirect to previous URL.
+        return Redirect::to(Session::get('currency.create.url'));
 
 
     }
 
     /**
-     * @param TransactionCurrency $currency
+     * @param CurrencyFormRequest         $request
+     * @param CurrencyRepositoryInterface $repository
+     * @param TransactionCurrency         $currency
      *
-     * @return $this|\Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse
      */
-    public function update(TransactionCurrency $currency, CurrencyFormRequest $request)
+    public function update(CurrencyFormRequest $request, CurrencyRepositoryInterface $repository, TransactionCurrency $currency)
     {
-
-        $currency->code   = $request->get('code');
-        $currency->symbol = $request->get('symbol');
-        $currency->name   = $request->get('name');
-        $currency->save();
+        $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);
         }
 
-        return Redirect::route('currency.index');
+        // redirect to previous URL.
+        return Redirect::to(Session::get('currency.edit.url'));
 
     }
 

app/Http/Controllers/GoogleChartController.php

@@ -1,666 +0,0 @@
-<?php namespace FireflyIII\Http\Controllers;
-
-use App;
-use Auth;
-use Carbon\Carbon;
-use DB;
-use Exception;
-use FireflyIII\Helpers\Report\ReportQueryInterface;
-use FireflyIII\Http\Requests;
-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\Bill\BillRepositoryInterface;
-use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
-use Grumpydictator\Gchart\GChart;
-use Illuminate\Database\Query\Builder as QueryBuilder;
-use Illuminate\Database\Query\JoinClause;
-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;
-
-        while ($end >= $current) {
-            $chart->addRow(clone $current, Steam::balance($account, $current), false);
-            $current->addDay();
-        }
-
-
-        $chart->generate();
-
-        return Response::json($chart->getData());
-    }
-
-    /**
-     * @param GChart $chart
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function allAccountsBalanceChart(GChart $chart)
-    {
-        $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());
-
-        if ($frontPage->data == []) {
-            $accounts = Auth::user()->accounts()->orderBy('accounts.name', 'ASC')->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*']);
-        } else {
-            $accounts = Auth::user()->accounts()->whereIn('id', $frontPage->data)->orderBy('accounts.name', 'ASC')->get(['accounts.*']);
-        }
-        $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)
-    {
-        try {
-            new Carbon('01-01-' . $year);
-        } catch (Exception $e) {
-            return view('error')->with('message', 'Invalid year.');
-        }
-        $budgets = Auth::user()->budgets()->get();
-        $budgets->sortBy('name');
-        $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)
-    {
-        $chart->addColumn('Budget', 'string');
-        $chart->addColumn('Budgeted', 'number');
-        $chart->addColumn('Spent', 'number');
-
-        $budgets = Auth::user()->budgets()->orderBy('name', 'DESC')->get();
-        $start   = Session::get('start', Carbon::now()->startOfMonth());
-        $end     = Session::get('end', Carbon::now()->endOfMonth());
-
-        /** @var Budget $budget */
-        foreach ($budgets as $budget) {
-
-            /** @var Collection $repetitions */
-            $repetitions = LimitRepetition::
-            leftJoin('budget_limits', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id')
-                                          ->where('limit_repetitions.startdate', '<=', $end->format('Y-m-d 00:00:00'))
-                                          ->where('limit_repetitions.startdate', '>=', $start->format('Y-m-d 00:00:00'))
-                                          ->where('budget_limits.budget_id', $budget->id)
-                                          ->get(['limit_repetitions.*']);
-
-            // no results? search entire range for expenses and list those.
-            if ($repetitions->count() == 0) {
-                $expenses = floatval($budget->transactionjournals()->before($end)->after($start)->lessThan(0)->sum('amount')) * -1;
-                if ($expenses > 0) {
-                    $chart->addRow($budget->name, 0, $expenses);
-                }
-            } else {
-                // add with foreach:
-                /** @var LimitRepetition $repetition */
-                foreach ($repetitions as $repetition) {
-
-                    $expenses
-                        =
-                        floatval($budget->transactionjournals()->before($repetition->enddate)->after($repetition->startdate)->lessThan(0)->sum('amount')) * -1;
-                    if ($expenses > 0) {
-                        $chart->addRow($budget->name . ' (' . $repetition->startdate->format('j M Y') . ')', floatval($repetition->amount), $expenses);
-                    }
-                }
-            }
-
-
-        }
-
-        $noBudgetSet = Auth::user()
-                           ->transactionjournals()
-                           ->whereNotIn(
-                               'transaction_journals.id', function (QueryBuilder $query) use ($start, $end) {
-                               $query
-                                   ->select('transaction_journals.id')
-                                   ->from('transaction_journals')
-                                   ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
-                                   ->where('transaction_journals.date', '>=', $start->format('Y-m-d 00:00:00'))
-                                   ->where('transaction_journals.date', '<=', $end->format('Y-m-d 00:00:00'))
-                                   ->whereNotNull('budget_transaction_journal.budget_id');
-                           }
-                           )
-                           ->before($end)
-                           ->after($start)
-                           ->lessThan(0)
-                           ->transactionTypes(['Withdrawal'])
-                           ->get();
-        $sum         = $noBudgetSet->sum('amount') * -1;
-        $chart->addRow('No budget', 0, $sum);
-        $chart->generate();
-
-        return Response::json($chart->getData());
-    }
-
-    /**
-     * @param GChart $chart
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function allCategoriesHomeChart(GChart $chart)
-    {
-        $chart->addColumn('Category', 'string');
-        $chart->addColumn('Spent', 'number');
-
-        // query!
-        $start = Session::get('start', Carbon::now()->startOfMonth());
-        $end   = Session::get('end', Carbon::now()->endOfMonth());
-        $set   = TransactionJournal::
-            where('transaction_journals.user_id',Auth::user()->id)
-            ->leftJoin(
-            'transactions',
-            function (JoinClause $join) {
-                $join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('amount', '>', 0);
-            }
-        )
-                                   ->leftJoin(
-                                       'category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id'
-                                   )
-                                   ->leftJoin('categories', 'categories.id', '=', 'category_transaction_journal.category_id')
-                                   ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
-                                   ->before($end)
-                                   ->where('categories.user_id',Auth::user()->id)
-                                   ->after($start)
-                                   ->where('transaction_types.type', 'Withdrawal')
-                                   ->groupBy('categories.id')
-                                   ->orderBy('sum', 'DESC')
-                                   ->get(['categories.id', 'categories.name', \DB::Raw('SUM(`transactions`.`amount`) AS `sum`')]);
-
-        foreach ($set as $entry) {
-            $entry->name = strlen($entry->name) == 0 ? '(no category)' : $entry->name;
-            $chart->addRow($entry->name, floatval($entry->sum));
-        }
-
-        $chart->generate();
-
-        return Response::json($chart->getData());
-
-    }
-
-    /**
-     * @param Bill $bill
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function billOverview(Bill $bill, GChart $chart)
-    {
-
-        $chart->addColumn('Date', 'date');
-        $chart->addColumn('Max amount', 'number');
-        $chart->addColumn('Min amount', 'number');
-        $chart->addColumn('Current entry', 'number');
-
-        // get first transaction or today for start:
-        $first = $bill->transactionjournals()->orderBy('date', 'ASC')->first();
-        if ($first) {
-            $start = $first->date;
-        } else {
-            $start = new Carbon;
-        }
-        $end = new Carbon;
-        while ($start <= $end) {
-            $result = $bill->transactionjournals()->before($end)->after($start)->first();
-            if ($result) {
-                /** @var Transaction $tr */
-                foreach ($result->transactions()->get() as $tr) {
-                    if (floatval($tr->amount) > 0) {
-                        $amount = floatval($tr->amount);
-                    }
-                }
-            } else {
-                $amount = 0;
-            }
-            unset($result);
-            $chart->addRow(clone $start, $bill->amount_max, $bill->amount_min, $amount);
-            $start = Navigation::addPeriod($start, $bill->repeat_freq, 0);
-        }
-
-        $chart->generate();
-
-        return Response::json($chart->getData());
-
-    }
-
-    /**
-     * @param GChart $chart
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function billsOverview(GChart $chart, BillRepositoryInterface $repository)
-    {
-        $chart->addColumn('Name', 'string');
-        $chart->addColumn('Amount', 'number');
-
-
-        $paid   = ['items' => [], 'amount' => 0];
-        $unpaid = ['items' => [], 'amount' => 0];
-        $start  = Session::get('start', Carbon::now()->startOfMonth());
-        $end    = Session::get('end', Carbon::now()->endOfMonth());
-
-        $bills = Auth::user()->bills()->where('active', 1)->get();
-
-        /** @var Bill $bill */
-        foreach ($bills as $bill) {
-            $ranges = $repository->getRanges($bill, $start, $end);
-
-            foreach ($ranges as $range) {
-                // paid a bill in this range?
-                $count = $bill->transactionjournals()->before($range['end'])->after($range['start'])->count();
-                if ($count == 0) {
-                    $unpaid['items'][] = $bill->name . ' (' . $range['start']->format('jS M Y') . ')';
-                    $unpaid['amount'] += ($bill->amount_max + $bill->amount_min / 2);
-
-                } else {
-                    $journal         = $bill->transactionjournals()->with('transactions')->before($range['end'])->after($range['start'])->first();
-                    $paid['items'][] = $journal->description;
-                    $amount          = 0;
-                    foreach ($journal->transactions as $t) {
-                        if (floatval($t->amount) > 0) {
-                            $amount = floatval($t->amount);
-                        }
-                    }
-                    $paid['amount'] += $amount;
-                }
-
-            }
-        }
-
-        $chart->addRow('Unpaid: ' . join(', ', $unpaid['items']), $unpaid['amount']);
-        $chart->addRow('Paid: ' . join(', ', $paid['items']), $paid['amount']);
-        $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)
-    {
-        $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 = floatval($budget->transactionjournals()->lessThan(0)->transactionTypes(['Withdrawal'])->onDate($start)->sum('amount'));
-            $amount += $sum;
-            $chart->addRow(clone $start, $amount);
-            $start->addDay();
-        }
-        $chart->generate();
-
-        return Response::json($chart->getData());
-
-    }
-
-    /**
-     *
-     * @param Budget $budget
-     *
-     * @param int    $year
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function budgetsAndSpending(Budget $budget, $year = 0)
-    {
-
-        $chart      = App::make('Grumpydictator\Gchart\GChart');
-        $repository = App::make('FireflyIII\Repositories\Budget\BudgetRepository');
-        $chart->addColumn('Month', 'date');
-        $chart->addColumn('Budgeted', 'number');
-        $chart->addColumn('Spent', 'number');
-        if ($year == 0) {
-            // grab the first budgetlimit ever:
-            $firstLimit = $budget->budgetlimits()->orderBy('startdate', 'ASC')->first();
-            if ($firstLimit) {
-                $start = new Carbon($firstLimit->startdate);
-            } else {
-                $start = Carbon::now()->startOfYear();
-            }
-
-            // grab the last budget limit ever:
-            $lastLimit = $budget->budgetlimits()->orderBy('startdate', 'DESC')->first();
-            if ($lastLimit) {
-                $end = new Carbon($lastLimit->startdate);
-            } else {
-                $end = Carbon::now()->endOfYear();
-            }
-        } else {
-            $start = Carbon::createFromDate(intval($year), 1, 1);
-            $end   = clone $start;
-            $end->endOfYear();
-        }
-
-        while ($start <= $end) {
-            $spent      = $repository->spentInMonth($budget, $start);
-            $repetition = LimitRepetition::leftJoin('budget_limits', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id')
-                                         ->where('limit_repetitions.startdate', $start->format('Y-m-d 00:00:00'))
-                                         ->where('budget_limits.budget_id', $budget->id)
-                                         ->first(['limit_repetitions.*']);
-
-            if ($repetition) {
-                $budgeted = floatval($repetition->amount);
-                \Log::debug('Found a repetition on ' . $start->format('Y-m-d') . ' for budget ' . $budget->name . '!');
-            } else {
-                \Log::debug('No repetition on ' . $start->format('Y-m-d') . ' for budget ' . $budget->name);
-                $budgeted = null;
-            }
-            $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)
-    {
-        // oldest transaction in category:
-        /** @var TransactionJournal $first */
-        $first = $category->transactionjournals()->orderBy('date', 'ASC')->first();
-        $start = $first->date;
-        /** @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      = floatval($category->transactionjournals()->before($currentEnd)->after($start)->lessThan(0)->sum('amount')) * -1;
-            $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)
-    {
-        // oldest transaction in category:
-        /** @var TransactionJournal $first */
-        $start = clone Session::get('start');
-        $chart->addColumn('Period', 'date');
-        $chart->addColumn('Spent', 'number');
-
-        $end = Session::get('end');
-        while ($start <= $end) {
-            $spent = floatval($category->transactionjournals()->onDate($start)->lessThan(0)->sum('amount')) * -1;
-            $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)
-    {
-        $chart->addColumn('Date', 'date');
-        $chart->addColumn('Balance', 'number');
-
-        /** @var Collection $set */
-        $set = DB::table('piggy_bank_events')->where('piggy_bank_id', $piggyBank->id)->groupBy('date')->get(['date', DB::Raw('SUM(`amount`) AS `sum`')]);
-        $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)
-    {
-        try {
-            $start = new Carbon('01-01-' . $year);
-        } catch (Exception $e) {
-            return view('error')->with('message', 'Invalid 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:
-            $income    = $query->incomeByPeriod($start, $currentEnd, $showSharedReports);
-            $incomeSum = 0;
-            foreach ($income as $entry) {
-                $incomeSum += floatval($entry->amount);
-            }
-
-            // total expenses:
-            $expense    = $query->journalsByExpenseAccount($start, $currentEnd, $showSharedReports);
-            $expenseSum = 0;
-            foreach ($expense as $entry) {
-                $expenseSum += floatval($entry->amount);
-            }
-
-            $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)
-    {
-        try {
-            $start = new Carbon('01-01-' . $year);
-        } catch (Exception $e) {
-            return view('error')->with('message', 'Invalid 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:
-            $incomeResult = $query->incomeByPeriod($start, $currentEnd, $showSharedReports);
-            $incomeSum    = 0;
-            foreach ($incomeResult as $entry) {
-                $incomeSum += floatval($entry->amount);
-            }
-
-            // total expenses:
-            $expenseResult = $query->journalsByExpenseAccount($start, $currentEnd, $showSharedReports);
-            $expenseSum    = 0;
-            foreach ($expenseResult as $entry) {
-                $expenseSum += floatval($entry->amount);
-            }
-
-            $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

@@ -1,11 +1,8 @@
 <?php namespace FireflyIII\Http\Controllers;
 
-use Cache;
-use ErrorException;
-use FireflyIII\Http\Requests;
-use League\CommonMark\CommonMarkConverter;
+use FireflyIII\Helpers\Help\HelpInterface;
+use Log;
 use Response;
-use Route;
 
 /**
  * Class HelpController
@@ -16,77 +13,39 @@ class HelpController extends Controller
 {
 
     /**
-     * @param $route
+     * @param HelpInterface $help
+     * @param               $route
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function show($route)
+    public function show(HelpInterface $help, $route)
     {
         $content = [
             'text'  => '<p>There is no help for this route!</p>',
             'title' => 'Help',
         ];
 
-        if (!Route::has($route)) {
-            \Log::error('No such route: ' . $route);
+        if (!$help->hasRoute($route)) {
+            Log::error('No such route: ' . $route);
 
             return Response::json($content);
         }
 
-        if ($this->_inCache($route)) {
+        if ($help->inCache($route)) {
             $content = [
-                'text'  => Cache::get('help.' . $route . '.text'),
-                'title' => Cache::get('help.' . $route . '.title'),
+                'text'  => $help->getFromCache('help.' . $route . '.text'),
+                'title' => $help->getFromCache('help.' . $route . '.title'),
             ];
 
             return Response::json($content);
         }
-        $content = $this->_getFromGithub($route);
+        $content = $help->getFromGithub($route);
 
-
-        Cache::put('help.' . $route . '.text', $content['text'], 10080); // a week.
-        Cache::put('help.' . $route . '.title', $content['title'], 10080);
+        $help->putInCache($route, $content);
 
         return Response::json($content);
 
     }
 
-    /**
-     * @param $route
-     *
-     * @return bool
-     */
-    protected function _inCache($route)
-    {
-        return Cache::has('help.' . $route . '.title') && Cache::has('help.' . $route . '.text');
-    }
-
-    /**
-     * @param $route
-     *
-     * @return array
-     */
-    protected 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;
-
-
-    }
 
 }

app/Http/Controllers/HomeController.php

@@ -1,12 +1,13 @@
 <?php namespace FireflyIII\Http\Controllers;
 
-use Cache;
 use Carbon\Carbon;
+use Config;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use Input;
 use Preferences;
 use Redirect;
 use Session;
+use Steam;
 
 /**
  * Class HomeController
@@ -16,13 +17,6 @@ use Session;
 class HomeController extends Controller
 {
 
-    /**
-     *
-     */
-    public function __construct()
-    {
-    }
-
     public function dateRange()
     {
         $start = new Carbon(Input::get('start'));
@@ -43,27 +37,45 @@ class HomeController extends Controller
      */
     public function flush()
     {
-        Cache::flush();
+        Session::clear();
 
         return Redirect::route('index');
     }
 
     /**
+     * @param AccountRepositoryInterface $repository
+     *
      * @return \Illuminate\View\View
      */
     public function index(AccountRepositoryInterface $repository)
     {
 
-        $count         = $repository->countAssetAccounts();
-        $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();
+        $types             = Config::get('firefly.accountTypesByIdentifier.asset');
+        $count             = $repository->countAccounts($types);
+        $title             = 'Firefly';
+        $subTitle          = trans('firefly.welcomeBack');
+        $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);
+        }
+
+        $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);
@@ -72,9 +84,7 @@ class HomeController extends Controller
             }
         }
 
-        //        var_dump($transactions);
-
-        return view('index', compact('count', 'title','savings', 'subTitle', 'mainTitleIcon', 'transactions'));
+        return view('index', compact('count', 'title', 'savings', 'subTitle', 'mainTitleIcon', 'transactions', 'savingsTotal', 'piggyBankAccounts'));
     }
 
 

app/Http/Controllers/JsonController.php

@@ -1,15 +1,20 @@
 <?php namespace FireflyIII\Http\Controllers;
 
 use Amount;
-use Auth;
-use DB;
-use FireflyIII\Http\Requests;
+use Carbon\Carbon;
+use FireflyIII\Helpers\Report\ReportQueryInterface;
+use FireflyIII\Models\Account;
 use FireflyIII\Models\Bill;
+use FireflyIII\Models\Preference;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
-use Input;
-use Preferences;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use Illuminate\Support\Collection;
 use Response;
 use Session;
+use Steam;
 
 /**
  * Class JsonController
@@ -21,105 +26,136 @@ class JsonController extends Controller
 
 
     /**
+     * @param BillRepositoryInterface    $repository
      *
+     * @param AccountRepositoryInterface $accountRepository
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function box(BillRepositoryInterface $repository)
+    public function boxBillsPaid(BillRepositoryInterface $repository, AccountRepositoryInterface $accountRepository)
     {
+        $start  = Session::get('start', Carbon::now()->startOfMonth());
+        $end    = Session::get('end', Carbon::now()->endOfMonth());
         $amount = 0;
-        $start  = Session::get('start');
-        $end    = Session::get('end');
-        $box    = 'empty';
-        switch (Input::get('box')) {
-            case 'in':
-                $box = Input::get('box');
-                $in  = Auth::user()->transactionjournals()
-                           ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                           ->before($end)
-                           ->after($start)
-                           ->transactionTypes(['Deposit'])
-                           ->where('transactions.amount', '>', 0)
-                           ->first([DB::Raw('SUM(transactions.amount) as `amount`')]);
-                if (!is_null($in)) {
-                    $amount = floatval($in->amount);
-                }
 
-                break;
-            case 'out':
-                $box = Input::get('box');
-                $in  = Auth::user()->transactionjournals()
-                           ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                           ->before($end)
-                           ->after($start)
-                           ->transactionTypes(['Withdrawal'])
-                           ->where('transactions.amount', '>', 0)
-                           ->first([DB::Raw('SUM(transactions.amount) as `amount`')]);
-                if (!is_null($in)) {
-                    $amount = floatval($in->amount);
-                }
+        // these two functions are the same as the chart
+        $bills = $repository->getActiveBills();
 
-                break;
-            case 'bills-unpaid':
-                $box   = 'bills-unpaid';
-                $bills = Auth::user()->bills()->where('active', 1)->get();
+        /** @var Bill $bill */
+        foreach ($bills as $bill) {
+            $amount += $repository->billPaymentsInRange($bill, $start, $end);
+        }
+        unset($bill, $bills);
 
-                /** @var Bill $bill */
-                foreach ($bills as $bill) {
-                    $ranges = $repository->getRanges($bill, $start, $end);
-
-                    foreach ($ranges as $range) {
-                        // paid a bill in this range?
-                        $count = $bill->transactionjournals()->before($range['end'])->after($range['start'])->count();
-                        if ($count == 0) {
-                            $amount += floatval($bill->amount_max + $bill->amount_min / 2);
-
-                        }
-
-                    }
-                }
-                break;
-            case 'bills-paid':
-                $box = 'bills-paid';
-                // these two functions are the same as the chart TODO
-                $bills = Auth::user()->bills()->where('active', 1)->get();
-
-                /** @var Bill $bill */
-                foreach ($bills as $bill) {
-                    $ranges = $repository->getRanges($bill, $start, $end);
-
-                    foreach ($ranges as $range) {
-                        // paid a bill in this range?
-                        $count = $bill->transactionjournals()->before($range['end'])->after($range['start'])->count();
-                        if ($count != 0) {
-                            $journal         = $bill->transactionjournals()->with('transactions')->before($range['end'])->after($range['start'])->first();
-                            $paid['items'][] = $journal->description;
-                            $currentAmount   = 0;
-                            foreach ($journal->transactions as $t) {
-                                if (floatval($t->amount) > 0) {
-                                    $currentAmount = floatval($t->amount);
-                                }
-                            }
-                            $amount += $currentAmount;
-                        }
-
-                    }
-                }
+        /**
+         * 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, $end, 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' => $box, 'amount' => Amount::format($amount, false), 'amount_raw' => $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, $end, 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->incomeInPeriod($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->expenseInPeriod($start, $end, true)->sum('queryAmount') * -1;
+
+        return Response::json(['box' => 'out', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]);
     }
 
     /**
      * Returns a list of categories.
      *
+     * @param CategoryRepositoryInterface $repository
+     *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function categories()
+    public function categories(CategoryRepositoryInterface $repository)
     {
-        $list   = Auth::user()->categories()->orderBy('name', 'ASC')->get();
+        $list   = $repository->getCategories();
         $return = [];
         foreach ($list as $entry) {
             $return[] = $entry->name;
         }
+        sort($return);
 
         return Response::json($return);
     }
@@ -127,11 +163,13 @@ class JsonController extends Controller
     /**
      * Returns a JSON list of all beneficiaries.
      *
+     * @param AccountRepositoryInterface $accountRepository
+     *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function expenseAccounts()
+    public function expenseAccounts(AccountRepositoryInterface $accountRepository)
     {
-        $list   = Auth::user()->accounts()->orderBy('accounts.name', 'ASC')->accountTypeIn(['Expense account', 'Beneficiary account'])->get();
+        $list   = $accountRepository->getAccounts(['Expense account', 'Beneficiary account']);
         $return = [];
         foreach ($list as $entry) {
             $return[] = $entry->name;
@@ -142,11 +180,13 @@ class JsonController extends Controller
     }
 
     /**
+     * @param AccountRepositoryInterface $accountRepository
+     *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function revenueAccounts()
+    public function revenueAccounts(AccountRepositoryInterface $accountRepository)
     {
-        $list   = Auth::user()->accounts()->accountTypeIn(['Revenue account'])->orderBy('accounts.name', 'ASC')->get(['accounts.*']);
+        $list   = $accountRepository->getAccounts(['Revenue account']);
         $return = [];
         foreach ($list as $entry) {
             $return[] = $entry->name;
@@ -157,26 +197,46 @@ class JsonController extends Controller
     }
 
     /**
-     * @return \Symfony\Component\HttpFoundation\Response
+     * Returns a JSON list of all beneficiaries.
+     *
+     * @param TagRepositoryInterface $tagRepository
+     *
+     * @return \Illuminate\Http\JsonResponse
      */
-    public function showSharedReports()
+    public function tags(TagRepositoryInterface $tagRepository)
     {
-        $pref = Preferences::get('showSharedReports', false);
+        $list   = $tagRepository->get();
+        $return = [];
+        foreach ($list as $entry) {
+            $return[] = $entry->tag;
+        }
+
+        return Response::json($return);
 
-        return Response::json(['value' => $pref->data]);
     }
 
     /**
+     * @param JournalRepositoryInterface $repository
+     * @param                            $what
+     *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function setSharedReports()
+    public function transactionJournals(JournalRepositoryInterface $repository, $what)
     {
-        $pref = Preferences::get('showSharedReports', false);
-        $new  = !$pref->data;
-        Preferences::set('showSharedReports', $new);
+        $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);
 
 
-        return Response::json(['value' => $new]);
     }
 
 }

app/Http/Controllers/PiggyBankController.php

@@ -1,15 +1,12 @@
 <?php namespace FireflyIII\Http\Controllers;
 
 use Amount;
-use Auth;
 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;
@@ -17,6 +14,7 @@ use Input;
 use Redirect;
 use Session;
 use Steam;
+use URL;
 use View;
 
 /**
@@ -32,43 +30,49 @@ class PiggyBankController extends Controller
      */
     public function __construct()
     {
-        View::share('title', 'Piggy banks');
+        parent::__construct();
+        View::share('title', trans('firefly.piggyBanks'));
         View::share('mainTitleIcon', 'fa-sort-amount-asc');
     }
 
     /**
      * Add money to piggy bank
      *
-     * @param PiggyBank $piggyBank
+     * @param AccountRepositoryInterface $repository
+     * @param PiggyBank                  $piggyBank
      *
      * @return $this
      */
-    public function add(PiggyBank $piggyBank, AccountRepositoryInterface $repository)
+    public function add(AccountRepositoryInterface $repository, PiggyBank $piggyBank)
     {
-        $leftOnAccount = $repository->leftOnAccount($piggyBank->account);
+        $date          = Session::get('end', Carbon::now()->endOfMonth());
+        $leftOnAccount = $repository->leftOnAccount($piggyBank->account, $date);
         $savedSoFar    = $piggyBank->currentRelevantRep()->currentamount;
         $leftToSave    = $piggyBank->targetamount - $savedSoFar;
         $maxAmount     = min($leftOnAccount, $leftToSave);
 
-
-        \Log::debug('Now going to view for piggy bank #' . $piggyBank->id . ' (' . $piggyBank->name . ')');
-
         return view('piggy-banks.add', compact('piggyBank', 'maxAmount'));
     }
 
     /**
+     * @param AccountRepositoryInterface $repository
+     *
      * @return mixed
      */
-    public function create()
+    public function create(AccountRepositoryInterface $repository)
     {
 
         $periods      = Config::get('firefly.piggy_bank_periods');
-        $accounts     = ExpandedForm::makeSelectList(
-            Auth::user()->accounts()->orderBy('accounts.name', 'ASC')->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*'])
-        );
+        $accounts     = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
         $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'));
     }
 
@@ -81,37 +85,39 @@ class PiggyBankController extends Controller
     {
         $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
+     * @param PiggyBankRepositoryInterface $repository
+     * @param PiggyBank                    $piggyBank
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function destroy(PiggyBank $piggyBank)
+    public function destroy(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank)
     {
 
-        Session::flash('success', 'Piggy bank "' . e($piggyBank->name) . '" deleted.');
-        $piggyBank->delete();
 
-        return Redirect::route('piggy-banks.index');
+        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 AccountRepositoryInterface $repository
+     * @param PiggyBank                  $piggyBank
      *
-     * @param PiggyBank $piggyBank
-     *
-     * @return $this
+     * @return View
      */
-    public function edit(PiggyBank $piggyBank)
+    public function edit(AccountRepositoryInterface $repository, PiggyBank $piggyBank)
     {
 
         $periods      = Config::get('firefly.piggy_bank_periods');
-        $accounts     = ExpandedForm::makeSelectList(
-            Auth::user()->accounts()->orderBy('accounts.name', 'ASC')->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*'])
-        );
+        $accounts     = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
         $subTitle     = 'Edit piggy bank "' . e($piggyBank->name) . '"';
         $subTitleIcon = 'fa-pencil';
 
@@ -133,22 +139,32 @@ class PiggyBankController extends Controller
         ];
         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
+     * @param AccountRepositoryInterface   $repository
+     * @param PiggyBankRepositoryInterface $piggyRepository
+     *
+     * @return View
      */
-    public function index(AccountRepositoryInterface $repository)
+    public function index(AccountRepositoryInterface $repository, PiggyBankRepositoryInterface $piggyRepository)
     {
         /** @var Collection $piggyBanks */
-        $piggyBanks = Auth::user()->piggyBanks()->where('repeats', 0)->orderBy('order', 'ASC')->get();
+        $piggyBanks = $piggyRepository->getPiggyBanks();
+        $end        = Session::get('end', Carbon::now()->endOfMonth());
 
         $accounts = [];
         /** @var PiggyBank $piggyBank */
         foreach ($piggyBanks as $piggyBank) {
             $piggyBank->savedSoFar = floatval($piggyBank->currentRelevantRep()->currentamount);
-            $piggyBank->percentage = intval($piggyBank->savedSoFar / $piggyBank->targetamount * 100);
+            $piggyBank->percentage = $piggyBank->savedSoFar != 0 ? intval($piggyBank->savedSoFar / $piggyBank->targetamount * 100) : 0;
             $piggyBank->leftToSave = $piggyBank->targetamount - $piggyBank->savedSoFar;
 
             /*
@@ -158,8 +174,8 @@ class PiggyBankController extends Controller
             if (!isset($accounts[$account->id])) {
                 $accounts[$account->id] = [
                     'name'              => $account->name,
-                    'balance'           => Steam::balance($account),
-                    'leftForPiggyBanks' => $repository->leftOnAccount($account),
+                    'balance'           => Steam::balance($account, $end, true),
+                    'leftForPiggyBanks' => $repository->leftOnAccount($account, $end),
                     'sumOfSaved'        => $piggyBank->savedSoFar,
                     'sumOfTargets'      => floatval($piggyBank->targetamount),
                     'leftToSave'        => $piggyBank->leftToSave
@@ -175,7 +191,7 @@ class PiggyBankController extends Controller
     }
 
     /**
-     * Allow user to order piggy banks.
+     * @param PiggyBankRepositoryInterface $repository
      */
     public function order(PiggyBankRepositoryInterface $repository)
     {
@@ -192,16 +208,17 @@ class PiggyBankController extends Controller
     }
 
     /**
-     * POST add money to piggy bank
-     *
-     * @param PiggyBank $piggyBank
+     * @param PiggyBankRepositoryInterface $repository
+     * @param AccountRepositoryInterface   $accounts
+     * @param PiggyBank                    $piggyBank
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postAdd(PiggyBank $piggyBank, PiggyBankRepositoryInterface $repository, AccountRepositoryInterface $accounts)
+    public function postAdd(PiggyBankRepositoryInterface $repository, AccountRepositoryInterface $accounts, PiggyBank $piggyBank)
     {
         $amount        = round(floatval(Input::get('amount')), 2);
-        $leftOnAccount = $accounts->leftOnAccount($piggyBank->account);
+        $date          = Session::get('end', Carbon::now()->endOfMonth());
+        $leftOnAccount = $accounts->leftOnAccount($piggyBank->account, $date);
         $savedSoFar    = $piggyBank->currentRelevantRep()->currentamount;
         $leftToSave    = $piggyBank->targetamount - $savedSoFar;
         $maxAmount     = round(min($leftOnAccount, $leftToSave), 2);
@@ -211,8 +228,8 @@ class PiggyBankController extends Controller
             $repetition->currentamount += $amount;
             $repetition->save();
 
-            // create event.
-            PiggyBankEvent::create(['date' => Carbon::now(), 'amount' => $amount, 'piggy_bank_id' => $piggyBank->id]);
+            // create event
+            $repository->createEvent($piggyBank, $amount);
 
             /*
              * Create event!
@@ -228,11 +245,12 @@ class PiggyBankController extends Controller
     }
 
     /**
-     * @param PiggyBank $piggyBank
+     * @param PiggyBankRepositoryInterface $repository
+     * @param PiggyBank                    $piggyBank
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postRemove(PiggyBank $piggyBank)
+    public function postRemove(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank)
     {
         $amount = floatval(Input::get('amount'));
 
@@ -243,12 +261,8 @@ class PiggyBankController extends Controller
             $repetition->currentamount -= $amount;
             $repetition->save();
 
-            PiggyBankEvent::create(['date' => Carbon::now(), 'amount' => $amount * -1, 'piggy_bank_id' => $piggyBank->id]);
-
-            /*
-             * Create event!
-             */
-            //Event::fire('piggy_bank.removeMoney', [$piggyBank, $amount]); // new and used.
+            // create event
+            $repository->createEvent($piggyBank, $amount * -1);
 
             Session::flash('success', 'Removed ' . Amount::format($amount, false) . ' from "' . e($piggyBank->name) . '".');
         } else {
@@ -261,7 +275,6 @@ class PiggyBankController extends Controller
     /**
      * @param PiggyBank $piggyBank
      *
-     * @SuppressWarnings("Unused")
      *
      * @return \Illuminate\View\View
      */
@@ -271,14 +284,14 @@ class PiggyBankController extends Controller
     }
 
     /**
-     * @param PiggyBank $piggyBank
+     * @param PiggyBankRepositoryInterface $repository
+     * @param PiggyBank                    $piggyBank
      *
-     * @return $this
+     * @return View
      */
-    public function show(PiggyBank $piggyBank)
+    public function show(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank)
     {
-
-        $events = $piggyBank->piggyBankEvents()->orderBy('date', 'DESC')->orderBy('id', 'DESC')->get();
+        $events = $repository->getEvents($piggyBank);
 
         /*
          * Number of reminders:
@@ -298,8 +311,8 @@ class PiggyBankController extends Controller
      */
     public function store(PiggyBankFormRequest $request, PiggyBankRepositoryInterface $repository)
     {
+
         $piggyBankData = [
-            'repeats'      => false,
             'name'         => $request->get('name'),
             'startdate'    => new Carbon,
             'account_id'   => intval($request->get('account_id')),
@@ -314,24 +327,26 @@ class PiggyBankController extends Controller
         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();
         }
 
 
-        return Redirect::route('piggy-banks.index');
+        // 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.
+     * @param PiggyBankRepositoryInterface $repository
+     * @param PiggyBankFormRequest         $request
+     * @param PiggyBank                    $piggyBank
      *
      * @return $this
      */
-    public function update(PiggyBank $piggyBank, PiggyBankRepositoryInterface $repository, PiggyBankFormRequest $request)
+    public function update(PiggyBankRepositoryInterface $repository, PiggyBankFormRequest $request, PiggyBank $piggyBank)
     {
         $piggyBankData = [
-            'repeats'      => false,
             'name'         => $request->get('name'),
             'startdate'    => is_null($piggyBank->startdate) ? $piggyBank->created_at : $piggyBank->startdate,
             'account_id'   => intval($request->get('account_id')),
@@ -341,17 +356,19 @@ class PiggyBankController extends Controller
             '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);
         }
 
 
-        return Redirect::route('piggy-banks.index');
+        // redirect to previous URL.
+        return Redirect::to(Session::get('piggy-banks.edit.url'));
 
 
     }

app/Http/Controllers/PreferencesController.php

@@ -1,7 +1,7 @@
 <?php namespace FireflyIII\Http\Controllers;
 
-use Auth;
-use FireflyIII\Http\Requests;
+use Config;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use Input;
 use Preferences;
 use Redirect;
@@ -21,26 +21,28 @@ class PreferencesController extends Controller
      */
     public function __construct()
     {
-
-        View::share('title', 'Preferences');
+        parent::__construct();
+        View::share('title', trans('firefly.preferences'));
         View::share('mainTitleIcon', 'fa-gear');
     }
 
     /**
+     * @param AccountRepositoryInterface $repository
+     *
      * @return $this|\Illuminate\View\View
      */
-    public function index()
+    public function index(AccountRepositoryInterface $repository)
     {
-        $accounts       = Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->orderBy('accounts.name', 'ASC')->get(['accounts.*']);
-        $viewRange      = Preferences::get('viewRange', '1M');
-        $viewRangeValue = $viewRange->data;
-        $frontPage      = Preferences::get('frontPageAccounts', []);
-        $budgetMax      = Preferences::get('budgetMaximum', 1000);
-        $budgetMaximum  = $budgetMax->data;
+        $accounts          = $repository->getAccounts(['Default account', 'Asset account']);
+        $viewRangePref     = Preferences::get('viewRange', '1M');
+        $viewRange         = $viewRangePref->data;
+        $frontPageAccounts = Preferences::get('frontPageAccounts', []);
+        $budgetMax         = Preferences::get('budgetMaximum', 1000);
+        $languagePref      = Preferences::get('language', 'en');
+        $language          = $languagePref->data;
+        $budgetMaximum     = $budgetMax->data;
 
-        return view('preferences.index', compact('budgetMaximum'))->with('accounts', $accounts)->with('frontPageAccounts', $frontPage)->with(
-            'viewRange', $viewRangeValue
-        );
+        return view('preferences.index', compact('budgetMaximum', 'language', 'accounts', 'frontPageAccounts', 'viewRange'));
     }
 
     /**
@@ -50,10 +52,12 @@ class PreferencesController extends Controller
     {
         // front page accounts
         $frontPageAccounts = [];
-        foreach (Input::get('frontPageAccounts') as $id) {
-            $frontPageAccounts[] = intval($id);
+        if (is_array(Input::get('frontPageAccounts'))) {
+            foreach (Input::get('frontPageAccounts') as $id) {
+                $frontPageAccounts[] = intval($id);
+            }
+            Preferences::set('frontPageAccounts', $frontPageAccounts);
         }
-        Preferences::set('frontPageAccounts', $frontPageAccounts);
 
         // view range:
         Preferences::set('viewRange', Input::get('viewRange'));
@@ -66,6 +70,12 @@ class PreferencesController extends Controller
         $budgetMaximum = intval(Input::get('budgetMaximum'));
         Preferences::set('budgetMaximum', $budgetMaximum);
 
+        // language:
+        $lang = Input::get('language');
+        if (in_array($lang, array_keys(Config::get('firefly.lang')))) {
+            Preferences::set('language', $lang);
+        }
+
 
         Session::flash('success', 'Preferences saved!');
 

app/Http/Controllers/ProfileController.php

@@ -2,6 +2,7 @@
 
 use Auth;
 use FireflyIII\Http\Requests;
+use FireflyIII\Http\Requests\DeleteAccountFormRequest;
 use FireflyIII\Http\Requests\ProfileFormRequest;
 use Hash;
 use Redirect;
@@ -25,6 +26,16 @@ class ProfileController extends Controller
         );
     }
 
+    /**
+     * @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'
+        );
+    }
+
     /**
      * @return \Illuminate\View\View
      *
@@ -35,6 +46,8 @@ class ProfileController extends Controller
     }
 
     /**
+     * @param ProfileFormRequest $request
+     *
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
      */
     public function postChangePassword(ProfileFormRequest $request)
@@ -45,7 +58,7 @@ class ProfileController extends Controller
 
             return Redirect::route('change-password');
         }
-        $result = $this->_validatePassword($request->get('current_password'), $request->get('new_password'), $request->get('new_password_confirmation'));
+        $result = $this->validatePassword($request->get('current_password'), $request->get('new_password'));
         if (!($result === true)) {
             Session::flash('error', $result);
 
@@ -62,29 +75,43 @@ class ProfileController extends Controller
     }
 
     /**
-     * @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)
+    protected function validatePassword($old, $new1)
     {
-        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;
 
     }
+
+    /**
+     * @param DeleteAccountFormRequest $request
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Exception
+     */
+    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');
+    }
+
+
 }

app/Http/Controllers/RelatedController.php

@@ -1,177 +0,0 @@
-<?php namespace FireflyIII\Http\Controllers;
-
-use Auth;
-use FireflyIII\Http\Requests;
-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 Controller
-{
-
-    /**
-     *
-     * @param TransactionJournal $journal
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function alreadyRelated(TransactionJournal $journal)
-    {
-        $ids = [];
-        /** @var TransactionGroup $group */
-        foreach ($journal->transactiongroups()->get() as $group) {
-            /** @var TransactionJournal $loopJournal */
-            foreach ($group->transactionjournals()->get() as $loopJournal) {
-                if ($loopJournal->id != $journal->id) {
-                    $ids[] = $loopJournal->id;
-                }
-            }
-        }
-        $unique   = array_unique($ids);
-        $journals = new Collection;
-        if (count($unique) > 0) {
-
-            $journals = Auth::user()->transactionjournals()->whereIn('id', $unique)->get();
-            $journals->each(
-                function (TransactionJournal $journal) {
-                    /** @var Transaction $t */
-                    foreach ($journal->transactions()->get() as $t) {
-                        if ($t->amount > 0) {
-                            $journal->amount = $t->amount;
-                        }
-                    }
-
-                }
-            );
-        }
-        $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());
-    }
-
-    /**
-     * @param TransactionJournal $parentJournal
-     * @param TransactionJournal $childJournal
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function relate(TransactionJournal $parentJournal, TransactionJournal $childJournal)
-    {
-        $group           = new TransactionGroup;
-        $group->relation = 'balance';
-        $group->user_id  = Auth::user()->id;
-        $group->save();
-        $group->transactionjournals()->save($parentJournal);
-        $group->transactionjournals()->save($childJournal);
-
-        return Response::json(true);
-
-    }
-
-    /**
-     * @param TransactionJournal $journal
-     *
-     * @return \Illuminate\View\View
-     */
-    public function related(TransactionJournal $journal)
-    {
-        $groups  = $journal->transactiongroups()->get();
-        $members = new Collection;
-        /** @var TransactionGroup $group */
-        foreach ($groups as $group) {
-            /** @var TransactionJournal $loopJournal */
-            foreach ($group->transactionjournals()->get() as $loopJournal) {
-                if ($loopJournal->id != $journal->id) {
-                    $members->push($loopJournal);
-                }
-            }
-        }
-
-        return view('related.relate', compact('journal', 'members'));
-    }
-
-    /**
-     * @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 removeRelation(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 Response::json(true);
-    }
-
-    /**
-     * @param TransactionJournal $journal
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function search(TransactionJournal $journal, JournalRepositoryInterface $repository)
-    {
-
-        $search = e(trim(Input::get('searchValue')));
-        $parent = $journal;
-
-        $journals = $repository->searchRelated($search, $journal);
-
-        return view('related.searchResult', compact('journals', 'search', 'parent'));
-
-    }
-
-}

app/Http/Controllers/ReminderController.php

@@ -1,10 +1,7 @@
 <?php namespace FireflyIII\Http\Controllers;
 
-use Auth;
-use Carbon\Carbon;
-use FireflyIII\Helpers\Reminders\ReminderHelperInterface;
-use FireflyIII\Http\Requests;
 use FireflyIII\Models\Reminder;
+use FireflyIII\Repositories\Reminder\ReminderRepositoryInterface;
 use Redirect;
 use Session;
 use URL;
@@ -20,6 +17,8 @@ class ReminderController extends Controller
 
     /**
      * @param Reminder $reminder
+     *
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function act(Reminder $reminder)
     {
@@ -37,6 +36,8 @@ class ReminderController extends Controller
 
     /**
      * @param Reminder $reminder
+     *
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function dismiss(Reminder $reminder)
     {
@@ -49,55 +50,18 @@ class ReminderController extends Controller
     }
 
     /**
+     * @param ReminderRepositoryInterface $repository
      *
+     * @return \Illuminate\View\View
      */
-    public function index(ReminderHelperInterface $helper)
+    public function index(ReminderRepositoryInterface $repository)
     {
 
-        $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) use ($today) {
-                if ($reminder->active === false) {
-                    return $reminder;
-                }
-            }
-        );
-
-        // dismissed reminders
-        $dismissed = $reminders->filter(
-            function (Reminder $reminder) use ($today) {
-                if ($reminder->notnow === true) {
-                    return $reminder;
-                }
-            }
-        );
+        $active    = $repository->getActiveReminders();
+        $expired   = $repository->getExpiredReminders();
+        $inactive  = $repository->getInactiveReminders();
+        $dismissed = $repository->getDismissedReminders();
 
         $title         = 'Reminders';
         $mainTitleIcon = 'fa-clock-o';
@@ -107,6 +71,8 @@ class ReminderController extends Controller
 
     /**
      * @param Reminder $reminder
+     *
+     * @return \Illuminate\View\View
      */
     public function show(Reminder $reminder)
     {

app/Http/Controllers/RepeatedExpenseController.php

@@ -1,217 +0,0 @@
-<?php namespace FireflyIII\Http\Controllers;
-
-use Auth;
-use Carbon\Carbon;
-use Config;
-use ExpandedForm;
-use FireflyIII\Http\Requests;
-use FireflyIII\Http\Requests\PiggyBankFormRequest;
-use FireflyIII\Models\PiggyBank;
-use FireflyIII\Models\PiggyBankRepetition;
-use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
-use Redirect;
-use Session;
-use View;
-use Input;
-
-/**
- * Class RepeatedExpenseController
- *
- * @package FireflyIII\Http\Controllers
- */
-class RepeatedExpenseController extends Controller
-{
-
-    /**
-     *
-     */
-    public function __construct()
-    {
-        View::share('title', 'Repeated expenses');
-        View::share('mainTitleIcon', 'fa-rotate-left');
-    }
-
-    /**
-     * @return $this
-     */
-    public function create()
-    {
-        $periods  = Config::get('firefly.piggy_bank_periods');
-        $accounts = ExpandedForm::makeSelectList(
-            Auth::user()->accounts()->orderBy('accounts.name', 'ASC')->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*'])
-        );
-
-        return view('repeatedExpense.create', compact('accounts', 'periods'))->with('subTitle', 'Create new repeated expense')->with(
-            'subTitleIcon', 'fa-plus'
-        );
-    }
-
-    /**
-     * @param PiggyBank $repeatedExpense
-     *
-     * @return $this
-     */
-    public function delete(PiggyBank $repeatedExpense)
-    {
-        $subTitle = 'Delete "' . e($repeatedExpense->name) . '"';
-
-        return view('repeatedExpense.delete', compact('repeatedExpense', 'subTitle'));
-    }
-
-    /**
-     * @param PiggyBank $repeatedExpense
-     *
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function destroy(PiggyBank $repeatedExpense)
-    {
-
-        Session::flash('success', 'Repeated expense "' . e($repeatedExpense->name) . '" deleted.');
-
-        $repeatedExpense->delete();
-
-        return Redirect::route('repeated.index');
-    }
-
-    /**
-     * @param PiggyBank $repeatedExpense
-     *
-     * @return $this
-     */
-    public function edit(PiggyBank $repeatedExpense)
-    {
-
-        $periods      = Config::get('firefly.piggy_bank_periods');
-        $accounts     = ExpandedForm::makeSelectList(
-            Auth::user()->accounts()->orderBy('accounts.name', 'ASC')->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*'])
-        );
-        $subTitle     = 'Edit repeated expense "' . e($repeatedExpense->name) . '"';
-        $subTitleIcon = 'fa-pencil';
-
-        /*
-         * Flash some data to fill the form.
-         */
-        $preFilled = ['name'          => $repeatedExpense->name,
-                      'account_id'    => $repeatedExpense->account_id,
-                      'targetamount'  => $repeatedExpense->targetamount,
-                      'reminder_skip' => $repeatedExpense->reminder_skip,
-                      'rep_every'     => $repeatedExpense->rep_every,
-                      'rep_times'     => $repeatedExpense->rep_times,
-                      'targetdate'    => $repeatedExpense->targetdate->format('Y-m-d'),
-                      'reminder'      => $repeatedExpense->reminder,
-                      'remind_me'     => intval($repeatedExpense->remind_me) == 1 || !is_null($repeatedExpense->reminder) ? true : false
-        ];
-        Session::flash('preFilled', $preFilled);
-
-        return view('repeatedExpense.edit', compact('subTitle', 'subTitleIcon', 'repeatedExpense', 'accounts', 'periods', 'preFilled'));
-    }
-
-    /**
-     * @return \Illuminate\View\View
-     */
-    public function index()
-    {
-
-        $subTitle = 'Overview';
-
-        $expenses = Auth::user()->piggyBanks()->where('repeats', 1)->get();
-        $expenses->each(
-            function (PiggyBank $piggyBank) {
-                $piggyBank->currentRelevantRep();
-            }
-        );
-
-        return view('repeatedExpense.index', compact('expenses', 'subTitle'));
-    }
-
-    /**
-     * @param PiggyBank $repeatedExpense
-     *
-     * @return \Illuminate\View\View
-     */
-    public function show(PiggyBank $repeatedExpense, PiggyBankRepositoryInterface $repository)
-    {
-        $subTitle    = $repeatedExpense->name;
-        $today       = Carbon::now();
-        $repetitions = $repeatedExpense->piggyBankRepetitions()->get();
-
-        $repetitions->each(
-            function (PiggyBankRepetition $repetition) use ($repository) {
-                $repetition->bars = $repository->calculateParts($repetition);
-            }
-        );
-
-        return view('repeatedExpense.show', compact('repetitions', 'repeatedExpense', 'today', 'subTitle'));
-    }
-
-    /**
-     * @param PiggyBankFormRequest         $request
-     * @param PiggyBankRepositoryInterface $repository
-     *
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function store(PiggyBankFormRequest $request, PiggyBankRepositoryInterface $repository)
-    {
-
-        $piggyBankData = [
-            'repeats'      => true,
-            'name'         => $request->get('name'),
-            'startdate'    => new Carbon,
-            'account_id'   => intval($request->get('account_id')),
-            'targetamount' => floatval($request->get('targetamount')),
-            'targetdate'   => new Carbon($request->get('targetdate')),
-            'reminder'     => $request->get('reminder'),
-            'skip'         => intval($request->get('skip')),
-            'rep_every'    => intval($request->get('rep_every')),
-            'rep_length'    => $request->get('rep_length'),
-            'rep_times'    => intval($request->get('rep_times')),
-        ];
-
-        $piggyBank = $repository->store($piggyBankData);
-
-        Session::flash('success', 'Stored repeated expense "' . e($piggyBank->name) . '".');
-
-        if (intval(Input::get('create_another')) === 1) {
-            return Redirect::route('repeated.create', $request->input('what'))->withInput();
-        }
-
-
-        return Redirect::route('repeated.index');
-    }
-
-    /**
-     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
-     *
-     * @param PiggyBank $repeatedExpense
-     *
-     * @return $this
-     */
-    public function update(PiggyBank $repeatedExpense, PiggyBankFormRequest $request, PiggyBankRepositoryInterface $repository)
-    {
-        $piggyBankData = [
-            'repeats'      => false,
-            'name'         => $request->get('name'),
-            'account_id'   => intval($request->get('account_id')),
-            'targetamount' => floatval($request->get('targetamount')),
-            'targetdate'   => strlen($request->get('targetdate')) > 0 ? new Carbon($request->get('targetdate')) : null,
-            'rep_length'   => $request->get('rep_length'),
-            'rep_every'    => intval($request->get('rep_every')),
-            'rep_times'    => intval($request->get('rep_times')),
-            'remind_me'    => intval($request->get('remind_me')) == 1 ? true : false,
-            'reminder'     => $request->get('reminder'),
-        ];
-
-
-        $piggyBank = $repository->update($repeatedExpense, $piggyBankData);
-
-        if (intval(Input::get('return_to_edit')) === 1) {
-            return Redirect::route('repeated.edit', $piggyBank->id);
-        }
-
-        Session::flash('success', 'Updated repeated expense "' . e($piggyBank->name) . '".');
-
-        return Redirect::route('repeated.index');
-
-    }
-
-}

app/Http/Controllers/ReportController.php

@@ -1,17 +1,14 @@
 <?php namespace FireflyIII\Http\Controllers;
 
-use Auth;
 use Carbon\Carbon;
-use Exception;
 use FireflyIII\Helpers\Report\ReportHelperInterface;
-use FireflyIII\Helpers\Report\ReportQueryInterface;
-use FireflyIII\Http\Requests;
 use FireflyIII\Models\Account;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Models\Preference;
 use FireflyIII\Models\TransactionJournal;
-use Illuminate\Database\Query\JoinClause;
-use Preferences;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use Session;
-use Steam;
 use View;
 
 /**
@@ -22,365 +19,134 @@ use View;
 class ReportController extends Controller
 {
 
+    /** @var ReportHelperInterface */
+    protected $helper;
+
     /**
-     *
+     * @param ReportHelperInterface $helper
      */
-    public function __construct()
+    public function __construct(ReportHelperInterface $helper)
     {
-        View::share('title', 'Reports');
+        parent::__construct();
+        $this->helper = $helper;
+
+        View::share('title', trans('firefly.reports'));
         View::share('mainTitleIcon', 'fa-line-chart');
 
     }
 
     /**
-     * @param string $year
-     * @param string $month
-     *
-     * @return \Illuminate\View\View
-     */
-    public function budget($year = '2014', $month = '1', ReportQueryInterface $query)
-    {
-        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();
-
-        // shared accounts preference:
-        $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     = $query->getAllAccounts($start, $end, $showSharedReports);
-        $start->addDay();
-
-        $accounts->each(
-            function (Account $account) use ($start, $end, $query) {
-                $budgets        = $query->getBudgetSummary($account, $start, $end);
-                $balancedAmount = $query->balancedTransactionsSum($account, $start, $end);
-                $array          = [];
-                foreach ($budgets as $budget) {
-                    $id         = intval($budget->id);
-                    $data       = $budget->toArray();
-                    $array[$id] = $data;
-                }
-
-                $account->budgetInformation = $array;
-                $account->balancedAmount    = $balancedAmount;
-
-            }
-        );
-
-        $start = clone $date;
-        $start->startOfMonth();
-
-        /**
-         * Start getBudgetsForMonth DONE
-         */
-        $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 amount']);
-        $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]['amount'] = isset($budgets[0]['amount']) ? $budgets[0]['amount'] : 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);
-            foreach ($transfers as $transfer) {
-                $budgets[0]['spent'] += floatval($transfer->amount) * -1;
-            }
-        }
-
-        /**
-         * End getBudgetsForMonth DONE
-         */
-
-        return view('reports.budget', compact('subTitle', 'year', 'month', 'subTitleIcon', 'date', 'accounts', 'budgets', 'dayEarly'));
-
-    }
-
-    /**
-     * @param ReportHelperInterface $helper
+     * @param AccountRepositoryInterface $repository
      *
      * @return View
+     * @internal param ReportHelperInterface $helper
      */
-    public function index(ReportHelperInterface $helper)
+    public function index(AccountRepositoryInterface $repository)
     {
-        $start         = Session::get('first');
-        $months        = $helper->listOfMonths($start);
-        $years         = $helper->listOfYears($start);
-        $title         = 'Reports';
-        $mainTitleIcon = 'fa-line-chart';
+        $start  = Session::get('first');
+        $months = $this->helper->listOfMonths($start);
 
-        return view('reports.index', compact('years', 'months', 'title', 'mainTitleIcon'));
-    }
+        // does the user have shared accounts?
+        $accounts  = $repository->getAccounts(['Default account', 'Asset account']);
+        $hasShared = false;
 
-    /**
-     * @param Account $account
-     * @param string  $year
-     * @param string  $month
-     *
-     * @return \Illuminate\View\View
-     */
-    public function modalBalancedTransfers(Account $account, $year = '2014', $month = '1', ReportQueryInterface $query)
-    {
-
-        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 = $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', ReportQueryInterface $query)
-    {
-        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 = $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', ReportQueryInterface $query)
-    {
-        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 = $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', ReportQueryInterface $query)
-    {
-        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.
-
-        $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 = $query->incomeByPeriod($start, $end, $showSharedReports);
-        /**
-         * End getIncomeForMonth DONE
-         */
-        /**
-         * Start getExpenseGroupedForMonth DONE
-         */
-        $set      = $query->journalsByExpenseAccount($start, $end, $showSharedReports);
-        $expenses = Steam::makeArray($set);
-        $expenses = Steam::sortArray($expenses);
-        $expenses = Steam::limitArray($expenses, 10);
-        /**
-         * End getExpenseGroupedForMonth DONE
-         */
-        /**
-         * Start getBudgetsForMonth DONE
-         */
-        $set                  = Auth::user()->budgets()
-                                    ->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 amount']);
-        $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]['amount'] = isset($budgets[0]['amount']) ? $budgets[0]['amount'] : 0.0;
-        $budgets[0]['name']   = 'No budget';
-
-        // find transactions to shared expense accounts, which are without a budget by default:
-        if ($showSharedReports === false) {
-            $transfers = $query->sharedExpenses($start, $end);
-            foreach ($transfers as $transfer) {
-                $budgets[0]['spent'] += floatval($transfer->amount) * -1;
-            }
-        }
-
-        /**
-         * End getBudgetsForMonth DONE
-         */
-        /**
-         * Start getCategoriesForMonth DONE
-         */
-        // all categories.
-        $result     = $query->journalsByCategory($start, $end);
-        $categories = Steam::makeArray($result);
-
-        // all transfers
-        if ($showSharedReports === false) {
-            $result    = $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     = $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'];
+        foreach ($accounts as $account) {
+            if ($account->getMeta('accountRole') == 'sharedAsset') {
+                $hasShared = true;
+            }
         }
 
-        /**
-         * End getAccountsForMonth
-         */
+
+        return view('reports.index', compact('months', 'hasShared'));
+    }
+
+    /**
+     * @param string $year
+     * @param string $month
+     *
+     * @param bool   $shared
+     *
+     * @return \Illuminate\View\View
+     */
+    public function month($year = '2014', $month = '1', $shared = false)
+    {
+        $start            = new Carbon($year . '-' . $month . '-01');
+        $subTitle         = trans('firefly.reportForMonth', ['date' => $start->formatLocalized($this->monthFormat)]);
+        $subTitleIcon     = 'fa-calendar';
+        $end              = clone $start;
+        $incomeTopLength  = 8;
+        $expenseTopLength = 8;
+        if ($shared == 'shared') {
+            $shared   = true;
+            $subTitle = trans('firefly.reportForMonthShared', ['date' => $start->formatLocalized($this->monthFormat)]);
+        }
+
+        $end->endOfMonth();
+
+        $accounts   = $this->helper->getAccountReport($start, $end, $shared);
+        $incomes    = $this->helper->getIncomeReport($start, $end, $shared);
+        $expenses   = $this->helper->getExpenseReport($start, $end, $shared);
+        $budgets    = $this->helper->getBudgetReport($start, $end, $shared);
+        $categories = $this->helper->getCategoryReport($start, $end, $shared);
+        $balance    = $this->helper->getBalanceReport($start, $end, $shared);
+        $bills      = $this->helper->getBillReport($start, $end, $shared);
 
 
         return view(
             'reports.month',
             compact(
-                'income', 'expenses', 'budgets', 'accounts', 'categories',
-                'date', 'subTitle', 'displaySum', 'subTitleIcon'
+                'start', 'shared',
+                'subTitle', 'subTitleIcon',
+                'accounts',
+                'incomes', 'incomeTopLength',
+                'expenses', 'expenseTopLength',
+                'budgets', 'balance',
+                'categories',
+                'bills'
             )
         );
+
     }
 
     /**
-     * @param $year
+     * @param      $year
+     *
+     * @param bool $shared
      *
      * @return $this
      */
-    public function year($year, ReportHelperInterface $helper, ReportQueryInterface $query)
+    public function year($year, $shared = false)
     {
-        try {
-            new Carbon('01-01-' . $year);
-        } catch (Exception $e) {
-            return view('error')->with('message', 'Invalid date.');
+        $start            = new Carbon('01-01-' . $year);
+        $end              = clone $start;
+        $subTitle         = trans('firefly.reportForYear', ['year' => $year]);
+        $subTitleIcon     = 'fa-bar-chart';
+        $incomeTopLength  = 8;
+        $expenseTopLength = 8;
+
+        if ($shared == 'shared') {
+            $shared   = true;
+            $subTitle = trans('firefly.reportForYearShared', ['year' => $year]);
         }
-
-        $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        = $helper->yearBalanceReport($date, $showSharedReports);
-        $groupedIncomes  = $query->journalsByRevenueAccount($date, $end, $showSharedReports);
-        $groupedExpenses = $query->journalsByExpenseAccount($date, $end, $showSharedReports);
 
-        //$groupedExpenses = $helper-> expensesGroupedByAccount($date, $end, 15);
+        $accounts = $this->helper->getAccountReport($start, $end, $shared);
+        $incomes  = $this->helper->getIncomeReport($start, $end, $shared);
+        $expenses = $this->helper->getExpenseReport($start, $end, $shared);
+
 
         return view(
-            'reports.year', compact('date', 'groupedIncomes', 'groupedExpenses', 'year', 'balances', 'title', 'subTitle', 'subTitleIcon', 'mainTitleIcon')
+            'reports.year',
+            compact(
+                'start', // the date for this report.
+                'shared', // is a shared report?
+                'accounts', // all accounts
+                'incomes', 'expenses', // expenses and incomes.
+                'subTitle', 'subTitleIcon', // subtitle and subtitle icon.
+                'incomeTopLength', // length of income top X
+                'expenseTopLength' // length of expense top X.
+            )
         );
     }
 

app/Http/Controllers/SearchController.php

@@ -1,6 +1,5 @@
 <?php namespace FireflyIII\Http\Controllers;
 
-use FireflyIII\Http\Requests;
 use FireflyIII\Support\Search\SearchInterface;
 use Input;
 
@@ -13,6 +12,10 @@ class SearchController extends Controller
 {
     /**
      * Results always come in the form of an array [results, count, fullCount]
+     *
+     * @param SearchInterface $searcher
+     *
+     * @return $this
      */
     public function index(SearchInterface $searcher)
     {

app/Http/Controllers/TagController.php

@@ -0,0 +1,325 @@
+<?php
+
+namespace FireflyIII\Http\Controllers;
+
+use Auth;
+use Carbon\Carbon;
+use FireflyIII\Http\Requests\TagFormRequest;
+use FireflyIII\Models\Preference;
+use FireflyIII\Models\Tag;
+use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use Input;
+use Preferences;
+use Redirect;
+use Response;
+use Session;
+use URL;
+use View;
+
+/**
+ * Class TagController
+ *
+ * Remember: a balancingAct takes at most one expense and one transfer.
+ *           an advancePayment takes at most one expense, infinite deposits and NO transfers.
+ *
+ *  transaction can only have one advancePayment OR balancingAct.
+ *  Other attempts to put in such a tag are blocked.
+ *  also show an error when editing a tag and it becomes either
+ *  of these two types. Or rather, block editing of the tag.
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class TagController extends Controller
+{
+    /**
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        View::share('title', 'Tags');
+        View::share('mainTitleIcon', 'fa-tags');
+        View::share('hideTags', true);
+        $tagOptions = [
+            'nothing'        => 'Just a regular tag.',
+            'balancingAct'   => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
+            'advancePayment' => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
+        ];
+        View::share('tagOptions', $tagOptions);
+    }
+
+    /**
+     * @return \Illuminate\View\View
+     */
+    public function create()
+    {
+        $subTitle     = 'New tag';
+        $subTitleIcon = 'fa-tag';
+
+        $preFilled = [
+            'tagMode' => 'nothing'
+        ];
+        if (!Input::old('tagMode')) {
+            Session::flash('preFilled', $preFilled);
+        }
+        // put previous url in session if not redirect from store (not "create another").
+        if (Session::get('tags.create.fromStore') !== true) {
+            Session::put('tags.create.url', URL::previous());
+        }
+        Session::forget('tags.create.fromStore');
+
+        return view('tags.create', compact('subTitle', 'subTitleIcon'));
+    }
+
+    /**
+     * @param Tag $tag
+     *
+     * @return \Illuminate\View\View
+     */
+    public function delete(Tag $tag)
+    {
+        $subTitle = 'Delete "' . e($tag->tag) . '"';
+
+        // put previous url in session
+        Session::put('tags.delete.url', URL::previous());
+
+        return view('tags.delete', compact('tag', 'subTitle'));
+    }
+
+    /**
+     * @param TagRepositoryInterface $repository
+     * @param Tag                    $tag
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy(TagRepositoryInterface $repository, Tag $tag)
+    {
+
+        $tagName = $tag->tag;
+        $repository->destroy($tag);
+
+        Session::flash('success', 'Tag "' . e($tagName) . '" was deleted.');
+
+        return Redirect::to(route('tags.index'));
+    }
+
+    /**
+     * @param Tag $tag
+     *
+     * @return View
+     */
+    public function edit(Tag $tag)
+    {
+        $subTitle     = 'Edit tag "' . e($tag->tag) . '"';
+        $subTitleIcon = 'fa-tag';
+
+        /*
+         * Default tag options (again)
+         */
+        $tagOptions = [
+            'nothing'        => 'Just a regular tag.',
+            'balancingAct'   => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
+            'advancePayment' => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
+        ];
+
+        /*
+         * Can this tag become another type?
+         */
+        $allowToAdvancePayment = true;
+        $allowToBalancingAct   = true;
+
+        /*
+         * If this tag is a balancing act, and it contains transfers, it cannot be
+         * changes to an advancePayment.
+         */
+
+        if ($tag->tagMode == 'balancingAct') {
+            foreach ($tag->transactionjournals as $journal) {
+                if ($journal->transactionType->type == 'Transfer') {
+                    $allowToAdvancePayment = false;
+                }
+            }
+        }
+
+        /*
+         * If this tag contains more than one expenses, it cannot become an advance payment.
+         */
+        $count = 0;
+        foreach ($tag->transactionjournals as $journal) {
+            if ($journal->transactionType->type == 'Withdrawal') {
+                $count++;
+            }
+        }
+        if ($count > 1) {
+            $allowToAdvancePayment = false;
+        }
+
+        /*
+         * If has more than two transactions already, cannot become a balancing act:
+         */
+        if ($tag->transactionjournals->count() > 2) {
+            $allowToBalancingAct = false;
+        }
+
+        /*
+         * If any transaction is a deposit, cannot become a balancing act.
+         */
+        $count = 0;
+        foreach ($tag->transactionjournals as $journal) {
+            if ($journal->transactionType->type == 'Deposit') {
+                $count++;
+            }
+        }
+        if ($count > 0) {
+            $allowToBalancingAct = false;
+        }
+
+
+        // edit tag options:
+        if ($allowToAdvancePayment === false) {
+            unset($tagOptions['advancePayment']);
+        }
+        if ($allowToBalancingAct === false) {
+            unset($tagOptions['balancingAct']);
+        }
+
+
+        // put previous url in session if not redirect from store (not "return_to_edit").
+        if (Session::get('tags.edit.fromUpdate') !== true) {
+            Session::put('tags.edit.url', URL::previous());
+        }
+        Session::forget('tags.edit.fromUpdate');
+
+        return view('tags.edit', compact('tag', 'subTitle', 'subTitleIcon', 'tagOptions'));
+    }
+
+    /**
+     * @param $state
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function hideTagHelp($state)
+    {
+
+        $state = $state == 'true' ? true : false;
+        Preferences::set('hideTagHelp', $state);
+
+        return Response::json(true);
+    }
+
+    /**
+     *
+     */
+    public function index()
+    {
+        /** @var Preference $helpHiddenPref */
+        $helpHiddenPref = Preferences::get('hideTagHelp', false);
+        $title          = 'Tags';
+        $mainTitleIcon  = 'fa-tags';
+        $helpHidden     = $helpHiddenPref->data;
+        $tags           = Auth::user()->tags()->get();
+
+        return view('tags.index', compact('title', 'mainTitleIcon', 'helpHidden', 'tags'));
+    }
+
+    /**
+     * @param Tag $tag
+     *
+     * @return \Illuminate\View\View
+     */
+    public function show(Tag $tag)
+    {
+        $subTitle     = $tag->tag;
+        $subTitleIcon = 'fa-tag';
+
+        return view('tags.show', compact('tag', 'subTitle', 'subTitleIcon'));
+    }
+
+    /**
+     * @param TagFormRequest         $request
+     *
+     * @param TagRepositoryInterface $repository
+     *
+     * @return $this|\Illuminate\Http\RedirectResponse
+     */
+    public function store(TagFormRequest $request, TagRepositoryInterface $repository)
+    {
+        if (Input::get('setTag') == 'true') {
+            $latitude  = strlen($request->get('latitude')) > 0 ? $request->get('latitude') : null;
+            $longitude = strlen($request->get('longitude')) > 0 ? $request->get('longitude') : null;
+            $zoomLevel = strlen($request->get('zoomLevel')) > 0 ? $request->get('zoomLevel') : null;
+        } else {
+            $latitude  = null;
+            $longitude = null;
+            $zoomLevel = null;
+        }
+
+        $data = [
+            'tag'         => $request->get('tag'),
+            'date'        => strlen($request->get('date')) > 0 ? new Carbon($request->get('date')) : null,
+            'description' => strlen($request->get('description')) > 0 ? $request->get('description') : '',
+            'latitude'    => $latitude,
+            'longitude'   => $longitude,
+            'zoomLevel'   => $zoomLevel,
+            'tagMode'     => $request->get('tagMode'),
+        ];
+        $repository->store($data);
+
+        Session::flash('success', 'The tag has been created!');
+
+        if (intval(Input::get('create_another')) === 1) {
+            // set value so create routine will not overwrite URL:
+            Session::put('tags.create.fromStore', true);
+
+            return Redirect::route('tags.create')->withInput();
+        }
+
+        // redirect to previous URL.
+        return Redirect::to(Session::get('tags.create.url'));
+
+    }
+
+    /**
+     * @param TagFormRequest         $request
+     * @param TagRepositoryInterface $repository
+     * @param Tag                    $tag
+     *
+     * @return $this|\Illuminate\Http\RedirectResponse
+     */
+    public function update(TagFormRequest $request, TagRepositoryInterface $repository, Tag $tag)
+    {
+        if (Input::get('setTag') == 'true') {
+            $latitude  = $request->get('latitude');
+            $longitude = $request->get('longitude');
+            $zoomLevel = $request->get('zoomLevel');
+        } else {
+            $latitude  = null;
+            $longitude = null;
+            $zoomLevel = null;
+        }
+
+        $data = [
+            'tag'         => $request->get('tag'),
+            'date'        => strlen($request->get('date')) > 0 ? new Carbon($request->get('date')) : null,
+            'description' => strlen($request->get('description')) > 0 ? $request->get('description') : '',
+            'latitude'    => $latitude,
+            'longitude'   => $longitude,
+            'zoomLevel'   => $zoomLevel,
+            'tagMode'     => $request->get('tagMode'),
+        ];
+
+        $repository->update($tag, $data);
+
+        Session::flash('success', 'Tag "' . e($data['tag']) . '" updated.');
+
+        if (intval(Input::get('return_to_edit')) === 1) {
+            // set value so edit routine will not overwrite URL:
+            Session::put('tags.edit.fromUpdate', true);
+
+            return Redirect::route('tags.edit', $tag->id)->withInput(['return_to_edit' => 1]);
+        }
+
+        // redirect to previous URL.
+        return Redirect::to(Session::get('tags.edit.url'));
+    }
+}

app/Http/Controllers/TransactionController.php

@@ -9,13 +9,14 @@ use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\JournalFormRequest;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
-use Illuminate\Pagination\LengthAwarePaginator;
 use Input;
 use Redirect;
-use Session;
-use View;
 use Response;
+use Session;
+use URL;
+use View;
 
 /**
  * Class TransactionController
@@ -28,39 +29,39 @@ class TransactionController extends Controller
      */
     public function __construct()
     {
-        View::share('title', 'Transactions');
+        parent::__construct();
+        View::share('title', trans('firefly.transactions'));
         View::share('mainTitleIcon', 'fa-repeat');
     }
 
     /**
-     * Shows the view helping the user to create a new transaction journal.
+     * @param AccountRepositoryInterface $repository
+     * @param string                     $what
      *
-     * @param string $what
-     *
-     * @return \Illuminate\View\View
+     * @return View
      */
-    public function create($what = 'deposit')
+    public function create(AccountRepositoryInterface $repository, $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.*'])
-        );
+        $accounts   = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
         $budgets    = ExpandedForm::makeSelectList(Auth::user()->budgets()->get());
-        $budgets[0] = '(no budget)';
+        $budgets[0] = trans('form.noBudget');
         $piggies    = ExpandedForm::makeSelectList(Auth::user()->piggyBanks()->get());
-        $piggies[0] = '(no piggy bank)';
+        $piggies[0] = trans('form.noPiggybank');
         $preFilled  = Session::has('preFilled') ? Session::get('preFilled') : [];
         $respondTo  = ['account_id', 'account_from_id'];
-        $subTitle   = 'Add a new ' . e($what);
+        $subTitle   = trans('form.add_new_' . $what);
 
         foreach ($respondTo as $r) {
-            if (!is_null(Input::get($r))) {
-                $preFilled[$r] = 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);
 
 
@@ -79,63 +80,60 @@ class TransactionController extends Controller
         $type     = strtolower($journal->transactionType->type);
         $subTitle = 'Delete ' . e($type) . ' "' . e($journal->description) . '"';
 
-        return View::make('transactions.delete', compact('journal', 'subTitle'));
+        // put previous url in session
+        Session::put('transactions.delete.url', URL::previous());
+
+        return view('transactions.delete', compact('journal', 'subTitle'));
 
 
     }
 
     /**
-     * @param TransactionJournal $transactionJournal
+     * @param JournalRepositoryInterface $repository
+     * @param TransactionJournal         $transactionJournal
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function destroy(TransactionJournal $transactionJournal)
+    public function destroy(JournalRepositoryInterface $repository, TransactionJournal $transactionJournal)
     {
-        $type   = $transactionJournal->transactionType->type;
-        $return = 'withdrawal';
-
         Session::flash('success', 'Transaction "' . e($transactionJournal->description) . '" destroyed.');
 
-        $transactionJournal->delete();
+        $repository->delete($transactionJournal);
 
-        switch ($type) {
-            case 'Deposit':
-                $return = 'deposit';
-                break;
-            case 'Transfer':
-                $return = 'transfers';
-                break;
-        }
-
-        return Redirect::route('transactions.index', $return);
+        // redirect to previous URL:
+        return Redirect::to(Session::get('transactions.delete.url'));
     }
 
     /**
      * Shows the view to edit a transaction.
      *
-     * @param TransactionJournal $journal
+     * @param AccountRepositoryInterface $repository
+     * @param TransactionJournal         $journal
      *
      * @return $this
      */
-    public function edit(TransactionJournal $journal, JournalRepositoryInterface $repository)
+    public function edit(AccountRepositoryInterface $repository, TransactionJournal $journal)
     {
         $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.*'])
-        );
+        $accounts     = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
         $budgets      = ExpandedForm::makeSelectList(Auth::user()->budgets()->get());
-        $budgets[0]   = '(no budget)';
+        $budgets[0]   = trans('form.noBudget');
         $transactions = $journal->transactions()->orderBy('amount', 'DESC')->get();
         $piggies      = ExpandedForm::makeSelectList(Auth::user()->piggyBanks()->get());
-        $piggies[0]   = '(no piggy bank)';
+        $piggies[0]   = trans('form.noPiggybank');
+        $subTitle     = trans('breadcrumbs.edit_journal', ['description' => $journal->description]);
         $preFilled    = [
             'date'          => $journal->date->format('Y-m-d'),
             'category'      => '',
             'budget_id'     => 0,
             'piggy_bank_id' => 0
         ];
+        // get tags:
+        $tags = [];
+        foreach ($journal->tags as $tag) {
+            $tags[] = $tag->tag;
+        }
+        $preFilled['tags'] = join(',', $tags);
 
         $category = $journal->categories()->first();
         if (!is_null($category)) {
@@ -151,66 +149,59 @@ class TransactionController extends Controller
             $preFilled['piggy_bank_id'] = $journal->piggyBankEvents()->orderBy('date', 'DESC')->first()->piggy_bank_id;
         }
 
-        $preFilled['amount'] = 0;
-        /** @var Transaction $t */
-        foreach ($transactions as $t) {
-            if (floatval($t->amount) > 0) {
-                $preFilled['amount'] = floatval($t->amount);
-            }
-        }
-        $preFilled['account_id']      = $repository->getAssetAccount($journal);
+        $preFilled['amount']          = $journal->amount;
+        $preFilled['account_id']      = $journal->assetAccount->id;
         $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;
 
+        Session::flash('preFilled', $preFilled);
+
+        // 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
+     * @param JournalRepositoryInterface $repository
+     * @param                            $what
      *
-     * @return $this
+     * @return View
      */
-    public function index($what)
+    public function index(JournalRepositoryInterface $repository, $what)
     {
+        $types = [];
         switch ($what) {
             case 'expenses':
             case 'withdrawal':
                 $subTitleIcon = 'fa-long-arrow-left';
-                $subTitle     = 'Expenses';
+                $subTitle     = trans('firefly.expenses');
                 $types        = ['Withdrawal'];
                 break;
             case 'revenue':
             case 'deposit':
                 $subTitleIcon = 'fa-long-arrow-right';
-                $subTitle     = 'Revenue, income and deposits';
+                $subTitle     = trans('firefly.income');
                 $types        = ['Deposit'];
                 break;
             case 'transfer':
             case 'transfers':
                 $subTitleIcon = 'fa-exchange';
-                $subTitle     = 'Transfers';
+                $subTitle     = trans('firefly.transfers');
                 $types        = ['Transfer'];
                 break;
         }
 
-        $page   = intval(\Input::get('page'));
-        $offset = $page > 0 ? ($page - 1) * 50 : 0;
+        $page     = intval(Input::get('page'));
+        $offset   = $page > 0 ? ($page - 1) * 50 : 0;
+        $journals = $repository->getJournalsOfTypes($types, $offset, $page);
 
-        $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'));
@@ -218,52 +209,48 @@ class TransactionController extends Controller
     }
 
     /**
-     * Reorder transactions (which all must have the same date)
+     * @param JournalRepositoryInterface $repository
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function reorder()
+    public function reorder(JournalRepositoryInterface $repository)
     {
-        $ids = Input::get('items');
+        $ids  = Input::get('items');
+        $date = new Carbon(Input::get('date'));
         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 = $repository->getWithDate($id, $date);
+                if ($journal) {
                     $journal->order = $order;
                     $order++;
                     $journal->save();
                 }
             }
         }
+
         return Response::json(true);
 
     }
 
     /**
-     * @param TransactionJournal $journal
+     * @param JournalRepositoryInterface $repository
+     * @param TransactionJournal         $journal
      *
      * @return $this
      */
-    public function show(TransactionJournal $journal)
+    public function show(JournalRepositoryInterface $repository, 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')
-                );
+            function (Transaction $t) use ($journal, $repository) {
+                $t->before = $repository->getAmountBefore($journal, $t);
                 $t->after  = $t->before + $t->amount;
             }
         );
+        $subTitle = trans('firefly.' . $journal->transactiontype->type) . ' "' . e($journal->description) . '"';
 
-
-        return view('transactions.show', compact('journal'))->with(
-            'subTitle', e($journal->transactiontype->type) . ' "' . e($journal->description) . '"'
-        );
+        return view('transactions.show', compact('journal', 'subTitle'));
     }
 
     /**
@@ -274,70 +261,45 @@ class TransactionController extends Controller
      */
     public function store(JournalFormRequest $request, JournalRepositoryInterface $repository)
     {
-        $journalData = [
-            'what'               => $request->get('what'),
-            'description'        => $request->get('description'),
-            'account_id'         => intval($request->get('account_id')),
-            'account_from_id'    => intval($request->get('account_from_id')),
-            'account_to_id'      => intval($request->get('account_to_id')),
-            'expense_account'    => $request->get('expense_account'),
-            'revenue_account'    => $request->get('revenue_account'),
-            'amount'             => floatval($request->get('amount')),
-            'user'               => Auth::user()->id,
-            'amount_currency_id' => intval($request->get('amount_currency_id')),
-            'date'               => new Carbon($request->get('date')),
-            'budget_id'          => intval($request->get('budget_id')),
-            'category'           => $request->get('category'),
-        ];
 
-        $journal = $repository->store($journalData);
+        $journalData = $request->getJournalData();
+        $journal     = $repository->store($journalData);
 
+        // rescan journal, UpdateJournalConnection
         event(new JournalSaved($journal));
-        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();
+        // ConnectJournalToPiggyBank
+        if ($journal->transactionType->type == 'Transfer' && intval($request->get('piggy_bank_id')) > 0) {
+            event(new JournalCreated($journal, intval($request->get('piggy_bank_id'))));
         }
 
+        $repository->deactivateReminder($request->get('reminder_id'));
+
         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();
         }
 
-        return Redirect::route('transactions.index', $request->input('what'));
+        // redirect to previous URL.
+        return Redirect::to(Session::get('transactions.create.url'));
 
     }
 
+
     /**
-     * @param TransactionJournal $journal
+     * @param JournalFormRequest         $request
+     * @param JournalRepositoryInterface $repository
+     * @param TransactionJournal         $journal
      *
-     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
-     *
-     * @return $this
+     * @return $this|\Illuminate\Http\RedirectResponse
      */
-    public function update(TransactionJournal $journal, JournalFormRequest $request, JournalRepositoryInterface $repository)
+    public function update(JournalFormRequest $request, JournalRepositoryInterface $repository, TransactionJournal $journal)
     {
 
-
-        $journalData = [
-            'what'               => $request->get('what'),
-            'description'        => $request->get('description'),
-            'account_id'         => intval($request->get('account_id')),
-            'account_from_id'    => intval($request->get('account_from_id')),
-            'account_to_id'      => intval($request->get('account_to_id')),
-            'expense_account'    => $request->get('expense_account'),
-            'revenue_account'    => $request->get('revenue_account'),
-            'amount'             => floatval($request->get('amount')),
-            'user'               => Auth::user()->id,
-            'amount_currency_id' => intval($request->get('amount_currency_id')),
-            'date'               => new Carbon($request->get('date')),
-            'budget_id'          => intval($request->get('budget_id')),
-            'category'           => $request->get('category'),
-        ];
-
+        $journalData = $request->getJournalData();
         $repository->update($journal, $journalData);
 
         event(new JournalSaved($journal));
@@ -346,11 +308,14 @@ class TransactionController extends Controller
         Session::flash('success', 'Transaction "' . e($journalData['description']) . '" updated.');
 
         if (intval(Input::get('return_to_edit')) === 1) {
-            return Redirect::route('transactions.edit', $journal->id);
+            // 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]);
         }
 
-
-        return Redirect::route('transactions.index', $journalData['what']);
+        // redirect to previous URL.
+        return Redirect::to(Session::get('transactions.edit.url'));
 
     }
 

app/Http/Kernel.php

@@ -22,6 +22,7 @@ class Kernel extends HttpKernel
             'Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse',
             'Illuminate\Session\Middleware\StartSession',
             'Illuminate\View\Middleware\ShareErrorsFromSession',
+            'FireflyIII\Http\Middleware\ReplaceTestVars',
             'FireflyIII\Http\Middleware\VerifyCsrfToken',
         ];
 
@@ -38,6 +39,7 @@ class Kernel extends HttpKernel
             'range'      => 'FireflyIII\Http\Middleware\Range',
             'reminders'  => 'FireflyIII\Http\Middleware\Reminders',
             'piggybanks' => 'FireflyIII\Http\Middleware\PiggyBanks',
+
         ];
 
 }

app/Http/Middleware/Authenticate.php

@@ -1,11 +1,17 @@
 <?php namespace FireflyIII\Http\Middleware;
 
+use App;
 use Closure;
+use Config;
+use FireflyIII\Models\Preference;
 use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Http\Request;
+use Preferences;
 
 /**
  * Class Authenticate
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Http\Middleware
  */
 class Authenticate
@@ -37,7 +43,7 @@ class Authenticate
      *
      * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
     {
         if ($this->auth->guest()) {
             if ($request->ajax()) {
@@ -46,6 +52,11 @@ class Authenticate
                 return redirect()->guest('auth/login');
             }
         }
+        // if logged in, set user language:
+        $pref = Preferences::get('language', 'en');
+        App::setLocale($pref->data);
+
+        setlocale(LC_TIME, Config::get('firefly.locales.' . $pref->data));
 
         return $next($request);
     }

app/Http/Middleware/PiggyBanks.php

@@ -3,17 +3,12 @@
 namespace FireflyIII\Http\Middleware;
 
 
-use Carbon\Carbon;
 use Closure;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankRepetition;
-use FireflyIII\Models\Reminder;
 use Illuminate\Contracts\Auth\Guard;
-use Illuminate\Database\Query\JoinClause;
+use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
-use Navigation;
-use Session;
-
 
 /**
  * Class PiggyBanks
@@ -48,94 +43,28 @@ class PiggyBanks
      *
      * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
     {
         if ($this->auth->check() && !$request->isXmlHttpRequest()) {
             // 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')
-                              ->where('piggy_banks.repeats', 0)
                               ->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();
-                }
+
+            /** @var PiggyBank $partialPiggy */
+            foreach ($set as $partialPiggy) {
+                $repetition = new PiggyBankRepetition;
+                $repetition->piggyBank()->associate($partialPiggy);
+                $repetition->startdate     = $partialPiggy->startdate;
+                $repetition->targetdate    = $partialPiggy->targetdate;
+                $repetition->currentamount = 0;
+                $repetition->save();
             }
             unset($partialPiggy, $set, $repetition);
-
-            // get repeating piggy banks without a repetition for current time frame.
-            /** @var Collection $set */
-            $set = $this->auth->user()->piggybanks()->leftJoin(
-                'piggy_bank_repetitions', function (JoinClause $join) {
-                $join->on('piggy_bank_repetitions.piggy_bank_id', '=', 'piggy_banks.id')
-                     ->where('piggy_bank_repetitions.targetdate', '>=', Session::get('start')->format('Y-m-d'))
-                     ->where('piggy_bank_repetitions.startdate', '<=', Session::get('end')->format('Y-m-d'));
-            }
-            )
-                              ->where('repeats', 1)
-                              ->whereNull('piggy_bank_repetitions.id')
-                              ->get(['piggy_banks.*']);
-
-            // these piggy banks are missing a repetition. start looping and create them!
-            if ($set->count() > 0) {
-                /** @var PiggyBank $piggyBank */
-                foreach ($set as $piggyBank) {
-                    $start = clone $piggyBank->startdate;
-                    $end   = clone $piggyBank->targetdate;
-                    $max   = clone $piggyBank->targetdate;
-                    $index = 0;
-
-                    // first loop: start date to target date.
-                    // then, continue looping until end is > today
-                    while ($start <= $max) {
-                        // first loop fixes this date. or should fix it.
-                        $max = new Carbon;
-
-                        echo '[#'.$piggyBank->id.', from: '.$start->format('Y-m-d.').' to '.$end->format('Y-m-d.').']';
-                        // create stuff. Or at least, try:
-                        $repetition = $piggyBank->piggyBankRepetitions()->onDates($start, $end)->first();
-                        if(!$repetition) {
-                            $repetition = new PiggyBankRepetition;
-                            $repetition->piggyBank()->associate($piggyBank);
-                            $repetition->startdate     = $start;
-                            $repetition->targetdate    = $end;
-                            $repetition->currentamount = 0;
-                            // it might exist, catch:
-                            $repetition->save();
-                        }
-
-                        // start where end 'ended':
-                        $start = clone $end;
-                        // move end.
-                        $end = Navigation::addPeriod($end, $piggyBank->rep_length, 0);
-
-                    }
-
-
-                    // first repetition: from original start to original target.
-                    $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;
-                    // it might exist, catch:
-                    //$repetition->save();
-
-                    // then, loop from original target up to now.
-                }
-            }
-
-
         }
 
         return $next($request);
     }
-}
+}

app/Http/Middleware/Range.php

@@ -3,9 +3,11 @@
 
 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;
@@ -41,10 +43,11 @@ class Range
      *
      * @param  \Illuminate\Http\Request $request
      * @param  \Closure                 $theNext
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      *
      * @return mixed
      */
-    public function handle($request, Closure $theNext)
+    public function handle(Request $request, Closure $theNext)
     {
         if ($this->auth->check()) {
 
@@ -53,7 +56,7 @@ class Range
 
                 /** @var \FireflyIII\Models\Preference $viewRange */
                 $viewRange = Preferences::get('viewRange', '1M');
-                $start     = Session::has('start') ? Session::get('start') : new Carbon;
+                $start     = new Carbon;
                 $start     = Navigation::updateStartDate($viewRange->data, $start);
                 $end       = Navigation::updateEndDate($viewRange->data, $start);
 
@@ -61,27 +64,25 @@ class Range
                 Session::put('end', $end);
             }
             if (!Session::has('first')) {
-                $journal = $this->auth->user()->transactionjournals()->orderBy('date', 'ASC')->first(['transaction_journals.*']);
+                /** @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());
+                    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

@@ -3,10 +3,12 @@
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
 
 /**
  * Class RedirectIfAuthenticated
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Http\Middleware
  */
 class RedirectIfAuthenticated
@@ -38,7 +40,7 @@ class RedirectIfAuthenticated
      *
      * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
     {
         if ($this->auth->check()) {
             return new RedirectResponse(url('/'));

app/Http/Middleware/Reminders.php

@@ -8,6 +8,7 @@ use Closure;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\Reminder;
 use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Http\Request;
 use View;
 
 /**
@@ -43,38 +44,27 @@ class Reminders
      *
      * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
     {
         if ($this->auth->check() && !$request->isXmlHttpRequest()) {
             // 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;
-                    }
-
-                }
+                $helper->createReminders($piggyBank, new Carbon);
             }
             // 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();
+            // this is a construction SQLITE cannot handle :(
+            if (env('DB_CONNECTION') != 'sqlite') {
+                Reminder::whereUserId($this->auth->user()->id)
+                        ->leftJoin('piggy_banks', 'piggy_banks.id', '=', 'remindersable_id')
+                        ->whereNull('piggy_banks.id')
+                        ->delete();
             }
 
-
             // get and list active reminders:
             $reminders = $this->auth->user()->reminders()->today()->get();
             $reminders->each(
@@ -87,4 +77,4 @@ class Reminders
 
         return $next($request);
     }
-}
+}

app/Http/Middleware/ReplaceTestVars.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace FireflyIII\Http\Middleware;
+
+use Closure;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Http\Request;
+use Log;
+
+/**
+ * Class ReplaceTestVars
+ *
+ * @codeCoverageIgnore
+ * @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

@@ -6,6 +6,7 @@ use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
 /**
  * Class VerifyCsrfToken
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Http\Middleware
  */
 class VerifyCsrfToken extends BaseVerifier

app/Http/Requests/AccountFormRequest.php

@@ -10,6 +10,7 @@ use Input;
 /**
  * Class AccountFormRequest
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Http\Requests
  */
 class AccountFormRequest extends Request
@@ -28,22 +29,29 @@ class AccountFormRequest extends Request
      */
     public function rules()
     {
-        $accountRoles = join(',', array_keys(Config::get('firefly.accountRoles')));
-        $types        = join(',', array_keys(Config::get('firefly.subTitlesByIdentifier')));
+        $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|between:1,100|uniqueAccountForUser';
+        $nameRule = 'required|min:1|uniqueAccountForUser';
+        $idRule   = '';
         if (Account::find(Input::get('id'))) {
-            $nameRule = 'required|between:1,100|belongsToUser:accounts|uniqueForUser:'.Input::get('id');
+            $idRule   = 'belongsToUser:accounts';
+            $nameRule = 'required|min:1|uniqueAccountForUser:' . Input::get('id');
         }
 
         return [
-            'name'                => $nameRule,
-            'openingBalance'      => 'numeric',
-            'openingBalanceDate'  => 'date',
-            'accountRole'         => 'in:' . $accountRoles,
-            'active'              => 'boolean',
-            'balance_currency_id' => 'exists:transaction_currencies,id',
-            'what'                => 'in:' . $types
+            '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

@@ -3,11 +3,13 @@
 namespace FireflyIII\Http\Requests;
 
 use Auth;
+use Carbon\Carbon;
 use Input;
 
 /**
  * Class BillFormRequest
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Http\Requests
  */
 class BillFormRequest extends Request
@@ -21,19 +23,41 @@ class BillFormRequest extends Request
         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|uniqueForUser:bills,name';
+        $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 = 'required|between:1,255';
+            $nameRule .= ',' . intval(Input::get('id'));
+            $matchRule .= ',' . intval(Input::get('id'));
         }
 
         $rules = [
             'name'               => $nameRule,
-            'match'              => 'required|between:1,255',
+            'match'              => $matchRule,
             'amount_min'         => 'required|numeric|min:0.01',
             'amount_max'         => 'required|numeric|min:0.01',
             'amount_currency_id' => 'required|exists:transaction_currencies,id',
@@ -46,4 +70,4 @@ class BillFormRequest extends Request
 
         return $rules;
     }
-}
+}

app/Http/Requests/BudgetFormRequest.php

@@ -9,6 +9,7 @@ use Input;
 /**
  * Class BudgetFormRequest
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Http\Requests
  */
 class BudgetFormRequest extends Request
@@ -28,13 +29,14 @@ class BudgetFormRequest extends Request
     public function rules()
     {
 
-        $nameRule = 'required|between:1,100|uniqueForUser:budgets,name';
+        $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name,encrypted';
         if (Budget::find(Input::get('id'))) {
-            $nameRule = 'required|between:1,100';
+            $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name,encrypted,' . intval(Input::get('id'));
         }
 
         return [
-            'name' => $nameRule,
+            'name'   => $nameRule,
+            'active' => 'numeric|between:0,1'
         ];
     }
-}
+}

app/Http/Requests/CategoryFormRequest.php

@@ -9,6 +9,7 @@ use Input;
 /**
  * Class CategoryFormRequest
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Http\Requests
  */
 class CategoryFormRequest extends Request
@@ -28,13 +29,13 @@ class CategoryFormRequest extends Request
     public function rules()
     {
 
-        $nameRule = 'required|between:1,100|uniqueForUser:categories,name';
+        $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,encrypted';
         if (Category::find(Input::get('id'))) {
-            $nameRule = 'required|between:1,100';
+            $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,encrypted,' . intval(Input::get('id'));
         }
 
         return [
             'name' => $nameRule,
         ];
     }
-}
+}

app/Http/Requests/CurrencyFormRequest.php

@@ -8,6 +8,7 @@ use Input;
 /**
  * Class BillFormRequest
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Http\Requests
  */
 class CurrencyFormRequest extends Request
@@ -21,6 +22,18 @@ class CurrencyFormRequest extends Request
         return Auth::check();
     }
 
+    /**
+     * @return array
+     */
+    public function getCurrencyData()
+    {
+        return [
+            'name'   => $this->get('name'),
+            'code'   => $this->get('code'),
+            'symbol' => $this->get('symbol'),
+        ];
+    }
+
     /**
      * @return array
      */
@@ -42,4 +55,4 @@ class CurrencyFormRequest extends Request
 
         return $rules;
     }
-}
+}

app/Http/Requests/DeleteAccountFormRequest.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace FireflyIII\Http\Requests;
+
+use Auth;
+
+/**
+ * Class DeleteAccountFormRequest
+ *
+ * @codeCoverageIgnore
+ * @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

@@ -3,12 +3,14 @@
 namespace FireflyIII\Http\Requests;
 
 use Auth;
-use FireflyIII\Models\Account;
+use Carbon\Carbon;
+use Exception;
 use Input;
 
 /**
  * Class JournalFormRequest
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Http\Requests
  */
 class JournalFormRequest extends Request
@@ -25,14 +27,37 @@ class JournalFormRequest extends Request
     /**
      * @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'),
+            'tags'               => explode(',', $this->get('tags')),
+        ];
+    }
+
+    /**
+     * @return array
+     * @throws Exception
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
     public function rules()
     {
-        // can we switch on the "what"?
-        $what = Input::get('what');
-
+        $what  = Input::get('what');
         $rules = [
             'description'        => 'required|min:1,max:255',
-            'what'               => 'required|in:withdrawal,deposit,transfer|exists:transaction_types,type',
+            'what'               => 'required|in:withdrawal,deposit,transfer',
             'amount'             => 'numeric|required|min:0.01',
             'date'               => 'required|date',
             'reminder_id'        => 'numeric|exists:reminders,id',
@@ -48,8 +73,6 @@ class JournalFormRequest extends Request
                 if (intval(Input::get('budget_id')) != 0) {
                     $rules['budget_id'] = 'exists:budgets,id|belongsToUser:budgets';
                 }
-
-
                 break;
             case 'deposit':
                 $rules['category']        = 'between:1,255';
@@ -62,12 +85,10 @@ class JournalFormRequest extends Request
                 $rules['category']        = 'between:1,255';
                 break;
             default:
-                die('Cannot handle ' . $what);
+                throw new Exception('Cannot handle ' . $what);
                 break;
         }
 
         return $rules;
-
-
     }
-}
+}

app/Http/Requests/PiggyBankFormRequest.php

@@ -3,14 +3,12 @@
 namespace FireflyIII\Http\Requests;
 
 use Auth;
-use Carbon\Carbon;
-use FireflyIII\Models\Account;
 use Input;
-use Navigation;
 
 /**
  * Class PiggyBankFormRequest
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Http\Requests
  */
 class PiggyBankFormRequest extends Request
@@ -30,33 +28,20 @@ class PiggyBankFormRequest extends Request
     public function rules()
     {
 
-        $nameRule       = 'required|between:1,255|uniqueForUser:piggy_banks,name';
+        $nameRule       = 'required|between:1,255|uniquePiggyBankForUser';
         $targetDateRule = 'date';
         if (intval(Input::get('id'))) {
-            $nameRule = 'required|between:1,255';
-        }
-
-        if (intval(Input::get('repeats')) == 1) {
-            $targetDateRule = 'required|date|after:' . date('Y-m-d');
-            // switch on rep_every, make sure it's not too far away.
-            if (!is_null(Input::get('rep_length'))) {
-                $end = Navigation::addPeriod(new Carbon, Input::get('rep_length'), 0);
-                $targetDateRule .= '|before:' . $end->format('Y-m-d');
-            }
+            $nameRule = 'required|between:1,255|uniquePiggyBankForUser:' . intval(Input::get('id'));
         }
 
 
         $rules = [
-            'repeats'            => 'required|boolean',
             'name'               => $nameRule,
             'account_id'         => 'required|belongsToUser:accounts',
             'targetamount'       => 'required|min:0.01',
             'amount_currency_id' => 'exists:transaction_currencies,id',
             'startdate'          => 'date',
             'targetdate'         => $targetDateRule,
-            'rep_length'         => 'in:day,week,quarter,month,year',
-            'rep_every'          => 'integer|min:0|max:31',
-            'rep_times'          => 'integer|min:0|max:99',
             'reminder'           => 'in:day,week,quarter,month,year',
             'reminder_skip'      => 'integer|min:0|max:99',
             'remind_me'          => 'boolean|piggyBankReminder',
@@ -66,4 +51,4 @@ class PiggyBankFormRequest extends Request
 
         return $rules;
     }
-}
+}

app/Http/Requests/ProfileFormRequest.php

@@ -3,11 +3,11 @@
 namespace FireflyIII\Http\Requests;
 
 use Auth;
-use FireflyIII\Models\Account;
 
 /**
  * Class ProfileFormRequest
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Http\Requests
  */
 class ProfileFormRequest extends Request
@@ -27,9 +27,9 @@ class ProfileFormRequest extends Request
     public function rules()
     {
         return [
-            'current_password'               => 'required',
+            'current_password'          => 'required',
             'new_password'              => 'required|confirmed',
             'new_password_confirmation' => 'required',
         ];
     }
-}
+}

app/Http/Requests/Request.php

@@ -5,6 +5,7 @@ use Illuminate\Foundation\Http\FormRequest;
 /**
  * Class Request
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Http\Requests
  */
 abstract class Request extends FormRequest

app/Http/Requests/TagFormRequest.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: sander
+ * Date: 27/04/15
+ * Time: 12:50
+ */
+
+namespace FireflyIII\Http\Requests;
+
+use Auth;
+use FireflyIII\Models\Tag;
+use Input;
+
+/**
+ * Class TagFormRequest
+ *
+ * @codeCoverageIgnore
+ * @package FireflyIII\Http\Requests
+ */
+class TagFormRequest extends Request
+{
+    /**
+     * @return bool
+     */
+    public function authorize()
+    {
+        // Only allow logged in users
+        return Auth::check();
+    }
+
+    /**
+     * @return array
+     */
+    public function rules()
+    {
+        $idRule  = '';
+        $tagRule = 'required|min:1|uniqueObjectForUser:tags,tag,TRUE';
+        if (Tag::find(Input::get('id'))) {
+            $idRule  = 'belongsToUser:tags';
+            $tagRule = 'required|min:1|uniqueObjectForUser:tags,tag,TRUE,' . Input::get('id');
+        }
+
+        return [
+            'tag'         => $tagRule,
+            'id'          => $idRule,
+            'description' => 'min:1',
+            'date'        => 'date',
+            'latitude'    => 'numeric|min:-90|max:90',
+            'longitude'   => 'numeric|min:-90|max:90',
+            'zoomLevel'   => 'numeric|min:0|max:80',
+            'tagMode'     => 'required|in:nothing,balancingAct,advancePayment'
+        ];
+    }
+}

app/Http/breadcrumbs.php

@@ -3,13 +3,15 @@ use Carbon\Carbon;
 use DaveJamesMiller\Breadcrumbs\Generator;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\Budget;
-use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\Bill;
+use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
-use FireflyIII\Models\Reminder;
 use FireflyIII\Models\LimitRepetition;
 use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\Reminder;
+use FireflyIII\Models\Tag;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Models\TransactionJournal;
 
 /*
  * Back home.
@@ -18,17 +20,34 @@ Breadcrumbs::register(
     'home',
     function (Generator $breadcrumbs) {
 
-        $breadcrumbs->push('Home', route('index'));
+        $breadcrumbs->push(trans('breadcrumbs.home'), route('index'));
     }
 );
 
+Breadcrumbs::register(
+    'index',
+    function (Generator $breadcrumbs) {
+
+        $breadcrumbs->push(trans('breadcrumbs.home'), route('index'));
+    }
+);
+//trans('breadcrumbs.')
+
 // accounts
 Breadcrumbs::register(
     'accounts.index', function (Generator $breadcrumbs, $what) {
     $breadcrumbs->parent('home');
-    $breadcrumbs->push(ucfirst(e($what)) . ' accounts', route('accounts.index', $what));
+    $breadcrumbs->push(trans('breadcrumbs.' . strtolower(e($what)) . '_accounts'), route('accounts.index', $what));
 }
 );
+
+Breadcrumbs::register(
+    'accounts.create', function (Generator $breadcrumbs, $what) {
+    $breadcrumbs->parent('accounts.index', $what);
+    $breadcrumbs->push(trans('breadcrumbs.new_' . strtolower(e($what)) . '_account'), route('accounts.create', $what));
+}
+);
+
 Breadcrumbs::register(
     'accounts.show', function (Generator $breadcrumbs, Account $account) {
     switch ($account->accountType->type) {
@@ -57,14 +76,15 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'accounts.delete', function (Generator $breadcrumbs, Account $account) {
     $breadcrumbs->parent('accounts.show', $account);
-    $breadcrumbs->push('Delete ' . e($account->name), route('accounts.delete', $account->id));
+    $breadcrumbs->push(trans('breadcrumbs.delete_account', ['name' => e($account->name)]), route('accounts.delete', $account->id));
 }
 );
 
+
 Breadcrumbs::register(
     'accounts.edit', function (Generator $breadcrumbs, Account $account) {
     $breadcrumbs->parent('accounts.show', $account);
-    $breadcrumbs->push('Edit ' . e($account->name), route('accounts.edit', $account->id));
+    $breadcrumbs->push(trans('breadcrumbs.edit_account', ['name' => e($account->name)]), route('accounts.edit', $account->id));
 }
 );
 
@@ -72,26 +92,33 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'budgets.index', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('home');
-    $breadcrumbs->push('Budgets', route('budgets.index'));
+    $breadcrumbs->push(trans('breadcrumbs.budgets'), route('budgets.index'));
 }
 );
 Breadcrumbs::register(
     'budgets.create', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('budgets.index');
-    $breadcrumbs->push('Create new budget', route('budgets.create'));
+    $breadcrumbs->push(trans('breadcrumbs.newBudget'), route('budgets.create'));
 }
 );
 
 Breadcrumbs::register(
     'budgets.edit', function (Generator $breadcrumbs, Budget $budget) {
     $breadcrumbs->parent('budgets.show', $budget);
-    $breadcrumbs->push('Edit ' . e($budget->name), route('budgets.edit', $budget->id));
+    $breadcrumbs->push(trans('breadcrumbs.edit_budget', ['name' => e($budget->name)]), route('budgets.edit', $budget->id));
 }
 );
 Breadcrumbs::register(
     'budgets.delete', function (Generator $breadcrumbs, Budget $budget) {
     $breadcrumbs->parent('budgets.show', $budget);
-    $breadcrumbs->push('Delete ' . e($budget->name), route('budgets.delete', $budget->id));
+    $breadcrumbs->push(trans('breadcrumbs.delete_budget', ['name' => e($budget->name)]), route('budgets.delete', $budget->id));
+}
+);
+
+Breadcrumbs::register(
+    'budgets.noBudget', function (Generator $breadcrumbs, $subTitle) {
+    $breadcrumbs->parent('budgets.index');
+    $breadcrumbs->push($subTitle, route('budgets.noBudget'));
 }
 );
 
@@ -111,26 +138,26 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'categories.index', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('home');
-    $breadcrumbs->push('Categories', route('categories.index'));
+    $breadcrumbs->push(trans('breadcrumbs.categories'), route('categories.index'));
 }
 );
 Breadcrumbs::register(
     'categories.create', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('categories.index');
-    $breadcrumbs->push('Create new category', route('categories.create'));
+    $breadcrumbs->push(trans('breadcrumbs.newCategory'), route('categories.create'));
 }
 );
 
 Breadcrumbs::register(
     'categories.edit', function (Generator $breadcrumbs, Category $category) {
     $breadcrumbs->parent('categories.show', $category);
-    $breadcrumbs->push('Edit ' . e($category->name), route('categories.edit', $category->id));
+    $breadcrumbs->push(trans('breadcrumbs.edit_category', ['name' => e($category->name)]), route('categories.edit', $category->id));
 }
 );
 Breadcrumbs::register(
     'categories.delete', function (Generator $breadcrumbs, Category $category) {
     $breadcrumbs->parent('categories.show', $category);
-    $breadcrumbs->push('Delete ' . e($category->name), route('categories.delete', $category->id));
+    $breadcrumbs->push(trans('breadcrumbs.delete_category', ['name' => e($category->name)]), route('categories.delete', $category->id));
 }
 );
 
@@ -142,31 +169,59 @@ Breadcrumbs::register(
 }
 );
 
+Breadcrumbs::register(
+    'categories.noCategory', function (Generator $breadcrumbs, $subTitle) {
+    $breadcrumbs->parent('categories.index');
+    $breadcrumbs->push($subTitle, route('categories.noCategory'));
+}
+);
+
+// currencies.
+Breadcrumbs::register(
+    'currency.index', function (Generator $breadcrumbs) {
+    $breadcrumbs->parent('home');
+    $breadcrumbs->push(trans('breadcrumbs.currencies'), route('currency.index'));
+}
+);
+
+Breadcrumbs::register(
+    'currency.edit', function (Generator $breadcrumbs, TransactionCurrency $currency) {
+    $breadcrumbs->parent('currency.index');
+    $breadcrumbs->push(trans('breadcrumbs.edit_currency', ['name' => e($currency->name)]), route('currency.edit', $currency->id));
+}
+);
+Breadcrumbs::register(
+    'currency.delete', function (Generator $breadcrumbs, TransactionCurrency $currency) {
+    $breadcrumbs->parent('currency.index');
+    $breadcrumbs->push(trans('breadcrumbs.delete_currency', ['name' => e($currency->name)]), route('currency.delete', $currency->id));
+}
+);
+
 
 // piggy banks
 Breadcrumbs::register(
     'piggy-banks.index', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('home');
-    $breadcrumbs->push('Piggy banks', route('piggy-banks.index'));
+    $breadcrumbs->push(trans('breadcrumbs.piggyBanks'), route('piggy-banks.index'));
 }
 );
 Breadcrumbs::register(
     'piggy-banks.create', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('piggy-banks.index');
-    $breadcrumbs->push('Create new piggy bank', route('piggy-banks.create'));
+    $breadcrumbs->push(trans('breadcrumbs.newPiggyBank'), route('piggy-banks.create'));
 }
 );
 
 Breadcrumbs::register(
     '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->push(trans('breadcrumbs.edit_piggyBank', ['name' => e($piggyBank->name)]), route('piggy-banks.edit', $piggyBank->id));
 }
 );
 Breadcrumbs::register(
     '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->push(trans('breadcrumbs.delete_piggyBank', ['name' => e($piggyBank->name)]), route('piggy-banks.delete', $piggyBank->id));
 }
 );
 
@@ -182,7 +237,7 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'preferences', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('home');
-    $breadcrumbs->push('Preferences', route('preferences'));
+    $breadcrumbs->push(trans('breadcrumbs.preferences'), route('preferences'));
 
 }
 );
@@ -191,14 +246,14 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'profile', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('home');
-    $breadcrumbs->push('Profile', route('profile'));
+    $breadcrumbs->push(trans('breadcrumbs.profile'), route('profile'));
 
 }
 );
 Breadcrumbs::register(
     'change-password', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('profile');
-    $breadcrumbs->push('Change your password', route('change-password'));
+    $breadcrumbs->push(trans('breadcrumbs.changePassword'), route('change-password'));
 
 }
 );
@@ -207,26 +262,26 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'bills.index', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('home');
-    $breadcrumbs->push('Bills', route('bills.index'));
+    $breadcrumbs->push(trans('breadcrumbs.bills'), route('bills.index'));
 }
 );
 Breadcrumbs::register(
     'bills.create', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('bills.index');
-    $breadcrumbs->push('Create new bill', route('bills.create'));
+    $breadcrumbs->push(trans('breadcrumbs.newBill'), route('bills.create'));
 }
 );
 
 Breadcrumbs::register(
     'bills.edit', function (Generator $breadcrumbs, Bill $bill) {
     $breadcrumbs->parent('bills.show', $bill);
-    $breadcrumbs->push('Edit ' . e($bill->name), route('bills.edit', $bill->id));
+    $breadcrumbs->push(trans('breadcrumbs.edit_bill', ['name' => e($bill->name)]), route('bills.edit', $bill->id));
 }
 );
 Breadcrumbs::register(
     'bills.delete', function (Generator $breadcrumbs, Bill $bill) {
     $breadcrumbs->parent('bills.show', $bill);
-    $breadcrumbs->push('Delete ' . e($bill->name), route('bills.delete', $bill->id));
+    $breadcrumbs->push(trans('breadcrumbs.delete_bill', ['name' => e($bill->name)]), route('bills.delete', $bill->id));
 }
 );
 
@@ -242,7 +297,7 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'reminders.index', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('home');
-    $breadcrumbs->push('Reminders', route('reminders.index'));
+    $breadcrumbs->push(trans('breadcrumbs.reminders'), route('reminders.index'));
 
 }
 );
@@ -251,72 +306,43 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'reminders.show', function (Generator $breadcrumbs, Reminder $reminder) {
     $breadcrumbs->parent('reminders.index');
-    $breadcrumbs->push('Reminder #' . $reminder->id, route('reminders.show', $reminder->id));
+    $breadcrumbs->push(trans('breadcrumbs.reminder', ['id' => e($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(
     'reports.index', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('home');
-    $breadcrumbs->push('Reports', route('reports.index'));
+    $breadcrumbs->push(trans('breadcrumbs.reports'), route('reports.index'));
 }
 );
 
 Breadcrumbs::register(
-    'reports.year', function (Generator $breadcrumbs, Carbon $date) {
+    'reports.year', function (Generator $breadcrumbs, Carbon $date, $shared) {
     $breadcrumbs->parent('reports.index');
-    $breadcrumbs->push($date->format('Y'), route('reports.year', $date->format('Y')));
+    if ($shared) {
+        $title = trans('breadcrumbs.yearly_report_shared', ['date' => $date->year]);
+    } else {
+        $title = trans('breadcrumbs.yearly_report', ['date' => $date->year]);
+    }
+    $breadcrumbs->push($title, route('reports.year', $date->year));
 }
 );
 
 Breadcrumbs::register(
-    'reports.month', function (Generator $breadcrumbs, Carbon $date) {
-    $breadcrumbs->parent('reports.index');
-    $breadcrumbs->push('Monthly report for ' . $date->format('F Y'), route('reports.month', $date));
-}
-);
+    'reports.month', function (Generator $breadcrumbs, Carbon $date, $shared) {
+    $breadcrumbs->parent('reports.year', $date, $shared);
 
-Breadcrumbs::register(
-    'reports.budget', function (Generator $breadcrumbs, Carbon $date) {
-    $breadcrumbs->parent('reports.index');
-    $breadcrumbs->push('Budget report for ' . $date->format('F Y'), route('reports.budget', $date));
+    if ($shared) {
+        $title = trans('breadcrumbs.monthly_report_shared', ['date' => $date->year]);
+    } else {
+        $title = trans('breadcrumbs.monthly_report', ['date' => $date->year]);
+    }
+
+    $breadcrumbs->push($title, route('reports.month', [$date->year, $date->month]));
 }
 );
 
@@ -324,7 +350,7 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'search', function (Generator $breadcrumbs, $query) {
     $breadcrumbs->parent('home');
-    $breadcrumbs->push('Search for "' . e($query) . '"', route('search'));
+    $breadcrumbs->push(trans('breadcrumbs.searchResult', ['query' => e($query)]), route('search'));
 }
 );
 
@@ -332,47 +358,26 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'transactions.index', function (Generator $breadcrumbs, $what) {
     $breadcrumbs->parent('home');
-
-    switch ($what) {
-        case 'expenses':
-        case 'withdrawal':
-            $subTitle = 'Expenses';
-            break;
-        case 'revenue':
-        case 'deposit':
-            $subTitle = 'Revenue, income and deposits';
-            break;
-        case 'transfer':
-        case 'transfers':
-            $subTitle = 'Transfers';
-            break;
-        case 'opening balance':
-            $subTitle = 'Opening balances';
-            break;
-        default:
-            throw new FireflyException('Cannot handle $what "' . e($what) . '" in bread crumbs');
-    }
-
-    $breadcrumbs->push($subTitle, route('transactions.index', $what));
+    $breadcrumbs->push(trans('breadcrumbs.' . $what . '_list'), route('transactions.index', $what));
 }
 );
 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(trans('breadcrumbs.create_' . e($what)), route('transactions.create', $what));
 }
 );
 
 Breadcrumbs::register(
     'transactions.edit', function (Generator $breadcrumbs, TransactionJournal $journal) {
     $breadcrumbs->parent('transactions.show', $journal);
-    $breadcrumbs->push('Edit ' . e($journal->description), route('transactions.edit', $journal->id));
+    $breadcrumbs->push(trans('breadcrumbs.edit_journal', ['description' => $journal->description]), route('transactions.edit', $journal->id));
 }
 );
 Breadcrumbs::register(
     'transactions.delete', function (Generator $breadcrumbs, TransactionJournal $journal) {
     $breadcrumbs->parent('transactions.show', $journal);
-    $breadcrumbs->push('Delete ' . e($journal->description), route('transactions.delete', $journal->id));
+    $breadcrumbs->push(trans('breadcrumbs.delete_journal', ['description' => e($journal->description)]), route('transactions.delete', $journal->id));
 }
 );
 
@@ -380,7 +385,44 @@ Breadcrumbs::register(
     'transactions.show', function (Generator $breadcrumbs, TransactionJournal $journal) {
 
     $breadcrumbs->parent('transactions.index', strtolower($journal->transactionType->type));
-    $breadcrumbs->push(e($journal->description), route('transactions.show', $journal->id));
+    $breadcrumbs->push($journal->description, route('transactions.show', $journal->id));
 
 }
 );
+
+// tags
+Breadcrumbs::register(
+    'tags.index', function (Generator $breadcrumbs) {
+    $breadcrumbs->parent('home');
+    $breadcrumbs->push(trans('breadcrumbs.tags'), route('tags.index'));
+}
+);
+
+Breadcrumbs::register(
+    'tags.create', function (Generator $breadcrumbs) {
+    $breadcrumbs->parent('tags.index');
+    $breadcrumbs->push(trans('breadcrumbs.createTag'), route('tags.create'));
+}
+);
+
+Breadcrumbs::register(
+    'tags.edit', function (Generator $breadcrumbs, Tag $tag) {
+    $breadcrumbs->parent('tags.show', $tag);
+    $breadcrumbs->push(trans('breadcrumbs.edit_tag', ['tag' => e($tag->tag)]), route('tags.edit', $tag->id));
+}
+);
+
+Breadcrumbs::register(
+    'tags.delete', function (Generator $breadcrumbs, Tag $tag) {
+    $breadcrumbs->parent('tags.show', $tag);
+    $breadcrumbs->push(trans('breadcrumbs.delete_tag', ['tag' => e($tag->tag)]), route('tags.delete', $tag->id));
+}
+);
+
+
+Breadcrumbs::register(
+    'tags.show', function (Generator $breadcrumbs, Tag $tag) {
+    $breadcrumbs->parent('tags.index');
+    $breadcrumbs->push(e($tag->tag), route('tags.show', $tag->id));
+}
+);

app/Http/routes.php

@@ -6,135 +6,177 @@ use FireflyIII\Models\Category;
 use FireflyIII\Models\LimitRepetition;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\Reminder;
+use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 
 // models
+/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
     'account',
     function ($value, $route) {
         if (Auth::check()) {
-            $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)
-                              ->first(['accounts.*']);
-            if ($account) {
-                return $account;
+            $object = 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)
+                             ->first(['accounts.*']);
+            if ($object) {
+                return $object;
             }
         }
-        App::abort(404);
+        throw new NotFoundHttpException;
     }
 );
 
-Route::bind(
-    'repeatedExpense', 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;
-}
-);
-
-Route::bind(
-    'tjSecond', function ($value, $route) {
-    if (Auth::check()) {
-        return TransactionJournal::
-        where('id', $value)->where('user_id', Auth::user()->id)->first();
-    }
-
-    return null;
-}
-);
-
+/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
     'tj', function ($value, $route) {
     if (Auth::check()) {
-        return TransactionJournal::
-        where('id', $value)->where('user_id', Auth::user()->id)->first();
+        $object = TransactionJournal::where('id', $value)->where('user_id', Auth::user()->id)->first();
+        if ($object) {
+            return $object;
+        }
     }
 
-    return null;
+    throw new NotFoundHttpException;
 }
 );
 
+/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
     'currency', function ($value, $route) {
-    return TransactionCurrency::find($value);
+    if (Auth::check()) {
+        $object = TransactionCurrency::find($value);
+        if ($object) {
+            return $object;
+        }
+    }
+    throw new NotFoundHttpException;
 }
 );
 
+/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
     'bill', function ($value, $route) {
     if (Auth::check()) {
-        return Bill::where('id', $value)->where('user_id', Auth::user()->id)->first();
+        $object = Bill::where('id', $value)->where('user_id', Auth::user()->id)->first();
+        if ($object) {
+            return $object;
+        }
     }
 
-    return null;
+    throw new NotFoundHttpException;
 }
 );
 
+/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
     'budget', function ($value, $route) {
     if (Auth::check()) {
-        return Budget::where('id', $value)->where('user_id', Auth::user()->id)->first();
+        $object = Budget::where('id', $value)->where('user_id', Auth::user()->id)->first();
+        if ($object) {
+            return $object;
+        }
     }
 
-    return null;
+    throw new NotFoundHttpException;
 }
 );
 
+/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
     'reminder', function ($value, $route) {
     if (Auth::check()) {
-        return Reminder::where('id', $value)->where('user_id', Auth::user()->id)->first();
+        $object = Reminder::where('id', $value)->where('user_id', Auth::user()->id)->first();
+        if ($object) {
+            return $object;
+        }
     }
 
-    return null;
+    throw new NotFoundHttpException;
 }
 );
 
+/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
     'limitrepetition', function ($value, $route) {
     if (Auth::check()) {
-        return LimitRepetition::where('limit_repetitions.id', $value)
-                              ->leftjoin('budget_limits', 'budget_limits.id', '=', 'limit_repetitions.budget_limit_id')
-                              ->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id')
-                              ->where('budgets.user_id', Auth::user()->id)
-                              ->first(['limit_repetitions.*']);
+        $object = LimitRepetition::where('limit_repetitions.id', $value)
+                                 ->leftjoin('budget_limits', 'budget_limits.id', '=', 'limit_repetitions.budget_limit_id')
+                                 ->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id')
+                                 ->where('budgets.user_id', Auth::user()->id)
+                                 ->first(['limit_repetitions.*']);
+        if ($object) {
+            return $object;
+        }
     }
 
-    return null;
+    throw new NotFoundHttpException;
 }
 );
 
+/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
     'piggyBank', 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', 0)->first(['piggy_banks.*']);
+        $object = PiggyBank::where('piggy_banks.id', $value)
+                           ->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')
+                           ->where('accounts.user_id', Auth::user()->id)
+                           ->first(['piggy_banks.*']);
+        if ($object) {
+            return $object;
+        }
     }
 
-    return null;
+    throw new NotFoundHttpException;
 }
 );
 
+/** @noinspection PhpUnusedParameterInspection */
 Route::bind(
     'category', function ($value, $route) {
     if (Auth::check()) {
-        return Category::where('id', $value)->where('user_id', Auth::user()->id)->first();
+        $object = Category::where('id', $value)->where('user_id', Auth::user()->id)->first();
+        if ($object) {
+            return $object;
+        }
     }
 
-    return null;
+    throw new NotFoundHttpException;
+}
+);
+
+/** @noinspection PhpUnusedParameterInspection */
+Route::bind(
+    'reminder', function ($value, $route) {
+    if (Auth::check()) {
+        /** @var \FireflyIII\Models\Reminder $object */
+        $object = Reminder::find($value);
+        if ($object) {
+            if ($object->remindersable->account->user_id == Auth::user()->id) {
+                return $object;
+            }
+        }
+    }
+
+    throw new NotFoundHttpException;
+}
+);
+
+/** @noinspection PhpUnusedParameterInspection */
+Route::bind(
+    'tag', function ($value, $route) {
+    if (Auth::check()) {
+        $object = Tag::where('id', $value)->where('user_id', Auth::user()->id)->first();
+        if ($object) {
+            return $object;
+        }
+    }
+
+    throw new NotFoundHttpException;
 }
 );
 
@@ -156,7 +198,7 @@ Route::controllers(
  * Home Controller
  */
 Route::group(
-    ['middleware' => ['auth', 'range', 'reminders','piggybanks']], function () {
+    ['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']);
@@ -183,7 +225,6 @@ Route::group(
     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']);
-
     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']);
@@ -231,22 +272,38 @@ Route::group(
 
 
     /**
-     * Google Chart Controller
+     * ALL CHART Controllers
      */
-    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']);
-    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/piggy-history/{piggyBank}', ['uses' => 'GoogleChartController@piggyBankHistory']);
-    Route::get('/chart/category/{category}/period', ['uses' => 'GoogleChartController@categoryPeriodChart']);
-    Route::get('/chart/category/{category}/overview', ['uses' => 'GoogleChartController@categoryOverviewChart']);
+    // accounts:
+    Route::get('/chart/account/frontpage', ['uses' => 'Chart\AccountController@frontpage']);
+    Route::get('/chart/account/month/{year}/{month}/{shared?}', ['uses' => 'Chart\AccountController@all'])->where(['year' => '[0-9]{4}', 'month' => '[0-9]{1,2}', 'shared' => 'shared']);
+    Route::get('/chart/account/{account}', ['uses' => 'Chart\AccountController@single']);
+
+
+    // bills:
+    Route::get('/chart/bill/frontpage', ['uses' => 'Chart\BillController@frontpage']);
+    Route::get('/chart/bill/{bill}', ['uses' => 'Chart\BillController@single']);
+
+    // budgets:
+    Route::get('/chart/budget/frontpage', ['uses' => 'Chart\BudgetController@frontpage']);
+    Route::get('/chart/budget/year/{year}/{shared?}', ['uses' => 'Chart\BudgetController@year'])->where(['year' => '[0-9]{4}', 'shared' => 'shared']);
+    Route::get('/chart/budget/{budget}/{limitrepetition}', ['uses' => 'Chart\BudgetController@budgetLimit']);
+
+    // categories:
+    Route::get('/chart/category/frontpage', ['uses' => 'Chart\CategoryController@frontpage']);
+    Route::get('/chart/category/year/{year}/{shared?}', ['uses' => 'Chart\CategoryController@year'])->where(['year' => '[0-9]{4}', 'shared' => 'shared']);
+    Route::get('/chart/category/{category}/month', ['uses' => 'Chart\CategoryController@month']); // should be period.
+    Route::get('/chart/category/{category}/all', ['uses' => 'Chart\CategoryController@all']);
+
+    // piggy banks:
+    Route::get('/chart/piggyBank/{piggyBank}', ['uses' => 'Chart\PiggyBankController@history']);
+
+    // reports:
+    Route::get('/chart/report/in-out/{year}/{shared?}', ['uses' => 'Chart\ReportController@yearInOut'])->where(['year' => '[0-9]{4}', 'shared' => 'shared']);
+    Route::get('/chart/report/in-out-sum/{year}/{shared?}', ['uses' => 'Chart\ReportController@yearInOutSummarized'])->where(
+        ['year' => '[0-9]{4}', 'shared' => 'shared']
+    );
+
 
     /**
      * Help Controller
@@ -259,10 +316,12 @@ Route::group(
     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', ['uses' => 'JsonController@box', 'as' => 'json.box']);
-    Route::get('/json/show-shared-reports', 'JsonController@showSharedReports');
-    Route::get('/json/show-shared-reports/set', 'JsonController@setSharedReports');
-
+    Route::get('/json/tags', ['uses' => 'JsonController@tags', 'as' => 'json.tags']);
+    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/transaction-journals/{what}', 'JsonController@transactionJournals');
 
     /**
      * Piggy Bank Controller
@@ -292,18 +351,10 @@ Route::group(
      */
     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 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']);
-
     /**
      * Reminder Controller
      */
@@ -312,42 +363,39 @@ Route::group(
     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('/repeated-expenses', ['uses' => 'RepeatedExpenseController@index', 'as' => 'repeated.index']);
-    Route::get('/repeated-expenses/create', ['uses' => 'RepeatedExpenseController@create', 'as' => 'repeated.create']);
-    Route::get('/repeated-expenses/edit/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@edit', 'as' => 'repeated.edit']);
-    Route::get('/repeated-expenses/delete/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@delete', 'as' => 'repeated.delete']);
-    Route::get('/repeated-expenses/show/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@show', 'as' => 'repeated.show']);
-    Route::post('/repeated-expense/store', ['uses' => 'RepeatedExpenseController@store', 'as' => 'repeated.store']);
-    Route::post('/repeated-expense/update/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@update', 'as' => 'repeated.update']);
-    Route::post('/repeated-expense/destroy/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@destroy', 'as' => 'repeated.destroy']);
-
     /**
      * 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']);
+    //Route::get('/reports/{year}', ['uses' => 'ReportController@year', 'as' => 'reports.year'])->where(['year' => '[0-9]{4}']);
+    Route::get('/reports/{year}/{shared?}', ['uses' => 'ReportController@year', 'as' => 'reports.year'])->where(['year' => '[0-9]{4}', 'shared' => 'shared']);
+    Route::get('/reports/{year}/{month}/{shared?}', ['uses' => 'ReportController@month', 'as' => 'reports.month'])->where(
+        ['year' => '[0-9]{4}', 'month' => '[0-9]{1,2}', 'shared' => 'shared']
+    );
 
     // 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
      */
     Route::get('/search', ['uses' => 'SearchController@index', 'as' => 'search']);
 
+    /**
+     * Tag Controller
+     */
+    Route::get('/tags', ['uses' => 'TagController@index', 'as' => 'tags.index']);
+    Route::get('/tags/create', ['uses' => 'TagController@create', 'as' => 'tags.create']);
+    Route::get('/tags/show/{tag}', ['uses' => 'TagController@show', 'as' => 'tags.show']);
+    Route::get('/tags/edit/{tag}', ['uses' => 'TagController@edit', 'as' => 'tags.edit']);
+    Route::get('/tags/delete/{tag}', ['uses' => 'TagController@delete', 'as' => 'tags.delete']);
+
+    Route::post('/tags/store', ['uses' => 'TagController@store', 'as' => 'tags.store']);
+    Route::post('/tags/update/{tag}', ['uses' => 'TagController@update', 'as' => 'tags.update']);
+    Route::post('/tags/destroy/{tag}', ['uses' => 'TagController@destroy', 'as' => 'tags.destroy']);
+
+    Route::post('/tags/hideTagHelp/{state}', ['uses' => 'TagController@hideTagHelp', 'as' => 'tags.hideTagHelp']);
+
+
     /**
      * Transaction Controller
      */

app/Models/Account.php

@@ -1,10 +1,13 @@
 <?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;
-use Crypt;
+
 /**
  * Class Account
  *
@@ -14,17 +17,104 @@ 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'
         ];
 
-    protected $fillable = ['user_id', 'account_type_id', 'name', 'active'];
+    /**
+     * @param array $fields
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     *
+     * @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;
+
+    }
 
     /**
+     * @param array $fields
+     *
+     * @return Account|null
+     */
+    public static function firstOrNullEncrypted(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;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @codeCoverageIgnore
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function accountMeta()
+    {
+        return $this->hasMany('FireflyIII\Models\AccountMeta');
+    }
+
+    /**
+     * @codeCoverageIgnore
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function accountType()
+    {
+        return $this->belongsTo('FireflyIII\Models\AccountType');
+    }
+
+    /**
+     * @codeCoverageIgnore
+     * @return array
+     */
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'deleted_at'];
+    }
+
+    /**
+     *
      * @param $fieldName
      *
      * @return string|null
@@ -42,13 +132,16 @@ class Account extends Model
     }
 
     /**
+     * @codeCoverageIgnore
+     *
      * @param $value
      *
      * @return string
      */
     public function getNameAttribute($value)
     {
-        if ($this->encrypted) {
+
+        if (intval($this->encrypted) == 1) {
             return Crypt::decrypt($value);
         }
 
@@ -58,30 +151,17 @@ class Account extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
-    public function accountMeta()
+    public function piggyBanks()
     {
-        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'];
+        return $this->hasMany('FireflyIII\Models\PiggyBank');
     }
 
     /**
+     * @codeCoverageIgnore
+     *
      * @param EloquentBuilder $query
      * @param array           $types
      */
@@ -95,6 +175,36 @@ class Account extends Model
     }
 
     /**
+     * @codeCoverageIgnore
+     *
+     * @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));
+    }
+
+    /**
+     * @codeCoverageIgnore
+     *
+     * @param $value
+     */
+    public function setNameAttribute($value)
+    {
+        $this->attributes['name']      = Crypt::encrypt($value);
+        $this->attributes['encrypted'] = true;
+    }
+
+    /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function transactions()
@@ -103,6 +213,7 @@ class Account extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function user()
@@ -110,12 +221,4 @@ class Account extends Model
         return $this->belongsTo('FireflyIII\User');
     }
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function piggyBanks()
-    {
-        return $this->hasMany('FireflyIII\Models\PiggyBank');
-    }
-
 }

app/Models/AccountMeta.php

@@ -6,6 +6,7 @@ use Watson\Validating\ValidatingTrait;
 /**
  * Class AccountMeta
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Models
  */
 class AccountMeta extends Model
@@ -14,14 +15,15 @@ class AccountMeta extends Model
     use ValidatingTrait;
     protected $fillable = ['account_id', 'name', 'data'];
     protected $rules
-                     = [
+                        = [
             'account_id' => 'required|exists:accounts,id',
             'name'       => 'required|between:1,100',
             'data'       => 'required'
         ];
-    protected $table = 'account_meta';
+    protected $table    = 'account_meta';
 
     /**
+     *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function account()

app/Models/AccountType.php

@@ -5,6 +5,7 @@ use Illuminate\Database\Eloquent\Model;
 /**
  * Class AccountType
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Models
  */
 class AccountType extends Model

app/Models/Bill.php

@@ -1,5 +1,6 @@
 <?php namespace FireflyIII\Models;
 
+use Crypt;
 use Illuminate\Database\Eloquent\Model;
 
 /**
@@ -10,7 +11,8 @@ use Illuminate\Database\Eloquent\Model;
 class Bill extends Model
 {
 
-    protected $fillable = ['name', 'match', 'amount_min','user_id', 'amount_max', 'date', 'repeat_freq', 'skip', 'automatch', 'active',];
+    protected $fillable
+        = ['name', 'match', 'amount_min', 'match_encrypted', 'name_encrypted', 'user_id', 'amount_max', 'date', 'repeat_freq', 'skip', 'automatch', 'active',];
 
     /**
      * @return array
@@ -20,6 +22,58 @@ class Bill extends Model
         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
      */

app/Models/Budget.php

@@ -1,11 +1,13 @@
 <?php namespace FireflyIII\Models;
 
+use Crypt;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * Class Budget
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Models
  */
 class Budget extends Model
@@ -16,6 +18,7 @@ class Budget extends Model
     protected $fillable = ['user_id', 'name'];
 
     /**
+     *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function budgetlimits()
@@ -31,6 +34,23 @@ class Budget extends Model
         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
      */
@@ -39,6 +59,15 @@ class Budget extends Model
         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
      */

app/Models/BudgetLimit.php

@@ -5,6 +5,7 @@ use Illuminate\Database\Eloquent\Model;
 /**
  * Class BudgetLimit
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Models
  */
 class BudgetLimit extends Model

app/Models/Category.php

@@ -1,11 +1,14 @@
 <?php namespace FireflyIII\Models;
 
+use App;
+use Crypt;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * Class Category
  *
+ *
  * @package FireflyIII\Models
  */
 class Category extends Model
@@ -15,6 +18,7 @@ class Category extends Model
     protected $fillable = ['user_id', 'name'];
 
     /**
+     * @codeCoverageIgnore
      * @return array
      */
     public function getDates()
@@ -23,6 +27,7 @@ class Category extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
     public function transactionjournals()
@@ -31,6 +36,41 @@ class Category extends Model
     }
 
     /**
+     * @param array $fields
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     *
+     * @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;
+
+    }
+
+    /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function user()
@@ -38,4 +78,32 @@ class Category extends Model
         return $this->belongsTo('FireflyIII\User');
     }
 
+    /**
+     * @codeCoverageIgnore
+     *
+     * @param $value
+     */
+    public function setNameAttribute($value)
+    {
+        $this->attributes['name']      = Crypt::encrypt($value);
+        $this->attributes['encrypted'] = true;
+    }
+
+    /**
+     * @codeCoverageIgnore
+     *
+     * @param $value
+     *
+     * @return string
+     */
+    public function getNameAttribute($value)
+    {
+
+        if (intval($this->encrypted) == 1) {
+            return Crypt::decrypt($value);
+        }
+
+        return $value;
+    }
+
 }

app/Models/Component.php

@@ -6,13 +6,14 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 /**
  * Class Component
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Models
  */
 class Component extends Model
 {
     use SoftDeletes;
 
-    protected $fillable = ['user_id', 'name','class'];
+    protected $fillable = ['user_id', 'name', 'class'];
 
     /**
      * @return array

app/Models/LimitRepetition.php

@@ -1,5 +1,7 @@
 <?php namespace FireflyIII\Models;
 
+use Auth;
+use DB;
 use Illuminate\Database\Eloquent\Model;
 
 /**
@@ -11,6 +13,7 @@ class LimitRepetition extends Model
 {
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function budgetLimit()
@@ -19,6 +22,7 @@ class LimitRepetition extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return array
      */
     public function getDates()
@@ -26,18 +30,23 @@ class LimitRepetition extends Model
         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('transactions.amount', '>', 0)
-                  ->where('limit_repetitions.id', '=', $this->id)
-                  ->sum('transactions.amount');
+        $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

@@ -1,7 +1,6 @@
 <?php namespace FireflyIII\Models;
 
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Crypt;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
@@ -15,10 +14,10 @@ class PiggyBank extends Model
     use SoftDeletes;
 
     protected $fillable
-        = ['repeats', 'name', 'account_id', 'rep_every', 'rep_times', 'reminder_skip', 'targetamount', 'startdate', 'targetdate', 'reminder', 'remind_me',
-           'rep_length'];
+        = ['name', 'account_id', 'order', 'reminder_skip', 'targetamount', 'startdate', 'targetdate', 'reminder', 'remind_me'];
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function account()
@@ -36,52 +35,17 @@ class PiggyBank extends Model
         if (!is_null($this->currentRep)) {
             return $this->currentRep;
         }
-        if (intval($this->repeats) === 0) {
-            $rep              = $this->piggyBankRepetitions()->first(['piggy_bank_repetitions.*']);
-            $this->currentRep = $rep;
+        // repeating piggy banks are no longer supported.
+        $rep              = $this->piggyBankRepetitions()->first(['piggy_bank_repetitions.*']);
+        $this->currentRep = $rep;
 
-            return $rep;
-        } else {
-            $query            = $this->piggyBankRepetitions()->where(
-                function (EloquentBuilder $q) {
-
-                    $q->where(
-                        function (EloquentBuilder $q) {
-
-                            $q->where(
-                                function (EloquentBuilder $q) {
-                                    $today = new Carbon;
-                                    $q->whereNull('startdate');
-                                    $q->orWhere('startdate', '<=', $today->format('Y-m-d 00:00:00'));
-                                }
-                            )->where(
-                                function (EloquentBuilder $q) {
-                                    $today = new Carbon;
-                                    $q->whereNull('targetdate');
-                                    $q->orWhere('targetdate', '>=', $today->format('Y-m-d 00:00:00'));
-                                }
-                            );
-                        }
-                    )->orWhere(
-                        function (EloquentBuilder $q) {
-                            $today = new Carbon;
-                            $q->where('startdate', '>=', $today->format('Y-m-d 00:00:00'));
-                            $q->where('targetdate', '>=', $today->format('Y-m-d 00:00:00'));
-                        }
-                    );
-
-                }
-            )->orderBy('startdate', 'ASC');
-            $result           = $query->first(['piggy_bank_repetitions.*']);
-            $this->currentRep = $result;
-
-            return $result;
-        }
+        return $rep;
 
 
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function piggyBankRepetitions()
@@ -90,6 +54,7 @@ class PiggyBank extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return array
      */
     public function getDates()
@@ -98,6 +63,8 @@ class PiggyBank extends Model
     }
 
     /**
+     * @codeCoverageIgnore
+     *
      * @param $value
      *
      * @return int
@@ -108,6 +75,7 @@ class PiggyBank extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function piggyBankEvents()
@@ -116,10 +84,41 @@ class PiggyBank extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\MorphMany
      */
     public function reminders()
     {
         return $this->morphMany('FireflyIII\Models\Reminder', 'remindersable');
     }
+
+    /**
+     * @codeCoverageIgnore
+     *
+     * @param $value
+     */
+    public function setNameAttribute($value)
+    {
+        $this->attributes['name']      = Crypt::encrypt($value);
+        $this->attributes['encrypted'] = true;
+    }
+
+    /**
+     * @codeCoverageIgnore
+     *
+     * @param $value
+     *
+     * @return string
+     */
+    public function getNameAttribute($value)
+    {
+
+        if (intval($this->encrypted) == 1) {
+            return Crypt::decrypt($value);
+        }
+
+        // @codeCoverageIgnoreStart
+        return $value;
+        // @codeCoverageIgnoreEnd
+    }
 }