merchant

commit 01568f9714c4c12918d5ff7f3bf8bbd30975cf7c
parent 671659963e153dcdf48d3d9495d9513a395d38db
Author: Christian Grothoff <christian@grothoff.org>
Date:   Wed,  4 May 2016 06:40:14 +0200

merge

Diffstat:
M
copylib/config.php
 | 
2
+-
M
examples/shop/fulfillment.php
 | 
1
-
M
examples/shop/pay.php
 | 
6
+-----
M
src/backend/taler-merchant-httpd_contract.c
 | 
3
---

4 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/copylib/config.php b/copylib/config.php
@@ -17,7 +17,7 @@
 
 $REFUND_DELTA = 'P3M';
 // set to false when done with local tests
-$explicit_currency = "KUDOS";
+$explicit_currency = "PUDOS";
 $MERCHANT_CURRENCY = $explicit_currency;
 
 $host = $_SERVER["HTTP_HOST"];
diff --git a/examples/shop/fulfillment.php b/examples/shop/fulfillment.php
@@ -71,7 +71,6 @@ $offering_url = url_rel("index.php", true);
 
 if (array() === $my_payment || true !== get($my_payment["is_payed"], false)) {
   // restore contract
-  
   $contract = generate_contract(array(
     "amount_value" => intval($_GET['aval']),
     "amount_fraction" => intval($_GET['afrac']),
diff --git a/examples/shop/pay.php b/examples/shop/pay.php
@@ -17,7 +17,7 @@
 */
 
 include '../../copylib/util.php';
-
+log_string("getting money");
 // so we won't generate a response for the wrong receiver.
 $receiver = get($_GET["receiver"]);
 if (empty($receiver))
@@ -42,10 +42,6 @@ if (!isset($payments[$receiver]))
   return;
 }
 
-echo 'recognized session';
-echo 'with hash ' . $payments[$receiver]['hc'];
-die();
-
 $post_body = file_get_contents('php://input');
 $deposit_permission = json_decode ($post_body, true);
 
diff --git a/src/backend/taler-merchant-httpd_contract.c b/src/backend/taler-merchant-httpd_contract.c
@@ -104,14 +104,11 @@ MH_handler_contract (struct TMH_RequestHandler *rh,
   res = TMH_PARSE_json_data (connection,
                              jcontract,
                              spec);
-  printf ("parsed\n");
   if (GNUNET_NO == res)
     return MHD_YES;
   if (GNUNET_SYSERR == res)
     return TMH_RESPONSE_reply_external_error (connection,
                                               "contract request malformed");
-
-  printf ("beyond\n");
   /* add fields to the contract that the backend should provide */
   json_object_set (jcontract,
                    "exchanges",