From 6624576c0cdd81072256d8abbfe6dd1343f956c6 Mon Sep 17 00:00:00 2001 From: Jonathan Buchanan Date: Wed, 17 Jun 2020 21:35:09 -0400 Subject: implementations, tests, and renames for GET /tips/ & GET /private/tips/ --- src/backend/taler-merchant-httpd_get-tips-ID.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/backend/taler-merchant-httpd_get-tips-ID.c') diff --git a/src/backend/taler-merchant-httpd_get-tips-ID.c b/src/backend/taler-merchant-httpd_get-tips-ID.c index fc77b2f3..52a0a561 100644 --- a/src/backend/taler-merchant-httpd_get-tips-ID.c +++ b/src/backend/taler-merchant-httpd_get-tips-ID.c @@ -95,19 +95,25 @@ TMH_get_tips_ID (const struct TMH_RequestHandler *rh, { MHD_RESULT ret; struct TALER_Amount remaining; + struct GNUNET_TIME_Absolute expiration_round = expiration; - GNUNET_break (0 >= + GNUNET_break (0 <= TALER_amount_subtract (&remaining, &total_authorized, &total_picked_up)); + + GNUNET_TIME_round_abs (&expiration_round); + ret = TALER_MHD_reply_json_pack (connection, MHD_HTTP_OK, - "{s:s, s:o, s:o, s:o}", - "exchange_url", exchange_url, + "{s:s, s:o, s:o}", + "exchange_url", + exchange_url, "tip_amount", TALER_JSON_from_amount (&remaining), "expiration", - GNUNET_JSON_from_time_abs (expiration)); + GNUNET_JSON_from_time_abs ( + expiration_round)); GNUNET_free (exchange_url); return ret; } -- cgit v1.2.3