More code.

app/Http/Controllers/PreferencesController.php

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

app/Http/Controllers/ProfileController.php

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

app/Http/Controllers/RelatedController.php

@@ -0,0 +1,156 @@
+<?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\Repositories\Journal\JournalRepositoryInterface;
+use Illuminate\Support\Collection;
+use Response;
+use Input;
+
+/**
+ * Class RelatedController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class RelatedController extends Controller
+{
+
+    /**
+     *
+     * @param TransactionJournal $journal
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function alreadyRelated(TransactionJournal $journal)
+    {
+        $ids = [];
+        /** @var TransactionGroup $group */
+        foreach ($journal->transactiongroups()->get() as $group) {
+            /** @var TransactionJournal $loopJournal */
+            foreach ($group->transactionjournals()->get() as $loopJournal) {
+                if ($loopJournal->id != $journal->id) {
+                    $ids[] = $loopJournal->id;
+                }
+            }
+        }
+        $unique = array_unique($ids);
+        if (count($unique) > 0) {
+
+            $set = Auth::user()->transactionjournals()->whereIn('id', $unique)->get();
+            $set->each(
+                function (TransactionJournal $journal) {
+                    /** @var Transaction $t */
+                    foreach ($journal->transactions()->get() as $t) {
+                        if ($t->amount > 0) {
+                            $journal->amount = $t->amount;
+                        }
+                    }
+
+                }
+            );
+
+            return Response::json($set->toArray());
+        } else {
+            return Response::json((new Collection)->toArray());
+        }
+    }
+
+    /**
+     * @param TransactionJournal $parentJournal
+     * @param TransactionJournal $childJournal
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function relate(TransactionJournal $parentJournal, TransactionJournal $childJournal)
+    {
+        $group           = new TransactionGroup;
+        $group->relation = 'balance';
+        $group->user_id  = Auth::user()->id;
+        $group->save();
+        $group->transactionjournals()->save($parentJournal);
+        $group->transactionjournals()->save($childJournal);
+
+        return Response::json(true);
+
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return \Illuminate\View\View
+     */
+    public function related(TransactionJournal $journal)
+    {
+        $groups  = $journal->transactiongroups()->get();
+        $members = new Collection;
+        /** @var TransactionGroup $group */
+        foreach ($groups as $group) {
+            /** @var TransactionJournal $loopJournal */
+            foreach ($group->transactionjournals()->get() as $loopJournal) {
+                if ($loopJournal->id != $journal->id) {
+                    $members->push($loopJournal);
+                }
+            }
+        }
+
+        return view('related.relate', compact('journal', 'members'));
+    }
+
+    /**
+     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
+     *
+     * @param TransactionJournal $parentJournal
+     * @param TransactionJournal $childJournal
+     *
+     * @return \Illuminate\Http\JsonResponse
+     * @throws Exception
+     */
+    public function removeRelation(TransactionJournal $parentJournal, TransactionJournal $childJournal)
+    {
+        $groups = $parentJournal->transactiongroups()->get();
+        /** @var TransactionGroup $group */
+        foreach ($groups as $group) {
+            foreach ($group->transactionjournals()->get() as $loopJournal) {
+                if ($loopJournal->id == $childJournal->id) {
+                    // remove from group:
+                    $group->transactionjournals()->detach($childJournal);
+                }
+            }
+            if ($group->transactionjournals()->count() == 1) {
+                $group->delete();
+            }
+        }
+
+        return Response::json(true);
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function search(TransactionJournal $journal, JournalRepositoryInterface $repository)
+    {
+
+        $search = e(trim(Input::get('searchValue')));
+
+        $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;
+                    }
+                }
+            }
+        );
+
+        return Response::json($result->toArray());
+    }
+
+}

app/Http/Controllers/TransactionController.php

@@ -5,8 +5,11 @@ use Carbon\Carbon;
 use ExpandedForm;
 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;
@@ -105,6 +108,42 @@ class TransactionController extends Controller
 
     }
 
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return $this
+     */
+    public function show(TransactionJournal $journal)
+    {
+        $journal->transactions->each(
+            function (Transaction $t) use ($journal) {
+                $t->before = floatval(
+                    $t->account->transactions()->leftJoin(
+                        'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'
+                    )->where('transaction_journals.date', '<=', $journal->date->format('Y-m-d'))->where(
+                        'transaction_journals.created_at', '<=', $journal->created_at->format('Y-m-d H:i:s')
+                    )->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('subTitle', e($journal->transactiontype->type) . ' "' . e($journal->description) . '"'
+        );
+    }
+
+
     public function store(JournalFormRequest $request, JournalRepositoryInterface $repository)
     {
 
@@ -112,8 +151,8 @@ class TransactionController extends Controller
             'what'               => $request->get('what'),
             'description'        => $request->get('description'),
             'account_id'         => intval($request->get('account_id')),
-            'account_from_id'         => intval($request->get('account_from_id')),
-            'account_to_id'         => intval($request->get('account_to_id')),
+            'account_from_id'    => intval($request->get('account_from_id')),
+            'account_to_id'      => intval($request->get('account_to_id')),
             'expense_account'    => $request->get('expense_account'),
             'revenue_account'    => $request->get('revenue_account'),
             'amount'             => floatval($request->get('amount')),

app/Http/Requests/ProfileFormRequest.php

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

app/Http/breadcrumbs.php

@@ -4,6 +4,7 @@ use DaveJamesMiller\Breadcrumbs\Generator;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Budget;
+use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\LimitRepetition;

app/Http/routes.php

@@ -5,6 +5,7 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\LimitRepetition;
 use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\PiggyBank;
 
 
@@ -26,6 +27,28 @@ Route::bind(
     }
 );
 
+Route::bind(
+    'tjSecond', function ($value, $route) {
+    if (Auth::check()) {
+        return TransactionJournal::
+        where('id', $value)->where('user_id', Auth::user()->id)->first();
+    }
+
+    return null;
+}
+);
+
+Route::bind(
+    'tj', function ($value, $route) {
+    if (Auth::check()) {
+        return TransactionJournal::
+        where('id', $value)->where('user_id', Auth::user()->id)->first();
+    }
+
+    return null;
+}
+);
+
 Route::bind(
     'currency', function ($value, $route) {
     return TransactionCurrency::find($value);
@@ -219,12 +242,23 @@ Route::group(
      * Preferences Controller
      */
     Route::get('/preferences', ['uses' => 'PreferencesController@index', 'as' => 'preferences']);
+    Route::post('/preferences', ['uses' => 'PreferencesController@postIndex']);
 
     /**
      * Profile Controller
      */
     Route::get('/profile', ['uses' => 'ProfileController@index', 'as' => 'profile']);
-    //Route::get('/profile/change-password', ['uses' => 'ProfileController@changePassword', 'as' => 'change-password']);
+    Route::get('/profile/change-password', ['uses' => 'ProfileController@changePassword', 'as' => 'change-password']);
+    Route::post('/profile/change-password', ['uses' => 'ProfileController@postChangePassword','as' => 'change-password-post']);
+
+    /**
+     * Related transactions controller
+     */
+    Route::get('/related/alreadyRelated/{tj}', ['uses' => 'RelatedController@alreadyRelated', 'as' => 'related.alreadyRelated']);
+    Route::post('/related/relate/{tj}/{tjSecond}', ['uses' => 'RelatedController@relate', 'as' => 'related.relate']);
+    Route::post('/related/removeRelation/{tj}/{tjSecond}', ['uses' => 'RelatedController@removeRelation', 'as' => 'related.removeRelation']);
+    Route::get('/related/related/{tj}', ['uses' => 'RelatedController@related', 'as' => 'related.related']);
+    Route::post('/related/search/{tj}', ['uses' => 'RelatedController@search', 'as' => 'related.search']);
 
     /**
      * Repeated Expenses Controller

app/Repositories/Journal/JournalRepository.php

@@ -9,6 +9,8 @@ use FireflyIII\Models\Category;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
+use Illuminate\Support\Collection;
+use Auth;
 
 /**
  * Class JournalRepository
@@ -18,6 +20,58 @@ use FireflyIII\Models\TransactionType;
 class JournalRepository implements JournalRepositoryInterface
 {
 
+    /**
+     * @param string             $query
+     * @param TransactionJournal $journal
+     *
+     * @return Collection
+     */
+    public function searchRelated($query, TransactionJournal $journal)
+    {
+        $start = clone $journal->date;
+        $end   = clone $journal->date;
+        $start->startOfMonth();
+        $end->endOfMonth();
+
+        // get already related transactions:
+        $exclude = [$journal->id];
+        foreach ($journal->transactiongroups()->get() as $group) {
+            foreach ($group->transactionjournals()->get() as $current) {
+                $exclude[] = $current->id;
+            }
+        }
+        $exclude = array_unique($exclude);
+
+        /** @var Collection $collection */
+        $collection = Auth::user()->transactionjournals()
+                          ->withRelevantData()
+                          ->before($end)->after($start)->where('encrypted', 0)
+                          ->whereNotIn('id', $exclude)
+                          ->where('description', 'LIKE', '%' . $query . '%')
+                          ->get();
+
+        // manually search encrypted entries:
+        /** @var Collection $encryptedCollection */
+        $encryptedCollection = Auth::user()->transactionjournals()
+                                   ->withRelevantData()
+                                   ->before($end)->after($start)
+                                   ->where('encrypted', 1)
+                                   ->whereNotIn('id', $exclude)
+                                   ->get();
+        $encrypted           = $encryptedCollection->filter(
+            function (TransactionJournal $journal) use ($query) {
+                $strPos = strpos(strtolower($journal->description), strtolower($query));
+                if ($strPos !== false) {
+                    return $journal;
+                }
+
+                return null;
+            }
+        );
+
+        return $collection->merge($encrypted);
+    }
+
     /**
      * @param array $data
      *

app/Repositories/Journal/JournalRepositoryInterface.php

@@ -3,6 +3,7 @@
 namespace FireflyIII\Repositories\Journal;
 
 use FireflyIII\Models\TransactionJournal;
+use Illuminate\Support\Collection;
 
 /**
  * Interface JournalRepositoryInterface
@@ -18,4 +19,11 @@ interface JournalRepositoryInterface
      */
     public function store(array $data);
 
+    /**
+     * @param string              $query
+     * @param TransactionJournal $journal
+     *
+     * @return Collection
+     */
+    public function searchRelated($query, TransactionJournal $journal);
 }

public/js/related-manager.js

@@ -0,0 +1,107 @@
+$(document).ready(function () {
+    $('.relateTransaction').click(relateTransaction);
+    $('.unrelate-checkbox').click(unrelateTransaction);
+
+});
+
+function unrelateTransaction(e) {
+    var target = $(e.target);
+    var id = target.data('id');
+    var relatedTo = target.data('relatedto');
+
+    $.post('related/removeRelation/' + id + '/' + relatedTo, {_token:token}).success(function (data) {
+        target.parent().parent().remove();
+    }).fail(function () {
+        alert('Could not!');
+    });
+
+}
+
+function relateTransaction(e) {
+    var target = $(e.target);
+    var ID = target.data('id');
+
+
+    $('#relationModal').empty().load('related/related/' + ID, function () {
+
+        $('#relationModal').modal('show');
+        getAlreadyRelatedTransactions(e, ID);
+        $('#searchRelated').submit(function (e) {
+            searchRelatedTransactions(e, ID);
+
+            return false;
+        });
+    });
+
+
+    return false;
+}
+
+
+function searchRelatedTransactions(e, ID) {
+    var searchValue = $('#relatedSearchValue').val();
+    if (searchValue != '') {
+        $.post('related/search/' + ID, {searchValue: searchValue,_token:token}).success(function (data) {
+            // post each result to some div.
+            $('#relatedSearchResults').empty();
+
+            $.each(data, function (i, row) {
+                var tr = $('<tr>');
+
+                var checkBox = $('<td>').append($('<input>').attr('type', 'checkbox').data('relateto', ID).data('id', row.id).click(doRelateNewTransaction));
+                var description = $('<td>').text(row.description);
+                var amount = $('<td>').html(row.amount);
+                tr.append(checkBox).append(description).append(amount);
+                $('#relatedSearchResults').append(tr);
+                //$('#relatedSearchResults').append($('<div>').text(row.id));
+            });
+
+
+        }).fail(function () {
+            alert('Could not search. Sorry.');
+        });
+    }
+
+    return false;
+}
+
+function doRelateNewTransaction(e) {
+    // remove the row from the table:
+    var target = $(e.target);
+    var id = target.data('id');
+    var relateToId = target.data('relateto');
+    if (!target.checked) {
+        var relateID = target.data('id');
+        $.post('related/relate/' + id + '/' + relateToId,{_token:token}).success(function (data) {
+            // success!
+            target.parent().parent().remove();
+            getAlreadyRelatedTransactions(null, relateToId);
+        }).fail(function () {
+            // could not relate.
+            alert('Error!');
+        });
+
+
+    } else {
+        alert('remove again!');
+    }
+}
+
+function getAlreadyRelatedTransactions(e, ID) {
+    //#alreadyRelated
+    $.get('related/alreadyRelated/' + ID).success(function (data) {
+        $('#alreadyRelated').empty();
+        $.each(data, function (i, row) {
+            var tr = $('<tr>');
+
+            var checkBox = $('<td>').append($('<input>').attr('type', 'checkbox').data('relateto', ID).data('id', row.id).click(doRelateNewTransaction));
+            var description = $('<td>').text(row.description);
+            var amount = $('<td>').html(row.amount);
+            tr.append(checkBox).append(description).append(amount);
+            $('#alreadyRelated').append(tr);
+            //$('#relatedSearchResults').append($('<div>').text(row.id));
+        });
+    }).fail(function () {
+        alert('Cannot get related stuff.');
+    });
+}

resources/views/preferences/index.blade.php

@@ -0,0 +1,103 @@
+@extends('layouts.default')
+@section('content')
+{!! Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName()) !!}
+<!-- form -->
+{!! Form::open(['class' => 'form-horizontal','id' => 'preferences']) !!}
+
+<div class="row">
+    <div class="col-lg-6 col-md-6 col-sm-6">
+        <div class="panel panel-default">
+          <div class="panel-heading">
+                <i class="fa fa-credit-card fa-fw"></i> Home screen accounts
+            </div>
+            <div class="panel-body">
+                <p class="text-info">Which accounts should be displayed on the home page?</p>
+                 @foreach($accounts as $account)
+                    <div class="form-group">
+                        <div class="col-sm-10">
+                            <div class="checkbox">
+                                <label>
+                                    @if(in_array($account->id,$frontPageAccounts->data) || count($frontPageAccounts->data) == 0)
+                                        <input type="checkbox" name="frontPageAccounts[]" value="{{$account->id}}" checked> {{{$account->name}}}
+                                    @else
+                                    <input type="checkbox" name="frontPageAccounts[]" value="{{$account->id}}"> {{{$account->name}}}
+                                    @endif
+                                </label>
+                            </div>
+                        </div>
+                    </div>
+                @endforeach
+            </div>
+        </div>
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <i class="fa fa-credit-card fa-fw"></i> Budget settings
+            </div>
+            <div class="panel-body">
+                <p class="text-info">
+                    What's the maximum amount of money a budget envelope may contain?
+                </p>
+                {!! ExpandedForm::amount('budgetMaximum',$budgetMaximum,['label' => 'Budget maximum']) !!}
+            </div>
+        </div>
+
+    </div>
+    <div class="col-lg-6 col-md-6 col-sm-6">
+        <div class="panel panel-default">
+          <div class="panel-heading">
+                <i class="fa fa-clock-o fa-fw"></i> Home view range
+            </div>
+            <div class="panel-body">
+                <p class="text-info">By default, Firefly will show you one month of data.</p>
+                <div class="radio">
+                    <label>
+                        <input type="radio" name="viewRange" value="1D" @if($viewRange == '1D') checked @endif>
+                        One day
+                    </label>
+                </div>
+
+                <div class="radio">
+                    <label>
+                        <input type="radio" name="viewRange" value="1W" @if($viewRange == '1W') checked @endif>
+                        One week
+                    </label>
+                </div>
+
+                <div class="radio">
+                    <label>
+                        <input type="radio" name="viewRange" value="1M" @if($viewRange == '1M') checked @endif>
+                        One month
+                    </label>
+                </div>
+
+                <div class="radio">
+                    <label>
+                        <input type="radio" name="viewRange" value="3M" @if($viewRange == '3M') checked @endif>
+                        Three months
+                    </label>
+                </div>
+
+                <div class="radio">
+                    <label>
+                        <input type="radio" name="viewRange" value="6M" @if($viewRange == '6M') checked @endif>
+                        Six months
+                    </label>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="row">
+    <div class="col-lg-12 col-md-12 col-sm-12">
+        <div class="form-group">
+            <div class="col-sm-12">
+                <button type="submit" class="btn btn-success btn-lg">Save settings</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- form close -->
+{!! Form::close() !!}
+
+@stop

resources/views/profile/change-password.blade.php

@@ -0,0 +1,54 @@
+@extends('layouts.default')
+@section('content')
+{!! Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName()) !!}
+<div class="row">
+    <div class="col-lg-6 col-md-12 col-sm-12">
+        <div class="panel panel-primary">
+            <div class="panel-heading">
+                Change your password
+            </div>
+            <div class="panel-body">
+
+                @if($errors->count() > 0)
+                    <ul>
+                        @foreach($errors->all() as $err)
+                            <li class="text-danger">{{$err}}</li>
+                        @endforeach
+                    </ul>
+
+                @endif
+
+                {!! Form::open(['class' => 'form-horizontal','id' => 'change-password']) !!}
+                    <div class="form-group">
+                        <label for="inputOldPassword" class="col-sm-4 control-label">Old password</label>
+                        <div class="col-sm-8">
+                            <input type="password" class="form-control" id="inputOldPassword" placeholder="Old password" name="current_password">
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="inputNewPassword1" class="col-sm-4 control-label">New password</label>
+                        <div class="col-sm-8">
+                            <input type="password" class="form-control" id="inputNewPassword1" placeholder="New password" name="new_password">
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="inputNewPassword2" class="col-sm-4 control-label">New password (again)</label>
+                        <div class="col-sm-8">
+                            <input type="password" class="form-control" id="inputNewPassword2" placeholder="New password (again)" name="new_password_confirmation">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <div class="col-sm-offset-4 col-sm-10">
+                            <button type="submit" class="btn btn-success">Change your password</button>
+                        </div>
+                    </div>
+                {!! Form::close() !!}
+            </div>
+        </div>
+    </div>
+</div>
+@stop
+@section('scripts')
+@stop

resources/views/profile/index.blade.php

@@ -0,0 +1,18 @@
+@extends('layouts.default')
+@section('content')
+{!! Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName()) !!}
+    <div class="row">
+    <div class="col-lg-6 col-md-12 col-sm-12">
+        <div class="panel panel-primary">
+            <div class="panel-heading">
+                Options
+            </div>
+            <div class="panel-body">
+                <a href="{{route('change-password')}}">Change your password</a>
+            </div>
+        </div>
+    </div>
+</div>
+@stop
+@section('scripts')
+@stop

resources/views/related/relate.blade.php

@@ -0,0 +1,27 @@
+<div class="modal-dialog modal-lg">
+    <div class="modal-content">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+            <h4 class="modal-title">Relate "{{{$journal->description}}}" to other transactions</h4>
+        </div>
+        <div class="modal-body">
+            <form class="form-inline" role="form" id="searchRelated">
+                <div class="form-group">
+                    <input type="text" style="width:400px;" class="form-control" name="related" id="relatedSearchValue" placeholder="Search for related transactions">
+                </div>
+              <button type="submit" class="btn btn-default">Search</button>
+            </form>
+            <h5>Search results</h5>
+            <div>
+                <table id="relatedSearchResults" class="table table-bordered table-striped"></table>
+            </div>
+            <h5>(Already) related transactions</h5>
+            <div>
+                <table id="alreadyRelated" class="table table-bordered table-striped"></table>
+            </div>
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        </div>
+    </div>
+</div>

resources/views/transactions/show.blade.php

@@ -1,6 +1,6 @@
 @extends('layouts.default')
 @section('content')
-{{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName(), $journal) }}
+{!! Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName(), $journal) !!}
 <div class="row">
     <div class="col-lg-6 col-md-6 col-sm-12">
         <div class="panel panel-default">
@@ -74,7 +74,14 @@
                         <tr>
                             <td><input type="checkbox" checked="checked" data-relatedto="{{$journal->id}}" data-id="{{$jrnl->id}}" class="unrelate-checkbox" /></td>
                             <td><a href="#">{{{$jrnl->description}}}</a></td>
-                            <td>{{Amount::formatJournal($jrnl, $jrnl->getAmount())}}</td>
+
+                            <td>
+                                @foreach($jrnl->transactions()->get() as $t)
+                                    @if($t->amount > 0)
+                                        {!! Amount::formatTransaction($t) !!}
+                                    @endif
+                                @endforeach
+                            </td>
                         </tr>
                     @endforeach
                     </table>
@@ -97,11 +104,11 @@
                 <table class="table table-striped table-bordered">
                     <tr>
                         <td>Amount</td>
-                        <td>{{Amount::formatTransaction($t)}}</td>
+                        <td>{!! Amount::formatTransaction($t) !!}</td>
                     </tr>
                     <tr>
                         <td>New balance</td>
-                        <td>{{Amount::format($t->before)}} &rarr; {{Amount::format($t->after)}}</td>
+                        <td>{!! Amount::format($t->before) !!} &rarr; {!! Amount::format($t->after) !!}</td>
                     </tr>
                     @if(!is_null($t->description))
                     <tr>
@@ -126,6 +133,9 @@
 
 @stop
 @section('scripts')
-{{HTML::script('assets/javascript/firefly/transactions.js')}}
-{{HTML::script('assets/javascript/firefly/related-manager.js')}}
+    <script type="text/javascript">
+        var token = "{{csrf_token()}}";
+    </script>
+<script type="text/javascript" src="js/transactions.js"></script>
+<script type="text/javascript" src="js/related-manager.js"></script>
 @stop