Reinstated soft deletes, added first steps for account controller.

2025-10-12 23:45:10 +00:00 · 2015-02-07 23:19:28 +01:00
parent 1499b2cd40
commit 3d01669cea
17 changed files with 300 additions and 14 deletions
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -0,0 +1,32 @@
+<?php namespace FireflyIII\Http\Controllers;
+
+use Auth;
+use Config;
+use FireflyIII\Http\Requests;
+use Illuminate\Http\Request;
+use View;
+
+/**
+ * Class AccountController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class AccountController extends Controller
+{
+    public function __construct()
+    {
+        View::share('mainTitleIcon', 'fa-credit-card');
+        View::share('title', 'Accounts');
+    }
+
+    public function index($what = 'default')
+    {
+        $subTitle     = Config::get('firefly.subTitlesByIdentifier.' . $what);
+        $subTitleIcon = Config::get('firefly.subIconsByIdentifier.' . $what);
+        $types        = Config::get('firefly.accountTypesByIdentifier.' . $what);
+        $accounts     = Auth::user()->accounts()->accountTypeIn($types)->get(['accounts.*']);
+
+        return view('accounts.index', compact('what', 'subTitleIcon', 'subTitle', 'accounts'));
+    }
+
+}
--- a/app/Http/Controllers/GoogleChartController.php
+++ b/app/Http/Controllers/GoogleChartController.php
@@ -4,15 +4,19 @@ use Auth;
 use Carbon\Carbon;
 use FireflyIII\Http\Requests;
 use FireflyIII\Models\Account;
+use FireflyIII\Models\Bill;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Models\TransactionJournal;
 use Grumpydictator\Gchart\GChart;
 use Illuminate\Database\Query\Builder as QueryBuilder;
+use Illuminate\Database\Query\JoinClause;
 use Illuminate\Http\Request;
 use Preferences;
 use Response;
 use Session;
 use Steam;
+use Crypt;

 /**
 * Class GoogleChartController
@@ -133,5 +137,92 @@ class GoogleChartController extends Controller
        return Response::json($chart->getData());
    }

+    public function allCategoriesHomeChart(GChart $chart)
+    {
+        $chart->addColumn('Category', 'string');
+        $chart->addColumn('Spent', 'number');
+
+        // query!
+        $start = Session::get('start', Carbon::now()->startOfMonth());
+        $end   = Session::get('end', Carbon::now()->endOfMonth());
+        $set   = TransactionJournal::leftJoin(
+            'transactions',
+            function (JoinClause $join) {
+                $join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('amount', '>', 0);
+            }
+        )
+                                   ->leftJoin(
+                                       'category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id'
+                                   )
+                                   ->leftJoin('categories', 'categories.id', '=', 'category_transaction_journal.category_id')
+                                   ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+                                   ->before($end)
+                                   ->after($start)
+                                   ->where('transaction_types.type', 'Withdrawal')
+                                   ->groupBy('categories.id')
+                                   ->orderBy('sum', 'DESC')
+                                   ->get(['categories.id', 'categories.name', \DB::Raw('SUM(`transactions`.`amount`) AS `sum`')]);
+
+        foreach ($set as $entry) {
+            $entry->name = strlen($entry->name) == 0 ? '(no category)' : $entry->name;
+            $chart->addRow($entry->name, floatval($entry->sum));
+        }
+
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+    }
+
+    public function billsOverview(GChart $chart)
+    {
+        $paid   = ['items' => [], 'amount' => 0];
+        $unpaid = ['items' => [], 'amount' => 0];
+        $start  = Session::get('start', Carbon::now()->startOfMonth());
+        $end    = Session::get('end', Carbon::now()->endOfMonth());
+
+        $chart->addColumn('Name', 'string');
+        $chart->addColumn('Amount', 'number');
+
+        $set = Bill::
+        leftJoin(
+            'transaction_journals', function (JoinClause $join) use ($start, $end) {
+            $join->on('bills.id', '=', 'transaction_journals.bill_id')
+                 ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
+                 ->where('transaction_journals.date', '<=', $end->format('Y-m-d'));
+        }
+        )
+                   ->leftJoin(
+                       'transactions', function (JoinClause $join) {
+                       $join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('transactions.amount', '>', 0);
+                   }
+                   )
+                   ->where('active', 1)
+                   ->groupBy('bills.id')
+                   ->get(
+                       ['bills.id', 'bills.name', 'transaction_journals.description',
+                        'transaction_journals.encrypted',
+                        'transaction_journals.id as journalId',
+                        \DB::Raw('SUM(`bills`.`amount_min` + `bills`.`amount_max`) / 2 as `averageAmount`'),
+                        'transactions.amount AS actualAmount']
+                   );
+
+        foreach ($set as $entry) {
+            if (intval($entry->journalId) == 0) {
+                $unpaid['items'][] = $entry->name;
+                $unpaid['amount'] += floatval($entry->averageAmount);
+            } else {
+                $description     = intval($entry->encrypted) == 1 ? Crypt::decrypt($entry->description) : $entry->description;
+                $paid['items'][] = $description;
+                $paid['amount'] += floatval($entry->actualAmount);
+            }
+        }
+        $chart->addRow('Unpaid: ' . join(', ', $unpaid['items']), $unpaid['amount']);
+        $chart->addRow('Paid: ' . join(', ', $paid['items']), $paid['amount']);
+        $chart->generate();
+
+        return Response::json($chart->getData());
+    }
+

 }
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -15,8 +15,8 @@ Route::group(
     */
    Route::get('/accounts/{what}', ['uses' => 'AccountController@index', 'as' => 'accounts.index'])->where('what', 'revenue|asset|expense');
    Route::get('/accounts/create/{what}', ['uses' => 'AccountController@create', 'as' => 'accounts.create'])->where('what', 'revenue|asset|expense');
-    //Route::get('/accounts/edit/{account}', ['uses' => 'AccountController@edit', 'as' => 'accounts.edit']);
-    //Route::get('/accounts/delete/{account}', ['uses' => 'AccountController@delete', 'as' => 'accounts.delete']);
+    Route::get('/accounts/edit/{account}', ['uses' => 'AccountController@edit', 'as' => 'accounts.edit']);
+    Route::get('/accounts/delete/{account}', ['uses' => 'AccountController@delete', 'as' => 'accounts.delete']);
    Route::get('/accounts/show/{account}/{view?}', ['uses' => 'AccountController@show', 'as' => 'accounts.show']);

    /**
@@ -64,8 +64,8 @@ Route::group(
     */
    Route::get('/chart/home/account', ['uses' => 'GoogleChartController@allAccountsBalanceChart']);
    Route::get('/chart/home/budgets', ['uses' => 'GoogleChartController@allBudgetsHomeChart']);
-    //Route::get('/chart/home/categories', ['uses' => 'GoogleChartController@allCategoriesHomeChart']);
-    //Route::get('/chart/home/bills', ['uses' => 'GoogleChartController@billsOverview']);
+    Route::get('/chart/home/categories', ['uses' => 'GoogleChartController@allCategoriesHomeChart']);
+    Route::get('/chart/home/bills', ['uses' => 'GoogleChartController@billsOverview']);
    //Route::get('/chart/account/{account}/{view?}', ['uses' => 'GoogleChartController@accountBalanceChart']);
    //Route::get('/chart/reports/income-expenses/{year}', ['uses' => 'GoogleChartController@yearInExp']);
    //Route::get('/chart/reports/income-expenses-sum/{year}', ['uses' => 'GoogleChartController@yearInExpSum']);