[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated: possible fix for #6477
From: |
gnunet |
Subject: |
[taler-merchant] branch master updated: possible fix for #6477 |
Date: |
Wed, 12 Aug 2020 16:59:31 +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 ab1a421 possible fix for #6477
ab1a421 is described below
commit ab1a421f346312e5b6bfbf18b26959c97226a70b
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Aug 12 16:59:29 2020 +0200
possible fix for #6477
---
src/backend/taler-merchant-httpd_get-orders-ID.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/backend/taler-merchant-httpd_get-orders-ID.c
b/src/backend/taler-merchant-httpd_get-orders-ID.c
index 34a5a2b..bb4d1b3 100644
--- a/src/backend/taler-merchant-httpd_get-orders-ID.c
+++ b/src/backend/taler-merchant-httpd_get-orders-ID.c
@@ -597,6 +597,10 @@ 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;
@@ -952,7 +956,7 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh,
MHD_GET_ARGUMENT_KIND,
"timeout");
if ((NULL != long_poll_timeout_s) &&
- !god->generate_html)
+ ! god->generate_html)
{
unsigned int timeout;
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-merchant] branch master updated: possible fix for #6477,
gnunet <=