merchant

commit d08f3bc98e5e03bdb2ffca9a8a6dcc3788178f85
parent 0bc2f82eeeafd47a948c024805403c539ddeb8d3
Author: Florian Dold <florian.dold@gmail.com>
Date:   Fri, 19 Jan 2018 02:32:12 +0100

include contract terms in refund / check-pay

Diffstat:
M
src/backend/taler-merchant-httpd_check-payment.c
 | 
15
+++++++++------
M
src/backend/taler-merchant-httpd_refund.c
 | 
7
++++---

2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_check-payment.c b/src/backend/taler-merchant-httpd_check-payment.c
@@ -280,12 +280,15 @@ MH_handler_check_payment (struct TMH_RequestHandler *rh,
 
   {
     int refunded = 0 != refund_amount.value || 0 != refund_amount.fraction;
-    return TMH_RESPONSE_reply_json_pack (connection,
-                                         MHD_HTTP_OK,
-                                         "{s:b, s:b, s:o}",
-                                         "paid", 1,
-                                         "refunded", refunded,
-                                         "refund_amount", TALER_JSON_from_amount (&refund_amount));
+    int res;
+    res = TMH_RESPONSE_reply_json_pack (connection,
+                                        MHD_HTTP_OK,
+                                        "{s:o s:b, s:b, s:o}",
+                                        "contract_terms", contract_terms,
+                                        "paid", 1,
+                                        "refunded", refunded,
+                                        "refund_amount", TALER_JSON_from_amount (&refund_amount));
+    return res;
   }
 
 do_pay:
diff --git a/src/backend/taler-merchant-httpd_refund.c b/src/backend/taler-merchant-httpd_refund.c
@@ -308,14 +308,15 @@ MH_handler_refund_increase (struct TMH_RequestHandler *rh,
     GNUNET_assert (NULL != refund_redirect_url);
     ret = TMH_RESPONSE_reply_json_pack (connection,
                                         MHD_HTTP_OK,
-                                        "{s:o, s:s}",
+                                        "{s:o, s:s, s:o}",
                                         "sig",
                                         GNUNET_JSON_from_data_auto (&sig),
                                         "refund_redirect_url",
-                                        refund_redirect_url);
+                                        refund_redirect_url,
+                                        "contract_terms",
+                                        contract_terms);
     GNUNET_free (refund_pickup_url);
     GNUNET_free (refund_redirect_url);
-    json_decref (contract_terms);
     json_decref (root);
     GNUNET_JSON_parse_free (spec);
     return ret;