Some more work done. Mainly accounts. [skip ci]

app/views/accounts/create.blade.php

@@ -1,66 +1,109 @@
 @extends('layouts.default')
 @section('content')
 <div class="row">
-    <div class="col-lg-8 col-md-8 col-sm-12">
+    <div class="col-lg-12 col-md-12 col-sm-12">
         <h1>Firefly
-            <small>Add a new account</small>
+            <small>Add a new personal account</small>
         </h1>
         <p class="lead">
             Accounts are the record holders for transactions and transfers. Money moves
             from one account to another.
         </p>
-        <p>
+
+        <p class="text-info">
             In a double-entry bookkeeping system (such as this one) there is a "from" account and a "to"
             account, even when money is created from thin air (such as interest, or when new accounts already have
             a positive balance).
         </p>
-        <p>
+
+        <p class="text-info"><span class="text-danger">This form creates personal accounts only.</span>
             If this is your first account, it should be a checking or savings account. Enter its name and if relevant
             the current balance. Check your bank statements for the last current balance you can find.
         </p>
-        {{Form::open(['class' => 'form-horizontal','url' => route('accounts.store')])}}
-            <div class="form-group">
-                {{ Form::label('name', 'Account name', ['class' => 'col-sm-3 control-label'])}}
-                <div class="col-sm-9">
-                    {{ Form::text('name', Input::old('name'), ['class' => 'form-control']) }}
-                    @if($errors->has('name'))
-                    <p class="text-danger">{{$errors->first('name')}}</p>
-                    @else
-                    <p class="text-info">Use something descriptive such as "checking account" or "My Bank Main Account".</p>
-                    @endif
-
-                </div>
-            </div>
-            <div class="form-group">
-                {{ Form::label('openingbalance', 'Opening balance', ['class' => 'col-sm-3 control-label'])}}
-                <div class="col-sm-9">
-                    {{ Form::input('number','openingbalance', Input::old('openingbalance'), ['step' => 'any', 'class' => 'form-control'])}}
-                    @if($errors->has('openingbalance'))
-                        <p class="text-danger">{{$errors->first('openingbalance')}}</p>
-                    @else
-                        <p class="text-info">What's the current balance of this new account?</p>
-                    @endif
-                </div>
-            </div>
-            <div class="form-group">
-                {{ Form::label('openingbalancedate', 'Opening balance date', ['class' => 'col-sm-3 control-label'])}}
-                <div class="col-sm-9">
-                    {{ Form::input('date','openingbalancedate', Input::old('openingbalancedate') ?: date('Y-m-d'), ['class' => 'form-control']) }}
-                    @if($errors->has('openingbalancedate'))
-                        <p class="text-danger">{{$errors->first('openingbalancedate')}}</p>
-                    @else
-                        <p class="text-info">When was this the balance of the new account? Since your bank statements may lag behind, update this date to match the date of the last known balance of the account.</p>
-                    @endif
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-sm-offset-3 col-sm-9">
-                    <button type="submit" class="btn btn-default">Create my first account</button>
-                </div>
-            </div>
-        </form>
-
-
     </div>
 </div>
+
+{{Form::open(['class' => 'form-horizontal','route' => 'accounts.store'])}}
+<div class="row">
+    <div class="col-lg-6 col-md-6 col-sm-12">
+        <h4>Mandatory fields</h4>
+
+        <div class="form-group">
+            {{ Form::label('name', 'Account name', ['class' => 'col-sm-4 control-label'])}}
+            <div class="col-sm-8">
+                {{ Form::text('name', Input::old('name'), ['class' => 'form-control']) }}
+                @if($errors->has('name'))
+                <p class="text-danger">{{$errors->first('name')}}</p>
+                @else
+                <span
+                    class="help-block">Use something descriptive such as "checking account" or "My Bank Main Account".</span>
+                @endif
+
+            </div>
+        </div>
+
+    </div>
+    <div class="col-lg-6 col-md-6 col-sm-12">
+        <h4>Optional fields</h4>
+
+        <div class="form-group">
+            {{ Form::label('openingbalance', 'Opening balance', ['class' => 'col-sm-4 control-label'])}}
+            <div class="col-sm-8">
+                <div class="input-group">
+                    <span class="input-group-addon">&euro;</span>
+                    {{Form::input('number','openingbalance', Input::old('openingbalance'), ['step' => 'any', 'class' =>
+                    'form-control'])}}
+                </div>
+
+                @if($errors->has('openingbalance'))
+                <p class="text-danger">{{$errors->first('openingbalance')}}</p>
+                @else
+                <span class="help-block">What's the current balance of this new account?</span>
+                @endif
+            </div>
+        </div>
+        <div class="form-group">
+            {{ Form::label('openingbalancedate', 'Opening balance date', ['class' => 'col-sm-4 control-label'])}}
+            <div class="col-sm-8">
+                {{ Form::input('date','openingbalancedate', Input::old('openingbalancedate') ?: date('Y-m-d'), ['class'
+                => 'form-control']) }}
+                @if($errors->has('openingbalancedate'))
+                <p class="text-danger">{{$errors->first('openingbalancedate')}}</p>
+                @else
+                <span class="help-block">When was this the balance of the new account? Since your bank statements may lag behind, update this date to match the date of the last known balance of the account.</span>
+                @endif
+            </div>
+        </div>
+
+    </div>
+
+
+</div>
+
+<div class="row">
+    <div class="col-lg-6">
+
+        <!-- add another after this one? -->
+        <div class="form-group">
+            <label for="create" class="col-sm-4 control-label">&nbsp;</label>
+            <div class="col-sm-8">
+                <div class="checkbox">
+                    <label>
+                        {{Form::checkbox('create',1,Input::old('create') == '1')}}
+                        Create another (return to this form)
+                    </label>
+                </div>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-sm-offset-4 col-sm-8">
+                <button type="submit" class="btn btn-default btn-success">Create the account</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+{{Form::close()}}
 @stop

app/views/accounts/delete.blade.php

@@ -0,0 +1,46 @@
+@extends('layouts.default')
+@section('content')
+<div class="row">
+    <div class="col-lg-12 col-md-12 col-sm-12">
+        <h1>Firefly
+            <small>Delete "{{{$account->name}}}"</small>
+        </h1>
+        <p class="lead">
+            Remember that deleting something is permanent.
+        </p>
+    </div>
+</div>
+
+{{Form::model($account, ['class' => 'form-horizontal','url' => route('accounts.destroy')])}}
+{{Form::hidden('id',$account->id)}}
+<div class="row">
+    <div class="col-lg-6 col-md-6 col-sm-12">
+        @if($account->transactions()->count() > 0)
+        <p class="text-info">
+
+            Account "{{{$account->name}}}" still has {{$account->transactions()->count()}} transaction(s) associated to it.
+            These will be deleted as well.
+        </p>
+        @endif
+
+        <p class="text-danger">
+            Press "Delete permanently" If you are sure you want to delete "{{{$account->name}}}".
+        </p>
+    </div>
+
+</div>
+
+<div class="row">
+    <div class="col-lg-6">
+        <div class="form-group">
+            <div class="col-sm-8">
+                <button type="submit" class="btn btn-default btn-danger">Delete permanently</button>
+                <a href="{{route('accounts.index')}}" class="btn-default btn">Cancel</a>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+{{Form::close()}}
+@stop

app/views/accounts/edit.blade.php

@@ -0,0 +1,94 @@
+@extends('layouts.default')
+@section('content')
+<div class="row">
+    <div class="col-lg-12 col-md-12 col-sm-12">
+        <h1>Firefly
+            <small>Edit "{{{$account->name}}}"</small>
+        </h1>
+        <p class="lead">
+            Accounts are the record holders for transactions and transfers. Money moves
+            from one account to another.
+        </p>
+    </div>
+</div>
+
+{{Form::model($account, ['class' => 'form-horizontal','url' => route('accounts.update')])}}
+{{Form::hidden('id',$account->id)}}
+<div class="row">
+    <div class="col-lg-6 col-md-6 col-sm-12">
+        <h4>Mandatory fields</h4>
+
+        <div class="form-group">
+            {{ Form::label('name', 'Account name', ['class' => 'col-sm-4 control-label'])}}
+            <div class="col-sm-8">
+                {{ Form::text('name', Input::old('name'), ['class' => 'form-control']) }}
+                @if($errors->has('name'))
+                <p class="text-danger">{{$errors->first('name')}}</p>
+                @else
+                <span
+                    class="help-block">Use something descriptive such as "checking account" or "Albert Heijn".</span>
+                @endif
+
+            </div>
+        </div>
+
+    </div>
+    <div class="col-lg-6 col-md-6 col-sm-12">
+        @if($account->accounttype->description == 'Default account')
+        <h4>Optional fields</h4>
+
+        <div class="form-group">
+            {{ Form::label('openingbalance', 'Opening balance', ['class' => 'col-sm-4 control-label'])}}
+            <div class="col-sm-8">
+                <div class="input-group">
+                    <span class="input-group-addon">&euro;</span>
+                    @if(!is_null($openingBalance))
+                        {{Form::input('number','openingbalance', Input::old('openingbalance') ?: $openingBalance->transactions[1]->amount, ['step' => 'any', 'class' => 'form-control'])}}
+                    @else
+                        {{Form::input('number','openingbalance', Input::old('openingbalance'), ['step' => 'any', 'class' => 'form-control'])}}
+                    @endif
+
+                </div>
+
+                @if($errors->has('openingbalance'))
+                <p class="text-danger">{{$errors->first('openingbalance')}}</p>
+                @else
+                <span class="help-block">What's the current balance of this new account?</span>
+                @endif
+            </div>
+        </div>
+        <div class="form-group">
+            {{ Form::label('openingbalancedate', 'Opening balance date', ['class' => 'col-sm-4 control-label'])}}
+            <div class="col-sm-8">
+                @if(!is_null($openingBalance))
+                    {{ Form::input('date','openingbalancedate', Input::old('openingbalancedate') ?: $openingBalance->date->format('Y-m-d'), ['class' => 'form-control']) }}
+                @else
+                    {{ Form::input('date','openingbalancedate', Input::old('openingbalancedate') ?: date('Y-m-d'), ['class' => 'form-control']) }}
+                @endif
+                @if($errors->has('openingbalancedate'))
+                <p class="text-danger">{{$errors->first('openingbalancedate')}}</p>
+                @else
+                <span class="help-block">When was this the balance of the new account? Since your bank statements may lag behind, update this date to match the date of the last known balance of the account.</span>
+                @endif
+            </div>
+        </div>
+        @endif
+
+    </div>
+
+
+</div>
+
+<div class="row">
+    <div class="col-lg-6">
+        <div class="form-group">
+            <div class="col-sm-offset-4 col-sm-8">
+                <button type="submit" class="btn btn-default btn-success">Update {{{$account->name}}}</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+{{Form::close()}}
+@stop

app/views/accounts/index.blade.php

@@ -5,8 +5,10 @@
         <h1>Firefly
             <small>Accounts</small>
         </h1>
-        <h2>Index</h2>
-        <p style="width:50%;" class="text-info">
+        <p class="lead">
+            Accounts are the record holders for transactions and transfers. Money moves from one account to another.
+        </p>
+        <p class="text-info">
             In a double-entry bookkeeping system almost <em>everything</em> is an account. Your own personal
             bank accounts are representated as accounts (naturally), but the stores you buy stuff at are also
             represented as accounts. Likewise, if you have a job, your salary is drawn from their account.

app/views/accounts/list.blade.php

@@ -3,6 +3,7 @@
         <th>&nbsp;</th>
         <th style="width:30%;">Name</th>
         <th>Current balance</th>
+        <th></th>
     </tr>
     @foreach($accounts as $account)
     <tr>
@@ -14,6 +15,12 @@
         <td>
             <a href="{{route('accounts.show',$account->id)}}" title="Overview for account {{{$account->name}}}">{{{$account->name}}}</a></td>
         <td>{{mf($account->balance())}}</td>
+        <td>
+            <span class="btn-group-xs btn-group">
+                <a href="{{route('accounts.edit',$account->id)}}" title="Edit {{{$account->name}}}" class="btn btn-default"><span class="glyphicon glyphicon-pencil"></span></a>
+                <a href="{{route('accounts.delete',$account->id)}}" title="Edit {{{$account->name}}}" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span></a>
+            </span>
+        </td>
     </tr>
     @endforeach
 </table>

app/views/accounts/show.blade.php

@@ -0,0 +1,29 @@
+@extends('layouts.default')
+@section('content')
+<div class="row">
+    <div class="col-lg-12 col-md-12 col-sm-12">
+        <h1>Firefly
+            <small>Overview for account "{{{$account->name}}}"</small>
+        </h1>
+    </div>
+</div>
+
+@include('partials.date_nav')
+
+<div class="row">
+    <div class="col-lg-12 col-md-12 col-sm-12">
+            <div id="chart"></div>
+        </div>
+    </div>
+
+@stop
+@section('scripts')
+<script type="text/javascript">
+    var accountID = {{$account->id}};
+</script>
+<script src="assets/javascript/highcharts.js"></script>
+<script src="assets/javascript/highcharts-more.js"></script>
+<script src="assets/javascript/highslide-full.min.js"></script>
+<script src="assets/javascript/highslide.config.js"></script>
+<script src="assets/javascript/accounts.js"></script>
+@stop

app/views/budgets/index.blade.php

@@ -1,29 +0,0 @@
-@extends('layouts.default')
-@section('content')
-<div class="row">
-    <div class="col-lg-12 col-md-12 col-sm-12">
-        <h1>Firefly
-            <small>Budgets and limits</small>
-        </h1>
-        <p class="text-info">
-            These are your budgets and if set, their "limits". Firefly uses an "<a
-                href="http://en.wikipedia.org/wiki/Envelope_System" class="text-success">envelope system</a>" for your
-            budgets,
-            which means that for each period of time (for example a month) a virtual "envelope" can be created
-            containing a certain amount of money. Money spent within a budget is removed from the envelope.
-        </p>
-        <p>
-            @if($group == 'budget')
-                <a class="btn btn-default" href ="{{route('budgets.index','date')}}"><span class="glyphicon glyphicon-th-list"></span> Group by date</a>
-            @else
-                <a class="btn btn-default" href ="{{route('budgets.index','budget')}}"><span class="glyphicon glyphicon-th-list"></span> Group by budget</a>
-            @endif
-        </p>
-    </div>
-</div>
-@if($group == 'budget')
-    @include('budgets.index-budget')
-@else
-    @include('budgets.index-date')
-@endif
-@stop

app/views/index.blade.php

@@ -1,6 +1,17 @@
 @extends('layouts.default')
 @section('content')
-@include('partials.date_nav')
+<div class="row">
+    <div class="col-lg-12 col-md-12 col-sm-12">
+        <h1>Firefly
+            @if($count > 0)
+            <small>What's playing?</small>
+            @endif
+        </h1>
+    </div>
+</div>
+@if($count > 0)
+    @include('partials.date_nav')
+@endif
 @if($count == 0)
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
@@ -66,9 +77,10 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <h4>Budgets</h4>
 
-            <div id="budgets">
-
-            </div>
+            <div id="budgets"></div>
+            <p>
+                <a class="btn btn-default btn-xs" href ="{{route('budgets.limits.create')}}?startdate={{Session::get('start')->format('Y-m-d')}}"><span class="glyphicon glyphicon-plus-sign"></span> Create a limit</a>
+            </p>
         </div>
     </div>
 

app/views/partials/date_nav.blade.php

@@ -1,12 +1,6 @@
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
-        <h1>Firefly
-            @if($count > 0)
-            <small>What's playing?</small>
-            @endif
-        </h1>
-        @if($count > 0)
-        <form role="form" method="GET">
+        <form role="form" method="GET" action="{{Request::url()}}">
         <?php $r = Session::get('range', '1M'); ?>
         <div class="row">
             <div class="col-lg-2">
@@ -55,7 +49,6 @@
         </form>
 
 
-        @endif
 
     </div>
 </div>

app/views/transactions/create.blade.php

@@ -171,6 +171,7 @@
         </div>
     </div>
 </div>
+{{Form::close()}}
 
 @stop
 @section('scripts')

app/views/transactions/edit.blade.php

@@ -3,7 +3,7 @@
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
         <h1>Firefly
-            <small>Edit transaction ""</small>
+            <small>Edit transaction "{{{$journal->description}}}"</small>
         </h1>
     </div>
 </div>
@@ -14,61 +14,101 @@
             account <em>A</em> to account <em>B</em>.
         </p>
         <p class="text-info">
-            A deposit is when you earn money, moving an amount from a beneficiary into your own account.
+            Updating a transaction will also update balances, budgets and other records.
         </p>
     </div>
 </div>
 
-{{Form::open(['class' => 'form-horizontal'])}}
+{{Form::open(['class' => 'form-horizontal','url' => route('transactions.update',$journal->id)])}}
+
 
 <div class="row">
     <div class="col-lg-6 col-md-12 col-sm-12">
         <h4>Mandatory fields</h4>
 
+        <!-- ALWAYS AVAILABLE -->
         <div class="form-group">
             <label for="description" class="col-sm-4 control-label">Description</label>
             <div class="col-sm-8">
-                <input type="text" name="description" value="{{{Input::old('description')}}}" autocomplete="off" class="form-control" placeholder="Description" />
+                <input type="text" name="description" value="{{{Input::old('description') ?: $journal->description}}}" autocomplete="off" class="form-control" placeholder="Description" />
             </div>
         </div>
 
-
-
+        <!-- SHOW ACCOUNT (FROM) ONLY FOR WITHDRAWALS AND DEPOSITS -->
+        @if($what == 'deposit' || $what == 'withdrawal')
         <div class="form-group">
-            <label for="beneficiary" class="col-sm-4 control-label">Beneficiary (payer)</label>
+            <label for="account_id" class="col-sm-4 control-label">
+                @if($what == 'deposit')
+                Receiving account
+                @endif
+                @if($what == 'withdrawal')
+                Paid from account
+                @endif
+            </label>
             <div class="col-sm-8">
-                <input type="text" name="beneficiary" value="{{{Input::old('beneficiary')}}}" autocomplete="off" class="form-control" placeholder="Beneficiary" />
+                {{Form::select('account_id',$accounts,Input::old('account_id') ?: $data['account_id'],['class' => 'form-control'])}}
+            </div>
+        </div>
+        @endif
+
+        <!-- SHOW BENEFICIARY (ACCOUNT TO) ONLY FOR WITHDRAWALS AND DEPOSITS -->
+        @if($what == 'deposit' || $what == 'withdrawal')
+        <div class="form-group">
+            <label for="beneficiary" class="col-sm-4 control-label">
+                @if($what == 'deposit')
+                Paying beneficiary
+                @endif
+                @if($what == 'withdrawal')
+                Beneficiary
+                @endif
+            </label>
+            <div class="col-sm-8">
+                <input type="text" name="beneficiary" value="{{{Input::old('beneficiary') ?: $data['beneficiary']}}}" autocomplete="off" class="form-control" placeholder="Beneficiary" />
                 <span class="help-block">This field will auto-complete your existing beneficiaries (if any), but you can type freely to create new ones.</span>
             </div>
         </div>
+        @endif
 
+        <!-- ONLY SHOW FROM/TO ACCOUNT WHEN CREATING TRANSFER -->
+        @if($what == 'transfer')
         <div class="form-group">
-            <label for="account_id" class="col-sm-4 control-label">Account</label>
+            <label for="account_from_id" class="col-sm-4 control-label">Account from</label>
             <div class="col-sm-8">
-                {{Form::select('account_id',$accounts,Input::old('account_id'),['class' => 'form-control'])}}
+                {{Form::select('account_to_id',$accounts,Input::old('account_from_id') ?: $data['account_from_id'],['class' => 'form-control'])}}
             </div>
         </div>
 
-
-
         <div class="form-group">
-            <label for="amount" class="col-sm-4 control-label">Amount spent</label>
+            <label for="account_to_id" class="col-sm-4 control-label">Account to</label>
             <div class="col-sm-8">
-                <input type="number" name="amount" min="0.01" value="{{Input::old('amount') or 0}}" step="any" class="form-control" />
+                {{Form::select('account_from_id',$accounts,Input::old('account_to_id') ?: $data['account_to_id'],['class' => 'form-control'])}}
+            </div>
+        </div>
+        @endif
+
+        <!-- ALWAYS SHOW AMOUNT -->
+        <div class="form-group">
+            <label for="amount" class="col-sm-4 control-label">
+                @if($what == 'withdrawal')
+                Amount spent
+                @endif
+                @if($what == 'deposit')
+                Amount received
+                @endif
+                @if($what == 'transfer')
+                Amount transferred
+                @endif
+            </label>
+            <div class="col-sm-8">
+                <input type="number" name="amount" min="0.01" value="{{Input::old('amount') ?: $data['amount']}}" step="any" class="form-control" />
             </div>
         </div>
 
+        <!-- ALWAYS SHOW DATE -->
         <div class="form-group">
             <label for="date" class="col-sm-4 control-label">Date</label>
             <div class="col-sm-8">
-                <input type="date" name="date" value="{{Input::old('date') ?: date('Y-m-d')}}" class="form-control" />
-            </div>
-        </div>
-
-        <div class="form-group">
-            <label for="submit" class="col-sm-4 control-label">&nbsp;</label>
-            <div class="col-sm-8">
-                <input type="submit" name="submit" value="Create deposit" class="btn btn-info" />
+                <input type="date" name="date" value="{{Input::old('date') ?: $data['date']}}" class="form-control" />
             </div>
         </div>
 
@@ -76,10 +116,21 @@
     <div class="col-lg-6 col-md-12 col-sm-12">
         <h4>Optional fields</h4>
 
+        <!-- BUDGET ONLY WHEN CREATING A WITHDRAWAL -->
+        @if($what == 'withdrawal')
+        <div class="form-group">
+            <label for="budget_id" class="col-sm-4 control-label">Budget</label>
+            <div class="col-sm-8">
+                {{Form::select('budget_id',$budgets,Input::old('budget_id') ?: $data['budget_id'],['class' => 'form-control'])}}
+                <span class="help-block">Select one of your budgets to make this transaction a part of it.</span>
+            </div>
+        </div>
+        @endif
+        <!-- CATEGORY ALWAYS -->
         <div class="form-group">
             <label for="category" class="col-sm-4 control-label">Category</label>
             <div class="col-sm-8">
-                <input type="text" name="category"  value="" autocomplete="off" class="form-control" placeholder="Category" />
+                <input type="text" name="category"  value="{{Input::old('category') ?: $data['category']}}" autocomplete="off" class="form-control" placeholder="Category" />
                 <span class="help-block">Add more fine-grained information to this transaction by entering a category.
                 Like the beneficiary-field, this field will auto-complete existing categories but can also be used
                     to create new ones.
@@ -88,7 +139,20 @@
         </div>
 
     </div>
+</div>
 
+<div class="row">
+    <div class="col-lg-6">
+        <!-- ALWAYS SHOW SUBMit -->
+        <div class="form-group">
+            <label for="submit" class="col-sm-4 control-label">&nbsp;</label>
+            <div class="col-sm-8">
+                <input type="submit" name="submit" value="Update {{$what}}" class="btn btn-info" />
+            </div>
+        </div>
+    </div>
+</div>
+{{Form::close()}}
 
 
 @stop

app/views/transactions/index.blade.php

@@ -49,7 +49,15 @@
                 <a href="#">{{{$journal->transactions[1]->account->name}}}</a>
             @endif
         </td>
-        <td>Edit / delete</td>
+        <td>
+            <div class="btn-group btn-group-xs">
+            <a href="{{route('transactions.edit',$journal->id)}}" class="btn btn-default">
+                <span class="glyphicon glyphicon-pencil"></span>
+                <a href="{{route('transactions.delete',$journal->id)}}" class="btn btn-danger">
+                    <span class="glyphicon glyphicon-trash"></span>
+            </a>
+            </div>
+            </td>
     </tr>
     @endforeach
 </table>