Add and remove transactions.

app/Http/Controllers/CategoryController.php

@@ -5,9 +5,12 @@ use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\CategoryFormRequest;
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use Illuminate\Pagination\LengthAwarePaginator;
 use Redirect;
 use Session;
 use View;
+use Input;
+
 
 /**
  * Class CategoryController
@@ -17,6 +20,9 @@ use View;
 class CategoryController extends Controller
 {
 
+    /**
+     *
+     */
     public function __construct()
     {
         View::share('title', 'Categories');
@@ -31,6 +37,24 @@ 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'));
+    }
+
     /**
      * @param Category $category
      *

app/Http/Controllers/GoogleChartController.php

@@ -12,6 +12,7 @@ use FireflyIII\Models\Bill;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\LimitRepetition;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use Grumpydictator\Gchart\GChart;
 use Illuminate\Database\Query\Builder as QueryBuilder;
@@ -30,6 +31,49 @@ class GoogleChartController extends Controller
 {
 
 
+    /**
+     *
+     * @param Category  $category
+     * @param           $year
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function categoriesAndSpending(Category $category, $year, GChart $chart)
+    {
+        try {
+            new Carbon('01-01-' . $year);
+        } catch (Exception $e) {
+            return view('error')->with('message', 'Invalid year.');
+        }
+
+        $chart->addColumn('Month', 'date');
+        $chart->addColumn('Budgeted', 'number');
+        $chart->addColumn('Spent', 'number');
+
+        $start = new Carbon('01-01-' . $year);
+        $end   = clone $start;
+        $end->endOfYear();
+        while ($start <= $end) {
+
+            $currentEnd = clone $start;
+            $currentEnd->endOfMonth();
+            $spent = floatval($category->transactionjournals()->before($end)->after($start)->lessThan(0)->sum('amount')) * -1;
+            $budgeted = null;
+
+            $chart->addRow(clone $start, $budgeted, $spent);
+
+            $start->addMonth();
+        }
+
+
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+
+    }
+
+
     /**
      * @param Account $account
      * @param string  $view

app/Http/Controllers/JsonController.php

@@ -0,0 +1,68 @@
+<?php namespace FireflyIII\Http\Controllers;
+
+use FireflyIII\Http\Requests;
+use FireflyIII\Http\Controllers\Controller;
+
+use Illuminate\Http\Request;
+use Response;
+use Auth;
+
+/**
+ * Class JsonController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class JsonController extends Controller {
+
+
+    /**
+     * Returns a list of categories.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function categories()
+    {
+        $list       = Auth::user()->categories()->orderBy('name','ASC')->get();
+        $return     = [];
+        foreach ($list as $entry) {
+            $return[] = $entry->name;
+        }
+
+        return Response::json($return);
+
+
+    }
+
+    /**
+     * Returns a JSON list of all beneficiaries.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function expenseAccounts()
+    {
+        $list     = Auth::user()->accounts()->accountTypeIn(['Expense account', 'Beneficiary account'])->get();
+        $return   = [];
+        foreach ($list as $entry) {
+            $return[] = $entry->name;
+        }
+
+        return Response::json($return);
+
+    }
+
+    /**
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function revenueAccounts()
+    {
+        $list     = Auth::user()->accounts()->accountTypeIn(['Revenue account'])->get();
+        $return   = [];
+        foreach ($list as $entry) {
+            $return[] = $entry->name;
+        }
+
+        return Response::json($return);
+
+    }
+
+}

app/Http/Controllers/PiggyBankController.php

@@ -64,7 +64,7 @@ class PiggyBankController extends Controller {
             }
         }
 
-        return View::make('piggy-banks.index', compact('piggyBanks', 'accounts'));
+        return view('piggy-banks.index', compact('piggyBanks', 'accounts'));
     }
 
 }

app/Http/Controllers/ReportController.php

@@ -102,7 +102,7 @@ class ReportController extends Controller
          * End getBudgetsForMonth DONE
          */
 
-        return View::make('reports.budget', compact('subTitle', 'subTitleIcon', 'date', 'accounts', 'budgets', 'dayEarly'));
+        return view('reports.budget', compact('subTitle', 'subTitleIcon', 'date', 'accounts', 'budgets', 'dayEarly'));
 
     }
 
@@ -239,7 +239,7 @@ class ReportController extends Controller
          */
 
 
-        return View::make(
+        return view(
             'reports.month',
             compact(
                 'income', 'expenses', 'budgets', 'accounts', 'categories',
@@ -258,7 +258,7 @@ class ReportController extends Controller
         try {
             new Carbon('01-01-' . $year);
         } catch (Exception $e) {
-            return View::make('error')->with('message', 'Invalid date.');
+            return view('error')->with('message', 'Invalid date.');
         }
         $date = new Carbon('01-01-' . $year);
         $end  = clone $date;
@@ -273,7 +273,7 @@ class ReportController extends Controller
 
         //$groupedExpenses = $helper-> expensesGroupedByAccount($date, $end, 15);
 
-        return View::make(
+        return view(
             'reports.year', compact('date', 'groupedIncomes', 'groupedExpenses', 'year', 'balances', 'title', 'subTitle', 'subTitleIcon', 'mainTitleIcon')
         );
     }

app/Http/Controllers/TransactionController.php

@@ -1,14 +1,17 @@
 <?php namespace FireflyIII\Http\Controllers;
 
 use Auth;
+use Carbon\Carbon;
 use ExpandedForm;
 use FireflyIII\Http\Requests;
+use FireflyIII\Http\Requests\JournalFormRequest;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Input;
+use Redirect;
 use Session;
 use View;
 
-
 /**
  * Class TransactionController
  *
@@ -34,7 +37,7 @@ 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()
+            Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->where('active', 1)->orderBy('name', 'DESC')->get(['accounts.*'])
         );
         $budgets    = ExpandedForm::makeSelectList(Auth::user()->budgets()->get());
         $budgets[0] = '(no budget)';
@@ -98,7 +101,34 @@ class TransactionController extends Controller
         $journals = new LengthAwarePaginator($set, $count, 50, $page);
         $journals->setPath('transactions/' . $what);
 
-        return View::make('transactions.index', compact('subTitle', 'what', 'subTitleIcon', 'journals'));
+        return view('transactions.index', compact('subTitle', 'what', 'subTitleIcon', 'journals'));
+
+    }
+
+    public function store(JournalFormRequest $request, JournalRepositoryInterface $repository)
+    {
+
+        $journalData = [
+            'what'               => $request->get('what'),
+            'description'        => $request->get('description'),
+            'account_id'         => intval($request->get('account_id')),
+            'account_from_id'         => intval($request->get('account_from_id')),
+            'account_to_id'         => intval($request->get('account_to_id')),
+            'expense_account'    => $request->get('expense_account'),
+            'revenue_account'    => $request->get('revenue_account'),
+            'amount'             => floatval($request->get('amount')),
+            'user'               => Auth::user()->id,
+            'amount_currency_id' => intval($request->get('amount_currency_id')),
+            'date'               => new Carbon($request->get('date')),
+            'budget_id'          => intval($request->get('budget_id')),
+            'category'           => $request->get('category'),
+        ];
+
+        $journal = $repository->store($journalData);
+
+        Session::flash('success', 'New transaction "' . $journal->description . '" stored!');
+
+        return Redirect::route('transactions.index', $request->input('what'));
 
     }