diff --git a/assets/css/login.css b/assets/css/login.css new file mode 100644 index 0000000..83f8f38 --- /dev/null +++ b/assets/css/login.css @@ -0,0 +1,117 @@ +.appinfodiv{ + background-color: #DDDDDD; + height: 100%; + display: flex; + justify-content: center; + align-items: center; +} + +.formdiv{ + background-color: #AAAAAA; + height: 100%; + display: flex; + justify-content: center; + align-items: center; +} + +@import url(http://fonts.googleapis.com/css?family=Roboto); + +/****** LOGIN MODAL ******/ +.loginmodal-container { + padding: 30px; + max-width: 350px; + width: 100% !important; + background-color: #F7F7F7; + margin: 0 auto; + border-radius: 2px; + box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3); + overflow: hidden; + font-family: roboto; +} + +.loginmodal-container h1 { + text-align: center; + font-size: 1.8em; + font-family: roboto; +} + +.loginmodal-container input[type=submit] { + width: 100%; + display: block; + margin-bottom: 10px; + position: relative; +} + +.loginmodal-container input[type=text], input[type=password] { + height: 44px; + font-size: 16px; + width: 100%; + margin-bottom: 10px; + -webkit-appearance: none; + background: #fff; + border: 1px solid #d9d9d9; + border-top: 1px solid #c0c0c0; + padding: 0 8px; + box-sizing: border-box; + -moz-box-sizing: border-box; +} + +.loginmodal-container input[type=text]:hover, input[type=password]:hover { + border: 1px solid #b9b9b9; + border-top: 1px solid #a0a0a0; + -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); + -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); + box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); +} + +.loginmodal { + text-align: center; + font-size: 14px; + font-family: 'Arial', sans-serif; + font-weight: 700; + height: 36px; + padding: 0 8px; +} + +.loginmodal-submit { + border: 0px; + color: #fff; + text-shadow: 0 1px rgba(0,0,0,0.1); + background-color: #4d90fe; + padding: 17px 0px; + font-family: roboto; + font-size: 14px; +} + +.loginmodal-submit:hover { + border: 0px; + text-shadow: 0 1px rgba(0,0,0,0.3); + background-color: #357ae8; +} + +.loginmodal-container a { + text-decoration: none; + color: #666; + font-weight: 400; + text-align: center; + display: inline-block; + opacity: 0.6; + transition: opacity ease 0.5s; +} + +body{ + color: #ff6000; +} + +html, body{ + height: 100%; +} + +.logo{ + display: block; +} + +.full{ + width: 100%; + height: 100%; +} diff --git a/assets/css/main.css b/assets/css/main.css index 6ef0522..ac7ce0d 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -45,10 +45,22 @@ ul.nv { /** Index **/ .clickable { cursor: pointer; + color: #333; } .clickable:hover { - background: #0094ff; + text-decoration: none; + color: #333; +} + +.clickable:hover > div { + background: #eaeaea; +} + +.big { + font-size: 24px; + color: #0094ff; + font-weight: 600; } /** Footer **/ diff --git a/assets/logo.png b/assets/logo.png index 1a51ba0..0be8b57 100644 Binary files a/assets/logo.png and b/assets/logo.png differ diff --git a/src/Application/Login.php b/src/Application/Login.php index 5fd620a..e70e27c 100644 --- a/src/Application/Login.php +++ b/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); } }); diff --git a/src/Application/Overboeking.php b/src/Application/Overboeking.php index 78042c5..730152a 100644 --- a/src/Application/Overboeking.php +++ b/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()); } diff --git a/src/Application/Transacties.php b/src/Application/Transacties.php index 06a2940..0621cd9 100644 --- a/src/Application/Transacties.php +++ b/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()); } diff --git a/src/bootstrap.php b/src/bootstrap.php index b753261..1d5b28b 100644 --- a/src/bootstrap.php +++ b/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 /** * ============== diff --git a/templates/index.phtml b/templates/index.phtml index f18ad5c..75d62af 100644 --- a/templates/index.phtml +++ b/templates/index.phtml @@ -1,25 +1,19 @@ - - - - - - - - - - - - - - - Mijn rekeningenNieuwe overboeking - } - ?> -
IBANSaldoRekeningtypeRente
+ +
+
+

+

+
+
+ diff --git a/templates/login.phtml b/templates/login.phtml index 6b87226..1b3c39e 100644 --- a/templates/login.phtml +++ b/templates/login.phtml @@ -2,73 +2,39 @@ - InforBank - Inloggen - + Inforbank + - +
-
- -

Welkom bij de InforBank

- Bij InforBank krijg je zelfs 10% rente op betaalrekeningen.

- Je kunt bij InforBank ook online betalen.

- BIC: INFONL2N +
+
+ +

Welkom bij de InforBank

+ Bij InforBank krijg je zelfs 10% rente op betaalrekeningen.

+ Je kunt bij InforBank ook online betalen.

+ BIC: INFONL2N +
-
-
- - diff --git a/templates/transacties.phtml b/templates/transacties.phtml index 852c0e3..1eb0239 100644 --- a/templates/transacties.phtml +++ b/templates/transacties.phtml @@ -3,43 +3,65 @@ -Fout: niet jouw eigen rekening. + + -Nieuwe overboeking

-Saldo:
+ +

TransactieoverzichtNieuwe overboeking

+
+
+
+
+ IBAN/rekeningnummer
+

+
+ +
Rentetarief
+

%

+
+
Saldo
+

+
+
+ +
+
- + - + "; - echo ""; - echo "\n"; - echo "\n"; - if($transactie['van'] === $rekening['iban']){ - echo "\n"; - echo "\n"; - }else{ - echo "\n"; - echo "\n"; - } - echo "\n"; - echo ""; -} -?> + if (!isset($transactie['omschrijving'])) { + $transactie['omschrijving'] = ""; + } + echo ""; + echo ""; + echo "\n"; + echo "\n"; + + if ($transactie['van'] === $rekening['iban']) { + echo "\n"; + echo "\n"; + } else { + echo "\n"; + echo "\n"; + } + + echo "\n"; + echo ""; + } ?>
DatumTypeCode OmschrijvingIBANTegenrekening AF/BIJ Bedrag
" . $transactie['type'] . "" . $transactie['omschrijving'] . "" . $transactie['naar'] . "AF" . $transactie['van'] . "BIJ€" . $transactie['bedrag'] . "
" . $transactie['type'] . "" . $transactie['omschrijving'] . "" . $transactie['naar'] . "AF" . $transactie['van'] . "BIJ" . money_format('%(#1n', $transactie['bedrag']) . "
+
+ba = betaalautomaat, bg = bankgiro/SEPA opdracht, id = Inforbank Direct Online Betalen (iDeal), sp = spoedbetaling