commit d7ef42b83b6056bb39a2a2c78cf3aff51821d674
parent 0f3e3e1fed1550bde1f2eb442255a8f7d3ef5d72
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Thu, 19 Nov 2015 10:29:53 +0100
Merge branch 'master' of ssh://taler.net/var/git/merchant
Conflicts:
src/frontend/pay.php
Diffstat:
2 files changed, 12 insertions(+), 79 deletions(-)
diff --git a/src/frontend/fake_wire_transfer.php b/src/frontend/fake_wire_transfer.php
@@ -1,79 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>Fake Wire Transfer</title>
- <script>
- /*
- @licstart The following is the entire license notice for the
- JavaScript code in this page.
-
- Copyright (C) 2014,2015 GNUnet e.V.
-
- The JavaScript code in this page is free software: you can
- redistribute it and/or modify it under the terms of the GNU
- Lesser General Public License (GNU LGPL) as published by the Free Software
- Foundation, either version 2.1 of the License, or (at your option)
- any later version. The code is distributed WITHOUT ANY WARRANTY;
- without even the implied warranty of MERCHANTABILITY or FITNESS
- FOR A PARTICULAR PURPOSE. See the GNU LGPL for more details.
-
- As additional permission under GNU LGPL version 2.1 section 7, you
- may distribute non-source (e.g., minimized or compacted) forms of
- that code without the copy of the GNU LGPL normally required by
- section 4, provided you include this license notice and a URL
- through which recipients can access the Corresponding Source.
-
- @licend The above is the entire license notice
- for the JavaScript code in this page.
- */
- </script>
-</head>
-<body>
-<!--
- This page's main aim is to forward the fake wire transfer
- request to the demonstrator and to inform the customer
- about the result. In a real-world deployment, this
- page would not be required as the customer would do a
- wire transfer with his bank instead.
- -->
-<?php
-
-// Evaluate form
-$reserve_pk = $_POST['reserve_pk'];
-$kudos_amount = $_POST['kudos_amount'];
-$mint = $_POST['mint_url'];
-
-// pack the JSON
-$json = json_encode (array ('reserve_pub' => $reserve_pk,
- 'execution_date' => "/Date(" . time() . ")/",
- 'wire' => array ('type' => 'test'),
- 'amount' => array ('value' => intval($kudos_amount),
- 'fraction' => 0,
- 'currency' => 'KUDOS'))); // TODO 'KUDOS' example needs 'KUDOS' denom keys ..
-
-// craft the HTTP request
-$req = new http\Client\Request ("POST",
- "http://" . $mint . "/admin/add/incoming",
- array ("Content-Type" => "application/json"));
-$req->getBody()->append ($json);
-
-// execute HTTP request
-$client = new http\Client;
-$client->enqueue($req)->send ();
-$resp = $client->getResponse ();
-
-// evaluate response
-$status_code = $resp->getResponseCode ();
-http_response_code ($status_code);
-
-if ($status_code != 200)
-{
- echo "Error $status_code when faking the wire transfer. Please report to taler@gnu.org";
-}
-else
-{
- echo "Pretend wire transfer successful. Go <a href=\"/\">back</a> and enjoy shopping!";
-}
-?>
-</body>
-</html>
diff --git a/src/frontend/fullfillment.html b/src/frontend/fullfillment.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <title>Taler's "Demo" Shop</title>
+ <link rel="stylesheet" type="text/css" href="style.css">
+</head>
+<body id="css-zen-garden" onload="signal_me()">
+<p>Congratulations, your purchase has succeeded! Go to <a href="/">
+our homepage</a>, or visit <a href="http://taler.net">taler.net</a>.
+</p>
+</body>
+</html>
