merchant

commit 146fc36ae82153ebc60f6ff2b4d2799af64ab5fe
parent 28fef85ce013fef2a7779160d02407933391f983
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Thu, 15 Oct 2015 18:47:41 +0200

Minor changes

Diffstat:
M
src/backend/taler-merchant-httpd.c
 | 
8
++++----
M
src/frontend/generate_taler_contract.php
 | 
4
++--

2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c
@@ -378,7 +378,7 @@ url_handler (void *cls,
 {
 
   /*printf ("%s\n", url);*/
-  unsigned int status;
+  unsigned long status;
   unsigned int no_destroy;
   struct GNUNET_CRYPTO_EddsaSignature c_sig;
   struct GNUNET_CRYPTO_EddsaPublicKey pub;
@@ -509,8 +509,6 @@ url_handler (void *cls,
     mr.ptr = malloc(1);
     mr.size = 0;
 
-
-
     if (curl)
     {
     
@@ -543,7 +541,9 @@ url_handler (void *cls,
       curl_easy_cleanup(curl);
     
       /* Bounce back to the frontend what the mint said */
-      status = generate_message (&resp, mr.ptr);
+      //printf ("get %s\n", mr.ptr);
+      generate_message (&resp, mr.ptr);
+      curl_easy_getinfo (curl, CURLINFO_RESPONSE_CODE, &status);
       GNUNET_free (mr.ptr);
  
     }
diff --git a/src/frontend/generate_taler_contract.php b/src/frontend/generate_taler_contract.php
@@ -76,8 +76,8 @@ $teatax = array ('value' => 1,
 $json = json_encode (array ('amount' => array ('value' => $value,
 			                       'fraction' => $fraction,
                                                'currency' => $currency),
-			    'max fee' => array ('value' => 3,
-			                        'fraction' => 0,
+			    'max fee' => array ('value' => 0,
+			                        'fraction' => 01010,
 						'currency' => $currency),
                             'trans_id' => $transaction_id,
                             'details' =>