implement #6616 claim status in /private/orders/ID handler

1 files changed, 48 insertions, 2 deletions

diff --git a/src/lib/merchant_api_merchant_get_order.c b/src/lib/merchant_api_merchant_get_order.c
index 21e60efb..22c0dcd3 100644
--- a/src/lib/merchant_api_merchant_get_order.c
+++ b/src/lib/merchant_api_merchant_get_order.c
@@ -95,7 +95,7 @@ handle_unpaid (struct TALER_MERCHANT_OrderMerchantGetHandle *omgh,
   }
   {
     struct TALER_MERCHANT_OrderStatusResponse osr = {
-      .paid = false,
+      .status = TALER_MERCHANT_OSC_UNPAID,
       .details.unpaid.taler_pay_uri = taler_pay_uri,
       .details.unpaid.already_paid_order_id = already_paid_order_id
     };
@@ -109,6 +109,47 @@ handle_unpaid (struct TALER_MERCHANT_OrderMerchantGetHandle *omgh,
 
 /**
  * Function called when we're done processing the GET /private/orders/$ORDER
+ * request and we got an HTTP status of OK and the order was claimed but not
+ * paid. Parse the response and call the callback.
+ *
+ * @param omgh handle for the request
+ * @param[in,out] hr HTTP response we got
+ */
+static void
+handle_claimed (struct TALER_MERCHANT_OrderMerchantGetHandle *omgh,
+                struct TALER_MERCHANT_HttpResponse *hr)
+{
+  struct TALER_MERCHANT_OrderStatusResponse osr = {
+    .status = TALER_MERCHANT_OSC_CLAIMED
+  };
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_json ("contract_terms",
+                           (json_t **) &osr.details.claimed.contract_terms),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (hr->reply,
+                         spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    hr->http_status = 0;
+    hr->ec = TALER_EC_MERCHANT_ORDER_GET_REPLY_MALFORMED;
+    omgh->cb (omgh->cb_cls,
+              hr,
+              NULL);
+    return;
+  }
+  omgh->cb (omgh->cb_cls,
+            hr,
+            &osr);
+  GNUNET_JSON_parse_free (spec);
+}
+
+
+/**
+ * Function called when we're done processing the GET /private/orders/$ORDER
  * request and we got an HTTP status of OK and the order was paid. Parse
  * the response and call the callback.
  *
@@ -125,7 +166,7 @@ handle_paid (struct TALER_MERCHANT_OrderMerchantGetHandle *omgh,
   json_t *wire_reports;
   json_t *refund_details;
   struct TALER_MERCHANT_OrderStatusResponse osr = {
-    .paid = true
+    .status = TALER_MERCHANT_OSC_PAID
   };
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_bool ("refunded",
@@ -377,6 +418,11 @@ handle_merchant_order_get_finished (void *cls,
     handle_paid (omgh,
                  &hr);
   }
+  else if (0 == strcmp ("claimed", order_status))
+  {
+    handle_claimed (omgh,
+                    &hr);
+  }
   else if (0 == strcmp ("unpaid", order_status))
   {
     handle_unpaid (omgh,