summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2015-12-18 13:57:29 +0100
committerMarcello Stanisci <marcello.stanisci@inria.fr>2015-12-18 13:57:29 +0100
commit2a270be0497b88c95936bfcd09b5ecd83141b94c (patch)
tree911de5c3a8146f652fd3da079fd48b1221b82956
parentfa32cc5feaf801651c18e3ad1c812c336f3a359d (diff)
parent20871c37ede3d4df984257e9547ef0554dffeea9 (diff)
downloadmerchant-2a270be0497b88c95936bfcd09b5ecd83141b94c.tar.gz
merchant-2a270be0497b88c95936bfcd09b5ecd83141b94c.tar.bz2
merchant-2a270be0497b88c95936bfcd09b5ecd83141b94c.zip
Merge branch 'master' of ssh://taler.net/var/git/merchant
-rw-r--r--src/frontend/pay.php19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/frontend/pay.php b/src/frontend/pay.php
index 97ee5290..090b6525 100644
--- a/src/frontend/pay.php
+++ b/src/frontend/pay.php
@@ -39,13 +39,6 @@ if ($_GET['backend_test'] == 'no')
session_start();
-if (!$cli_debug && (! isset($_SESSION['receiver'])))
-{
- http_response_code(400);
- echo "Please, donate to someone before landing here!";
- exit();
-}
-
$cli_debug = false;
$backend_test = true;
@@ -112,15 +105,17 @@ if ($status_code != 200)
/* error: just forwarding to the wallet what
gotten from the backend (which is forwarding 'as is'
the error gotten from the mint) */
+ echo "Error came from the backend\n";
+ echo "json_encode ($new_deposit_permission)"
+ echo "\n";
echo $resp->body->toString ();
-
}
else
{
-$_SESSION['payment_ok'] = true;
-http_response_code (301);
-header("Location: http://" . $_SERVER["SERVER_NAME"] . "/fullfillment");
-die();
+ $_SESSION['payment_ok'] = true;
+ http_response_code (301);
+ header("Location: http://" . $_SERVER["SERVER_NAME"] . "/fullfillment");
+ die();
}
?>