[taler-taler-mdb] branch master updated (5ef597a -> 7327096)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a change to branch master
in repository taler-mdb.

    from 5ef597a  -reduce logging
     new 5a2de7e  -force deletion
     new 7327096  adaptations for latest merchant C API

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/main.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main.c b/src/main.c
index a6c90e0..f0b1529 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1005,6 +1005,7 @@ cleanup_payment (struct PaymentActivity *pa)
       pa->ctx,
       pa->base_url,
       oid,
+      true, /* delete even claimed orders */
       &order_delete_cb,
       pa);
     GNUNET_free (oid);
@@ -1467,15 +1468,14 @@ start_read_keyboard (void);
  * @brief Callback to process a GET /check-payment request
  *
  * @param cls closure
- * @param hr HTTP response
  * @param osr order status response details (on success)
  */
 static void
 check_payment_cb (void *cls,
-                  const struct TALER_MERCHANT_HttpResponse *hr,
                   const struct TALER_MERCHANT_OrderStatusResponse *osr)
 {
   struct PaymentActivity *pa = cls;
+  const struct TALER_MERCHANT_HttpResponse *hr = &osr->hr;
   char *uri;
 
   GNUNET_assert (payment_activity == pa);
@@ -1496,7 +1496,8 @@ check_payment_cb (void *cls,
     return;
   }
 
-  if (TALER_MERCHANT_OSC_PAID == osr->status)
+  if ( (MHD_HTTP_OK != hr->http_status) &&
+       (TALER_MERCHANT_OSC_PAID == osr->details.success.status) )
   {
     mdb.cmd = &cmd_approve_vend;
     payment_activity->paid = true;
@@ -1521,14 +1522,15 @@ check_payment_cb (void *cls,
                                                        pa);
   }
   if ( (NULL == pa->taler_pay_uri) &&
-       (TALER_MERCHANT_OSC_UNPAID == osr->status) )
+       (MHD_HTTP_OK == hr->http_status) &&
+       (TALER_MERCHANT_OSC_UNPAID == osr->details.success.status) )
   {
     if (NULL == essid)
-      uri = GNUNET_strdup (osr->details.unpaid.taler_pay_uri);
+      uri = GNUNET_strdup (osr->details.success.details.unpaid.taler_pay_uri);
     else
       GNUNET_asprintf (&uri,
                        "%s#%s",
-                       osr->details.unpaid.taler_pay_uri,
+                       osr->details.success.details.unpaid.taler_pay_uri,
                        essid);
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Trying to talk to wallet to give it pay URI `%s'\n",

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.