Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/Application/Overboeking.php
#	src/Application/Transacties.php

src/Application/Login.php

@@ -16,30 +16,41 @@ namespace Inforbank\Application;
 
 use \Slim\App;
 use Inforbank\Application\Helper\Redirect;
+use Inforbank\Proxy;
 
 class Login
 {
     public function __construct(App $app)
     {
         $app->get('/login', function ($request, $response, $args) {
+            $query = $request->getQueryParams();
+            $error = isset($query['error']);
+
             // Render index view
-            return $this->renderer->render($response, 'login.phtml', $args);
+            return $this->renderer->render($response, 'login.phtml', array(
+                'base' => Proxy::$route->getBaseUrl() . "/",
+                'error' => $error
+            ));
         });
 
         $app->post('/login', function ($request, $response, $args) {
             // Render index view
             $post = $request->getParsedBody();
+            $query = $request->getQueryParams();
+            $redirect = $query['redirect'];
 
             try {
                 $resp = $this->auth->login($post['rekeningnr'], $post['pascode']);
 
-                if ($resp) {
-                    return Redirect::create($request, $response, '/');
+                if ($resp && $redirect !== "") {
+                    return Redirect::create($request, $response, $redirect);
+                } elseif ($resp) {
+                    return Redirect::create($request, $response, '/rekeningen');
                 } else {
-                    return Redirect::create($request, $response, '/login?error');
+                    return Redirect::create($request, $response, '/login?error&redirect='.$redirect);
                 }
             } catch (\Exception $e) {
-                return Redirect::create($request, $response, '/login?error');
+                return Redirect::create($request, $response, '/login?error&redirect='.$redirect);
             }
         });
 

src/Application/Overboeking.php

@@ -47,8 +47,17 @@ class Overboeking
                 Overboekingen::createOverboeking($ibanhelper->getIBAN($van), $naar, $bedrag, $omschrijving, "GT");
             }catch(Exception $e){
                 return Redirect::create($request, $response, "/overboeking?$e");
-                //NL84 INFO 0023 4567 89
             }
+            $db = Application::getContainer()->db;
+            $db->transacties->insert([
+                "van" => $vanRekening['nr'],
+                "naar" => $naarRekeningnr,
+                "bedrag" => $bedrag,
+                "type" => "bg" //bg staat voor internetbankieren
+            ]);
+
+            //TODO update saldo
+            //TODO Checken of het saldo van de rekening onder de 20 euro komt, dan doe je een mededeling via de berichthelper.
             return Redirect::create($request, $response, "/");
         })->add(new Middleware());
     }

src/Application/Transacties.php

@@ -59,9 +59,9 @@ class Transacties {
                 );
             }
             return $this->renderer->render($response, 'transacties.phtml', [
-                        'header' => Header::getHeaderData(),
-                        'rekening' => $rekening,
-                        'transacties' => $returnArray
+                'header' => Header::getHeaderData(),
+                'rekening' => $rekening,
+                'transacties' => $returnArray
             ]);
         })->add(new Auth\Middleware());
     }

src/bootstrap.php

@@ -21,6 +21,10 @@ session_start();
 // Get the Slim framework settings
 $settings = require __DIR__ . '/settings.php';
 
+// Set Locale
+setlocale(LC_MONETARY, 'nl_NL.UTF-8');
+date_default_timezone_set('Europe/Amsterdam');
+
 // Create the Slim application object with the settings
 /**
  * ==============