merchant

commit 1f45f2b48d719c4a5cae354f667cec75e9eff94a
parent 3697000a1957680efa4a4b334f35df97ac0aaab2
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sat, 29 Feb 2020 15:43:58 +0100

Merge branch 'master' of git+ssh://git.taler.net/merchant

Diffstat:
M
src/backend/taler-merchant-httpd_order.c
 | 
4
++--
M
src/lib/merchant_api_proposal.c
 | 
12
+++++-------

2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_order.c b/src/backend/taler-merchant-httpd_order.c
@@ -195,7 +195,7 @@ proposal_put (struct MHD_Connection *connection,
   int res;
   struct TALER_Amount total;
   const char *order_id;
-  const char *summary;
+  json_t *summary;
   const char *fulfillment_url;
   json_t *products;
   json_t *merchant;
@@ -206,7 +206,7 @@ proposal_put (struct MHD_Connection *connection,
   struct GNUNET_JSON_Specification spec[] = {
     TALER_JSON_spec_amount ("amount", &total),
     GNUNET_JSON_spec_string ("order_id", &order_id),
-    GNUNET_JSON_spec_string ("summary", &summary),
+    GNUNET_JSON_spec_json ("summary", &summary),
     GNUNET_JSON_spec_string ("fulfillment_url",
                              &fulfillment_url),
     /**
diff --git a/src/lib/merchant_api_proposal.c b/src/lib/merchant_api_proposal.c
@@ -226,12 +226,11 @@ handle_proposal_finished (void *cls,
  * @return a handle for this request, NULL on error
  */
 struct TALER_MERCHANT_ProposalOperation *
-TALER_MERCHANT_order_put
-  (struct GNUNET_CURL_Context *ctx,
-  const char *backend_url,
-  const json_t *order,
-  TALER_MERCHANT_ProposalCallback proposal_cb,
-  void *proposal_cb_cls)
+TALER_MERCHANT_order_put (struct GNUNET_CURL_Context *ctx,
+                          const char *backend_url,
+                          const json_t *order,
+                          TALER_MERCHANT_ProposalCallback proposal_cb,
+                          void *proposal_cb_cls)
 {
   struct TALER_MERCHANT_ProposalOperation *po;
   json_t *req;
@@ -260,7 +259,6 @@ TALER_MERCHANT_order_put
                  curl_easy_setopt (eh,
                                    CURLOPT_URL,
                                    po->url));
-
   po->job = GNUNET_CURL_job_add2 (ctx,
                                   eh,
                                   po->post_ctx.headers,