[taler-merchant] branch master updated: get_order_summary() can return NULL, make field optional

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 6ac3001  get_order_summary() can return NULL, make field optional
6ac3001 is described below

commit 6ac300125f397470cac808e190eb02270b9a01bb
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Sep 6 00:11:17 2020 +0200

    get_order_summary() can return NULL, make field optional
---
 src/backend/taler-merchant-httpd_get-orders-ID.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_get-orders-ID.c 
b/src/backend/taler-merchant-httpd_get-orders-ID.c
index 5ed9208..f55e403 100644
--- a/src/backend/taler-merchant-httpd_get-orders-ID.c
+++ b/src/backend/taler-merchant-httpd_get-orders-ID.c
@@ -532,7 +532,8 @@ send_pay_request (struct GetOrderData *god,
     {
       enum GNUNET_GenericReturnValue res;
       json_t *context;
-      context = json_pack ("{s:s, s:s, s:s, s:s:}",
+
+      context = json_pack ("{s:s, s:s, s:s, s:s?}",
                            "taler_pay_uri",
                            taler_pay_uri,
                            "order_status_url",
@@ -1103,7 +1104,8 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh,
         }
         {
           json_t *context;
-          context = json_pack ("{s:s, s:s, s:s, s:s}"
+
+          context = json_pack ("{s:s?, s:s, s:s, s:s}"
                                "order_summary",
                                get_order_summary (god),
                                "refund_amount",
@@ -1127,7 +1129,7 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh,
       {
         json_t *context;
 
-        context = json_pack ("{s:O, s:s, s:s}",
+        context = json_pack ("{s:O, s:s?, s:s}",
                              "contract_terms",
                              god->contract_terms,
                              "order_summary",

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