New stuff and fix for transaction controller [skip ci]

app/assets/javascripts/firefly/transactions.js

@@ -0,0 +1,7 @@
+$.getJSON('json/beneficiaries').success(function (data) {
+    $('input[name="beneficiary"]').typeahead({ source: data });
+});
+
+$.getJSON('json/categories').success(function (data) {
+    $('input[name="category"]').typeahead({ source: data });
+});

app/assets/javascripts/transactions.js

@@ -0,0 +1,14 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear in whatever order it 
+// gets included (e.g. say you have require_tree . then the code will appear after all the directories 
+// but before any files alphabetically greater than 'application.js' 
+//
+// The available directives right now are require, require_directory, and require_tree
+//
+//= require typeahead/bootstrap3-typeahead.min
+//= require firefly/transactions

app/controllers/CategoryController.php

@@ -0,0 +1,38 @@
+<?php
+
+class ComponentsController extends BaseController
+{
+    public function create()
+    {
+    }
+
+    public function delete()
+    {
+    }
+
+    public function destroy()
+    {
+    }
+
+    public function edit()
+    {
+    }
+
+    public function index()
+    {
+    }
+
+    public function show()
+    {
+    }
+
+    public function store()
+    {
+    }
+
+    public function update()
+    {
+    }
+
+
+}

app/controllers/ComponentsController.php

@@ -1,10 +0,0 @@
-<?php
-
-/**
- * Class ComponentsController
- */
-class ComponentsController extends BaseController
-{
-
-
-}

app/controllers/HomeController.php

@@ -54,9 +54,6 @@ class HomeController extends BaseController
         }
 
 
-        // get the budgets for this period:
-        $budgets = $this->_budgets->getWithRepetitionsInPeriod($start, \Session::get('range'));
-
         $transactions = [];
         foreach ($accounts as $account) {
             $set = $this->_journal->getByAccountInDateRange($account, 15, $start, $end);
@@ -74,9 +71,7 @@ class HomeController extends BaseController
         }
 
         // build the home screen:
-        return View::make('index')->with('count', $count)->with('transactions', $transactions)->with(
-            'budgets', $budgets
-        );
+        return View::make('index')->with('count', $count)->with('transactions', $transactions);
     }
 
     /**

app/controllers/PiggybankController.php

@@ -0,0 +1,34 @@
+<?php
+class PiggybankController extends BaseController {
+    public function create()
+    {
+    }
+
+    public function delete()
+    {
+    }
+
+    public function destroy()
+    {
+    }
+
+    public function edit()
+    {
+    }
+
+    public function index()
+    {
+    }
+
+    public function show()
+    {
+    }
+
+    public function store()
+    {
+    }
+
+    public function update()
+    {
+    }
+}

app/controllers/RecurringControlle.php

@@ -0,0 +1,35 @@
+<?php
+
+class RecurringController extends BaseController {
+    public function create()
+    {
+    }
+
+    public function delete()
+    {
+    }
+
+    public function destroy()
+    {
+    }
+
+    public function edit()
+    {
+    }
+
+    public function index()
+    {
+    }
+
+    public function show()
+    {
+    }
+
+    public function store()
+    {
+    }
+
+    public function update()
+    {
+    }
+} 

app/controllers/ReportController.php

@@ -0,0 +1,9 @@
+<?php
+class ReportController extends BaseController {
+
+
+    public function index()
+    {
+    }
+
+}

app/controllers/SearchController.php

@@ -0,0 +1,10 @@
+<?php
+
+class SearchController
+{
+
+
+    public function index()
+    {
+    }
+}

app/controllers/TransactionController.php

@@ -43,9 +43,7 @@ class TransactionController extends BaseController
     {
         // get accounts with names and id's.
         $accounts = $this->_accounts->getActiveDefaultAsSelectList();
-
         $budgets = $this->_budgets->getAsSelectList();
-
         $budgets[0] = '(no budget)';
 
 
@@ -54,6 +52,90 @@ class TransactionController extends BaseController
         );
     }
 
+    /**
+     * @param $journalId
+     *
+     * @return $this|\Illuminate\View\View
+     */
+    public function edit($journalId)
+    {
+        // get journal:
+        $journal = $this->_journal->find($journalId);
+
+        if ($journal) {
+            // type is useful for display:
+            $what = strtolower($journal->transactiontype->type);
+
+            // some lists prefilled:
+            $budgets = $this->_budgets->getAsSelectList();
+            $budgets[0] = '(no budget)';
+            $accounts = $this->_accounts->getActiveDefaultAsSelectList();
+
+            // data to properly display form:
+            $data = [
+                'date'      => $journal->date->format('Y-m-d'),
+                'category'  => '',
+                'budget_id' => 0
+            ];
+            $category = $journal->categories()->first();
+            if (!is_null($category)) {
+                $data['category'] = $category->name;
+            }
+            switch ($journal->transactiontype->type) {
+                case 'Withdrawal':
+                    $data['account_id'] = $journal->transactions[0]->account->id;
+                    $data['beneficiary'] = $journal->transactions[1]->account->name;
+                    $data['amount'] = floatval($journal->transactions[1]->amount);
+                    $budget = $journal->budgets()->first();
+                    if (!is_null($budget)) {
+                        $data['budget_id'] = $budget->id;
+                    }
+                    break;
+                case 'Deposit':
+                    $data['account_id'] = $journal->transactions[1]->account->id;
+                    $data['beneficiary'] = $journal->transactions[0]->account->name;
+                    $data['amount'] = floatval($journal->transactions[1]->amount);
+                    break;
+                case 'Transfer':
+                    $data['account_from_id'] = $journal->transactions[1]->account->id;
+                    $data['account_to_id'] = $journal->transactions[0]->account->id;
+                    $data['amount'] = floatval($journal->transactions[1]->amount);
+                    break;
+            }
+
+            return View::make('transactions.edit')->with('journal', $journal)->with('accounts', $accounts)->with(
+                'what', $what
+            )->with('budgets', $budgets)->with('data', $data);
+        }
+
+        return View::make('error')->with('message', 'Invalid journal');
+    }
+
+    /**
+     * @return $this|\Illuminate\View\View
+     */
+    public function index()
+    {
+        $transactions = $this->_journal->paginate(25);
+
+        return View::make('transactions.index')->with('transactions', $transactions);
+    }
+
+    /**
+     * @param $journalId
+     *
+     * @return $this|\Illuminate\View\View
+     */
+    public function show($journalId)
+    {
+        $journal = $this->_journal->find($journalId);
+        if ($journal) {
+            return View::make('transactions.show')->with('journal', $journal);
+        }
+
+        return View::make('error')->with('message', 'Invalid journal');
+    }
+
     /**
      * @param $what
      *
@@ -123,90 +205,6 @@ class TransactionController extends BaseController
 
     }
 
-    /**
-     * @return $this|\Illuminate\View\View
-     */
-    public function index()
-    {
-        $transactions = $this->_journal->paginate(25);
-
-        return View::make('transactions.index')->with('transactions', $transactions);
-    }
-
-    /**
-     * @param $journalId
-     *
-     * @return $this|\Illuminate\View\View
-     */
-    public function show($journalId)
-    {
-        $journal = $this->_journal->find($journalId);
-        if ($journal) {
-            return View::make('transactions.show')->with('journal', $journal);
-        }
-
-        return View::make('error')->with('message', 'Invalid journal');
-    }
-
-    /**
-     * @param $journalId
-     *
-     * @return $this|\Illuminate\View\View
-     */
-    public function edit($journalId)
-    {
-        // get journal:
-        $journal = $this->_journal->find($journalId);
-
-        if ($journal) {
-            // type is useful for display:
-            $what = strtolower($journal->transactiontype->type);
-
-            // some lists prefilled:
-            $budgets = $this->_budgets->getAsSelectList();
-            $budgets[0] = '(no budget)';
-            $accounts = $this->_accounts->getActiveDefaultAsSelectList();
-
-            // data to properly display form:
-            $data = [
-                'date'      => $journal->date->format('Y-m-d'),
-                'category'  => '',
-                'budget_id' => 0
-            ];
-            $category = $journal->categories()->first();
-            if (!is_null($category)) {
-                $data['category'] = $category->name;
-            }
-            switch ($journal->transactiontype->type) {
-                case 'Withdrawal':
-                    $data['account_id'] = $journal->transactions[0]->account->id;
-                    $data['beneficiary'] = $journal->transactions[1]->account->name;
-                    $data['amount'] = floatval($journal->transactions[1]->amount);
-                    $budget = $journal->budgets()->first();
-                    if (!is_null($budget)) {
-                        $data['budget_id'] = $budget->id;
-                    }
-                    break;
-                case 'Deposit':
-                    $data['account_id'] = $journal->transactions[1]->account->id;
-                    $data['beneficiary'] = $journal->transactions[0]->account->name;
-                    $data['amount'] = floatval($journal->transactions[1]->amount);
-                    break;
-                case 'Transfer':
-                    $data['account_from_id'] = $journal->transactions[1]->account->id;
-                    $data['account_to_id'] = $journal->transactions[0]->account->id;
-                    $data['amount'] = floatval($journal->transactions[1]->amount);
-                    break;
-            }
-
-            return View::make('transactions.edit')->with('journal', $journal)->with('accounts', $accounts)->with(
-                'what', $what
-            )->with('budgets', $budgets)->with('data', $data);
-        }
-
-        return View::make('error')->with('message', 'Invalid journal');
-    }
-
     public function update($journalId)
     {
 

app/views/transactions/create.blade.php

@@ -175,6 +175,5 @@
 
 @stop
 @section('scripts')
-
-    <script type="text/javascript" src="assets/javascript/withdrawal.js"></script>
+<?php echo javascript_include_tag('transactions'); ?>
 @stop

app/views/transactions/deposit.blade.php

@@ -1,98 +0,0 @@
-@extends('layouts.default')
-@section('content')
-<div class="row">
-    <div class="col-lg-12 col-md-12 col-sm-12">
-        <h1>Firefly
-            <small>Add a new deposit</small>
-        </h1>
-    </div>
-</div>
-<div class="row">
-    <div class="col-lg-6 col-md-12 col-sm-12">
-        <p class="text-info">
-            Technically speaking, withdrawals, deposits and transfers are all transactions, moving money from
-            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.
-        </p>
-    </div>
-</div>
-
-{{Form::open(['class' => 'form-horizontal'])}}
-
-<div class="row">
-    <div class="col-lg-6 col-md-12 col-sm-12">
-        <h4>Mandatory fields</h4>
-
-        <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" />
-            </div>
-        </div>
-
-
-
-        <div class="form-group">
-            <label for="beneficiary" class="col-sm-4 control-label">Beneficiary (payer)</label>
-            <div class="col-sm-8">
-                <input type="text" name="beneficiary" value="{{{Input::old('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>
-
-        <div class="form-group">
-            <label for="account_id" class="col-sm-4 control-label">Account</label>
-            <div class="col-sm-8">
-                {{Form::select('account_id',$accounts,Input::old('account_id'),['class' => 'form-control'])}}
-            </div>
-        </div>
-
-
-
-        <div class="form-group">
-            <label for="amount" class="col-sm-4 control-label">Amount spent</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" />
-            </div>
-        </div>
-
-        <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" />
-            </div>
-        </div>
-
-    </div>
-    <div class="col-lg-6 col-md-12 col-sm-12">
-        <h4>Optional fields</h4>
-
-        <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" />
-                <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.
-                </span>
-            </div>
-        </div>
-
-    </div>
-
-
-
-@stop
-@section('scripts')
-
-    <script type="text/javascript" src="assets/javascript/withdrawal.js"></script>
-@stop

app/views/transactions/transfer.blade.php

@@ -1,96 +0,0 @@
-@extends('layouts.default')
-@section('content')
-<div class="row">
-    <div class="col-lg-12 col-md-12 col-sm-12">
-        <h1>Firefly
-            <small>Add a new transfer</small>
-        </h1>
-    </div>
-</div>
-<div class="row">
-    <div class="col-lg-6 col-md-12 col-sm-12">
-        <p class="text-info">
-            Technically speaking, withdrawals, deposits and transfers are all transactions, moving money from
-            account <em>A</em> to account <em>B</em>.
-        </p>
-        <p class="text-info">
-            A transfer moves money between your own accounts.
-        </p>
-    </div>
-</div>
-
-{{Form::open(['class' => 'form-horizontal'])}}
-
-<div class="row">
-    <div class="col-lg-6 col-md-12 col-sm-12">
-        <h4>Mandatory fields</h4>
-
-        <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" />
-            </div>
-        </div>
-
-
-
-        <div class="form-group">
-            <label for="account_from_id" class="col-sm-4 control-label">Account from</label>
-            <div class="col-sm-8">
-                {{Form::select('account_to_id',$accounts,Input::old('account_from_id'),['class' => 'form-control'])}}
-            </div>
-        </div>
-
-        <div class="form-group">
-            <label for="account_to_id" class="col-sm-4 control-label">Account to</label>
-            <div class="col-sm-8">
-                {{Form::select('account_from_id',$accounts,Input::old('account_to_id'),['class' => 'form-control'])}}
-            </div>
-        </div>
-
-
-        <div class="form-group">
-            <label for="amount" class="col-sm-4 control-label">Amount spent</label>
-            <div class="col-sm-8">
-                <input type="number" name="amount" min="0.01" value="{{floatval(Input::old('amount'))}}" step="any" class="form-control" />
-            </div>
-        </div>
-
-        <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 transfer" class="btn btn-info" />
-            </div>
-        </div>
-
-    </div>
-    <div class="col-lg-6 col-md-12 col-sm-12">
-        <h4>Optional fields</h4>
-
-        <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" />
-                <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.
-                </span>
-            </div>
-        </div>
-
-    </div>
-
-
-
-@stop
-@section('scripts')
-
-    <script type="text/javascript" src="assets/javascript/withdrawal.js"></script>
-@stop

app/views/transactions/withdrawal.blade.php

@@ -1,104 +0,0 @@
-@extends('layouts.default')
-@section('content')
-<div class="row">
-    <div class="col-lg-12 col-md-12 col-sm-12">
-        <h1>Firefly
-            <small>Add a new withdrawal</small>
-        </h1>
-    </div>
-</div>
-<div class="row">
-    <div class="col-lg-6 col-md-12 col-sm-12">
-        <p class="text-info">
-            Technically speaking, withdrawals, deposits and transfers are all transactions, moving money from
-            account <em>A</em> to account <em>B</em>.
-        </p>
-        <p class="text-info">
-            A withdrawal is when you spend money on something, moving an amount to a <em>beneficiary</em>.
-        </p>
-    </div>
-</div>
-
-{{Form::open(['class' => 'form-horizontal'])}}
-
-<div class="row">
-    <div class="col-lg-6 col-md-12 col-sm-12">
-        <h4>Mandatory fields</h4>
-
-        <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" />
-            </div>
-        </div>
-
-        <div class="form-group">
-            <label for="account_id" class="col-sm-4 control-label">Account</label>
-            <div class="col-sm-8">
-                {{Form::select('account_id',$accounts,Input::old('account_id'),['class' => 'form-control'])}}
-            </div>
-        </div>
-
-        <div class="form-group">
-            <label for="beneficiary" class="col-sm-4 control-label">Beneficiary</label>
-            <div class="col-sm-8">
-                <input type="text" name="beneficiary" value="{{{Input::old('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>
-
-
-
-        <div class="form-group">
-            <label for="amount" class="col-sm-4 control-label">Amount spent</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" />
-            </div>
-        </div>
-
-        <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 withdrawal" class="btn btn-info" />
-            </div>
-        </div>
-
-    </div>
-    <div class="col-lg-6 col-md-12 col-sm-12">
-        <h4>Optional fields</h4>
-
-        <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') ?: 0,['class' => 'form-control'])}}
-                <span class="help-block">Select one of your budgets to make this transaction a part of it.</span>
-            </div>
-        </div>
-
-        <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" />
-                <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.
-                </span>
-            </div>
-        </div>
-
-    </div>
-
-
-
-@stop
-@section('scripts')
-
-    <script type="text/javascript" src="assets/javascript/withdrawal.js"></script>
-@stop

public/assets/javascript/withdrawal.js

@@ -1,7 +0,0 @@
-$.getJSON('json/beneficiaries').success(function (data) {
-    $('input[name="beneficiary"]').typeahead({ source: data });
-});
-
-$.getJSON('json/categories').success(function (data) {
-    $('input[name="category"]').typeahead({ source: data });
-});