Merge branch 'feature/twig' into develop

app/Http/Controllers/Auth/AuthController.php

@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
 use Illuminate\Mail\Message;
 use Mail;
 use Session;
+use Twig;
 
 /**
  * Class AuthController
@@ -47,6 +48,16 @@ class AuthController extends Controller
         $this->middleware('guest', ['except' => 'getLogout']);
     }
 
+    /**
+     * Show the application login form.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function getLogin()
+    {
+        return Twig::render('auth.login');
+    }
+
     /**
      * Handle a registration request for the application.
      *

app/Http/Controllers/BudgetController.php

@@ -8,6 +8,7 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\LimitRepetition;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use Illuminate\Support\Collection;
 use Input;
 use Preferences;
 use Redirect;
@@ -190,6 +191,9 @@ class BudgetController extends Controller
         $journals = $repository->getJournals($budget, $repetition);
         $limits   = !is_null($repetition->id) ? [$repetition->budgetLimit] : $repository->getBudgetLimits($budget);
         $subTitle = !is_null($repetition->id) ? e($budget->name) . ' in ' . $repetition->startdate->format('F Y') : e($budget->name);
+        if (!$journals instanceof Collection) {
+            $journals->setPath('/budgets/show/' . $budget->id);
+        }
 
         return view('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle'));
     }

app/Http/Controllers/ReportController.php

@@ -47,50 +47,51 @@ class ReportController extends Controller
      */
     public function budget($year = '2014', $month = '1')
     {
-        try {
-            new Carbon($year . '-' . $month . '-01');
-        } catch (Exception $e) {
-            return view('error')->with('message', 'Invalid date');
-        }
-        $date  = new Carbon($year . '-' . $month . '-01');
-        $start = clone $date;
+        $date         = new Carbon($year . '-' . $month . '-01');
+        $subTitle     = 'Budget report for ' . $date->format('F Y');
+        $subTitleIcon = 'fa-calendar';
+        $start        = clone $date;
+
+
         $start->startOfMonth();
         $end = clone $date;
         $end->endOfMonth();
-        $start->subDay();
 
+        // should show shared reports?
         /** @var Preference $pref */
         $pref              = Preferences::get('showSharedReports', false);
         $showSharedReports = $pref->data;
+        $accountAmounts    = []; // array with sums of spent amounts on each account.
+        $accounts          = $this->query->getAllAccounts($start, $end, $showSharedReports); // all accounts and some data.
 
+        foreach ($accounts as $account) {
 
-        $dayEarly     = clone $date;
-        $subTitle     = 'Budget report for ' . $date->format('F Y');
-        $subTitleIcon = 'fa-calendar';
-        $dayEarly     = $dayEarly->subDay();
-        $accounts     = $this->query->getAllAccounts($start, $end, $showSharedReports);
-        $start->addDay();
+            $budgets                      = $this->query->getBudgetSummary($account, $start, $end);// get budget summary for this account:
+            $balancedAmount               = $this->query->balancedTransactionsSum($account, $start, $end);
+            $accountAmounts[$account->id] = $balancedAmount;
+            // balance out the transactions (see transaction groups & tags) ^^
 
-        $accounts->each(
-            function (Account $account) use ($start, $end) {
-                $budgets        = $this->query->getBudgetSummary($account, $start, $end);
-                $balancedAmount = $this->query->balancedTransactionsSum($account, $start, $end);
-                $array          = [];
-                $hide           = true;
-                foreach ($budgets as $budget) {
-                    $id         = intval($budget->id);
-                    $data       = $budget->toArray();
-                    $array[$id] = $data;
-                    if (floatval($data['queryAmount']) != 0) {
-                        $hide = false;
-                    }
+            // array with budget information for each account:
+            $array = [];
+            // should always hide account
+            $hide = true;
+            // loop all budgets
+            foreach ($budgets as $budget) {
+                $id         = intval($budget->id);
+                $data       = $budget->toArray();
+                $array[$id] = $data;
+
+                // no longer hide account if any budget has money in it.
+                if (floatval($data['queryAmount']) != 0) {
+                    $hide = false;
                 }
-                $account->hide              = $hide;
-                $account->budgetInformation = $array;
-                $account->balancedAmount    = $balancedAmount;
-
+                $accountAmounts[$account->id] += $data['queryAmount'];
             }
-        );
+            $account->hide              = $hide;
+            $account->budgetInformation = $array;
+            $account->balancedAmount    = $balancedAmount;
+
+        }
 
         /**
          * Start getBudgetsForMonth DONE
@@ -101,7 +102,7 @@ class ReportController extends Controller
          * End getBudgetsForMonth DONE
          */
 
-        return view('reports.budget', compact('subTitle', 'year', 'month', 'subTitleIcon', 'date', 'accounts', 'budgets', 'dayEarly'));
+        return view('reports.budget', compact('subTitle', 'accountAmounts', 'year', 'month', 'subTitleIcon', 'date', 'accounts', 'budgets'));
 
     }
 

app/Http/breadcrumbs.php

@@ -23,6 +23,14 @@ Breadcrumbs::register(
     }
 );
 
+Breadcrumbs::register(
+    'index',
+    function (Generator $breadcrumbs) {
+
+        $breadcrumbs->push('Home', route('index'));
+    }
+);
+
 // accounts
 Breadcrumbs::register(
     'accounts.index', function (Generator $breadcrumbs, $what) {