gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-merchant] branch master updated: add fulfillment_url to JSON, no


From: gnunet
Subject: [taler-merchant] branch master updated: add fulfillment_url to JSON, not to HTML
Date: Wed, 12 Aug 2020 17:06:34 +0200

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 326d73d  add fulfillment_url to JSON, not to HTML
326d73d is described below

commit 326d73d050f371b1e7f995d9184aabd5b9baac94
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Aug 12 17:06:32 2020 +0200

    add fulfillment_url to JSON, not to HTML
---
 src/backend/taler-merchant-httpd_get-orders-ID.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_get-orders-ID.c 
b/src/backend/taler-merchant-httpd_get-orders-ID.c
index bb4d1b3..ffc9ac0 100644
--- a/src/backend/taler-merchant-httpd_get-orders-ID.c
+++ b/src/backend/taler-merchant-httpd_get-orders-ID.c
@@ -597,10 +597,6 @@ send_pay_request (struct GetOrderData *god,
           // language preferences from summary_i18n if present.
           json_string_value (json_object_get (god->contract_terms,
                                               "summary")) },
-        { "already_paid_fulfillment_url",
-          (NULL != already_paid_order_id)
-          ? god->fulfillment_url
-          : "" },
         { NULL, NULL }
       };
       enum GNUNET_GenericReturnValue res;
@@ -623,11 +619,14 @@ send_pay_request (struct GetOrderData *god,
   {
     ret = TALER_MHD_reply_json_pack (god->sc.con,
                                      MHD_HTTP_PAYMENT_REQUIRED,
-                                     "{s:s, s:s?}",
+                                     "{s:s, s:s, s:s?}",
                                      "taler_pay_uri",
                                      taler_pay_uri,
+                                     "fulfillment_url",
+                                     god->fulfillment_url,
                                      "already_paid_order_id",
                                      already_paid_order_id);
+
   }
   GNUNET_free (taler_pay_uri);
   GNUNET_free (order_status_url);

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]