[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant] branch master updated: include tip expirat
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-merchant] branch master updated: include tip expiration timestamp |
Date: |
Fri, 30 Aug 2019 15:24:00 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new 09b3d97 include tip expiration timestamp
09b3d97 is described below
commit 09b3d97746973387ff5594285e77dd5bf5235eb4
Author: Florian Dold <address@hidden>
AuthorDate: Fri Aug 30 15:23:57 2019 +0200
include tip expiration timestamp
---
src/backend/taler-merchant-httpd_tip-pickup.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/backend/taler-merchant-httpd_tip-pickup.c
b/src/backend/taler-merchant-httpd_tip-pickup.c
index 0f1a2ca..eba99e3 100644
--- a/src/backend/taler-merchant-httpd_tip-pickup.c
+++ b/src/backend/taler-merchant-httpd_tip-pickup.c
@@ -626,6 +626,7 @@ MH_handler_tip_pickup_get (struct TMH_RequestHandler *rh,
struct TALER_Amount tip_amount;
struct TALER_Amount tip_amount_left;
struct GNUNET_TIME_Absolute timestamp;
+ struct GNUNET_TIME_Absolute timestamp_expire;
int ret;
int qs;
@@ -701,13 +702,17 @@ MH_handler_tip_pickup_get (struct TMH_RequestHandler *rh,
ec,
"Could not determine exchange URL for the
given tip id");
}
+
+ timestamp_expire = GNUNET_TIME_absolute_add (timestamp,
GNUNET_TIME_UNIT_DAYS);
+
ret = TMH_RESPONSE_reply_json_pack (connection,
MHD_HTTP_OK,
- "{s:s, s:o, s:o, s:o, s:o}",
+ "{s:s, s:o, s:o, s:o, s:o, s:o}",
"exchange_url", exchange_url,
"amount", TALER_JSON_from_amount
(&tip_amount),
"amount_left", TALER_JSON_from_amount
(&tip_amount_left),
"stamp_created",
GNUNET_JSON_from_time_abs (timestamp),
+ "stamp_expire",
GNUNET_JSON_from_time_abs (timestamp_expire),
"extra", extra);
GNUNET_free (exchange_url);
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-merchant] branch master updated: include tip expiration timestamp,
gnunet <=