Merge branch 'release/3.3.4'

Fixed chart.

.coveralls.yml

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

.gitignore

@@ -3,6 +3,7 @@
 composer.phar
 Thumbs.db
 .idea/
+.DS_Store
 tests/_output/*
 _ide_helper.php
 /build/logs/clover.xml
@@ -25,3 +26,5 @@ c3.php
 db.sqlite-journal
 tests/_output/*
 .env
+clover.xml
+node_modules/

.travis.yml

@@ -1,4 +1,6 @@
 language: php
+sudo: false
+
 
 php:
   - 5.5
@@ -13,14 +15,11 @@ install:
   - composer install
   - php artisan env
   - mv -v .env.testing .env
+  - touch tests/database/db.sqlite
+  - php artisan migrate --seed
 
 script:
-  - ./tests/_data/db.sh
-  - php vendor/bin/codecept build
-  - php vendor/bin/codecept run --coverage --coverage-xml --no-exit
+  - phpunit --debug
 
 after_script:
-  - cp -v tests/_output/coverage.xml build/logs/clover.xml
   - php vendor/bin/coveralls
-  - vendor/bin/test-reporter --stdout > codeclimate.json
-  - "curl -X POST -d @codeclimate.json -H 'Content-Type: application/json' -H 'User-Agent: Code Climate (PHP Test Reporter v0.1.1)' https://codeclimate.com/test_reports"

README.md

@@ -1,4 +1,4 @@
-Firefly III (v3.3.1)
+Firefly III (v3.3.4)
 ===========
 
 [![Build Status](https://travis-ci.org/JC5/firefly-iii.svg?branch=develop)](https://travis-ci.org/JC5/firefly-iii)
@@ -18,6 +18,11 @@ Firefly Mark III is a new version of Firefly built upon best practices and lesso
 from building [Firefly](https://github.com/JC5/Firefly). It's Mark III since the original Firefly never made it outside of my
 laptop and [Firefly II](https://github.com/JC5/Firefly) is live.
 
+If you're not sure if this tool is for you, please read the [full description](https://github.com/JC5/firefly-iii/wiki/full-description).
+
+To install and use Firefly III, please read [the installation guide](https://github.com/JC5/firefly-iii/wiki/Installation),
+ [the upgrade guide](https://github.com/JC5/firefly-iii/wiki/Upgrade-instructions) (if applicable) and the **[first use guide](https://github.com/JC5/firefly-iii/wiki/First-use)**
+
 ## Current features
 
 - [A double-entry bookkeeping system](http://en.wikipedia.org/wiki/Double-entry_bookkeeping_system);
@@ -25,9 +30,8 @@ laptop and [Firefly II](https://github.com/JC5/Firefly) is live.
 - It's possible to create, change and manage money using _budgets_;
 - Organize transactions using categories;
 - Save towards a goal using piggy banks;
-- Predict and anticipate large expenses using "repeated expenses" (ie. yearly taxes);
-- Predict and anticipate bills using "recurring transactions" (rent for example);
-- View basic income / expense reports.
+- Predict and anticipate bills;
+- View income / expense reports;
 - Lots of help text in case you don't get it;
 
 Everything is organised:
@@ -55,7 +59,6 @@ Firefly III will feature, but does not feature yet:
 Some stuff has been removed:
 
 - The nesting of budgets, categories and beneficiaries is removed because it was pretty pointless.
-- Firefly will not encrypt the content of the (MySQL) tables. Old versions of Firefly had this capability but it sucks when searching, sorting and organizing entries.
 
 ## Screenshots
 

app/Events/JournalCreated.php

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

app/Events/JournalSaved.php

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

app/Handlers/Events/ConnectJournalToPiggyBank.php

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

app/Handlers/Events/RescanJournal.php

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

app/Handlers/Events/UpdateJournalConnection.php

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

app/Helpers/Reminders/ReminderHelper.php

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

app/Helpers/Reminders/ReminderHelperInterface.php

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

app/Helpers/Report/ReportHelper.php

@@ -7,6 +7,7 @@ use Carbon\Carbon;
 use FireflyIII\Models\Account;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Collection;
+use Steam;
 
 /**
  * Class ReportHelper
@@ -35,19 +36,6 @@ class ReportHelper implements ReportHelperInterface
 
     }
 
-    /**
-     * @return Carbon
-     */
-    public function firstDate()
-    {
-        $journal = Auth::user()->transactionjournals()->orderBy('date', 'ASC')->first();
-        if ($journal) {
-            return $journal->date;
-        }
-
-        return Carbon::now();
-    }
-
     /**
      * This method gets some kind of list for a monthly overview.
      *
@@ -62,13 +50,13 @@ class ReportHelper implements ReportHelperInterface
         $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']);
+        $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               = $this->_helper->makeArray($set);
@@ -99,7 +87,8 @@ class ReportHelper implements ReportHelperInterface
         $end    = Carbon::now();
         $months = [];
         while ($start <= $end) {
-            $months[] = [
+            $year            = $start->format('Y');
+            $months[$year][] = [
                 'formatted' => $start->format('F Y'),
                 'month'     => intval($start->format('m')),
                 'year'      => intval($start->format('Y')),
@@ -130,43 +119,50 @@ class ReportHelper implements ReportHelperInterface
 
     /**
      * @param Carbon $date
+     * @param bool   $showSharedReports
      *
      * @return array
      */
-    public function yearBalanceReport(Carbon $date)
+    public function yearBalanceReport(Carbon $date, $showSharedReports = false)
     {
-        $start            = clone $date;
-        $end              = clone $date;
-        $sharedAccounts   = [];
-        $sharedCollection = \Auth::user()->accounts()
-                                 ->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id')
-                                 ->where('account_meta.name', '=', 'accountRole')
-                                 ->where('account_meta.data', '=', json_encode('sharedExpense'))
-                                 ->get(['accounts.id']);
+        $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;
+            foreach ($sharedCollection as $account) {
+                $sharedAccounts[] = $account->id;
+            }
         }
 
-        $accounts = \Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*'])->filter(
-            function (Account $account) use ($sharedAccounts) {
-                if (!in_array($account->id, $sharedAccounts)) {
-                    return $account;
-                }
+        $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;
-            }
-        );
+                                return null;
+                            }
+                        );
         $report   = [];
         $start->startOfYear()->subDay();
         $end->endOfYear();
 
         foreach ($accounts as $account) {
-            $report[] = [
-                'start'   => \Steam::balance($account, $start),
-                'end'     => \Steam::balance($account, $end),
+            $startBalance = Steam::balance($account, $start);
+            $endBalance   = Steam::balance($account, $end);
+            $report[]     = [
+                'start'   => $startBalance,
+                'end'     => $endBalance,
+                'hide'    => ($startBalance == 0 && $endBalance == 0),
                 'account' => $account,
-                'shared'  => $account->accountRole == 'sharedExpense'
+                'shared'  => $account->accountRole == 'sharedAsset'
             ];
         }
 

app/Helpers/Report/ReportHelperInterface.php

@@ -14,32 +14,6 @@ interface ReportHelperInterface
 {
 
 
-    /**
-     * @return Carbon
-     */
-    public function firstDate();
-
-    /**
-     * @param Carbon $date
-     *
-     * @return array
-     */
-    public function listOfMonths(Carbon $date);
-
-    /**
-     * @param Carbon $date
-     *
-     * @return array
-     */
-    public function listOfYears(Carbon $date);
-
-    /**
-     * @param Carbon $date
-     *
-     * @return array
-     */
-    public function yearBalanceReport(Carbon $date);
-
     /**
      * This methods fails to take in account transfers FROM shared accounts.
      *
@@ -59,4 +33,26 @@ interface ReportHelperInterface
      * @return Collection
      */
     public function getBudgetsForMonth(Carbon $date);
+
+    /**
+     * @param Carbon $date
+     *
+     * @return array
+     */
+    public function listOfMonths(Carbon $date);
+
+    /**
+     * @param Carbon $date
+     *
+     * @return array
+     */
+    public function listOfYears(Carbon $date);
+
+    /**
+     * @param Carbon $date
+     * @param bool   $showSharedReports
+     *
+     * @return array
+     */
+    public function yearBalanceReport(Carbon $date, $showSharedReports = false);
 }

app/Helpers/Report/ReportQuery.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 22/02/15
- * Time: 18:30
- */
 
 namespace FireflyIII\Helpers\Report;
 
@@ -29,26 +23,33 @@ class ReportQuery implements ReportQueryInterface
     /**
      * This query retrieves a list of accounts that are active and not shared.
      *
+     * @param bool $showSharedReports
+     *
      * @return Collection
      */
-    public function accountList()
+    public function accountList($showSharedReports = false)
     {
-        return Auth::user()->accounts()
-                   ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
-                   ->leftJoin(
-                       'account_meta', function (JoinClause $join) {
-                       $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', "accountRole");
-                   }
-                   )
-                   ->whereIn('account_types.type', ['Default account', 'Cash account', 'Asset account'])
-                   ->where('active', 1)
-                   ->where(
-                       function (Builder $query) {
-                           $query->where('account_meta.data', '!=', '"sharedExpense"');
-                           $query->orWhereNull('account_meta.data');
-                       }
-                   )
-                   ->get(['accounts.*']);
+        $query = Auth::user()->accounts();
+        if ($showSharedReports === false) {
+
+            $query->leftJoin(
+                'account_meta', function (JoinClause $join) {
+                $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', "accountRole");
+            }
+            )->where(
+                function (Builder $query) {
+                    $query->where('account_meta.data', '!=', '"sharedAsset"');
+                    $query->orWhereNull('account_meta.data');
+                }
+            );
+
+        }
+        $query->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
+              ->whereIn('account_types.type', ['Default account', 'Cash account', 'Asset account'])
+              ->where('active', 1)
+              ->orderBy('accounts.name', 'ASC');
+
+        return $query->get(['accounts.*']);
     }
 
     /**
@@ -82,19 +83,40 @@ class ReportQuery implements ReportQueryInterface
                                  ->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)
+                                 ->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')
-                                 ->first(
+                                 ->get(
                                      [
-                                         DB::Raw('SUM(`transactions`.`amount`) as `amount`')
+                                         '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;
-        if (!is_null($set)) {
-            $sum = floatval($set->amount);
+        foreach ($set as $entry) {
+            $sum += floatval($entry->amount);
         }
 
         return $sum;
@@ -105,25 +127,31 @@ class ReportQuery implements ReportQueryInterface
      *
      * @param Carbon $start
      * @param Carbon $end
+     * @param bool   $showSharedReports
      *
      * @return Collection
      */
-    public function getAllAccounts(Carbon $start, Carbon $end)
+    public function getAllAccounts(Carbon $start, Carbon $end, $showSharedReports = false)
     {
-        $set = Auth::user()->accounts()->orderBy('accounts.name', 'ASC')
-                   ->accountTypeIn(['Default account', 'Asset account', 'Cash account'])
-                   ->leftJoin(
-                       'account_meta', function (JoinClause $join) {
-                       $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
-                   }
-                   )
-                   ->where(
-                       function (Builder $query) {
-                           $query->where('account_meta.data', '!=', '"sharedExpense"');
-                           $query->orWhereNull('account_meta.data');
-                       }
-                   )
-                   ->get(['accounts.*']);
+        $query = Auth::user()->accounts()->orderBy('accounts.name', 'ASC')
+                     ->accountTypeIn(['Default account', 'Asset account', 'Cash account']);
+        if ($showSharedReports === false) {
+            $query->leftJoin(
+                'account_meta', function (JoinClause $join) {
+                $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
+            }
+            )
+                  ->orderBy('accounts.name', 'ASC')
+                  ->where(
+                      function (Builder $query) use ($showSharedReports) {
+
+                          $query->where('account_meta.data', '!=', '"sharedAsset"');
+                          $query->orWhereNull('account_meta.data');
+
+                      }
+                  );
+        }
+        $set = $query->get(['accounts.*']);
         $set->each(
             function (Account $account) use ($start, $end) {
                 /** @noinspection PhpParamsInspection */
@@ -167,7 +195,40 @@ class ReportQuery implements ReportQueryInterface
 
         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;
     }
 
     /**
@@ -177,62 +238,73 @@ class ReportQuery implements ReportQueryInterface
      *
      * @param Carbon $start
      * @param Carbon $end
+     * @param bool   $showSharedReports
      *
      * @return Collection
      */
-    public function incomeByPeriod(Carbon $start, Carbon $end)
+    public function incomeByPeriod(Carbon $start, Carbon $end, $showSharedReports = false)
     {
-        return TransactionJournal::
+        $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')
-                                 ->where(
-                                     function ($query) {
-                                         $query->where(
-                                             function ($q) {
-                                                 $q->where('transaction_types.type', 'Deposit');
-                                                 $q->where('acm_to.data', '!=', '"sharedExpense"');
-                                             }
-                                         );
-                                         $query->orWhere(
-                                             function ($q) {
-                                                 $q->where('transaction_types.type', 'Transfer');
-                                                 $q->where('acm_from.data', '=', '"sharedExpense"');
-                                             }
-                                         );
-                                     }
-                                 )
-                                 ->before($end)->after($start)
-                                 ->where('transaction_journals.user_id', Auth::user()->id)
-                                 ->groupBy('t_from.account_id')->orderBy('transaction_journals.date')
-                                 ->get(
-                                     ['transaction_journals.id',
-                                      'transaction_journals.description',
-                                      'transaction_journals.encrypted',
-                                      'transaction_types.type',
-                                      't_to.amount', 'transaction_journals.date', 't_from.account_id as account_id',
-                                      'ac_from.name as name']
-                                 );
+                                   ->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) {
+            // only get deposits not to a shared account
+            // and transfers to a shared account.
+            $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 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');
+
+        return $query->get(
+            ['transaction_journals.id',
+             'transaction_journals.description',
+             'transaction_journals.encrypted',
+             'transaction_types.type',
+             DB::Raw('SUM(`t_to`.`amount`) as `amount`'),
+             'transaction_journals.date',
+             't_from.account_id as account_id',
+             'ac_from.name as name']
+        );
     }
 
     /**
@@ -240,33 +312,37 @@ class ReportQuery implements ReportQueryInterface
      *
      * @param Carbon $start
      * @param Carbon $end
+     * @param bool   $showSharedReports
      *
      * @return Collection
      */
-    public function journalsByBudget(Carbon $start, Carbon $end)
+    public function journalsByBudget(Carbon $start, Carbon $end, $showSharedReports = false)
     {
-        return 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')
-                   ->leftJoin(
-                       'account_meta', function (JoinClause $join) {
-                       $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
-                   }
-                   )
-                   ->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('account_meta.data', '!=', '"sharedExpense"')
-                   ->where('transaction_types.type', 'Withdrawal')
-                   ->groupBy('budgets.id')
-                   ->orderBy('budgets.name', 'ASC')
-                   ->get(['budgets.id', 'budgets.name', DB::Raw('SUM(`transactions`.`amount`) AS `spent`')]);
+        $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`')]);
     }
 
     /**
@@ -275,35 +351,38 @@ class ReportQuery implements ReportQueryInterface
      *
      * @param Carbon $start
      * @param Carbon $end
+     * @param bool   $showSharedReports
      *
      * @return Collection
      */
-    public function journalsByCategory(Carbon $start, Carbon $end)
+    public function journalsByCategory(Carbon $start, Carbon $end, $showSharedReports = false)
     {
-        return 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')
-                   ->leftJoin(
-                       'account_meta', function (JoinClause $join) {
-                       $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
-                   }
-                   )
-                   ->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('account_meta.data', '!=', '"sharedExpense"')
-                   ->where('transaction_types.type', 'Withdrawal')
-                   ->groupBy('categories.id')
-                   ->orderBy('amount')
-                   ->get(['categories.id', 'categories.name', DB::Raw('SUM(`transactions`.`amount`) AS `amount`')]);
+        $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`')]);
 
     }
 
@@ -315,57 +394,65 @@ class ReportQuery implements ReportQueryInterface
      *
      * @param Carbon $start
      * @param Carbon $end
+     * @param bool   $showSharedReports
      *
      * @return Collection
      */
-    public function journalsByExpenseAccount(Carbon $start, Carbon $end)
+    public function journalsByExpenseAccount(Carbon $start, Carbon $end, $showSharedReports = false)
     {
-        return TransactionJournal::
-        leftJoin(
+        $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')
-                                 ->where(
-                                     function ($query) {
-                                         $query->where(
-                                             function ($q) {
-                                                 $q->where('transaction_types.type', 'Withdrawal');
-                                                 $q->where('acm_from.data', '!=', '"sharedExpense"');
-                                             }
-                                         );
-                                         $query->orWhere(
-                                             function ($q) {
-                                                 $q->where('transaction_types.type', 'Transfer');
-                                                 $q->where('acm_to.data', '=', '"sharedExpense"');
-                                             }
-                                         );
-                                     }
-                                 )
-                                 ->before($end)
-                                 ->after($start)
-                                 ->where('transaction_journals.user_id', Auth::user()->id)
-                                 ->groupBy('t_to.account_id')
-                                 ->orderBy('amount', 'DESC')
-                                 ->get(['t_to.account_id as id', 'ac_to.name as name', DB::Raw('SUM(t_to.amount) as `amount`')]);
+        )->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`')]);
     }
 
     /**
@@ -373,55 +460,65 @@ class ReportQuery implements ReportQueryInterface
      *
      * @param Carbon $start
      * @param Carbon $end
+     * @param bool   $showSharedReports
      *
      * @return Collection
      */
-    public function journalsByRevenueAccount(Carbon $start, Carbon $end)
+    public function journalsByRevenueAccount(Carbon $start, Carbon $end, $showSharedReports = false)
     {
-        return TransactionJournal::
+        $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')
-                                 ->where(
-                                     function ($query) {
-                                         $query->where(
-                                             function ($q) {
-                                                 $q->where('transaction_types.type', 'Deposit');
-                                                 $q->where('acm_to.data', '!=', '"sharedExpense"');
-                                             }
-                                         );
-                                         $query->orWhere(
-                                             function ($q) {
-                                                 $q->where('transaction_types.type', 'Transfer');
-                                                 $q->where('acm_from.data', '=', '"sharedExpense"');
-                                             }
-                                         );
-                                     }
-                                 )
-                                 ->before($end)->after($start)
-                                 ->where('transaction_journals.user_id', Auth::user()->id)
-                                 ->groupBy('t_from.account_id')->orderBy('amount')
-                                 ->get(['t_from.account_id as account_id', 'ac_from.name as name', DB::Raw('SUM(t_from.amount) as `amount`')]);
+                                   ->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) {
+
+            // 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`')]);
     }
 
     /**
@@ -450,7 +547,7 @@ class ReportQuery implements ReportQueryInterface
                                      $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
                                  }
                                  )
-                                 ->where('account_meta.data', '"sharedExpense"')
+                                 ->where('account_meta.data', '"sharedAsset"')
                                  ->after($start)
                                  ->before($end)
                                  ->where('transaction_types.type', 'Transfer')
@@ -492,7 +589,7 @@ class ReportQuery implements ReportQueryInterface
                                      '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', '"sharedExpense"')
+                                 ->where('account_meta.data', '"sharedAsset"')
                                  ->after($start)
                                  ->before($end)
                                  ->where('transaction_types.type', 'Transfer')

app/Helpers/Report/ReportQueryInterface.php

@@ -17,19 +17,69 @@ interface ReportQueryInterface
     /**
      * This query retrieves a list of accounts that are active and not shared.
      *
+     * @param bool $showSharedReports
+     *
      * @return Collection
      */
-    public function accountList();
+    public function accountList($showSharedReports = false);
+
+    /**
+     * This method will get a list of all expenses in a certain time period that have no budget
+     * and are balanced by a transfer to make up for it.
+     *
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return Collection
+     */
+    public function balancedTransactionsList(Account $account, Carbon $start, Carbon $end);
+
+    /**
+     * This method will get the sum of all expenses in a certain time period that have no budget
+     * and are balanced by a transfer to make up for it.
+     *
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return 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
      *
      * @return Collection
      */
-    public function getAllAccounts(Carbon $start, Carbon $end);
+    public function getAllAccounts(Carbon $start, Carbon $end, $showSharedReports = false);
+
+    /**
+     * Grabs a summary of all expenses grouped by budget, related to the account.
+     *
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @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
@@ -38,20 +88,22 @@ interface ReportQueryInterface
      *
      * @param Carbon $start
      * @param Carbon $end
+     * @param bool   $showSharedReports
      *
      * @return Collection
      */
-    public function incomeByPeriod(Carbon $start, Carbon $end);
+    public function incomeByPeriod(Carbon $start, Carbon $end, $showSharedReports = false);
 
     /**
      * Gets a list of expenses grouped by the budget they were filed under.
      *
      * @param Carbon $start
      * @param Carbon $end
+     * @param bool   $showSharedReports
      *
      * @return Collection
      */
-    public function journalsByBudget(Carbon $start, Carbon $end);
+    public function journalsByBudget(Carbon $start, Carbon $end, $showSharedReports = false);
 
     /**
      * Gets a list of categories and the expenses therein, grouped by the relevant category.
@@ -59,10 +111,11 @@ interface ReportQueryInterface
      *
      * @param Carbon $start
      * @param Carbon $end
+     * @param bool   $showSharedReports
      *
      * @return Collection
      */
-    public function journalsByCategory(Carbon $start, Carbon $end);
+    public function journalsByCategory(Carbon $start, Carbon $end, $showSharedReports = false);
 
     /**
      * Gets a list of expense accounts and the expenses therein, grouped by that expense account.
@@ -72,20 +125,22 @@ interface ReportQueryInterface
      *
      * @param Carbon $start
      * @param Carbon $end
+     * @param bool   $showSharedReports
      *
      * @return Collection
      */
-    public function journalsByExpenseAccount(Carbon $start, Carbon $end);
+    public function journalsByExpenseAccount(Carbon $start, Carbon $end, $showSharedReports = false);
 
     /**
      * This method returns all deposits into asset accounts, grouped by the revenue account,
      *
      * @param Carbon $start
      * @param Carbon $end
+     * @param bool   $showSharedReports
      *
      * @return Collection
      */
-    public function journalsByRevenueAccount(Carbon $start, Carbon $end);
+    public function journalsByRevenueAccount(Carbon $start, Carbon $end, $showSharedReports = false);
 
     /**
      * With an equally misleading name, this query returns are transfers to shared accounts. These are considered
@@ -108,27 +163,4 @@ interface ReportQueryInterface
      * @return Collection
      */
     public function sharedExpensesByCategory(Carbon $start, Carbon $end);
-
-    /**
-     * 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);
-
-    /**
-     * 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);
 }

app/Http/Controllers/AccountController.php

@@ -1,6 +1,5 @@
 <?php namespace FireflyIII\Http\Controllers;
 
-use App;
 use Auth;
 use Carbon\Carbon;
 use Config;
@@ -8,9 +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 View;
 
 /**
@@ -36,7 +37,7 @@ 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';
 
         return view('accounts.create', compact('subTitleIcon', 'what', 'subTitle'));
@@ -74,6 +75,12 @@ class AccountController extends Controller
         return Redirect::route('accounts.index', $typeName);
     }
 
+    /**
+     * @param Account                    $account
+     * @param AccountRepositoryInterface $repository
+     *
+     * @return View
+     */
     public function edit(Account $account, AccountRepositoryInterface $repository)
     {
         $what           = Config::get('firefly.shortNamesByFullName')[$account->accountType->type];
@@ -110,29 +117,59 @@ class AccountController extends Controller
         $subTitle     = Config::get('firefly.subTitlesByIdentifier.' . $what);
         $subTitleIcon = Config::get('firefly.subIconsByIdentifier.' . $what);
         $types        = Config::get('firefly.accountTypesByIdentifier.' . $what);
-        $accounts     = Auth::user()->accounts()->accountTypeIn($types)->get(['accounts.*']);
+        $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();
+
+        // last activity:
+        $start = clone Session::get('start');
+        $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, clone Session::get('end'));
+            }
+        );
+
+        $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 string                     $range
      * @param AccountRepositoryInterface $repository
      *
-     * @return \Illuminate\View\View
+     * @return View
      */
-    public function show(Account $account, $range = 'session')
+    public function show(Account $account, AccountRepositoryInterface $repository)
     {
-        /** @var \FireflyIII\Repositories\Account\AccountRepositoryInterface $repository */
-        $repository   = App::make('FireflyIII\Repositories\Account\AccountRepositoryInterface');
         $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, $range);
+        $journals     = $repository->getJournals($account, $page);
         $subTitle     = 'Details for ' . strtolower(e($account->accountType->type)) . ' "' . e($account->name) . '"';
-
-        return view('accounts.show', compact('account', 'what', 'range', 'subTitleIcon', 'journals', 'subTitle'));
+        $journals->setPath('accounts/show/'.$account->id);
+        return view('accounts.show', compact('account', 'what', 'subTitleIcon', 'journals', 'subTitle'));
     }
 
     /**
@@ -158,6 +195,10 @@ 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();
+        }
+
         return Redirect::route('accounts.index', $request->input('what'));
 
     }
@@ -186,6 +227,10 @@ 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);
+        }
+
         return Redirect::route('accounts.index', $what);
 
     }

app/Http/Controllers/Auth/AuthController.php

@@ -4,6 +4,9 @@ use FireflyIII\Http\Controllers\Controller;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Contracts\Auth\Registrar;
 use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
+use Illuminate\Http\Request;
+use Mail;
+use Session;
 
 /**
  * Class AuthController
@@ -43,4 +46,43 @@ class AuthController extends Controller
         $this->middleware('guest', ['except' => 'getLogout']);
     }
 
+    /**
+     * Handle a registration request for the application.
+     *
+     * @param  Request $request
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function postRegister(Request $request)
+    {
+        $validator = $this->registrar->validator($request->all());
+
+        if ($validator->fails()) {
+            $this->throwValidationException(
+                $request, $validator
+            );
+        }
+
+        $data  =$request->all();
+        $data['password'] = bcrypt($data['password']);
+
+        $this->auth->login($this->registrar->create($data));
+
+        // get the email address
+        $email = $this->auth->user()->email;
+
+        // send email.
+        Mail::send(
+            'emails.registered', [], function ($message) use ($email) {
+            $message->to($email, $email)->subject('Welcome to Firefly III!');
+        }
+        );
+
+        // set flash message
+        Session::flash('success', 'You have registered successfully!');
+
+
+        return redirect($this->redirectPath());
+    }
+
 }

app/Http/Controllers/BillController.php

@@ -8,6 +8,7 @@ use FireflyIII\Models\Bill;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use Input;
 use Redirect;
 use Session;
 use URL;
@@ -80,7 +81,7 @@ class BillController extends Controller
      */
     public function index(BillRepositoryInterface $repository)
     {
-        $bills = Auth::user()->bills()->get();
+        $bills = Auth::user()->bills()->orderBy('name', 'ASC')->get();
         $bills->each(
             function (Bill $bill) use ($repository) {
                 $bill->nextExpectedMatch = $repository->nextExpectedMatch($bill);
@@ -108,7 +109,9 @@ class BillController extends Controller
             return Redirect::intended('/');
         }
 
-        $set = \DB::table('transactions')->where('amount', '>', 0)->where('amount', '>=', $bill->amount_min)->where('amount', '<=', $bill->amount_max)->get(['transaction_journal_id']);
+        $set = \DB::table('transactions')->where('amount', '>', 0)->where('amount', '>=', $bill->amount_min)->where('amount', '<=', $bill->amount_max)->get(
+            ['transaction_journal_id']
+        );
         $ids = [];
 
         /** @var Transaction $entry */
@@ -116,7 +119,7 @@ class BillController extends Controller
             $ids[] = intval($entry->transaction_journal_id);
         }
         if (count($ids) > 0) {
-            $journals = Auth::user()->transactionjournals()->whereIn('id',$ids)->get();
+            $journals = Auth::user()->transactionjournals()->whereIn('id', $ids)->get();
             /** @var TransactionJournal $journal */
             foreach ($journals as $journal) {
                 $repository->scan($bill, $journal);
@@ -135,7 +138,12 @@ class BillController extends Controller
      */
     public function show(Bill $bill, BillRepositoryInterface $repository)
     {
-        $journals                = $bill->transactionjournals()->withRelevantData()->orderBy('date', 'DESC')->get();
+        $journals                = $bill->transactionjournals()->withRelevantData()
+            ->orderBy('transaction_journals.date', 'DESC')
+            ->orderBy('transaction_journals.order','ASC')
+            ->orderBy('transaction_journals.id','DESC')
+
+            ->get();
         $bill->nextExpectedMatch = $repository->nextExpectedMatch($bill);
         $hideBill                = true;
 
@@ -168,6 +176,10 @@ class BillController extends Controller
         $bill = $repository->store($billData);
         Session::flash('success', 'Bill "' . e($bill->name) . '" stored.');
 
+        if (intval(Input::get('create_another')) === 1) {
+            return Redirect::route('bills.create')->withInput();
+        }
+
         return Redirect::route('bills.index');
 
     }
@@ -195,46 +207,14 @@ class BillController extends Controller
 
         $bill = $repository->update($bill, $billData);
 
+        if (intval(Input::get('return_to_edit')) === 1) {
+            return Redirect::route('bills.edit', $bill->id);
+        }
+
         Session::flash('success', 'Bill "' . e($bill->name) . '" updated.');
 
         return Redirect::route('bills.index');
 
-
-        //        $data              = Input::except('_token');
-        //        $data['active']    = intval(Input::get('active'));
-        //        $data['automatch'] = intval(Input::get('automatch'));
-        //        $data['user_id']   = Auth::user()->id;
-        //
-        //        // always validate:
-        //        $messages = $this->_repository->validate($data);
-        //
-        //        // flash messages:
-        //        Session::flash('warnings', $messages['warnings']);
-        //        Session::flash('successes', $messages['successes']);
-        //        Session::flash('errors', $messages['errors']);
-        //        if ($messages['errors']->count() > 0) {
-        //            Session::flash('error', 'Could not update bill: ' . $messages['errors']->first());
-        //
-        //            return Redirect::route('bills.edit', $bill->id)->withInput();
-        //        }
-        //
-        //        // return to update screen:
-        //        if ($data['post_submit_action'] == 'validate_only') {
-        //            return Redirect::route('bills.edit', $bill->id)->withInput();
-        //        }
-        //
-        //        // update
-        //        $this->_repository->update($bill, $data);
-        //        Session::flash('success', 'Bill "' . e($data['name']) . '" updated.');
-        //
-        //        // go back to list
-        //        if ($data['post_submit_action'] == 'update') {
-        //            return Redirect::route('bills.index');
-        //        }
-        //
-        //        // go back to update screen.
-        //        return Redirect::route('bills.edit', $bill->id)->withInput(['post_submit_action' => 'return_to_edit']);
-
     }
 
 }

app/Http/Controllers/BudgetController.php

@@ -133,7 +133,9 @@ class BudgetController extends Controller
                         ->whereNull('budget_transaction_journal.id')
                         ->before($end)
                         ->after($start)
-                        ->orderBy('transaction_journals.date')
+            ->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');
 
@@ -152,6 +154,12 @@ class BudgetController extends Controller
         return Redirect::route('budgets.index');
     }
 
+    /**
+     * @param BudgetFormRequest         $request
+     * @param BudgetRepositoryInterface $repository
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
     public function store(BudgetFormRequest $request, BudgetRepositoryInterface $repository)
     {
         $budgetData = [
@@ -204,6 +212,10 @@ 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);
+        }
+
         return Redirect::route('budgets.index');
 
     }

app/Http/Controllers/CategoryController.php

@@ -7,10 +7,10 @@ use FireflyIII\Http\Requests\CategoryFormRequest;
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Input;
 use Redirect;
 use Session;
 use View;
-use Input;
 
 
 /**
@@ -38,44 +38,6 @@ class CategoryController extends Controller
         return view('categories.create')->with('subTitle', 'Create a new category');
     }
 
-    /**
-     * @param Category $category
-     *
-     * @return $this
-     */
-    public function show(Category $category, CategoryRepositoryInterface $repository)
-    {
-        $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('date', 'DESC')->get(['transaction_journals.*']);
-        $count  = $category->transactionJournals()->count();
-
-        $journals = new LengthAwarePaginator($set, $count, 50, $page);
-
-        return view('categories.show', compact('category', 'journals', 'hideCategory'));
-    }
-
-    /**
-     * @return \Illuminate\View\View
-     */
-    public function noCategory()
-    {
-        $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')
-                         ->get(['transaction_journals.*']);
-        $subTitle = 'Transactions without a category in ' . $start->format('F Y');
-
-        return view('categories.noCategory', compact('list', 'subTitle'));
-    }
-
     /**
      * @param Category $category
      *
@@ -122,11 +84,73 @@ class CategoryController extends Controller
      */
     public function index()
     {
-        $categories = Auth::user()->categories()->get();
+        $categories = Auth::user()->categories()->orderBy('name', 'ASC')->get();
+
+        $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;
+                }
+            }
+        );
 
         return view('categories.index', compact('categories'));
     }
 
+    /**
+     * @return \Illuminate\View\View
+     */
+    public function noCategory()
+    {
+        $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.*']);
+
+        $subTitle = 'Transactions without a category between ' . $start->format('jS F Y') . ' and ' . $end->format('jS F Y');
+
+        return view('categories.noCategory', compact('list', 'subTitle'));
+    }
+
+    /**
+     * @param Category $category
+     *
+     * @return $this
+     */
+    public function show(Category $category, CategoryRepositoryInterface $repository)
+    {
+        $hideCategory = true; // used in list.
+        $page         = intval(Input::get('page'));
+        $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);
+
+        return view('categories.show', compact('category', 'journals', 'hideCategory'));
+    }
+
     /**
      * @param CategoryFormRequest         $request
      * @param CategoryRepositoryInterface $repository
@@ -142,6 +166,14 @@ class CategoryController extends Controller
         $category     = $repository->store($categoryData);
 
         Session::flash('success', 'New category "' . $category->name . '" stored!');
+        
+        if (intval(Input::get('create_another')) === 1) {
+            return Redirect::route('categories.create')->withInput();
+        }
+
+        if (intval(Input::get('create_another')) === 1) {
+            return Redirect::route('categories.create');
+        }
 
         return Redirect::route('categories.index');
 
@@ -165,6 +197,10 @@ class CategoryController extends Controller
 
         Session::flash('success', 'Category "' . $category->name . '" updated.');
 
+        if (intval(Input::get('return_to_edit')) === 1) {
+            return Redirect::route('categories.edit', $category->id);
+        }
+
         return Redirect::route('categories.index');
 
     }

app/Http/Controllers/CurrencyController.php

@@ -1,14 +1,16 @@
 <?php namespace FireflyIII\Http\Controllers;
 
+use Cache;
 use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\CurrencyFormRequest;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
+use Input;
 use Preferences;
 use Redirect;
 use Session;
 use View;
-use Cache;
+
 
 /**
  * Class CurrencyController
@@ -145,6 +147,10 @@ class CurrencyController extends Controller
 
         Session::flash('success', 'Currency "' . $currency->name . '" created');
 
+        if (intval(Input::get('create_another')) === 1) {
+            return Redirect::route('currency.create')->withInput();
+        }
+
         return Redirect::route('currency.index');
 
 
@@ -163,7 +169,12 @@ class CurrencyController extends Controller
         $currency->name   = $request->get('name');
         $currency->save();
 
-        Session::flash('success', 'Currency "' . e($currency->namename) . '" updated.');
+        Session::flash('success', 'Currency "' . e($currency->name) . '" updated.');
+
+
+        if (intval(Input::get('return_to_edit')) === 1) {
+            return Redirect::route('currency.edit', $currency->id);
+        }
 
         return Redirect::route('currency.index');
 

app/Http/Controllers/GoogleChartController.php

@@ -3,7 +3,7 @@
 use App;
 use Auth;
 use Carbon\Carbon;
-use Crypt;
+use DB;
 use Exception;
 use FireflyIII\Helpers\Report\ReportQueryInterface;
 use FireflyIII\Http\Requests;
@@ -13,17 +13,19 @@ 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 DB;
 use Steam;
 
 /**
@@ -41,31 +43,20 @@ class GoogleChartController extends Controller
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function accountBalanceChart(Account $account, $view = 'session', GChart $chart)
+    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());
-        $count = $account->transactions()->count();
-
-        if ($view == 'all' && $count > 0) {
-            $first = $account->transactions()->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')->orderBy(
-                'date', 'ASC'
-            )->first(['transaction_journals.date']);
-            $last  = $account->transactions()->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')->orderBy(
-                'date', 'DESC'
-            )->first(['transaction_journals.date']);
-            $start = new Carbon($first->date);
-            $end   = new Carbon($last->date);
-        }
-
+        $start   = Session::get('start', Carbon::now()->startOfMonth());
+        $end     = Session::get('end', Carbon::now()->endOfMonth());
         $current = clone $start;
+        $today = new Carbon;
 
         while ($end >= $current) {
-            $chart->addRow(clone $current, Steam::balance($account, $current), false);
+            $certain = $current < $today;
+            $chart->addRow(clone $current, Steam::balance($account, $current), $certain);
             $current->addDay();
         }
 
@@ -89,9 +80,9 @@ class GoogleChartController extends Controller
         $end       = Session::get('end', Carbon::now()->endOfMonth());
 
         if ($frontPage->data == []) {
-            $accounts = Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*']);
+            $accounts = Auth::user()->accounts()->orderBy('accounts.name', 'ASC')->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*']);
         } else {
-            $accounts = Auth::user()->accounts()->whereIn('id', $frontPage->data)->get(['accounts.*']);
+            $accounts = Auth::user()->accounts()->whereIn('id', $frontPage->data)->orderBy('accounts.name', 'ASC')->get(['accounts.*']);
         }
         $index = 1;
         /** @var Account $account */
@@ -177,27 +168,35 @@ class GoogleChartController extends Controller
         /** @var Budget $budget */
         foreach ($budgets as $budget) {
 
-            /** @var \LimitRepetition $repetition */
-            $repetition = LimitRepetition::
+            /** @var Collection $repetitions */
+            $repetitions = 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 (is_null($repetition)) { // use the session start and end for our search query
-                $searchStart = $start;
-                $searchEnd   = $end;
-                $limit       = 0; // the limit is zero:
+                                          ->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 {
-                // use the limit's start and end for our search query
-                $searchStart = $repetition->startdate;
-                $searchEnd   = $repetition->enddate;
-                $limit       = floatval($repetition->amount); // the limit is the repetitions limit:
+                // 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);
+                    }
+                }
             }
 
-            $expenses = floatval($budget->transactionjournals()->before($searchEnd)->after($searchStart)->lessThan(0)->sum('amount')) * -1;
-            if ($expenses > 0) {
-                $chart->addRow($budget->name, $limit, $expenses);
-            }
+
         }
 
         $noBudgetSet = Auth::user()
@@ -209,7 +208,8 @@ class GoogleChartController extends Controller
                                    ->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'));
+                                   ->where('transaction_journals.date', '<=', $end->format('Y-m-d 00:00:00'))
+                                   ->whereNotNull('budget_transaction_journal.budget_id');
                            }
                            )
                            ->before($end)
@@ -237,7 +237,9 @@ class GoogleChartController extends Controller
         // query!
         $start = Session::get('start', Carbon::now()->startOfMonth());
         $end   = Session::get('end', Carbon::now()->endOfMonth());
-        $set   = TransactionJournal::leftJoin(
+        $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);
@@ -249,6 +251,7 @@ class GoogleChartController extends Controller
                                    ->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')
@@ -315,49 +318,45 @@ class GoogleChartController extends Controller
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function billsOverview(GChart $chart)
+    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());
 
-        $chart->addColumn('Name', 'string');
-        $chart->addColumn('Amount', 'number');
+        $bills = Auth::user()->bills()->where('active', 1)->get();
 
-        $set = Bill::
-        leftJoin(
-            'transaction_journals', function (JoinClause $join) use ($start, $end) {
-            $join->on('bills.id', '=', 'transaction_journals.bill_id')
-                 ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
-                 ->where('transaction_journals.date', '<=', $end->format('Y-m-d'));
-        }
-        )
-                   ->leftJoin(
-                       'transactions', function (JoinClause $join) {
-                       $join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('transactions.amount', '>', 0);
-                   }
-                   )
-                   ->where('active', 1)
-                   ->groupBy('bills.id')
-                   ->get(
-                       ['bills.id', 'bills.name', 'transaction_journals.description',
-                        'transaction_journals.encrypted',
-                        'transaction_journals.id as journalId',
-                        \DB::Raw('SUM(`bills`.`amount_min` + `bills`.`amount_max`) / 2 as `averageAmount`'),
-                        'transactions.amount AS actualAmount']
-                   );
+        /** @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;
+                }
 
-        foreach ($set as $entry) {
-            if (intval($entry->journalId) == 0) {
-                $unpaid['items'][] = $entry->name;
-                $unpaid['amount'] += floatval($entry->averageAmount);
-            } else {
-                $description     = intval($entry->encrypted) == 1 ? Crypt::decrypt($entry->description) : $entry->description;
-                $paid['items'][] = $description;
-                $paid['amount'] += floatval($entry->actualAmount);
             }
         }
+
         $chart->addRow('Unpaid: ' . join(', ', $unpaid['items']), $unpaid['amount']);
         $chart->addRow('Paid: ' . join(', ', $paid['items']), $paid['amount']);
         $chart->generate();
@@ -463,36 +462,32 @@ class GoogleChartController extends Controller
 
     /**
      *
-     * @param Category  $category
-     * @param           $year
+     * @param Category $category
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function categoriesAndSpending(Category $category, $year, GChart $chart)
+    public function categoryOverviewChart(Category $category, GChart $chart)
     {
-        try {
-            new Carbon('01-01-' . $year);
-        } catch (Exception $e) {
-            return view('error')->with('message', 'Invalid year.');
-        }
+        // 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('Month', 'date');
-        $chart->addColumn('Budgeted', 'number');
+        $chart->addColumn('Period', 'date');
         $chart->addColumn('Spent', 'number');
 
-        $start = new Carbon('01-01-' . $year);
-        $end   = clone $start;
-        $end->endOfYear();
+        $end = new Carbon;
         while ($start <= $end) {
 
-            $currentEnd = clone $start;
-            $currentEnd->endOfMonth();
-            $spent    = floatval($category->transactionjournals()->before($end)->after($start)->lessThan(0)->sum('amount')) * -1;
-            $budgeted = null;
+            $currentEnd = Navigation::endOfPeriod($start, $range->data);
+            $spent      = floatval($category->transactionjournals()->before($currentEnd)->after($start)->lessThan(0)->sum('amount')) * -1;
+            $chart->addRow(clone $start, $spent);
 
-            $chart->addRow(clone $start, $budgeted, $spent);
-
-            $start->addMonth();
+            $start = Navigation::addPeriod($start, $range->data, 0);
         }
 
 
@@ -503,6 +498,35 @@ class GoogleChartController extends Controller
 
     }
 
+    /**
+     *
+     * @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
      *
@@ -513,10 +537,13 @@ class GoogleChartController extends Controller
         $chart->addColumn('Date', 'date');
         $chart->addColumn('Balance', 'number');
 
-        $set = \DB::table('piggy_bank_events')->where('piggy_bank_id', $piggyBank->id)->groupBy('date')->get(['date', DB::Raw('SUM(`amount`) AS `sum`')]);
+        /** @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) {
-            $chart->addRow(new Carbon($entry->date), floatval($entry->sum));
+            $sum += floatval($entry->sum);
+            $chart->addRow(new Carbon($entry->date), $sum);
         }
 
         $chart->generate();
@@ -542,6 +569,9 @@ class GoogleChartController extends Controller
         $chart->addColumn('Income', 'number');
         $chart->addColumn('Expenses', 'number');
 
+        $pref              = Preferences::get('showSharedReports', false);
+        $showSharedReports = $pref->data;
+
         // get report query interface.
 
         $end = clone $start;
@@ -550,14 +580,14 @@ class GoogleChartController extends Controller
             $currentEnd = clone $start;
             $currentEnd->endOfMonth();
             // total income:
-            $income    = $query->incomeByPeriod($start, $currentEnd);
+            $income    = $query->incomeByPeriod($start, $currentEnd, $showSharedReports);
             $incomeSum = 0;
             foreach ($income as $entry) {
                 $incomeSum += floatval($entry->amount);
             }
 
             // total expenses:
-            $expense    = $query->journalsByExpenseAccount($start, $currentEnd);
+            $expense    = $query->journalsByExpenseAccount($start, $currentEnd, $showSharedReports);
             $expenseSum = 0;
             foreach ($expense as $entry) {
                 $expenseSum += floatval($entry->amount);
@@ -591,6 +621,9 @@ class GoogleChartController extends Controller
         $chart->addColumn('Income', 'number');
         $chart->addColumn('Expenses', 'number');
 
+        $pref              = Preferences::get('showSharedReports', false);
+        $showSharedReports = $pref->data;
+
         $income  = 0;
         $expense = 0;
         $count   = 0;
@@ -601,14 +634,14 @@ class GoogleChartController extends Controller
             $currentEnd = clone $start;
             $currentEnd->endOfMonth();
             // total income:
-            $incomeResult = $query->incomeByPeriod($start, $currentEnd);
+            $incomeResult = $query->incomeByPeriod($start, $currentEnd, $showSharedReports);
             $incomeSum    = 0;
             foreach ($incomeResult as $entry) {
                 $incomeSum += floatval($entry->amount);
             }
 
             // total expenses:
-            $expenseResult = $query->journalsByExpenseAccount($start, $currentEnd);
+            $expenseResult = $query->journalsByExpenseAccount($start, $currentEnd, $showSharedReports);
             $expenseSum    = 0;
             foreach ($expenseResult as $entry) {
                 $expenseSum += floatval($entry->amount);

app/Http/Controllers/HelpController.php

@@ -1,21 +1,19 @@
 <?php namespace FireflyIII\Http\Controllers;
 
+use Cache;
 use ErrorException;
 use FireflyIII\Http\Requests;
-use FireflyIII\Http\Controllers\Controller;
-
-use Illuminate\Http\Request;
 use League\CommonMark\CommonMarkConverter;
-use Route;
 use Response;
-use Cache;
+use Route;
 
 /**
  * Class HelpController
  *
  * @package FireflyIII\Http\Controllers
  */
-class HelpController extends Controller {
+class HelpController extends Controller
+{
 
     /**
      * @param $route
@@ -83,7 +81,7 @@ class HelpController extends Controller {
         if (strlen(trim($content['text'])) == 0) {
             $content['text'] = '<p>There is no help for this route.</p>';
         }
-        $converter = new CommonMarkConverter();
+        $converter       = new CommonMarkConverter();
         $content['text'] = $converter->convertToHtml($content['text']);
 
         return $content;

app/Http/Controllers/HomeController.php

@@ -1,13 +1,10 @@
 <?php namespace FireflyIII\Http\Controllers;
 
-use Auth;
-use Cache;
 use Carbon\Carbon;
-use Navigation;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use Input;
 use Preferences;
-use Redirect;
 use Session;
-use URL;
 
 /**
  * Class HomeController
@@ -17,29 +14,28 @@ use URL;
 class HomeController extends Controller
 {
 
-    /**
-     *
-     */
-    public function __construct()
+    public function dateRange()
     {
-    }
+        $start = new Carbon(Input::get('start'));
+        $end   = new Carbon(Input::get('end'));
 
-    /**
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function flush()
-    {
-        Cache::flush();
+        $diff = $start->diffInDays($end);
 
-        return Redirect::route('index');
+        if ($diff > 50) {
+            Session::flash('warning', $diff . ' days of data may take a while to load.');
+        }
+
+        Session::put('start', $start);
+        Session::put('end', $end);
     }
 
     /**
      * @return \Illuminate\View\View
      */
-    public function index()
+    public function index(AccountRepositoryInterface $repository)
     {
-        $count         = Auth::user()->accounts()->accountTypeIn(['Asset account', 'Default account'])->count();
+
+        $count         = $repository->countAssetAccounts();
         $title         = 'Firefly';
         $subTitle      = 'What\'s playing?';
         $mainTitleIcon = 'fa-fire';
@@ -47,78 +43,18 @@ class HomeController extends Controller
         $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()->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*']);
-        } else {
-            $accounts = Auth::user()->accounts()->whereIn('id', $frontPage->data)->get(['accounts.*']);
-        }
+        $accounts      = $repository->getFrontpageAccounts($frontPage);
+        $savings       = $repository->getSavingsAccounts();
 
         foreach ($accounts as $account) {
-            $set = Auth::user()
-                       ->transactionjournals()
-                       ->with(['transactions', 'transactioncurrency', 'transactiontype'])
-                       ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                       ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')->where('accounts.id', $account->id)
-                       ->where('date', '>=', $start->format('Y-m-d'))
-                       ->where('date', '<=', $end->format('Y-m-d'))
-                       ->orderBy('transaction_journals.date', 'DESC')
-                       ->orderBy('transaction_journals.id', 'DESC')
-                       ->take(10)
-                       ->get(['transaction_journals.*']);
+            $set = $repository->getFrontpageTransactions($account, $start, $end);
             if (count($set) > 0) {
                 $transactions[] = [$set, $account];
             }
         }
 
-        //        var_dump($transactions);
-
-        return view('index', compact('count', 'title', 'subTitle', 'mainTitleIcon', 'transactions'));
+        return view('index', compact('count', 'title', 'savings', 'subTitle', 'mainTitleIcon', 'transactions'));
     }
 
-    /**
-     * @param string $range
-     *
-     * @return mixed
-     */
-    public function rangeJump($range)
-    {
-
-        $valid = ['1D', '1W', '1M', '3M', '6M', '1Y',];
-
-        if (in_array($range, $valid)) {
-            Preferences::set('viewRange', $range);
-            Session::forget('range');
-        }
-
-        return Redirect::to(URL::previous());
-    }
-
-    /**
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function sessionNext()
-    {
-        $range = Session::get('range');
-        $start = Session::get('start');
-
-        Session::put('start', Navigation::jumpToNext($range, clone $start));
-
-        return Redirect::to(URL::previous());
-
-    }
-
-    /**
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function sessionPrev()
-    {
-        $range = Session::get('range');
-        $start = Session::get('start');
-
-        Session::put('start', Navigation::jumpToPrevious($range, clone $start));
-
-        return Redirect::to(URL::previous());
-    }
 
 }

app/Http/Controllers/JsonController.php

@@ -1,19 +1,112 @@
 <?php namespace FireflyIII\Http\Controllers;
 
-use FireflyIII\Http\Requests;
-use FireflyIII\Http\Controllers\Controller;
-
-use Illuminate\Http\Request;
-use Response;
+use Amount;
 use Auth;
-
+use DB;
+use FireflyIII\Http\Requests;
+use FireflyIII\Models\Bill;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use Input;
+use Preferences;
+use Response;
+use Session;
+use Config;
+use FireflyIII\Models\TransactionType;
 /**
  * Class JsonController
  *
  * @package FireflyIII\Http\Controllers
  */
-class JsonController extends Controller {
+class JsonController extends Controller
+{
 
+    /**
+     *
+     */
+    public function box(BillRepositoryInterface $repository)
+    {
+        $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);
+                }
+
+                break;
+            case 'bills-unpaid':
+                $box   = 'bills-unpaid';
+                $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) {
+                            $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;
+                        }
+
+                    }
+                }
+        }
+
+        return Response::json(['box' => $box, 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]);
+    }
 
     /**
      * Returns a list of categories.
@@ -22,15 +115,13 @@ class JsonController extends Controller {
      */
     public function categories()
     {
-        $list       = Auth::user()->categories()->orderBy('name','ASC')->get();
-        $return     = [];
+        $list   = Auth::user()->categories()->orderBy('name', 'ASC')->get();
+        $return = [];
         foreach ($list as $entry) {
             $return[] = $entry->name;
         }
 
         return Response::json($return);
-
-
     }
 
     /**
@@ -40,8 +131,8 @@ class JsonController extends Controller {
      */
     public function expenseAccounts()
     {
-        $list     = Auth::user()->accounts()->accountTypeIn(['Expense account', 'Beneficiary account'])->get();
-        $return   = [];
+        $list   = Auth::user()->accounts()->orderBy('accounts.name', 'ASC')->accountTypeIn(['Expense account', 'Beneficiary account'])->get();
+        $return = [];
         foreach ($list as $entry) {
             $return[] = $entry->name;
         }
@@ -55,8 +146,8 @@ class JsonController extends Controller {
      */
     public function revenueAccounts()
     {
-        $list     = Auth::user()->accounts()->accountTypeIn(['Revenue account'])->get();
-        $return   = [];
+        $list   = Auth::user()->accounts()->accountTypeIn(['Revenue account'])->orderBy('accounts.name', 'ASC')->get(['accounts.*']);
+        $return = [];
         foreach ($list as $entry) {
             $return[] = $entry->name;
         }
@@ -65,4 +156,45 @@ class JsonController extends Controller {
 
     }
 
+    /**
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function setSharedReports()
+    {
+        $pref = Preferences::get('showSharedReports', false);
+        $new  = !$pref->data;
+        Preferences::set('showSharedReports', $new);
+
+
+        return Response::json(['value' => $new]);
+    }
+
+    /**
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function showSharedReports()
+    {
+        $pref = Preferences::get('showSharedReports', false);
+
+        return Response::json(['value' => $pref->data]);
+    }
+
+    public function transactionJournals($what)
+    {
+        $descriptions = [];
+            $dbType   = TransactionType::whereType($what)->first();
+            $journals = Auth::user()->transactionjournals()->where('transaction_type_id', $dbType->id)
+                ->orderBy('id','DESC')->take(50)
+                ->get();
+            foreach($journals as $j) {
+                $descriptions[] = $j->description;
+            }
+
+        $descriptions = array_unique($descriptions);
+        sort($descriptions);
+        return Response::json($descriptions);
+
+
+    }
+
 }

app/Http/Controllers/PiggyBankController.php

@@ -9,6 +9,7 @@ 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;
@@ -62,7 +63,9 @@ class PiggyBankController extends Controller
     {
 
         $periods      = Config::get('firefly.piggy_bank_periods');
-        $accounts     = ExpandedForm::makeSelectList(Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*']));
+        $accounts     = ExpandedForm::makeSelectList(
+            Auth::user()->accounts()->orderBy('accounts.name', 'ASC')->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*'])
+        );
         $subTitle     = 'Create new piggy bank';
         $subTitleIcon = 'fa-plus';
 
@@ -78,7 +81,7 @@ class PiggyBankController extends Controller
     {
         $subTitle = 'Delete "' . e($piggyBank->name) . '"';
 
-        return view('piggy_banks.delete', compact('piggyBank', 'subTitle'));
+        return view('piggy-banks.delete', compact('piggyBank', 'subTitle'));
     }
 
     /**
@@ -90,9 +93,9 @@ class PiggyBankController extends Controller
     {
 
         Session::flash('success', 'Piggy bank "' . e($piggyBank->name) . '" deleted.');
-        $this->_repository->destroy($piggyBank);
+        $piggyBank->delete();
 
-        return Redirect::route('piggy_banks.index');
+        return Redirect::route('piggy-banks.index');
     }
 
     /**
@@ -106,7 +109,9 @@ class PiggyBankController extends Controller
     {
 
         $periods      = Config::get('firefly.piggy_bank_periods');
-        $accounts     = ExpandedForm::makeSelectList(Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*']));
+        $accounts     = ExpandedForm::makeSelectList(
+            Auth::user()->accounts()->orderBy('accounts.name', 'ASC')->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*'])
+        );
         $subTitle     = 'Edit piggy bank "' . e($piggyBank->name) . '"';
         $subTitleIcon = 'fa-pencil';
 
@@ -124,21 +129,20 @@ class PiggyBankController extends Controller
                       'targetamount' => $piggyBank->targetamount,
                       'targetdate'   => $targetDate,
                       'reminder'     => $piggyBank->reminder,
-                      'remind_me'    => intval($piggyBank->remind_me) == 1 || !is_null($piggyBank->reminder) ? true : false
+                      'remind_me'    => intval($piggyBank->remind_me) == 1 && !is_null($piggyBank->reminder) ? true : false
         ];
         Session::flash('preFilled', $preFilled);
 
         return view('piggy-banks.edit', compact('subTitle', 'subTitleIcon', 'piggyBank', 'accounts', 'periods', 'preFilled'));
     }
 
-
     /**
      * @return $this
      */
     public function index(AccountRepositoryInterface $repository)
     {
         /** @var Collection $piggyBanks */
-        $piggyBanks = Auth::user()->piggyBanks()->where('repeats', 0)->get();
+        $piggyBanks = Auth::user()->piggyBanks()->where('repeats', 0)->orderBy('order', 'ASC')->get();
 
         $accounts = [];
         /** @var PiggyBank $piggyBank */
@@ -170,6 +174,22 @@ class PiggyBankController extends Controller
         return view('piggy-banks.index', compact('piggyBanks', 'accounts'));
     }
 
+    /**
+     * Allow user to order piggy banks.
+     */
+    public function order(PiggyBankRepositoryInterface $repository)
+    {
+        $data = Input::get('order');
+
+        // set all users piggy banks to zero:
+        $repository->reset();
+
+        if (is_array($data)) {
+            foreach ($data as $order => $id) {
+                $repository->setOrder(intval($id), (intval($order) + 1));
+            }
+        }
+    }
 
     /**
      * POST add money to piggy bank
@@ -191,6 +211,9 @@ 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!
              */
@@ -220,6 +243,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!
              */
@@ -266,7 +291,10 @@ class PiggyBankController extends Controller
     }
 
     /**
+     * @param PiggyBankFormRequest         $request
+     * @param PiggyBankRepositoryInterface $repository
      *
+     * @return $this|\Illuminate\Http\RedirectResponse
      */
     public function store(PiggyBankFormRequest $request, PiggyBankRepositoryInterface $repository)
     {
@@ -278,12 +306,18 @@ class PiggyBankController extends Controller
             'targetamount' => floatval($request->get('targetamount')),
             'targetdate'   => strlen($request->get('targetdate')) > 0 ? new Carbon($request->get('targetdate')) : null,
             'reminder'     => $request->get('reminder'),
+            'remind_me'    => $request->get('remind_me'),
         ];
 
         $piggyBank = $repository->store($piggyBankData);
 
         Session::flash('success', 'Stored piggy bank "' . e($piggyBank->name) . '".');
 
+        if (intval(Input::get('create_another')) === 1) {
+            return Redirect::route('piggy-banks.create')->withInput();
+        }
+
+
         return Redirect::route('piggy-banks.index');
     }
 
@@ -299,21 +333,28 @@ class PiggyBankController extends Controller
         $piggyBankData = [
             'repeats'      => false,
             'name'         => $request->get('name'),
+            'startdate'    => is_null($piggyBank->startdate) ? $piggyBank->created_at : $piggyBank->startdate,
             'account_id'   => intval($request->get('account_id')),
             'targetamount' => floatval($request->get('targetamount')),
             'targetdate'   => strlen($request->get('targetdate')) > 0 ? new Carbon($request->get('targetdate')) : null,
             'reminder'     => $request->get('reminder'),
+            'remind_me'    => $request->get('remind_me')
         ];
 
+
         $piggyBank = $repository->update($piggyBank, $piggyBankData);
 
         Session::flash('success', 'Updated piggy bank "' . e($piggyBank->name) . '".');
 
+        if (intval(Input::get('return_to_edit')) === 1) {
+            return Redirect::route('piggy-banks.edit', $piggyBank->id);
+        }
+
+
         return Redirect::route('piggy-banks.index');
 
 
     }
 
 
-
 }

app/Http/Controllers/PreferencesController.php

@@ -1,21 +1,20 @@
 <?php namespace FireflyIII\Http\Controllers;
 
-use FireflyIII\Http\Requests;
-use FireflyIII\Http\Controllers\Controller;
-
-use Illuminate\Http\Request;
-use View;
 use Auth;
-use Preferences;
+use FireflyIII\Http\Requests;
 use Input;
-use Session;
+use Preferences;
 use Redirect;
+use Session;
+use View;
+
 /**
  * Class PreferencesController
  *
  * @package FireflyIII\Http\Controllers
  */
-class PreferencesController extends Controller {
+class PreferencesController extends Controller
+{
 
     /**
      *
@@ -32,7 +31,7 @@ class PreferencesController extends Controller {
      */
     public function index()
     {
-        $accounts       = Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*']);
+        $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', []);

app/Http/Controllers/RelatedController.php

@@ -1,15 +1,16 @@
 <?php namespace FireflyIII\Http\Controllers;
 
-use Amount;
 use Auth;
 use FireflyIII\Http\Requests;
 use FireflyIII\Models\Transaction;
-use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionGroup;
+use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use Illuminate\Support\Collection;
-use Response;
 use Input;
+use Redirect;
+use Response;
+use URL;
 
 /**
  * Class RelatedController
@@ -37,11 +38,12 @@ class RelatedController extends Controller
                 }
             }
         }
-        $unique = array_unique($ids);
+        $unique   = array_unique($ids);
+        $journals = new Collection;
         if (count($unique) > 0) {
 
-            $set = Auth::user()->transactionjournals()->whereIn('id', $unique)->get();
-            $set->each(
+            $journals = Auth::user()->transactionjournals()->whereIn('id', $unique)->get();
+            $journals->each(
                 function (TransactionJournal $journal) {
                     /** @var Transaction $t */
                     foreach ($journal->transactions()->get() as $t) {
@@ -52,11 +54,38 @@ class RelatedController extends Controller
 
                 }
             );
-
-            return Response::json($set->toArray());
-        } else {
-            return Response::json((new Collection)->toArray());
         }
+        $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());
     }
 
     /**
@@ -137,20 +166,12 @@ class RelatedController extends Controller
     {
 
         $search = e(trim(Input::get('searchValue')));
+        $parent = $journal;
 
-        $result = $repository->searchRelated($search, $journal);
-        $result->each(
-            function (TransactionJournal $journal) {
-                /** @var Transaction $t */
-                foreach ($journal->transactions()->get() as $t) {
-                    if ($t->amount > 0) {
-                        $journal->amount = $t->amount;
-                    }
-                }
-            }
-        );
+        $journals = $repository->searchRelated($search, $journal);
+
+        return view('related.searchResult', compact('journals', 'search', 'parent'));
 
-        return Response::json($result->toArray());
     }
 
 }

app/Http/Controllers/ReminderController.php

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

app/Http/Controllers/RepeatedExpenseController.php

@@ -1,199 +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;
-
-/**
- * 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()->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()->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'));
-    }
-
-    /**
-     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
-     */
-    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_times'    => intval($request->get('rep_times')),
-        ];
-
-        $piggyBank = $repository->store($piggyBankData);
-
-        Session::flash('success', 'Stored repeated expense "' . e($piggyBank->name) . '".');
-
-        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);
-
-        Session::flash('success', 'Updated repeated expense "' . e($piggyBank->name) . '".');
-
-        return Redirect::route('repeated.index');
-
-    }
-
-}

app/Http/Controllers/ReportController.php

@@ -7,9 +7,13 @@ use FireflyIII\Helpers\Report\ReportHelperInterface;
 use FireflyIII\Helpers\Report\ReportQueryInterface;
 use FireflyIII\Http\Requests;
 use FireflyIII\Models\Account;
+use FireflyIII\Models\TransactionJournal;
 use Illuminate\Database\Query\JoinClause;
+use Preferences;
+use Session;
 use Steam;
 use View;
+use FireflyIII\Models\Preference;
 
 /**
  * Class ReportController
@@ -49,24 +53,33 @@ class ReportController extends Controller
         $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);
+        $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->balancedTransactionsList($account, $start, $end);
+                $balancedAmount = $query->balancedTransactionsSum($account, $start, $end);
                 $array          = [];
+                $hide           = true;
                 foreach ($budgets as $budget) {
                     $id         = intval($budget->id);
                     $data       = $budget->toArray();
                     $array[$id] = $data;
+                    if (floatval($data['amount']) != 0) {
+                        $hide = false;
+                    }
                 }
-
+                $account->hide              = $hide;
                 $account->budgetInformation = $array;
                 $account->balancedAmount    = $balancedAmount;
 
@@ -87,24 +100,27 @@ class ReportController extends Controller
                                     )
                                     ->get(['budgets.*', 'budget_limits.amount as amount']);
         $budgets              = Steam::makeArray($set);
-        $amountSet            = $query->journalsByBudget($start, $end);
+        $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:
-        $transfers = $query->sharedExpenses($start, $end);
-        foreach ($transfers as $transfer) {
-            $budgets[0]['spent'] += floatval($transfer->amount) * -1;
+        // 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', 'subTitleIcon', 'date', 'accounts', 'budgets', 'dayEarly'));
+        return view('reports.budget', compact('subTitle', 'year', 'month', 'subTitleIcon', 'date', 'accounts', 'budgets', 'dayEarly'));
 
     }
 
@@ -115,7 +131,7 @@ class ReportController extends Controller
      */
     public function index(ReportHelperInterface $helper)
     {
-        $start         = $helper->firstDate();
+        $start         = Session::get('first');
         $months        = $helper->listOfMonths($start);
         $years         = $helper->listOfYears($start);
         $title         = 'Reports';
@@ -124,6 +140,87 @@ class ReportController extends Controller
         return view('reports.index', compact('years', 'months', 'title', 'mainTitleIcon'));
     }
 
+    /**
+     * @param Account $account
+     * @param string  $year
+     * @param string  $month
+     *
+     * @return \Illuminate\View\View
+     */
+    public function modalBalancedTransfers(Account $account, $year = '2014', $month = '1', 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
@@ -142,6 +239,9 @@ class ReportController extends Controller
         $subTitleIcon = 'fa-calendar';
         $displaySum   = true; // to show sums in report.
 
+        $pref              = Preferences::get('showSharedReports', false);
+        $showSharedReports = $pref->data;
+
 
         /**
          *
@@ -157,14 +257,14 @@ class ReportController extends Controller
         /**
          * Start getIncomeForMonth DONE
          */
-        $income = $query->incomeByPeriod($start, $end);
+        $income = $query->incomeByPeriod($start, $end, $showSharedReports);
         /**
          * End getIncomeForMonth DONE
          */
         /**
          * Start getExpenseGroupedForMonth DONE
          */
-        $set      = $query->journalsByExpenseAccount($start, $end);
+        $set      = $query->journalsByExpenseAccount($start, $end, $showSharedReports);
         $expenses = Steam::makeArray($set);
         $expenses = Steam::sortArray($expenses);
         $expenses = Steam::limitArray($expenses, 10);
@@ -182,7 +282,7 @@ class ReportController extends Controller
                                     )
                                     ->get(['budgets.*', 'budget_limits.amount as amount']);
         $budgets              = Steam::makeArray($set);
-        $amountSet            = $query->journalsByBudget($start, $end);
+        $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;
@@ -190,9 +290,11 @@ class ReportController extends Controller
         $budgets[0]['name']   = 'No budget';
 
         // find transactions to shared expense accounts, which are without a budget by default:
-        $transfers = $query->sharedExpenses($start, $end);
-        foreach ($transfers as $transfer) {
-            $budgets[0]['spent'] += floatval($transfer->amount) * -1;
+        if ($showSharedReports === false) {
+            $transfers = $query->sharedExpenses($start, $end);
+            foreach ($transfers as $transfer) {
+                $budgets[0]['spent'] += floatval($transfer->amount) * -1;
+            }
         }
 
         /**
@@ -206,9 +308,13 @@ class ReportController extends Controller
         $categories = Steam::makeArray($result);
 
         // all transfers
-        $result    = $query->sharedExpensesByCategory($start, $end);
-        $transfers = Steam::makeArray($result);
-        $merged    = Steam::mergeArrays($categories, $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);
@@ -221,7 +327,7 @@ class ReportController extends Controller
         /**
          * Start getAccountsForMonth
          */
-        $list     = $query->accountList();
+        $list     = $query->accountList($showSharedReports);
         $accounts = [];
         /** @var Account $account */
         foreach ($list as $account) {
@@ -262,16 +368,19 @@ class ReportController extends Controller
         } catch (Exception $e) {
             return view('error')->with('message', 'Invalid date.');
         }
-        $date = new Carbon('01-01-' . $year);
-        $end  = clone $date;
+        /** @var Preference $pref */
+        $pref              = Preferences::get('showSharedReports', false);
+        $showSharedReports = $pref->data;
+        $date              = new Carbon('01-01-' . $year);
+        $end               = clone $date;
         $end->endOfYear();
         $title           = 'Reports';
         $subTitle        = $year;
         $subTitleIcon    = 'fa-bar-chart';
         $mainTitleIcon   = 'fa-line-chart';
-        $balances        = $helper->yearBalanceReport($date);
-        $groupedIncomes  = $query->journalsByRevenueAccount($date, $end);
-        $groupedExpenses = $query->journalsByExpenseAccount($date, $end);
+        $balances        = $helper->yearBalanceReport($date, $showSharedReports);
+        $groupedIncomes  = $query->journalsByRevenueAccount($date, $end, $showSharedReports);
+        $groupedExpenses = $query->journalsByExpenseAccount($date, $end, $showSharedReports);
 
         //$groupedExpenses = $helper-> expensesGroupedByAccount($date, $end, 15);
 

app/Http/Controllers/SearchController.php

@@ -1,10 +1,7 @@
 <?php namespace FireflyIII\Http\Controllers;
 
 use FireflyIII\Http\Requests;
-use FireflyIII\Http\Controllers\Controller;
-
 use FireflyIII\Support\Search\SearchInterface;
-use Illuminate\Http\Request;
 use Input;
 
 /**
@@ -12,7 +9,8 @@ use Input;
  *
  * @package FireflyIII\Http\Controllers
  */
-class SearchController extends Controller {
+class SearchController extends Controller
+{
     /**
      * Results always come in the form of an array [results, count, fullCount]
      */

app/Http/Controllers/TransactionController.php

@@ -3,18 +3,19 @@
 use Auth;
 use Carbon\Carbon;
 use ExpandedForm;
+use FireflyIII\Events\JournalCreated;
+use FireflyIII\Events\JournalSaved;
 use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\JournalFormRequest;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use Illuminate\Pagination\LengthAwarePaginator;
-use Illuminate\Support\Collection;
 use Input;
 use Redirect;
 use Session;
 use View;
-
+use Response;
 
 /**
  * Class TransactionController
@@ -41,7 +42,9 @@ class TransactionController extends Controller
     public function create($what = 'deposit')
     {
         $accounts   = ExpandedForm::makeSelectList(
-            Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->where('active', 1)->orderBy('name', 'DESC')->get(['accounts.*'])
+            Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->orderBy('accounts.name', 'ASC')->orderBy('name', 'ASC')->where(
+                'active', 1
+            )->orderBy('name', 'DESC')->get(['accounts.*'])
         );
         $budgets    = ExpandedForm::makeSelectList(Auth::user()->budgets()->get());
         $budgets[0] = '(no budget)';
@@ -118,7 +121,9 @@ class TransactionController extends Controller
     {
         $what         = strtolower($journal->transactiontype->type);
         $accounts     = ExpandedForm::makeSelectList(
-            Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->where('active', 1)->orderBy('name', 'DESC')->get(['accounts.*'])
+            Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->orderBy('accounts.name', 'ASC')->where('active', 1)->orderBy(
+                'name', 'DESC'
+            )->get(['accounts.*'])
         );
         $budgets      = ExpandedForm::makeSelectList(Auth::user()->budgets()->get());
         $budgets[0]   = '(no budget)';
@@ -143,7 +148,7 @@ class TransactionController extends Controller
         }
 
         if ($journal->piggyBankEvents()->count() > 0) {
-            $preFilled['piggy_bank_id'] = $journal->piggyBankEvents()->first()->piggy_bank_id;
+            $preFilled['piggy_bank_id'] = $journal->piggyBankEvents()->orderBy('date', 'DESC')->first()->piggy_bank_id;
         }
 
         $preFilled['amount'] = 0;
@@ -175,29 +180,33 @@ class TransactionController extends Controller
             case 'withdrawal':
                 $subTitleIcon = 'fa-long-arrow-left';
                 $subTitle     = 'Expenses';
-                //$journals     = $this->_repository->getWithdrawalsPaginated(50);
-                $types = ['Withdrawal'];
+                $types        = ['Withdrawal'];
                 break;
             case 'revenue':
             case 'deposit':
                 $subTitleIcon = 'fa-long-arrow-right';
                 $subTitle     = 'Revenue, income and deposits';
-                //                $journals     = $this->_repository->getDepositsPaginated(50);
-                $types = ['Deposit'];
+                $types        = ['Deposit'];
                 break;
             case 'transfer':
             case 'transfers':
-                $subTitleIcon = 'fa-arrows-h';
+                $subTitleIcon = 'fa-exchange';
                 $subTitle     = 'Transfers';
-                //$journals     = $this->_repository->getTransfersPaginated(50);
-                $types = ['Transfer'];
+                $types        = ['Transfer'];
                 break;
         }
 
         $page   = intval(\Input::get('page'));
         $offset = $page > 0 ? ($page - 1) * 50 : 0;
 
-        $set      = Auth::user()->transactionJournals()->transactionTypes($types)->withRelevantData()->take(50)->offset($offset)->orderBy('date', 'DESC')->get(
+        $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();
@@ -208,6 +217,27 @@ class TransactionController extends Controller
 
     }
 
+    /**
+     * Reorder transactions (which all must have the same date)
+     */
+    public function reorder()
+    {
+        $ids = Input::get('items');
+        if (count($ids) > 0) {
+            $order = 0;
+            foreach ($ids as $id) {
+                $journal = Auth::user()->transactionjournals()->where('id', $id)->where('date', Input::get('date'))->first();
+                if($journal) {
+                    $journal->order = $order;
+                    $order++;
+                    $journal->save();
+                }
+            }
+        }
+        return Response::json(true);
+
+    }
+
     /**
      * @param TransactionJournal $journal
      *
@@ -220,32 +250,30 @@ class TransactionController extends Controller
                 $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.created_at', '<=', $journal->created_at->format('Y-m-d H:i:s')
-                    )->where('transaction_journals.id', '!=', $journal->id)->sum('transactions.amount')
+                    )
+                        ->where('transaction_journals.date', '<=', $journal->date->format('Y-m-d'))
+                        ->where('transaction_journals.order','>=',$journal->order)
+                        ->where('transaction_journals.id', '!=', $journal->id)
+                        ->sum('transactions.amount')
                 );
                 $t->after  = $t->before + $t->amount;
             }
         );
-        $members = new Collection;
-        /** @var TransactionGroup $group */
-        foreach ($journal->transactiongroups()->get() as $group) {
-            /** @var TransactionJournal $loopJournal */
-            foreach ($group->transactionjournals()->get() as $loopJournal) {
-                if ($loopJournal->id != $journal->id) {
-                    $members->push($loopJournal);
-                }
-            }
-        }
 
-        return view('transactions.show', compact('journal', 'members'))->with(
+
+        return view('transactions.show', compact('journal'))->with(
             'subTitle', e($journal->transactiontype->type) . ' "' . e($journal->description) . '"'
         );
     }
 
+    /**
+     * @param JournalFormRequest         $request
+     * @param JournalRepositoryInterface $repository
+     *
+     * @return $this|\Illuminate\Http\RedirectResponse
+     */
     public function store(JournalFormRequest $request, JournalRepositoryInterface $repository)
     {
-
         $journalData = [
             'what'               => $request->get('what'),
             'description'        => $request->get('description'),
@@ -264,8 +292,21 @@ class TransactionController extends Controller
 
         $journal = $repository->store($journalData);
 
+        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();
+        }
+
         Session::flash('success', 'New transaction "' . $journal->description . '" stored!');
 
+        if (intval(Input::get('create_another')) === 1) {
+            return Redirect::route('transactions.create', $request->input('what'))->withInput();
+        }
+
         return Redirect::route('transactions.index', $request->input('what'));
 
     }
@@ -276,11 +317,11 @@ class TransactionController extends Controller
      * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
      *
      * @return $this
-     * @throws FireflyException
      */
     public function update(TransactionJournal $journal, JournalFormRequest $request, JournalRepositoryInterface $repository)
     {
 
+
         $journalData = [
             'what'               => $request->get('what'),
             'description'        => $request->get('description'),
@@ -298,8 +339,17 @@ class TransactionController extends Controller
         ];
 
         $repository->update($journal, $journalData);
+
+        event(new JournalSaved($journal));
+        // update, get events by date and sort DESC
+
         Session::flash('success', 'Transaction "' . e($journalData['description']) . '" updated.');
 
+        if (intval(Input::get('return_to_edit')) === 1) {
+            return Redirect::route('transactions.edit', $journal->id);
+        }
+
+
         return Redirect::route('transactions.index', $journalData['what']);
 
     }

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',
         ];
 
@@ -36,6 +37,9 @@ class Kernel extends HttpKernel
             'auth.basic' => 'Illuminate\Auth\Middleware\AuthenticateWithBasicAuth',
             'guest'      => 'FireflyIII\Http\Middleware\RedirectIfAuthenticated',
             'range'      => 'FireflyIII\Http\Middleware\Range',
+            'reminders'  => 'FireflyIII\Http\Middleware\Reminders',
+            'piggybanks' => 'FireflyIII\Http\Middleware\PiggyBanks',
+
         ];
 
 }

app/Http/Middleware/PiggyBanks.php

@@ -0,0 +1,141 @@
+<?php
+
+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\Support\Collection;
+use Navigation;
+use Session;
+
+
+/**
+ * Class PiggyBanks
+ *
+ * @package FireflyIII\Http\Middleware
+ */
+class PiggyBanks
+{
+    /**
+     * The Guard implementation.
+     *
+     * @var Guard
+     */
+    protected $auth;
+
+    /**
+     * Create a new filter instance.
+     *
+     * @param  Guard $auth
+     *
+     */
+    public function __construct(Guard $auth)
+    {
+        $this->auth = $auth;
+    }
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure                 $next
+     *
+     * @return mixed
+     */
+    public function handle($request, 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();
+                }
+            }
+            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

@@ -9,6 +9,7 @@ use Illuminate\Contracts\Auth\Guard;
 use Navigation;
 use Preferences;
 use Session;
+use View;
 
 /**
  * Class SessionFilter
@@ -46,25 +47,36 @@ class Range
     public function handle($request, Closure $theNext)
     {
         if ($this->auth->check()) {
-            // user's view range comes from preferences, gets set in session:
-            /** @var \FireflyIII\Models\Preference $viewRange */
-            $viewRange = Preferences::get('viewRange', '1M');
 
+            // ignore preference. set the range to be the current month:
+            if (!Session::has('start') && !Session::has('end')) {
 
-            // the start and end date are checked and stored:
-            $start  = Session::has('start') ? Session::get('start') : new Carbon;
-            $start  = Navigation::updateStartDate($viewRange->data, $start);
-            $end    = Navigation::updateEndDate($viewRange->data, $start);
-            $period = Navigation::periodName($viewRange->data, $start);
-            $prev   = Navigation::jumpToPrevious($viewRange->data, clone $start);
-            $next   = Navigation::jumpToNext($viewRange->data, clone $start);
+                /** @var \FireflyIII\Models\Preference $viewRange */
+                $viewRange = Preferences::get('viewRange', '1M');
+                $start     = Session::has('start') ? Session::get('start') : new Carbon;
+                $start     = Navigation::updateStartDate($viewRange->data, $start);
+                $end       = Navigation::updateEndDate($viewRange->data, $start);
+
+                Session::put('start', $start);
+                Session::put('end', $end);
+            }
+            if (!Session::has('first')) {
+                $journal = $this->auth->user()->transactionjournals()->orderBy('date', 'ASC')->first(['transaction_journals.*']);
+                if ($journal) {
+                    Session::put('first', $journal->date);
+                } else {
+                    Session::put('first', Carbon::now());
+                }
+            }
+
+            // 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);
 
-            Session::put('range', $viewRange->data);
-            Session::put('start', $start);
-            Session::put('end', $end);
-            Session::put('period', $period);
-            Session::put('prev', Navigation::periodName($viewRange->data, $prev));
-            Session::put('next', Navigation::periodName($viewRange->data, $next));
 
         }
 

app/Http/Middleware/Reminders.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace FireflyIII\Http\Middleware;
+
+use App;
+use Carbon\Carbon;
+use Closure;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\Reminder;
+use Illuminate\Contracts\Auth\Guard;
+use View;
+
+/**
+ * Class Reminders
+ *
+ * @package FireflyIII\Http\Middleware
+ */
+class Reminders
+{
+    /**
+     * The Guard implementation.
+     *
+     * @var Guard
+     */
+    protected $auth;
+
+    /**
+     * Create a new filter instance.
+     *
+     * @param  Guard $auth
+     *
+     */
+    public function __construct(Guard $auth)
+    {
+        $this->auth = $auth;
+    }
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure                 $next
+     *
+     * @return mixed
+     */
+    public function handle($request, 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;
+                    }
+
+                }
+            }
+            // delete invalid reminders
+            $set = $this->auth->user()->reminders()->leftJoin('piggy_banks', 'piggy_banks.id', '=', 'remindersable_id')->whereNull('piggy_banks.id')->get(
+                ['reminders.id']
+            );
+            foreach ($set as $reminder) {
+                $reminder->delete();
+            }
+
+
+            // get and list active reminders:
+            $reminders = $this->auth->user()->reminders()->today()->get();
+            $reminders->each(
+                function (Reminder $reminder) use ($helper) {
+                    $reminder->description = $helper->getReminderText($reminder);
+                }
+            );
+            View::share('reminders', $reminders);
+        }
+
+        return $next($request);
+    }
+}

app/Http/Middleware/ReplaceTestVars.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace FireflyIII\Http\Middleware;
+
+use Closure;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Contracts\Routing\Middleware;
+use Log;
+
+/**
+ * Class ReplaceTestVars
+ *
+ * @package App\Http\Middleware
+ */
+class ReplaceTestVars implements Middleware
+{
+    /**
+     * 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, 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/Requests/AccountFormRequest.php

@@ -31,9 +31,9 @@ class AccountFormRequest extends Request
         $accountRoles = join(',', array_keys(Config::get('firefly.accountRoles')));
         $types        = join(',', array_keys(Config::get('firefly.subTitlesByIdentifier')));
 
-        $nameRule = 'required|between:1,100|uniqueForUser:accounts,name';
+        $nameRule = 'required|between:1,100|uniqueAccountForUser';
         if (Account::find(Input::get('id'))) {
-            $nameRule = 'required|between:1,100';
+            $nameRule = 'required|between:1,100|belongsToUser:accounts|uniqueForUser:'.Input::get('id');
         }
 
         return [
@@ -46,4 +46,4 @@ class AccountFormRequest extends Request
             'what'                => 'in:' . $types
         ];
     }
-}
+}

app/Http/Requests/BillFormRequest.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 25/02/15
- * Time: 12:29
- */
 
 namespace FireflyIII\Http\Requests;
 
@@ -33,8 +27,8 @@ class BillFormRequest extends Request
     public function rules()
     {
         $nameRule = 'required|between:1,255|uniqueForUser:bills,name';
-        if(intval(Input::get('id')) > 0) {
-            $nameRule .= ','.intval(Input::get('id'));
+        if (intval(Input::get('id')) > 0) {
+            $nameRule = 'required|between:1,255';
         }
 
         $rules = [

app/Http/Requests/CurrencyFormRequest.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 25/02/15
- * Time: 12:29
- */
 
 namespace FireflyIII\Http\Requests;
 

app/Http/Requests/JournalFormRequest.php

@@ -35,6 +35,7 @@ class JournalFormRequest extends Request
             'what'               => 'required|in:withdrawal,deposit,transfer|exists:transaction_types,type',
             'amount'             => 'numeric|required|min:0.01',
             'date'               => 'required|date',
+            'reminder_id'        => 'numeric|exists:reminders,id',
             'amount_currency_id' => 'required|exists:transaction_currencies,id',
 
         ];

app/Http/Requests/PiggyBankFormRequest.php

@@ -3,8 +3,10 @@
 namespace FireflyIII\Http\Requests;
 
 use Auth;
+use Carbon\Carbon;
 use FireflyIII\Models\Account;
 use Input;
+use Navigation;
 
 /**
  * Class PiggyBankFormRequest
@@ -28,7 +30,7 @@ class PiggyBankFormRequest extends Request
     public function rules()
     {
 
-        $nameRule       = 'required|between:1,255|uniqueForUser:piggy_banks,name';
+        $nameRule       = 'required|between:1,255|uniquePiggyBankForUser:piggy_banks,name';
         $targetDateRule = 'date';
         if (intval(Input::get('id'))) {
             $nameRule = 'required|between:1,255';
@@ -36,8 +38,14 @@ class PiggyBankFormRequest extends Request
 
         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');
+            }
         }
 
+
         $rules = [
             'repeats'            => 'required|boolean',
             'name'               => $nameRule,
@@ -51,7 +59,7 @@ class PiggyBankFormRequest extends Request
             'rep_times'          => 'integer|min:0|max:99',
             'reminder'           => 'in:day,week,quarter,month,year',
             'reminder_skip'      => 'integer|min:0|max:99',
-            'remind_me'          => 'boolean',
+            'remind_me'          => 'boolean|piggyBankReminder',
             'order'              => 'integer|min:1',
 
         ];

app/Http/breadcrumbs.php

@@ -7,6 +7,7 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\Category;
+use FireflyIII\Models\Reminder;
 use FireflyIII\Models\LimitRepetition;
 use FireflyIII\Models\PiggyBank;
 
@@ -239,47 +240,22 @@ Breadcrumbs::register(
 
 // reminders
 Breadcrumbs::register(
-    'reminders.show', function (Generator $breadcrumbs, Reminder $reminder) {
+    'reminders.index', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('home');
+    $breadcrumbs->push('Reminders', route('reminders.index'));
+
+}
+);
+
+// reminders
+Breadcrumbs::register(
+    'reminders.show', function (Generator $breadcrumbs, Reminder $reminder) {
+    $breadcrumbs->parent('reminders.index');
     $breadcrumbs->push('Reminder #' . $reminder->id, route('reminders.show', $reminder->id));
 
 }
 );
 
-// repeated expenses
-Breadcrumbs::register(
-    'repeated.index', function (Generator $breadcrumbs) {
-    $breadcrumbs->parent('home');
-    $breadcrumbs->push('Repeated expenses', route('repeated.index'));
-}
-);
-Breadcrumbs::register(
-    'repeated.create', function (Generator $breadcrumbs) {
-    $breadcrumbs->parent('repeated.index');
-    $breadcrumbs->push('Create new repeated expense', route('repeated.create'));
-}
-);
-
-Breadcrumbs::register(
-    'repeated.edit', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
-    $breadcrumbs->parent('repeated.show', $piggyBank);
-    $breadcrumbs->push('Edit ' . e($piggyBank->name), route('repeated.edit', $piggyBank->id));
-}
-);
-Breadcrumbs::register(
-    'repeated.delete', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
-    $breadcrumbs->parent('repeated.show', $piggyBank);
-    $breadcrumbs->push('Delete ' . e($piggyBank->name), route('repeated.delete', $piggyBank->id));
-}
-);
-
-Breadcrumbs::register(
-    'repeated.show', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
-    $breadcrumbs->parent('repeated.index');
-    $breadcrumbs->push(e($piggyBank->name), route('repeated.show', $piggyBank->id));
-
-}
-);
 
 // reports
 Breadcrumbs::register(

app/Http/routes.php

@@ -4,9 +4,10 @@ use FireflyIII\Models\Bill;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\Reminder;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\PiggyBank;
 
 
 // models
@@ -27,20 +28,6 @@ Route::bind(
     }
 );
 
-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()) {
@@ -89,6 +76,16 @@ Route::bind(
 }
 );
 
+Route::bind(
+    'reminder', function ($value, $route) {
+    if (Auth::check()) {
+        return Reminder::where('id', $value)->where('user_id', Auth::user()->id)->first();
+    }
+
+    return null;
+}
+);
+
 Route::bind(
     'limitrepetition', function ($value, $route) {
     if (Auth::check()) {
@@ -135,7 +132,7 @@ Route::get('/register', ['uses' => 'Auth\AuthController@getRegister', 'as' => 'r
 
 Route::controllers(
     [
-        'auth'     => 'Auth\AuthController',
+        'auth' => 'Auth\AuthController',
         'password' => 'Auth\PasswordController',
     ]
 );
@@ -145,12 +142,10 @@ Route::controllers(
  * Home Controller
  */
 Route::group(
-    ['middleware' => ['auth', 'range']], function () {
+    ['middleware' => ['auth', 'range', 'reminders','piggybanks']], function () {
     Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index']);
     Route::get('/home', ['uses' => 'HomeController@index', 'as' => 'home']);
-    Route::get('/prev', ['uses' => 'HomeController@sessionPrev', 'as' => 'sessionPrev']);
-    Route::get('/next', ['uses' => 'HomeController@sessionNext', 'as' => 'sessionNext']);
-    Route::get('/jump/{range}', ['uses' => 'HomeController@rangeJump', 'as' => 'rangeJump']);
+    Route::post('/daterange', ['uses' => 'HomeController@dateRange', 'as' => 'daterange']);
     Route::get('/flush', ['uses' => 'HomeController@flush', 'as' => 'flush']);
     /**
      * Account Controller
@@ -232,11 +227,12 @@ Route::group(
     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/category/{category}/spending/{year}', ['uses' => 'GoogleChartController@categoriesAndSpending']);
     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']);
 
     /**
      * Help Controller
@@ -249,14 +245,18 @@ 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/transaction-journals/{what}', 'JsonController@transactionJournals');
+    Route::get('/json/show-shared-reports/set', 'JsonController@setSharedReports');
 
 
     /**
      * Piggy Bank Controller
      */
     Route::get('/piggy-banks', ['uses' => 'PiggyBankController@index', 'as' => 'piggy-banks.index']);
-    Route::get('/piggy-banks/add/{piggyBank}', ['uses' => 'PiggyBankController@add']); # add money
-    Route::get('/piggy-banks/remove/{piggyBank}', ['uses' => 'PiggyBankController@remove']); #remove money
+    Route::get('/piggy-banks/add/{piggyBank}', ['uses' => 'PiggyBankController@add', 'as' => 'piggy-banks.addMoney']); # add money
+    Route::get('/piggy-banks/remove/{piggyBank}', ['uses' => 'PiggyBankController@remove', 'as' => 'piggy-banks.removeMoney']); #remove money
     Route::get('/piggy-banks/create', ['uses' => 'PiggyBankController@create', 'as' => 'piggy-banks.create']);
     Route::get('/piggy-banks/edit/{piggyBank}', ['uses' => 'PiggyBankController@edit', 'as' => 'piggy-banks.edit']);
     Route::get('/piggy-banks/delete/{piggyBank}', ['uses' => 'PiggyBankController@delete', 'as' => 'piggy-banks.delete']);
@@ -266,6 +266,7 @@ Route::group(
     Route::post('/piggy-banks/destroy/{piggyBank}', ['uses' => 'PiggyBankController@destroy', 'as' => 'piggy-banks.destroy']);
     Route::post('/piggy-banks/add/{piggyBank}', ['uses' => 'PiggyBankController@postAdd', 'as' => 'piggy-banks.add']); # add money
     Route::post('/piggy-banks/remove/{piggyBank}', ['uses' => 'PiggyBankController@postRemove', 'as' => 'piggy-banks.remove']); # remove money.
+    Route::post('/piggy-banks/sort', ['uses' => 'PiggyBankController@order', 'as' => 'piggy-banks.order']);
 
     /**
      * Preferences Controller
@@ -278,7 +279,7 @@ Route::group(
      */
     Route::get('/profile', ['uses' => 'ProfileController@index', 'as' => 'profile']);
     Route::get('/profile/change-password', ['uses' => 'ProfileController@changePassword', 'as' => 'change-password']);
-    Route::post('/profile/change-password', ['uses' => 'ProfileController@postChangePassword','as' => 'change-password-post']);
+    Route::post('/profile/change-password', ['uses' => 'ProfileController@postChangePassword', 'as' => 'change-password-post']);
 
     /**
      * Related transactions controller
@@ -286,20 +287,17 @@ Route::group(
     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']);
 
     /**
-     * Repeated Expenses Controller
+     * Reminder 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']);
+    Route::get('/reminders', ['uses' => 'ReminderController@index', 'as' => 'reminders.index']);
+    Route::get('/reminder/dismiss/{reminder}', ['uses' => 'ReminderController@dismiss', 'as' => 'reminders.dismiss']);
+    Route::get('/reminder/act/{reminder}', ['uses' => 'ReminderController@act', 'as' => 'reminders.act']);
+    Route::get('/reminder/{reminder}', ['uses' => 'ReminderController@show', 'as' => 'reminders.show']);
 
     /**
      * Report Controller
@@ -309,6 +307,16 @@ Route::group(
     Route::get('/reports/{year}/{month}', ['uses' => 'ReportController@month', 'as' => 'reports.month']);
     Route::get('/reports/budget/{year}/{month}', ['uses' => 'ReportController@budget', 'as' => 'reports.budget']);
 
+    // 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
      */
@@ -332,6 +340,7 @@ Route::group(
     );
     Route::post('/transaction/update/{tj}', ['uses' => 'TransactionController@update', 'as' => 'transactions.update']);
     Route::post('/transaction/destroy/{tj}', ['uses' => 'TransactionController@destroy', 'as' => 'transactions.destroy']);
+    Route::post('/transaction/reorder', ['uses' => 'TransactionController@reorder', 'as' => 'transactions.reorder']);
 
     /**
      * Auth\Auth Controller

app/Models/Account.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Watson\Validating\ValidatingTrait;
-
+use Crypt;
 /**
  * Class Account
  *
@@ -18,7 +18,7 @@ class Account extends Model
         = [
             'user_id'         => 'required|exists:users,id',
             'account_type_id' => 'required|exists:account_types,id',
-            'name'            => 'required|between:1,100|uniqueForUser:accounts,name',
+            'name'            => 'required|between:1,1024|uniqueAccountForUser',
             'active'          => 'required|boolean'
         ];
 
@@ -41,6 +41,22 @@ class Account extends Model
 
     }
 
+    /**
+     * @param $value
+     *
+     * @return string
+     */
+    public function getNameAttribute($value)
+    {
+        if ($this->encrypted) {
+            return Crypt::decrypt($value);
+        }
+
+        // @codeCoverageIgnoreStart
+        return $value;
+        // @codeCoverageIgnoreEnd
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */

app/Models/Component.php

@@ -12,6 +12,8 @@ class Component extends Model
 {
     use SoftDeletes;
 
+    protected $fillable = ['user_id', 'name','class'];
+
     /**
      * @return array
      */

app/Models/PiggyBank.php

@@ -4,7 +4,8 @@ use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
-
+use App;
+use Log;
 /**
  * Class PiggyBank
  *
@@ -14,7 +15,9 @@ class PiggyBank extends Model
 {
     use SoftDeletes;
 
-    protected $fillable = ['repeats', 'name', 'account_id','rep_every', 'rep_times', 'reminder_skip', 'targetamount', 'startdate', 'targetdate', 'reminder',];
+    protected $fillable
+        = ['repeats', 'name', 'account_id', 'rep_every', 'rep_times', 'reminder_skip', 'targetamount', 'startdate', 'targetdate', 'reminder', 'remind_me',
+           'rep_length'];
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
@@ -31,49 +34,18 @@ class PiggyBank extends Model
      */
     public function currentRelevantRep()
     {
-        if ($this->currentRep) {
+        if (!is_null($this->currentRep)) {
             return $this->currentRep;
         }
-        if ($this->repeats == 0) {
+        // repeating piggy banks are no longer supported.
+        if (intval($this->repeats) === 0) {
             $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;
+            Log::error('Tried to work with a piggy bank with a repeats=1 value! (id is '.$this->id.')');
+            //App::abort(500);
         }
 
 
@@ -95,6 +67,16 @@ class PiggyBank extends Model
         return ['created_at', 'updated_at', 'deleted_at', 'startdate', 'targetdate'];
     }
 
+    /**
+     * @param $value
+     *
+     * @return int
+     */
+    public function getRemindMeAttribute($value)
+    {
+        return intval($value) == 1;
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */

app/Models/PiggyBankEvent.php

@@ -10,6 +10,8 @@ use Illuminate\Database\Eloquent\Model;
 class PiggyBankEvent extends Model
 {
 
+    protected $fillable = ['piggy_bank_id', 'transaction_journal_id', 'date', 'amount'];
+
     /**
      * @return array
      */

app/Models/PiggyBankRepetition.php

@@ -1,7 +1,8 @@
 <?php namespace FireflyIII\Models;
 
 use Illuminate\Database\Eloquent\Model;
-
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Carbon\Carbon;
 /**
  * Class PiggyBankRepetition
  *
@@ -26,4 +27,37 @@ class PiggyBankRepetition extends Model
         return $this->belongsTo('FireflyIII\Models\PiggyBank');
     }
 
+    /**
+     * @param EloquentBuilder $query
+     * @param Carbon          $date
+     *
+     * @return mixed
+     */
+    public function scopeRelevantOnDate(EloquentBuilder $query, Carbon $date)
+    {
+        return $query->where(
+            function($q) use ($date) {
+                $q->where('startdate', '<=', $date->format('Y-m-d 00:00:00'));
+                $q->orWhereNull('startdate');
+            })
+
+            ->where(function($q) use ($date) {
+
+                $q->where('targetdate', '>=', $date->format('Y-m-d 00:00:00'));
+                $q->orWhereNull('targetdate');
+            });
+    }
+
+    /**
+     * @param EloquentBuilder $query
+     * @param Carbon          $start
+     * @param Carbon          $target
+     *
+     * @return $this
+     */
+    public function scopeOnDates(EloquentBuilder $query, Carbon $start, Carbon $target)
+    {
+        return $query->where('startdate',$start->format('Y-m-d'))->where('targetdate',$target->format('Y-m-d'));
+    }
+
 }

app/Models/Reminder.php

@@ -1,5 +1,7 @@
 <?php namespace FireflyIII\Models;
 
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Model;
 
 /**
@@ -10,6 +12,19 @@ use Illuminate\Database\Eloquent\Model;
 class Reminder extends Model
 {
 
+
+    protected $fillable = ['user_id', 'startdate', 'metadata', 'enddate', 'active', 'notnow', 'remindersable_id', 'remindersable_type',];
+
+    /**
+     * @param $value
+     *
+     * @return int
+     */
+    public function getActiveAttribute($value)
+    {
+        return intval($value) == 1;
+    }
+
     /**
      * @return array
      */
@@ -18,6 +33,26 @@ class Reminder extends Model
         return ['created_at', 'updated_at', 'startdate', 'enddate'];
     }
 
+    /**
+     * @param $value
+     *
+     * @return mixed
+     */
+    public function getMetadataAttribute($value)
+    {
+        return json_decode($value);
+    }
+
+    /**
+     * @param $value
+     *
+     * @return bool
+     */
+    public function getNotnowAttribute($value)
+    {
+        return intval($value) == 1;
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\MorphTo
      */
@@ -26,6 +61,34 @@ class Reminder extends Model
         return $this->morphTo();
     }
 
+    /**
+     * @param EloquentBuilder $query
+     * @param Carbon          $start
+     * @param Carbon          $end
+     *
+     * @return $this
+     */
+    public function scopeOnDates(EloquentBuilder $query, Carbon $start, Carbon $end)
+    {
+        return $query->where('reminders.startdate', '=', $start->format('Y-m-d 00:00:00'))->where('reminders.enddate', '=', $end->format('Y-m-d 00:00:00'));
+    }
+
+    public function scopeToday(EloquentBuilder $query)
+    {
+        $today = new Carbon;
+
+        return $query->where('startdate', '<=', $today->format('Y-m-d 00:00:00'))->where('enddate', '>=', $today->format('Y-m-d 00:00:00'))->where('active', 1)
+                     ->where('notnow', 0);
+    }
+
+    /**
+     * @param $value
+     */
+    public function setMetadataAttribute($value)
+    {
+        $this->attributes['metadata'] = json_encode($value);
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */

app/Providers/EventServiceProvider.php

@@ -1,17 +1,19 @@
 <?php namespace FireflyIII\Providers;
 
+use App;
 use FireflyIII\Models\Account;
+use FireflyIII\Models\Bill;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\LimitRepetition;
-use FireflyIII\Models\Transaction;
-use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankRepetition;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Support\Facades\Navigation;
 use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
 use Illuminate\Database\QueryException;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-
+use Log;
 
 /**
  * Class EventServiceProvider
@@ -28,12 +30,14 @@ class EventServiceProvider extends ServiceProvider
      */
     protected $listen
         = [
-            'event.name'                => [
-                'EventListener',
-            ],
-            'App\Events\JournalDeleted' => [
-                'App\Handlers\Events\JournalDeletedHandler@handle',
+            'FireflyIII\Events\JournalSaved' => [
+                'FireflyIII\Handlers\Events\RescanJournal',
+                'FireflyIII\Handlers\Events\UpdateJournalConnection',
+
             ],
+            'FireflyIII\Events\JournalCreated' => [
+                'FireflyIII\Handlers\Events\ConnectJournalToPiggyBank',
+            ]
         ];
 
     /**
@@ -57,6 +61,8 @@ class EventServiceProvider extends ServiceProvider
             }
         );
 
+
+
         Account::deleted(
             function (Account $account) {
 
@@ -68,14 +74,18 @@ class EventServiceProvider extends ServiceProvider
             }
         );
 
-        PiggyBank::created(function(PiggyBank $piggyBank) {
+        // move this routine to a filter
+        // in case of repeated piggy banks and/or other problems.
+        PiggyBank::created(
+            function (PiggyBank $piggyBank) {
                 $repetition = new PiggyBankRepetition;
                 $repetition->piggyBank()->associate($piggyBank);
-                $repetition->startdate     = $piggyBank->startdate;
-                $repetition->targetdate    = $piggyBank->targetdate;
+                $repetition->startdate     = is_null($piggyBank->startdate) ? null : $piggyBank->startdate;
+                $repetition->targetdate    = is_null($piggyBank->targetdate) ? null : $piggyBank->targetdate;
                 $repetition->currentamount = 0;
                 $repetition->save();
-        });
+            }
+        );
 
         BudgetLimit::saved(
             function (BudgetLimit $budgetLimit) {

app/Providers/FireflyServiceProvider.php

@@ -64,6 +64,8 @@ class FireflyServiceProvider extends ServiceProvider
         $this->app->bind('FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface', 'FireflyIII\Repositories\PiggyBank\PiggyBankRepository');
         $this->app->bind('FireflyIII\Support\Search\SearchInterface', 'FireflyIII\Support\Search\Search');
 
+
+        $this->app->bind('FireflyIII\Helpers\Reminders\ReminderHelperInterface', 'FireflyIII\Helpers\Reminders\ReminderHelper');
         $this->app->bind('FireflyIII\Helpers\Report\ReportHelperInterface', 'FireflyIII\Helpers\Report\ReportHelper');
         $this->app->bind('FireflyIII\Helpers\Report\ReportQueryInterface', 'FireflyIII\Helpers\Report\ReportQuery');
 

app/Repositories/Account/AccountRepository.php

@@ -10,12 +10,15 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountMeta;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\Preference;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
 use Log;
 use Session;
+use Steam;
 
 /**
  * Class AccountRepository
@@ -25,6 +28,14 @@ use Session;
 class AccountRepository implements AccountRepositoryInterface
 {
 
+    /**
+     * @return int
+     */
+    public function countAssetAccounts()
+    {
+        return Auth::user()->accounts()->accountTypeIn(['Asset account', 'Default account'])->count();
+    }
+
     /**
      * @param Account $account
      *
@@ -38,26 +49,69 @@ class AccountRepository implements AccountRepositoryInterface
     }
 
     /**
+     * @param Preference $preference
+     *
+     * @return Collection
+     */
+    public function getFrontpageAccounts(Preference $preference)
+    {
+        if ($preference->data == []) {
+            $accounts = Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->orderBy('accounts.name', 'ASC')->get(['accounts.*']);
+        } else {
+            $accounts = Auth::user()->accounts()->whereIn('id', $preference->data)->orderBy('accounts.name', 'ASC')->get(['accounts.*']);
+        }
+
+        return $accounts;
+    }
+
+    /**
+     * This method is used on the front page where (in turn) its viewed journals-tiny.php which (in turn)
+     * is almost the only place where formatJournal is used. Aka, we can use some custom querying to get some specific.
+     * fields using left joins.
+     *
      * @param Account $account
-     * @param int     $page
-     * @param string  $range
+     * @param Carbon  $start
+     * @param Carbon  $end
      *
      * @return mixed
      */
-    public function getJournals(Account $account, $page, $range = 'session')
+    public function getFrontpageTransactions(Account $account, Carbon $start, Carbon $end)
     {
-        $offset = $page * 50;
+        return Auth::user()
+                   ->transactionjournals()
+                   ->with(['transactions'])
+                   ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                   ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')->where('accounts.id', $account->id)
+                   ->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transaction_journals.transaction_currency_id')
+                   ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+                   ->before($end)
+                   ->after($start)
+                   ->orderBy('transaction_journals.date', 'DESC')
+                   ->orderBy('transaction_journals.id', 'DESC')
+                   ->take(10)
+                   ->get(['transaction_journals.*', 'transaction_currencies.symbol', 'transaction_types.type']);
+    }
+
+    /**
+     * @param Account $account
+     * @param int     $page
+     *
+     * @return mixed
+     */
+    public function getJournals(Account $account, $page)
+    {
+        $offset = ($page - 1) * 50;
         $query  = Auth::user()
                       ->transactionJournals()
                       ->withRelevantData()
                       ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
                       ->where('transactions.account_id', $account->id)
-                      ->orderBy('date', 'DESC');
+            ->orderBy('transaction_journals.date', 'DESC')
+            ->orderBy('transaction_journals.order','ASC')
+            ->orderBy('transaction_journals.id','DESC');
 
-        if ($range == 'session') {
-            $query->before(Session::get('end', Carbon::now()->startOfMonth()));
-            $query->after(Session::get('start', Carbon::now()->startOfMonth()));
-        }
+        $query->before(Session::get('end', Carbon::now()->endOfMonth()));
+        $query->after(Session::get('start', Carbon::now()->startOfMonth()));
         $count     = $query->count();
         $set       = $query->take(50)->offset($offset)->get(['transaction_journals.*']);
         $paginator = new LengthAwarePaginator($set, $count, 50, $page);
@@ -69,6 +123,65 @@ class AccountRepository implements AccountRepositoryInterface
 
     }
 
+    /**
+     * Get savings accounts and the balance difference in the period.
+     *
+     * @return Collection
+     */
+    public function getSavingsAccounts()
+    {
+        $accounts = Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->orderBy('accounts.name', 'ASC')
+                        ->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id')
+                        ->where('account_meta.name', 'accountRole')
+                        ->where('account_meta.data', '"savingAsset"')
+                        ->get(['accounts.*']);
+        $start    = clone Session::get('start');
+        $end      = clone Session::get('end');
+
+        $accounts->each(
+            function (Account $account) use ($start, $end) {
+                $account->startBalance = Steam::balance($account, $start);
+                $account->endBalance   = Steam::balance($account, $end);
+
+                // diff (negative when lost, positive when gained)
+                $diff = $account->endBalance - $account->startBalance;
+
+                if ($diff < 0 && $account->startBalance > 0) {
+                    // percentage lost compared to start.
+                    $pct = (($diff * -1) / $account->startBalance) * 100;
+                } else {
+                    if ($diff >= 0 && $account->startBalance > 0) {
+                        $pct = ($diff / $account->startBalance) * 100;
+                    } else {
+                        $pct = 100;
+                    }
+                }
+                $pct                 = $pct > 100 ? 100 : $pct;
+                $account->difference = $diff;
+                $account->percentage = round($pct);
+            }
+        );
+
+        return $accounts;
+    }
+
+    /**
+     * @param Account $account
+     *
+     * @return float
+     */
+    public function leftOnAccount(Account $account)
+    {
+        $balance = \Steam::balance($account);
+        /** @var PiggyBank $p */
+        foreach ($account->piggybanks()->get() as $p) {
+            $balance -= $p->currentRelevantRep()->currentamount;
+        }
+
+        return $balance;
+
+    }
+
     /**
      * @param Account $account
      *
@@ -123,13 +236,7 @@ class AccountRepository implements AccountRepositoryInterface
         $account->save();
 
         // update meta data:
-        /** @var AccountMeta $meta */
-        foreach ($account->accountMeta()->get() as $meta) {
-            if ($meta->name == 'accountRole') {
-                $meta->data = $data['accountRole'];
-                $meta->save();
-            }
-        }
+        $this->_updateMetadata($account, $data);
 
         $openingBalance = $this->openingBalanceTransaction($account);
 
@@ -180,12 +287,14 @@ class AccountRepository implements AccountRepositoryInterface
                 'active'          => $data['active'] === true ? true : false,
             ]
         );
+
         if (!$newAccount->isValid()) {
             // does the account already exist?
             $existingAccount = Account::where('user_id', $data['user'])->where('account_type_id', $accountType->id)->where('name', $data['name'])->first();
             if (!$existingAccount) {
                 Log::error('Account create error: ' . $newAccount->getErrors()->toJson());
-                var_dump($newAccount->getErrors()->toArray());
+                App::abort(500);
+
             }
             $newAccount = $existingAccount;
         }
@@ -285,6 +394,40 @@ class AccountRepository implements AccountRepositoryInterface
 
     }
 
+    /**
+     * @param Account $account
+     * @param array   $data
+     */
+    protected function _updateMetadata(Account $account, array $data)
+    {
+        $metaEntries = $account->accountMeta()->get();
+        $updated     = false;
+
+        /** @var AccountMeta $entry */
+        foreach ($metaEntries as $entry) {
+            if ($entry->name == 'accountRole') {
+                $entry->data = $data['accountRole'];
+                $updated     = true;
+                $entry->save();
+            }
+        }
+
+        if ($updated === false) {
+            $metaData = new AccountMeta(
+                [
+                    'account_id' => $account->id,
+                    'name'       => 'accountRole',
+                    'data'       => $data['accountRole']
+                ]
+            );
+            if (!$metaData->isValid()) {
+                App::abort(500);
+            }
+            $metaData->save();
+        }
+
+    }
+
     /**
      * @param Account            $account
      * @param TransactionJournal $journal
@@ -310,21 +453,4 @@ class AccountRepository implements AccountRepositoryInterface
 
         return $journal;
     }
-
-    /**
-     * @param Account $account
-     *
-     * @return float
-     */
-    public function leftOnAccount(Account $account)
-    {
-        $balance = \Steam::balance($account);
-        /** @var PiggyBank $p */
-        foreach ($account->piggybanks()->get() as $p) {
-            $balance -= $p->currentRelevantRep()->currentamount;
-        }
-
-        return $balance;
-
-    }
 }

app/Repositories/Account/AccountRepositoryInterface.php

@@ -4,7 +4,9 @@ namespace FireflyIII\Repositories\Account;
 
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionJournal;
-
+use FireflyIII\Models\Preference;
+use Illuminate\Support\Collection;
+use Carbon\Carbon;
 /**
  * Interface AccountRepositoryInterface
  *
@@ -19,14 +21,34 @@ interface AccountRepositoryInterface
      */
     public function destroy(Account $account);
 
+    /**
+     * @return int
+     */
+    public function countAssetAccounts();
+
+    /**
+     * @param Preference $preference
+     *
+     * @return Collection
+     */
+    public function getFrontpageAccounts(Preference $preference);
+
+    /**
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return mixed
+     */
+    public function getFrontpageTransactions(Account $account, Carbon $start, Carbon $end);
+
     /**
      * @param Account $account
-     * @param int     $page
      * @param string  $range
      *
      * @return mixed
      */
-    public function getJournals(Account $account, $page, $range = 'session');
+    public function getJournals(Account $account, $page);
 
     /**
      * @param Account $account
@@ -56,4 +78,11 @@ interface AccountRepositoryInterface
      * @return float
      */
     public function leftOnAccount(Account $account);
+
+    /**
+     * Get savings accounts and the balance difference in the period.
+     *
+     * @return Collection
+     */
+    public function getSavingsAccounts();
 }

app/Repositories/Bill/BillRepository.php

@@ -1,18 +1,12 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 25/02/15
- * Time: 07:40
- */
 
 namespace FireflyIII\Repositories\Bill;
 
 use Carbon\Carbon;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\TransactionJournal;
-use Navigation;
 use Log;
+use Navigation;
 
 /**
  * Class BillRepository
@@ -21,6 +15,54 @@ use Log;
  */
 class BillRepository implements BillRepositoryInterface
 {
+    /**
+     * Every bill repeats itself weekly, monthly or yearly (or whatever). This method takes a date-range (usually the view-range of Firefly itself)
+     * and returns date ranges that fall within the given range; those ranges are the bills expected. When a bill is due on the 14th of the month and
+     * you give 1st and the 31st of that month as argument, you'll get one response, matching the range of your bill.
+     *
+     * @param Bill   $bill
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return mixed
+     */
+    public function getRanges(Bill $bill, Carbon $start, Carbon $end)
+    {
+        $startOfBill = $bill->date;
+        $startOfBill = Navigation::startOfPeriod($startOfBill, $bill->repeat_freq);
+
+
+        // all periods of this bill up until the current period:
+        $billStarts = [];
+        while ($startOfBill < $end) {
+
+            $endOfBill = Navigation::endOfPeriod($startOfBill, $bill->repeat_freq);
+
+            $billStarts[] = [
+                'start' => clone $startOfBill,
+                'end'   => clone $endOfBill,
+            ];
+            // actually the next one:
+            $startOfBill = Navigation::addPeriod($startOfBill, $bill->repeat_freq, $bill->skip);
+
+        }
+        // for each
+        $validRanges = [];
+        foreach ($billStarts as $dateEntry) {
+            if ($dateEntry['end'] > $start && $dateEntry['start'] < $end) {
+                // count transactions for bill in this range (not relevant yet!):
+                //                $count = $bill->transactionjournals()->before($dateEntry['end'])->after($dateEntry['start'])->count();
+                //                if ($count == 0) {
+                $validRanges[] = $dateEntry;
+                //                }
+            }
+        }
+
+        return $validRanges;
+        //        echo $bill->name;
+        //        var_dump($validRanges);
+    }
+
     /**
      * @param Bill $bill
      *
@@ -28,6 +70,7 @@ class BillRepository implements BillRepositoryInterface
      */
     public function nextExpectedMatch(Bill $bill)
     {
+
         $finalDate = null;
         if ($bill->active == 0) {
             return $finalDate;
@@ -113,7 +156,7 @@ class BillRepository implements BillRepositoryInterface
             $wordMatch = true;
             Log::debug('word match is true');
         } else {
-            Log::debug('Count: ' . $count.', count(matches): ' . count($matches));
+            Log::debug('Count: ' . $count . ', count(matches): ' . count($matches));
         }
 
 

app/Repositories/Bill/BillRepositoryInterface.php

@@ -1,13 +1,8 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 25/02/15
- * Time: 07:40
- */
 
 namespace FireflyIII\Repositories\Bill;
 
+use Carbon\Carbon;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\TransactionJournal;
 
@@ -25,6 +20,19 @@ interface BillRepositoryInterface {
      */
     public function nextExpectedMatch(Bill $bill);
 
+    /**
+     * Every bill repeats itself weekly, monthly or yearly (or whatever). This method takes a date-range (usually the view-range of Firefly itself)
+     * and returns date ranges that fall within the given range; those ranges are the bills expected. When a bill is due on the 14th of the month and
+     * you give 1st and the 31st of that month as argument, you'll get one response, matching the range of your bill.
+     *
+     * @param Bill $bill
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return mixed
+     */
+    public function getRanges(Bill $bill, Carbon $start, Carbon $end);
+
     /**
      * @param array $data
      *

app/Repositories/Budget/BudgetRepository.php

@@ -42,7 +42,10 @@ class BudgetRepository implements BudgetRepositoryInterface
         $offset = intval(\Input::get('page')) > 0 ? intval(\Input::get('page')) * $take : 0;
 
 
-        $setQuery   = $budget->transactionJournals()->withRelevantData()->take($take)->offset($offset)->orderBy('date', 'DESC');
+        $setQuery   = $budget->transactionJournals()->withRelevantData()->take($take)->offset($offset)
+            ->orderBy('transaction_journals.date', 'DESC')
+            ->orderBy('transaction_journals.order','ASC')
+            ->orderBy('transaction_journals.id','DESC');
         $countQuery = $budget->transactionJournals();
 
 

app/Repositories/Journal/JournalRepository.php

@@ -11,6 +11,7 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Support\Collection;
+use Log;
 
 /**
  * Class JournalRepository
@@ -267,13 +268,15 @@ class JournalRepository implements JournalRepositoryInterface
         // update the from and to transaction.
         /** @var Transaction $transaction */
         foreach ($journal->transactions()->get() as $transaction) {
-            if ($transaction->account_id === $from->id) {
+            if (floatval($transaction->amount) < 0) {
                 // this is the from transaction, negative amount:
-                $transaction->amount = $data['amount'] * -1;
+                $transaction->amount     = $data['amount'] * -1;
+                $transaction->account_id = $from->id;
                 $transaction->save();
             }
-            if ($transaction->account_id === $to->id) {
+            if (floatval($transaction->amount) > 0) {
                 $transaction->amount = $data['amount'];
+                $transaction->account_id = $to->id;
                 $transaction->save();
             }
         }

app/Repositories/PiggyBank/PiggyBankRepository.php

@@ -2,8 +2,11 @@
 
 namespace FireflyIII\Repositories\PiggyBank;
 
+use Auth;
+use DB;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankRepetition;
+use FireflyIII\Models\Reminder;
 use Illuminate\Support\Collection;
 use Navigation;
 
@@ -15,49 +18,6 @@ use Navigation;
 class PiggyBankRepository implements PiggyBankRepositoryInterface
 {
 
-    /**
-     * @param array $data
-     *
-     * @return PiggyBank
-     */
-    public function store(array $data)
-    {
-
-        $piggyBank = PiggyBank::create($data);
-
-        return $piggyBank;
-    }
-
-    /**
-     * @param PiggyBank $account
-     * @param array     $data
-     *
-     * @return PiggyBank
-     */
-    public function update(PiggyBank $piggyBank, array $data)
-    {
-        /**
-        '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->name         = $data['name'];
-        $piggyBank->account_id   = intval($data['account_id']);
-        $piggyBank->targetamount = floatval($data['targetamount']);
-        $piggyBank->targetdate   = $data['targetdate'];
-        $piggyBank->reminder     = $data['reminder'];
-        $piggyBank->rep_length   = isset($data['rep_length']) ? $data['rep_length'] : null;
-        $piggyBank->rep_every    =isset($data['rep_every']) ? $data['rep_every'] : null;
-        $piggyBank->rep_times    = isset($data['rep_times']) ? $data['rep_times'] : null;
-        $piggyBank->remind_me    = isset($data['remind_me']) ? $data['remind_me'] : null;
-
-        $piggyBank->save();
-        return $piggyBank;
-    }
-
     /**
      * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
      *
@@ -126,4 +86,82 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
 
         return $part;
     }
+
+    /**
+     * Set all piggy banks to order 0.
+     *
+     * @return void
+     */
+    public function reset()
+    {
+        DB::table('piggy_banks')
+          ->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.id')
+          ->where('accounts.user_id', Auth::user()->id)
+          ->update(['order' => 0, 'piggy_banks.updated_at' => DB::Raw('NOW()')]);
+        //Auth::user()->piggyBanks()->update(['order' => 0]);
+    }
+
+    /**
+     *
+     * set id of piggy bank.
+     *
+     * @param int $id
+     * @param int $order
+     *
+     * @return void
+     */
+    public function setOrder($id, $order)
+    {
+        $piggyBank = PiggyBank::leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')->where('accounts.user_id', Auth::user()->id)
+            ->where('piggy_banks.id',$id)->first(['piggy_banks.*']);
+        if ($piggyBank) {
+            $piggyBank->order = $order;
+            $piggyBank->save();
+        }
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return PiggyBank
+     */
+    public function store(array $data)
+    {
+        $data['remind_me'] = isset($data['remind_me']) && $data['remind_me'] == '1' ? true : false;
+        $piggyBank         = PiggyBank::create($data);
+
+        return $piggyBank;
+    }
+
+    /**
+     * @param PiggyBank $account
+     * @param array     $data
+     *
+     * @return PiggyBank
+     */
+    public function update(PiggyBank $piggyBank, array $data)
+    {
+        /**
+         * '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->name         = $data['name'];
+        $piggyBank->account_id   = intval($data['account_id']);
+        $piggyBank->targetamount = floatval($data['targetamount']);
+        $piggyBank->targetdate   = $data['targetdate'];
+        $piggyBank->reminder     = $data['reminder'];
+        $piggyBank->startdate    = $data['startdate'];
+        $piggyBank->rep_length   = isset($data['rep_length']) ? $data['rep_length'] : null;
+        $piggyBank->rep_every    = isset($data['rep_every']) ? $data['rep_every'] : null;
+        $piggyBank->rep_times    = isset($data['rep_times']) ? $data['rep_times'] : null;
+        $piggyBank->remind_me    = isset($data['remind_me']) && $data['remind_me'] == '1' ? 1 : 0;
+
+        $piggyBank->save();
+
+        return $piggyBank;
+    }
 }

app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php

@@ -4,31 +4,19 @@ namespace FireflyIII\Repositories\PiggyBank;
 
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankRepetition;
+use FireflyIII\Models\Reminder;
 use Illuminate\Support\Collection;
+use Carbon\Carbon;
 
 /**
  * Interface PiggyBankRepositoryInterface
  *
  * @package FireflyIII\Repositories\PiggyBank
  */
-interface PiggyBankRepositoryInterface {
+interface PiggyBankRepositoryInterface
+{
 
 
-    /**
-     * @param array $data
-     *
-     * @return PiggyBank
-     */
-    public function store(array $data);
-
-    /**
-     * @param PiggyBank $account
-     * @param array   $data
-     *
-     * @return PiggyBank
-     */
-    public function update(PiggyBank $piggyBank, array $data);
-
     /**
      * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
      *
@@ -48,4 +36,38 @@ interface PiggyBankRepositoryInterface {
      * @return PiggyBankPart
      */
     public function createPiggyBankPart(array $data);
+
+    /**
+     * Set all piggy banks to order 0.
+     * @return void
+     */
+    public function reset();
+
+    /**
+     *
+     * set id of piggy bank.
+     *
+     * @param int $id
+     * @param int $order
+     *
+     * @return void
+     */
+    public function setOrder($id, $order);
+
+
+
+    /**
+     * @param array $data
+     *
+     * @return PiggyBank
+     */
+    public function store(array $data);
+
+    /**
+     * @param PiggyBank $account
+     * @param array     $data
+     *
+     * @return PiggyBank
+     */
+    public function update(PiggyBank $piggyBank, array $data);
 }

app/Support/Amount.php

@@ -5,6 +5,7 @@ namespace FireflyIII\Support;
 use Cache;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Models\TransactionJournal;
 use Preferences as Prefs;
 
 /**
@@ -30,19 +31,27 @@ class Amount
     }
 
     /**
-     * @param Transaction|\Transaction $transaction
-     * @param bool                     $coloured
-     *
      * @return string
      */
-    public function formatTransaction(Transaction $transaction, $coloured = true)
+    public function getCurrencySymbol()
     {
-        $symbol = $transaction->transactionJournal->transactionCurrency->symbol;
-        $amount = floatval($transaction->amount);
+        if (defined('FFCURRENCYSYMBOL')) {
+            return FFCURRENCYSYMBOL;
+        }
+        if (\Cache::has('FFCURRENCYSYMBOL')) {
+            define('FFCURRENCYSYMBOL', \Cache::get('FFCURRENCYSYMBOL'));
 
-        return $this->formatWithSymbol($symbol, $amount, $coloured);
+            return FFCURRENCYSYMBOL;
+        }
 
+        $currencyPreference = Prefs::get('currencyPreference', 'EUR');
+        $currency           = TransactionCurrency::whereCode($currencyPreference->data)->first();
 
+        \Cache::forever('FFCURRENCYSYMBOL', $currency->symbol);
+
+        define('FFCURRENCYSYMBOL', $currency->symbol);
+
+        return $currency->symbol;
     }
 
     /**
@@ -73,29 +82,56 @@ class Amount
         return $symbol . ' ' . $string;
     }
 
-
     /**
      * @return string
+     *
+     * @param TransactionJournal $journal
      */
-    public function getCurrencySymbol()
+    public function formatJournal(TransactionJournal $journal, $coloured = true)
     {
-        if (defined('FFCURRENCYSYMBOL')) {
-            return FFCURRENCYSYMBOL;
+        $showPositive = true;
+        if (is_null($journal->symbol)) {
+            $symbol = $journal->transactionCurrency->symbol;
+        } else {
+            $symbol = $journal->symbol;
         }
-        if (\Cache::has('FFCURRENCYSYMBOL')) {
-            define('FFCURRENCYSYMBOL', \Cache::get('FFCURRENCYSYMBOL'));
+        $amount = 0;
 
-            return FFCURRENCYSYMBOL;
+        if (is_null($journal->type)) {
+            $type = $journal->transactionType->type;
+        } else {
+            $type = $journal->type;
         }
 
-        $currencyPreference = Prefs::get('currencyPreference', 'EUR');
-        $currency           = TransactionCurrency::whereCode($currencyPreference->data)->first();
+        if ($type == 'Withdrawal') {
+            $showPositive = false;
+        }
 
-        \Cache::forever('FFCURRENCYSYMBOL', $currency->symbol);
+        foreach ($journal->transactions as $t) {
+            if (floatval($t->amount) > 0 && $showPositive === true) {
+                $amount = floatval($t->amount);
+                break;
+            }
+            if (floatval($t->amount) < 0 && $showPositive === false) {
+                $amount = floatval($t->amount);
+            }
+        }
 
-        define('FFCURRENCYSYMBOL', $currency->symbol);
+        return $this->formatWithSymbol($symbol, $amount, $coloured);
+    }
 
-        return $currency->symbol;
+    /**
+     * @param Transaction $transaction
+     * @param bool        $coloured
+     *
+     * @return string
+     */
+    public function formatTransaction(Transaction $transaction, $coloured = true)
+    {
+        $symbol = $transaction->transactionJournal->transactionCurrency->symbol;
+        $amount = floatval($transaction->amount);
+
+        return $this->formatWithSymbol($symbol, $amount, $coloured);
     }
 
     /**

app/Support/ExpandedForm.php

@@ -2,6 +2,7 @@
 
 namespace FireflyIII\Support;
 
+use Amount as Amt;
 use FireflyIII\Models\TransactionCurrency;
 use Illuminate\Support\Collection;
 use Illuminate\Support\MessageBag;
@@ -17,46 +18,6 @@ use View;
 class ExpandedForm
 {
 
-    /**
-     * @param       $name
-     * @param null  $value
-     * @param array $options
-     *
-     * @return string
-     */
-    public  function integer($name, $value = null, array $options = [])
-    {
-        $label           = $this->label($name, $options);
-        $options         = $this->expandOptionArray($name, $label, $options);
-        $classes         = $this->getHolderClasses($name);
-        $value           = $this->fillFieldValue($name, $value);
-        $options['step'] = '1';
-        $html            = \View::make('form.integer', compact('classes', 'name', 'label', 'value', 'options'))->render();
-
-        return $html;
-
-    }
-
-
-    /**
-     * @param       $name
-     * @param null  $value
-     * @param array $options
-     *
-     * @return string
-     */
-    public  function tags($name, $value = null, array $options = [])
-    {
-        $label                = $this->label($name, $options);
-        $options              = $this->expandOptionArray($name, $label, $options);
-        $classes              = $this->getHolderClasses($name);
-        $value                = $this->fillFieldValue($name, $value);
-        $options['data-role'] = 'tagsinput';
-        $html                 = \View::make('form.tags', compact('classes', 'name', 'label', 'value', 'options'))->render();
-
-        return $html;
-    }
-
     /**
      * @param       $name
      * @param null  $value
@@ -72,7 +33,7 @@ class ExpandedForm
         $value           = $this->fillFieldValue($name, $value);
         $options['step'] = 'any';
         $options['min']  = '0.01';
-        $defaultCurrency = isset($options['currency']) ? $options['currency'] : \Amount::getDefaultCurrency();
+        $defaultCurrency = isset($options['currency']) ? $options['currency'] : Amt::getDefaultCurrency();
         $currencies      = TransactionCurrency::orderBy('code', 'ASC')->get();
         $html            = View::make('form.amount', compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
 
@@ -91,9 +52,19 @@ class ExpandedForm
         if (isset($options['label'])) {
             return $options['label'];
         }
-        $labels = ['amount_min'      => 'Amount (min)', 'amount_max' => 'Amount (max)', 'match' => 'Matches on', 'repeat_freq' => 'Repetition',
-                   'account_from_id' => 'Account from', 'account_to_id' => 'Account to', 'account_id' => 'Asset account', 'budget_id' => 'Budget'
-                   , 'piggy_bank_id' => 'Piggy bank'];
+        $labels = [
+            'amount_min'         => 'Amount (min)',
+            'amount_max'         => 'Amount (max)',
+            'match'              => 'Matches on',
+            'repeat_freq'        => 'Repetition',
+            'account_from_id'    => 'Account from',
+            'account_to_id'      => 'Account to',
+            'account_id'         => 'Asset account',
+            'budget_id'          => 'Budget',
+            'openingBalance'     => 'Opening balance',
+            'accountRole'        => 'Account role',
+            'openingBalanceDate' => 'Opening balance date',
+            'piggy_bank_id'      => 'Piggy bank'];
 
 
         return isset($labels[$name]) ? $labels[$name] : str_replace('_', ' ', ucfirst($name));
@@ -125,24 +96,14 @@ class ExpandedForm
     public function getHolderClasses($name)
     {
         /*
-       * Get errors, warnings and successes from session:
+       * Get errors from session:
        */
         /** @var MessageBag $errors */
-        $errors = Session::get('errors');
+        $errors  = Session::get('errors');
+        $classes = 'form-group';
 
-        /** @var MessageBag $successes */
-        $successes = Session::get('successes');
-
-        switch (true) {
-            case (!is_null($errors) && $errors->has($name)):
-                $classes = 'form-group has-error has-feedback';
-                break;
-            case (!is_null($successes) && $successes->has($name)):
-                $classes = 'form-group has-success has-feedback';
-                break;
-            default:
-                $classes = 'form-group';
-                break;
+        if (!is_null($errors) && $errors->has($name)) {
+            $classes = 'form-group has-error has-feedback';
         }
 
         return $classes;
@@ -157,7 +118,7 @@ class ExpandedForm
     public function fillFieldValue($name, $value)
     {
         if (Session::has('preFilled')) {
-            $preFilled = \Session::get('preFilled');
+            $preFilled = Session::get('preFilled');
             $value     = isset($preFilled[$name]) && is_null($value) ? $preFilled[$name] : $value;
         }
         if (!is_null(Input::old($name))) {
@@ -181,7 +142,7 @@ class ExpandedForm
         $classes         = $this->getHolderClasses($name);
         $value           = $this->fillFieldValue($name, $value);
         $options['step'] = 'any';
-        $defaultCurrency = isset($options['currency']) ? $options['currency'] : Amount::getDefaultCurrency();
+        $defaultCurrency = isset($options['currency']) ? $options['currency'] : Amt::getDefaultCurrency();
         $currencies      = TransactionCurrency::orderBy('code', 'ASC')->get();
         $html            = View::make('form.balance', compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
 
@@ -229,6 +190,26 @@ class ExpandedForm
         return $html;
     }
 
+    /**
+     * @param       $name
+     * @param null  $value
+     * @param array $options
+     *
+     * @return string
+     */
+    public function integer($name, $value = null, array $options = [])
+    {
+        $label           = $this->label($name, $options);
+        $options         = $this->expandOptionArray($name, $label, $options);
+        $classes         = $this->getHolderClasses($name);
+        $value           = $this->fillFieldValue($name, $value);
+        $options['step'] = '1';
+        $html            = View::make('form.integer', compact('classes', 'name', 'label', 'value', 'options'))->render();
+
+        return $html;
+
+    }
+
     /**
      * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
      *
@@ -246,7 +227,7 @@ class ExpandedForm
             $selectList[0] = '(none)';
         }
         $fields = ['title', 'name', 'description'];
-        /** @var \Eloquent $entry */
+        /** @var Eloquent $entry */
         foreach ($set as $entry) {
             $id    = intval($entry->id);
             $title = null;
@@ -270,9 +251,9 @@ class ExpandedForm
      */
     public function optionsList($type, $name)
     {
-        $previousValue = \Input::old('post_submit_action');
+        $previousValue = Input::old('post_submit_action');
         $previousValue = is_null($previousValue) ? 'store' : $previousValue;
-        $html          = \View::make('form.options', compact('type', 'name', 'previousValue'))->render();
+        $html          = View::make('form.options', compact('type', 'name', 'previousValue'))->render();
 
         return $html;
     }
@@ -291,7 +272,26 @@ class ExpandedForm
         $options  = $this->expandOptionArray($name, $label, $options);
         $classes  = $this->getHolderClasses($name);
         $selected = $this->fillFieldValue($name, $selected);
-        $html     = \View::make('form.select', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render();
+        $html     = View::make('form.select', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render();
+
+        return $html;
+    }
+
+    /**
+     * @param       $name
+     * @param null  $value
+     * @param array $options
+     *
+     * @return string
+     */
+    public function tags($name, $value = null, array $options = [])
+    {
+        $label                = $this->label($name, $options);
+        $options              = $this->expandOptionArray($name, $label, $options);
+        $classes              = $this->getHolderClasses($name);
+        $value                = $this->fillFieldValue($name, $value);
+        $options['data-role'] = 'tagsinput';
+        $html                 = View::make('form.tags', compact('classes', 'name', 'label', 'value', 'options'))->render();
 
         return $html;
     }

app/Support/Navigation.php

@@ -28,20 +28,27 @@ class Navigation
         $add  = ($skip + 1);
 
         $functionMap = [
+            '1D'        => 'addDays',
             'daily'     => 'addDays',
+            '1W'        => 'addWeeks',
             'weekly'    => 'addWeeks',
             'week'      => 'addWeeks',
+            '1M'        => 'addMonths',
             'month'     => 'addMonths',
             'monthly'   => 'addMonths',
+            '3M'        => 'addMonths',
             'quarter'   => 'addMonths',
             'quarterly' => 'addMonths',
+            '6M'        => 'addMonths',
             'half-year' => 'addMonths',
             'year'      => 'addYears',
             'yearly'    => 'addYears',
         ];
         $modifierMap = [
             'quarter'   => 3,
+            '3M'        => 3,
             'quarterly' => 3,
+            '6M'        => 6,
             'half-year' => 6,
         ];
         if (!isset($functionMap[$repeatFreq])) {
@@ -68,24 +75,31 @@ class Navigation
         $currentEnd = clone $theCurrentEnd;
 
         $functionMap = [
+            '1D'        => 'addDay',
             'daily'     => 'addDay',
+            '1W'        => 'addWeek',
             'week'      => 'addWeek',
             'weekly'    => 'addWeek',
+            '1M'        => 'addMonth',
             'month'     => 'addMonth',
             'monthly'   => 'addMonth',
+            '3M'        => 'addMonths',
             'quarter'   => 'addMonths',
             'quarterly' => 'addMonths',
+            '6M'        => 'addMonths',
             'half-year' => 'addMonths',
             'year'      => 'addYear',
             'yearly'    => 'addYear',
         ];
         $modifierMap = [
             'quarter'   => 3,
+            '3M'        => 3,
             'quarterly' => 3,
             'half-year' => 6,
+            '6M'        => 6,
         ];
 
-        $subDay = ['week', 'weekly', 'month', 'monthly', 'quarter', 'quarterly', 'half-year', 'year', 'yearly'];
+        $subDay = ['week', 'weekly', '1W', 'month', 'monthly', '1M', '3M', 'quarter', 'quarterly', '6M', 'half-year', 'year', 'yearly'];
 
         if (!isset($functionMap[$repeatFreq])) {
             throw new FireflyException('Cannot do endOfPeriod for $repeat_freq ' . $repeatFreq);
@@ -298,15 +312,19 @@ class Navigation
         $date = clone $theDate;
 
         $functionMap = [
-            'daily'   => 'startOfDay',
-            'week'    => 'startOfWeek',
-            'weekly'  => 'startOfWeek',
-            'month'   => 'startOfMonth',
-            'monthly' => 'startOfMonth',
-            'quarter' => 'firstOfQuarter',
-            'quartly' => 'firstOfQuarter',
-            'year'    => 'startOfYear',
-            'yearly'  => 'startOfYear',
+            '1D'        => 'startOfDay',
+            'daily'     => 'startOfDay',
+            '1W'        => 'startOfWeek',
+            'week'      => 'startOfWeek',
+            'weekly'    => 'startOfWeek',
+            'month'     => 'startOfMonth',
+            '1M'        => 'startOfMonth',
+            'monthly'   => 'startOfMonth',
+            '3M'        => 'firstOfQuarter',
+            'quarter'   => 'firstOfQuarter',
+            'quarterly' => 'firstOfQuarter',
+            'year'      => 'startOfYear',
+            'yearly'    => 'startOfYear',
         ];
         if (isset($functionMap[$repeatFreq])) {
             $function = $functionMap[$repeatFreq];
@@ -314,7 +332,7 @@ class Navigation
 
             return $date;
         }
-        if ($repeatFreq == 'half-year') {
+        if ($repeatFreq == 'half-year' || $repeatFreq == '6M') {
             $month = intval($date->format('m'));
             $date->startOfYear();
             if ($month >= 7) {
@@ -396,5 +414,47 @@ class Navigation
         throw new FireflyException('updateStartDate cannot handle $range ' . $range);
     }
 
+    /**
+     * @param Carbon         $theDate
+     * @param                $repeatFreq
+     * @param int            $subtract
+     *
+     * @return Carbon
+     * @throws FireflyException
+     */
+    public function subtractPeriod(Carbon $theDate, $repeatFreq, $subtract = 1)
+    {
+        $date = clone $theDate;
+
+        $functionMap = [
+            'daily'   => 'subDays',
+            'week'    => 'subWeeks',
+            'weekly'  => 'subWeeks',
+            'month'   => 'subMonths',
+            'monthly' => 'subMonths',
+            'year'    => 'subYears',
+            'yearly'  => 'subYears',
+        ];
+        $modifierMap = [
+            'quarter'   => 3,
+            'quarterly' => 3,
+            'half-year' => 6,
+        ];
+        if (isset($functionMap[$repeatFreq])) {
+            $function = $functionMap[$repeatFreq];
+            $date->$function($subtract);
+
+            return $date;
+        }
+        if (isset($modifierMap[$repeatFreq])) {
+            $subtract = $subtract * $modifierMap[$repeatFreq];
+            $date->subMonths($subtract);
+
+            return $date;
+        }
+
+        throw new FireflyException('Cannot do subtractPeriod for $repeat_freq ' . $repeatFreq);
+    }
+
 
 }

app/Support/Preferences.php

@@ -45,12 +45,12 @@ class Preferences
         if (is_null($pref)) {
             $pref       = new Preference;
             $pref->name = $name;
-            $pref->user()->associate(Auth::user());
-
         }
         $pref->data = $value;
-        $pref->save();
-
+        if (!is_null(Auth::user()->id)) {
+            $pref->user()->associate(Auth::user());
+            $pref->save();
+        }
 
         return $pref;
 

app/Support/Search/Search.php

@@ -3,11 +3,12 @@
 namespace FireflyIII\Support\Search;
 
 
-use Illuminate\Support\Collection;
-use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Auth;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
-
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Illuminate\Support\Collection;
 
 /**
  * Class Search
@@ -23,7 +24,7 @@ class Search implements SearchInterface
      */
     public function searchAccounts(array $words)
     {
-        return \Auth::user()->accounts()->with('accounttype')->where(
+        return Auth::user()->accounts()->with('accounttype')->where(
             function (EloquentBuilder $q) use ($words) {
                 foreach ($words as $word) {
                     $q->orWhere('name', 'LIKE', '%' . e($word) . '%');
@@ -40,7 +41,7 @@ class Search implements SearchInterface
     public function searchBudgets(array $words)
     {
         /** @var Collection $set */
-        $set    = \Auth::user()->budgets()->get();
+        $set    = Auth::user()->budgets()->get();
         $newSet = $set->filter(
             function (Budget $b) use ($words) {
                 $found = 0;
@@ -65,7 +66,7 @@ class Search implements SearchInterface
     public function searchCategories(array $words)
     {
         /** @var Collection $set */
-        $set    = \Auth::user()->categories()->get();
+        $set    = Auth::user()->categories()->get();
         $newSet = $set->filter(
             function (Category $c) use ($words) {
                 $found = 0;
@@ -101,12 +102,39 @@ class Search implements SearchInterface
      */
     public function searchTransactions(array $words)
     {
-        return \Auth::user()->transactionjournals()->withRelevantData()->where(
+        // decrypted transaction journals:
+        $decrypted = Auth::user()->transactionjournals()->withRelevantData()->where('encrypted', 0)->where(
             function (EloquentBuilder $q) use ($words) {
                 foreach ($words as $word) {
                     $q->orWhere('description', 'LIKE', '%' . e($word) . '%');
                 }
             }
         )->get();
+
+        // encrypted
+        $all = Auth::user()->transactionjournals()->withRelevantData()->where('encrypted', 1)->get();
+        $set = $all->filter(
+            function (TransactionJournal $journal) use ($words) {
+                foreach ($words as $word) {
+                    $haystack = strtolower($journal->description);
+                    $word     = strtolower($word);
+                    if (!(strpos($haystack, $word) === false)) {
+                        return $journal;
+                    }
+                }
+
+            }
+        );
+        $filtered = $set->merge($decrypted);
+
+        $filtered->sortBy(
+            function (TransactionJournal $journal) {
+                return intval($journal->date->format('U'));
+            }
+        );
+
+        $filtered = $filtered->reverse();
+
+        return $filtered;
     }
 } 

app/Support/Steam.php

@@ -24,7 +24,24 @@ class Steam
      */
     public function balance(Account $account, Carbon $date = null)
     {
-        $date    = is_null($date) ? Carbon::now() : $date;
+        $date = is_null($date) ? Carbon::now() : $date;
+
+        // find the first known transaction on this account:
+        //
+        $firstDateObject = $account
+            ->transactions()
+            ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+            ->orderBy('transaction_journals.date', 'ASC')->first(['transaction_journals.date']);
+
+        $firstDate = is_null($firstDateObject) ? clone $date : new Carbon($firstDateObject->date);
+        $date      = $date < $firstDate ? $firstDate : $date;
+
+        /**
+         *select * from transactions
+         * left join transaction_journals ON transaction_journals.id = transactions.transaction_journal_id
+         * order by date ASC
+         */
+
         $balance = floatval(
             $account->transactions()->leftJoin(
                 'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'
@@ -34,6 +51,38 @@ class Steam
         return $balance;
     }
 
+    /**
+     * Only return the top X entries, group the rest by amount
+     * and described as 'Others'. id = 0 as well
+     *
+     * @param array $array
+     * @param int   $limit
+     *
+     * @return array
+     */
+    public function limitArray(array $array, $limit = 10)
+    {
+        $others = [
+            'name'   => 'Others',
+            'amount' => 0
+        ];
+        $return = [];
+        $count  = 0;
+        foreach ($array as $id => $entry) {
+            if ($count < ($limit - 1)) {
+                $return[$id] = $entry;
+            } else {
+                $others['amount'] += $entry['amount'];
+            }
+
+            $count++;
+        }
+        $return[0] = $others;
+
+        return $return;
+
+    }
+
     /**
      * Turns a collection into an array. Needs the field 'id' for the key,
      * and saves only 'name' and 'amount' as a sub array.
@@ -86,6 +135,24 @@ class Steam
         return $one;
     }
 
+    /**
+     * @param PiggyBank           $piggyBank
+     * @param PiggyBankRepetition $repetition
+     *
+     * @return int
+     */
+    public function percentage(PiggyBank $piggyBank, PiggyBankRepetition $repetition)
+    {
+        $pct = $repetition->currentamount / $piggyBank->targetamount * 100;
+        if ($pct > 100) {
+            // @codeCoverageIgnoreStart
+            return 100;
+            // @codeCoverageIgnoreEnd
+        } else {
+            return floor($pct);
+        }
+    }
+
     /**
      * Sort an array where all 'amount' keys are positive floats.
      *
@@ -109,38 +176,6 @@ class Steam
 
     }
 
-    /**
-     * Only return the top X entries, group the rest by amount
-     * and described as 'Others'. id = 0 as well
-     *
-     * @param array $array
-     * @param int   $limit
-     *
-     * @return array
-     */
-    public function limitArray(array $array, $limit = 10)
-    {
-        $others = [
-            'name'   => 'Others',
-            'amount' => 0
-        ];
-        $return = [];
-        $count  = 0;
-        foreach ($array as $id => $entry) {
-            if ($count < ($limit - 1)) {
-                $return[$id] = $entry;
-            } else {
-                $others['amount'] += $entry['amount'];
-            }
-
-            $count++;
-        }
-        $return[0] = $others;
-
-        return $return;
-
-    }
-
     /**
      * Sort an array where all 'amount' keys are negative floats.
      *
@@ -163,22 +198,4 @@ class Steam
         return $array;
     }
 
-    /**
-     * @param PiggyBank           $piggyBank
-     * @param PiggyBankRepetition $repetition
-     *
-     * @return int
-     */
-    public function percentage(PiggyBank $piggyBank, PiggyBankRepetition $repetition)
-    {
-        $pct = $repetition->currentamount / $piggyBank->targetamount * 100;
-        if ($pct > 100) {
-            // @codeCoverageIgnoreStart
-            return 100;
-            // @codeCoverageIgnoreEnd
-        } else {
-            return floor($pct);
-        }
-    }
-
 }

app/User.php

@@ -99,12 +99,4 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
         return $this->hasMany('FireflyIII\Models\TransactionJournal');
     }
 
-    /**
-     * @param $value
-     */
-    public function setPasswordAttribute($value)
-    {
-        $this->attributes['password'] = \Hash::make($value);
-    }
-
 }

app/Validation/FireflyValidator.php

@@ -3,8 +3,13 @@
 namespace FireflyIII\Validation;
 
 use Auth;
+use Carbon\Carbon;
+use Config;
 use DB;
+use FireflyIII\Models\AccountType;
 use Illuminate\Validation\Validator;
+use Input;
+use Navigation;
 
 /**
  * Class FireflyValidator
@@ -32,6 +37,89 @@ class FireflyValidator extends Validator
 
     }
 
+    /**
+     * @param $attribute
+     * @param $value
+     * @param $parameters
+     *
+     * @return bool
+     */
+    public function validatePiggyBankReminder($attribute, $value, $parameters)
+    {
+        $array = $this->data;
+        // no reminder? dont care.
+        if (!isset($array['remind_me'])) {
+            return true;
+        }
+
+        // get or set start date & target date:
+        $startDate  = isset($array['startdate']) ? new Carbon($array['startdate']) : new Carbon;
+        $targetDate = isset($array['targetdate']) && strlen($array['targetdate']) > 0 ? new Carbon($array['targetdate']) : null;
+
+        // target date is null? reminder period is always good.
+        if ($array['remind_me'] == '1' && is_null($targetDate)) {
+            return true;
+        }
+
+        $nextReminder = Navigation::addPeriod($startDate, $array['reminder'], 0);
+        // reminder is beyond target?
+        if ($nextReminder > $targetDate) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param $attribute
+     * @param $value
+     * @param $parameters
+     *
+     * @return bool
+     */
+    public function validateUniqueAccountForUser($attribute, $value, $parameters)
+    {
+        // get account type from data, we must have this:
+        $validTypes = array_keys(Config::get('firefly.subTitlesByIdentifier'));
+
+
+        $type = isset($this->data['what']) && in_array($this->data['what'], $validTypes) ? $this->data['what'] : null;
+        // some fallback:
+        if (is_null($type)) {
+            $type = in_array(Input::get('what'), $validTypes) ? Input::get('what') : null;
+        }
+        // still null?
+        if (is_null($type)) {
+            // find by other field:
+            $type   = isset($this->data['account_type_id']) ? $this->data['account_type_id'] : 0;
+            $dbType = AccountType::find($type);
+        } else {
+            $longType = Config::get('firefly.accountTypeByIdentifier.' . $type);
+            $dbType   = AccountType::whereType($longType)->first();
+        }
+
+        if (is_null($dbType)) {
+            return false;
+        }
+
+        // user id?
+        $userId = Auth::check() ? Auth::user()->id : $this->data['user_id'];
+
+        $query = DB::table('accounts')->where('name', $value)->where('account_type_id', $dbType->id)->where('user_id', $userId);
+
+        if (isset($parameters[0])) {
+            $query->where('id', '!=', $parameters[0]);
+        }
+        $count = $query->count();
+        if ($count == 0) {
+
+            return true;
+        }
+
+        return false;
+
+    }
+
     /**
      * @param $attribute
      * @param $value
@@ -41,7 +129,36 @@ class FireflyValidator extends Validator
      */
     public function validateUniqueForUser($attribute, $value, $parameters)
     {
-        $count = DB::table($parameters[0])->where($parameters[1], $value)->count();
+        $query = DB::table($parameters[0])->where($parameters[1], $value);
+        $query->where('user_id', Auth::user()->id);
+        if (isset($paramers[2])) {
+            $query->where('id', '!=', $parameters[2]);
+        }
+        $count = $query->count();
+        if ($count == 0) {
+            return true;
+        }
+
+        return false;
+
+    }
+
+    /**
+     * @param $attribute
+     * @param $value
+     * @param $parameters
+     *
+     * @return bool
+     */
+    public function validateUniquePiggyBankForUser($attribute, $value, $parameters)
+    {
+        $query = DB::table($parameters[0])->where('piggy_banks.'.$parameters[1], $value);
+        $query->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id');
+        $query->where('accounts.user_id', Auth::user()->id);
+        if (isset($paramers[2])) {
+            $query->where('piggy_banks.id', '!=', $parameters[2]);
+        }
+        $count = $query->count();
         if ($count == 0) {
             return true;
         }

codeception.yml

@@ -1,18 +0,0 @@
-actor: Tester
-paths:
-    tests: tests
-    log: tests/_output
-    data: tests/_data
-    helpers: tests/_support
-settings:
-    bootstrap: _bootstrap.php
-    colors: true
-    memory_limit: 1024M
-modules:
-    config:
-coverage:
-    enabled: true
-    remote: false
-    whitelist:
-        include:
-            - app/*

composer.json

@@ -26,23 +26,14 @@
         "watson/validating": "dev-master",
         "doctrine/dbal": "~2.5",
         "illuminate/html": "~5.0",
-        "barryvdh/laravel-ide-helper": "~2.0",
         "league/commonmark": "0.7.*"
-
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "@stable",
+        "barryvdh/laravel-ide-helper": "~2.0",
         "phpunit/phpunit": "~4.0",
         "phpspec/phpspec": "~2.1",
-        "codeception/codeception": "@stable",
-        "codeception/c3": "@stable",
-        "league/factory-muffin": "~2.1",
-        "codeception/phpbuiltinserver": "*",
-        "codeception/specify": "*",
-        "codeception/verify": "*",
-        "fzaninotto/faker": "1.*",
-        "codeclimate/php-test-reporter": "dev-master"
-
+        "satooshi/php-coveralls": "0.6.1"
     },
     "autoload": {
         "classmap": [
@@ -60,14 +51,11 @@
     "scripts": {
         "post-install-cmd": [
             "php artisan clear-compiled",
-            "php artisan optimize",
-            "Codeception\\c3\\Installer::copyC3ToRoot"
-
+            "php artisan optimize"
         ],
         "post-update-cmd": [
             "php artisan clear-compiled",
-            "php artisan optimize",
-            "Codeception\\c3\\Installer::copyC3ToRoot"
+            "php artisan optimize"
         ],
         "post-create-project-cmd": [
             "php -r \"copy('.env.example', '.env');\"",

config/database.php

@@ -48,7 +48,7 @@ return [
 
         'sqlite' => [
             'driver'   => 'sqlite',
-            'database' => realpath(__DIR__ . '/../tests/_data/db.sqlite'),
+            'database' => realpath(__DIR__ . '/../tests/database/db.sqlite'),
             'prefix'   => '',
         ],
 

config/firefly.php

@@ -18,8 +18,9 @@ return [
     ],
 
     'accountRoles'             => [
-        'defaultExpense' => 'Default expense account',
-        'sharedExpense'  => 'Shared expense account'
+        'defaultAsset' => 'Default asset account',
+        'sharedAsset'  => 'Shared asset account',
+        'savingAsset'  => 'Savings account'
     ],
 
     'range_to_text'            => [
@@ -72,9 +73,9 @@ return [
         ],
     'accountTypeByIdentifier'  =>
         [
-            'asset'   => 'Asset account',
-            'expense' => 'Expense account',
-            'revenue' => 'Revenue account',
+            'asset'      => 'Asset account',
+            'expense'    => 'Expense account',
+            'revenue'    => 'Revenue account'
         ],
     'shortNamesByFullName'     =>
         [

config/mail.php

@@ -15,7 +15,7 @@ return [
     |
     */
 
-    'driver'     => 'smtp',
+    'driver'     => env('EMAIL_DRIVER', 'smtp'),
 
     /*
     |--------------------------------------------------------------------------

database/migrations/2014_12_13_190730_changes_for_v321.php

@@ -1,5 +1,7 @@
 <?php
 
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\Category;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\Component;
 use Illuminate\Database\Migrations\Migration;

database/migrations/2014_12_24_191544_changes_for_v322.php

@@ -23,13 +23,17 @@ class ChangesForV322 extends Migration
         // rename fields
         Schema::table(
             'piggy_bank_events', function (Blueprint $table) {
+            $table->dropForeign('piggy_bank_events_piggy_bank_id_foreign');
             $table->renameColumn('piggy_bank_id', 'piggybank_id');
+            $table->foreign('piggybank_id')->references('id')->on('piggybanks')->onDelete('cascade');
         }
         );
 
         Schema::table(
             'piggybank_repetitions', function (Blueprint $table) {
+            $table->dropForeign('piggy_bank_repetitions_piggy_bank_id_foreign');
             $table->renameColumn('piggy_bank_id', 'piggybank_id');
+            $table->foreign('piggybank_id')->references('id')->on('piggybanks')->onDelete('cascade');
         }
         );
 
@@ -55,11 +59,12 @@ class ChangesForV322 extends Migration
         }
         );
 
-        // drop foreign key from budget_limits:
+        // drop unique constraint from budget_limits:
         Schema::table(
             'budget_limits', function (Blueprint $table) {
             $table->dropForeign('bid_foreign');
             $table->dropUnique('unique_bl_combi');
+            $table->foreign('budget_id', 'bid_foreign')->references('id')->on('budgets')->onDelete('cascade');
         }
         );
 

database/migrations/2015_02_27_210653_changes_for_v332.php

@@ -0,0 +1,46 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+/**
+ * Class ChangesForV332
+ */
+class ChangesForV332 extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+
+        Schema::table(
+            'accounts', function (Blueprint $table) {
+            $table->boolean('encrypted')->default(0);
+
+        }
+        );
+
+        Schema::table(
+            'reminders', function (Blueprint $table) {
+            $table->text('metadata')->nullable();
+
+        }
+        );
+
+
+    }
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+
+}

database/migrations/2015_03_27_061038_changes_for_v333.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class ChangesForV333 extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+        Schema::table(
+            'transaction_journals', function (Blueprint $table) {
+            $table->smallInteger('order',false,true)->default(0);
+
+        }
+        );
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+
+}

database/seeds/TestDataSeeder.php

@@ -90,7 +90,6 @@ class TestDataSeeder extends Seeder
         $this->createCategories();
         $this->createPiggyBanks();
         $this->createReminders();
-        $this->createRecurringTransactions();
         $this->createBills();
         $this->createExpenseAccounts();
         $this->createRevenueAccounts();
@@ -116,9 +115,9 @@ class TestDataSeeder extends Seeder
      */
     public function createUsers()
     {
-        User::create(['email' => 'reset@example.com', 'password' => 'functional', 'reset' => 'okokokokokokokokokokokokokokokok', 'remember_token' => null]);
-        User::create(['email' => 'functional@example.com', 'password' => 'functional', 'reset' => null, 'remember_token' => null]);
-        User::create(['email' => 'thegrumpydictator@gmail.com', 'password' => 'james', 'reset' => null, 'remember_token' => null]);
+        User::create(['email' => 'reset@example.com', 'password' => bcrypt('functional'), 'reset' => 'okokokokokokokokokokokokokokokok', 'remember_token' => null]);
+        User::create(['email' => 'functional@example.com', 'password' => bcrypt('functional'), 'reset' => null, 'remember_token' => null]);
+        User::create(['email' => 'thegrumpydictator@gmail.com', 'password' => bcrypt('james'), 'reset' => null, 'remember_token' => null]);
     }
 
     /**
@@ -138,9 +137,9 @@ class TestDataSeeder extends Seeder
         $acc_c = Account::create(['user_id' => $user->id, 'account_type_id' => $assetType->id, 'name' => 'Delete me', 'active' => 1]);
 
         // create account meta:
-        $meta_a = AccountMeta::create(['account_id' => $acc_a->id, 'name' => 'accountRole', 'data' => 'defaultExpense']);
-        $meta_b = AccountMeta::create(['account_id' => $acc_b->id, 'name' => 'accountRole', 'data' => 'defaultExpense']);
-        $meta_c = AccountMeta::create(['account_id' => $acc_c->id, 'name' => 'accountRole', 'data' => 'defaultExpense']);
+        $meta_a = AccountMeta::create(['account_id' => $acc_a->id, 'name' => 'accountRole', 'data' => 'defaultAsset']);
+        $meta_b = AccountMeta::create(['account_id' => $acc_b->id, 'name' => 'accountRole', 'data' => 'savingAsset']);
+        $meta_c = AccountMeta::create(['account_id' => $acc_c->id, 'name' => 'accountRole', 'data' => 'defaultAsset']);
 //        var_dump($meta_a->toArray());
 //        var_dump($meta_b->toArray());
 //        var_dump($meta_c->toArray());
@@ -279,7 +278,6 @@ class TestDataSeeder extends Seeder
         );
         // and some events!
         PiggyBankEvent::create(['piggy_bank_id' => $newCamera->id, 'date' => $this->som, 'amount' => 100]);
-        PiggyBankRepetition::create(['piggy_bank_id' => $newCamera->id, 'startdate' => $this->som, 'targetdate' => null, 'currentamount' => 100]);
 
 
         $newClothes = PiggyBank::create(
@@ -301,27 +299,51 @@ class TestDataSeeder extends Seeder
         );
 
         PiggyBankEvent::create(['piggy_bank_id' => $newClothes->id, 'date' => $this->som, 'amount' => 100]);
-        PiggyBankRepetition::create(['piggy_bank_id' => $newClothes->id, 'startdate' => $this->som, 'targetdate' => $end, 'currentamount' => 100]);
 
-        // weekly reminder piggy bank
-        $weekly = PiggyBank::create(
-            [
-                'account_id'    => $savings->id,
-                'name'          => 'Weekly reminder for clothes',
-                'targetamount'  => 2000,
-                'startdate'     => $this->som,
-                'targetdate'    => $next,
-                'repeats'       => 0,
-                'rep_length'    => null,
-                'rep_every'     => 0,
-                'rep_times'     => null,
-                'reminder'      => 'week',
-                'reminder_skip' => 0,
-                'remind_me'     => 1,
-                'order'         => 0,
-            ]
-        );
-        PiggyBankRepetition::create(['piggy_bank_id' => $weekly->id, 'startdate' => $this->som, 'targetdate' => $next, 'currentamount' => 0]);
+        /*
+         * New: create no less than eight piggy banks that
+         * create all sorts of reminders
+         */
+        $list = ['week','quarter','month','year'];
+        $nextYear = clone $this->_startOfMonth;
+        $nextYear->addYear();
+        foreach($list as $entry) {
+
+            PiggyBank::create(
+                [
+                    'account_id'    => $savings->id,
+                    'name'          => $entry.' piggy bank with target date.',
+                    'targetamount'  => 1000,
+                    'startdate'     => $this->som,
+                    'targetdate'    => $nextYear,
+                    'repeats'       => 0,
+                    'rep_length'    => null,
+                    'rep_every'     => 0,
+                    'rep_times'     => null,
+                    'reminder'      => $entry,
+                    'reminder_skip' => 0,
+                    'remind_me'     => 1,
+                    'order'         => 0,
+                ]
+            );
+            PiggyBank::create(
+                [
+                    'account_id'    => $savings->id,
+                    'name'          => $entry.' piggy bank without target date.',
+                    'targetamount'  => 1000,
+                    'startdate'     => $this->som,
+                    'targetdate'    => null,
+                    'repeats'       => 0,
+                    'rep_length'    => null,
+                    'rep_every'     => 0,
+                    'rep_times'     => null,
+                    'reminder'      => $entry,
+                    'reminder_skip' => 0,
+                    'remind_me'     => 1,
+                    'order'         => 0,
+                ]
+            );
+        }
     }
 
     /**
@@ -331,57 +353,7 @@ class TestDataSeeder extends Seeder
     {
         $user = User::whereEmail('thegrumpydictator@gmail.com')->first();
         // for weekly piggy bank (clothes)
-        $nextWeek  = clone $this->_startOfMonth;
-        $piggyBank = PiggyBank::whereName('New clothes')->orderBy('id', 'DESC')->first();
-        $nextWeek->addWeek();
-        $week = $nextWeek->format('Y-m-d');
 
-        Reminder::create(
-            ['user_id'          => $user->id, 'startdate' => $this->som, 'enddate' => $week, 'active' => 1, 'notnow' => 0,
-             'remindersable_id' => $piggyBank->id, 'remindersable_type' => 'PiggyBank']
-        );
-
-        // a fake reminder::
-        Reminder::create(
-            ['user_id'            => $user->id, 'startdate' => $this->som, 'enddate' => $week, 'active' => 0, 'notnow' => 0, 'remindersable_id' => 40,
-             'remindersable_type' => 'Transaction']
-        );
-    }
-
-    /**
-     *
-     */
-    public function createRecurringTransactions()
-    {
-        // account
-        $savings = Account::whereName('Savings account')->orderBy('id', 'DESC')->first();
-        $user    = User::whereEmail('thegrumpydictator@gmail.com')->first();
-
-        $recurring = PiggyBank::create(
-            [
-                'account_id'    => $savings->id,
-                'name'          => 'Nieuwe spullen',
-                'targetamount'  => 1000,
-                'startdate'     => $this->som,
-                'targetdate'    => $this->eom,
-                'repeats'       => 1,
-                'rep_length'    => 'month',
-                'rep_every'     => 0,
-                'rep_times'     => 0,
-                'reminder'      => 'month',
-                'reminder_skip' => 0,
-                'remind_me'     => 1,
-                'order'         => 0,
-            ]
-        );
-        PiggyBankRepetition::create(['piggy_bank_id' => $recurring->id, 'startdate' => $this->som, 'targetdate' => $this->eom, 'currentamount' => 0]);
-        PiggyBankRepetition::create(
-            ['piggy_bank_id' => $recurring->id, 'startdate' => $this->nsom, 'targetdate' => $this->neom, 'currentamount' => 0]
-        );
-        Reminder::create(
-            ['user_id'          => $user->id, 'startdate' => $this->som, 'enddate' => $this->neom, 'active' => 1, 'notnow' => 0,
-             'remindersable_id' => $recurring->id, 'remindersable_type' => 'PiggyBank']
-        );
     }
 
     /**

phpunit.xml

@@ -11,12 +11,24 @@
          syntaxCheck="false">
     <testsuites>
         <testsuite name="Application Test Suite">
-            <directory>./tests/</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./app</directory>
+        </whitelist>
+    </filter>
+
+    <!-- code coverage -->
+    <logging>
+        <log type="coverage-clover" target="./storage/coverage/clover.xml" charset="UTF-8" />
+    </logging>
+
     <php>
         <env name="APP_ENV" value="testing"/>
         <env name="CACHE_DRIVER" value="array"/>
         <env name="SESSION_DRIVER" value="array"/>
+        <env name="QUEUE_DRIVER" value="sync"/>
     </php>
-</phpunit>
+</phpunit>

pu.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# create DB if not exists
+
+if [ ! -f tests/database/db.sqlite ]; then
+    touch tests/database/db.sqlite
+    php artisan migrate --seed
+fi
+
+phpunit --verbose