merchant

commit 56eb638833096f2fe3d5ae6df6c0bf122dedf2a9
parent 2c5edc3039fd5fb5826d18c09e3603e1691b1d3d
Author: Sebastian <sebasjm@gmail.com>
Date:   Tue, 11 Feb 2025 17:12:18 -0300

implement v19: adding order status url on claimed orders

Diffstat:
M
src/backend/taler-merchant-httpd_config.c
 | 
2
+-
M
src/backend/taler-merchant-httpd_private-get-orders-ID.c
 | 
26
+++++++++++++++-----------

2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_config.c b/src/backend/taler-merchant-httpd_config.c
@@ -43,7 +43,7 @@
  * #MERCHANT_PROTOCOL_CURRENT and #MERCHANT_PROTOCOL_AGE in
  * merchant_api_config.c!
  */
-#define MERCHANT_PROTOCOL_VERSION "18:0:14"
+#define MERCHANT_PROTOCOL_VERSION "18:0:15"
 
 
 /**
diff --git a/src/backend/taler-merchant-httpd_private-get-orders-ID.c b/src/backend/taler-merchant-httpd_private-get-orders-ID.c
@@ -947,6 +947,17 @@ phase_unpaid_finish (struct GetOrderRequestContext *gorc)
     MHD_suspend_connection (gorc->sc.con);
     return;
   }
+  taler_pay_uri = TMH_make_taler_pay_uri (gorc->sc.con,
+                                          hc->infix,
+                                          gorc->session_id,
+                                          hc->instance->settings.id,
+                                          &gorc->claim_token);
+  order_status_url = TMH_make_order_status_url (gorc->sc.con,
+                                                hc->infix,
+                                                gorc->session_id,
+                                                hc->instance->settings.id,
+                                                &gorc->claim_token,
+                                                NULL);
   if (! gorc->order_only)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -956,23 +967,16 @@ phase_unpaid_finish (struct GetOrderRequestContext *gorc)
                TALER_MHD_REPLY_JSON_PACK (
                  gorc->sc.con,
                  MHD_HTTP_OK,
+                 GNUNET_JSON_pack_string ("taler_pay_uri",
+                                          taler_pay_uri),
+                 GNUNET_JSON_pack_string ("order_status_url",
+                                          order_status_url),
                  GNUNET_JSON_pack_object_incref ("contract_terms",
                                                  gorc->contract_terms),
                  GNUNET_JSON_pack_string ("order_status",
                                           "claimed")));
     return;
   }
-  taler_pay_uri = TMH_make_taler_pay_uri (gorc->sc.con,
-                                          hc->infix,
-                                          gorc->session_id,
-                                          hc->instance->settings.id,
-                                          &gorc->claim_token);
-  order_status_url = TMH_make_order_status_url (gorc->sc.con,
-                                                hc->infix,
-                                                gorc->session_id,
-                                                hc->instance->settings.id,
-                                                &gorc->claim_token,
-                                                NULL);
   ret = TALER_MHD_REPLY_JSON_PACK (
     gorc->sc.con,
     MHD_HTTP_OK,