[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] 242/277: also parse and return timestamp and row_id
From: |
gnunet |
Subject: |
[taler-merchant] 242/277: also parse and return timestamp and row_id |
Date: |
Sun, 05 Jul 2020 20:52:35 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
commit 3e5a21a6178a3aaeccb0c098f01847ef04238544
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Jun 23 10:48:27 2020 +0200
also parse and return timestamp and row_id
---
src/include/taler_merchant_service.h | 12 ++++++++++++
src/lib/merchant_api_get_orders.c | 6 ++++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/include/taler_merchant_service.h
b/src/include/taler_merchant_service.h
index b6cd681..44da221 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -1221,6 +1221,18 @@ struct TALER_MERCHANT_OrderEntry
*/
const char *order_id;
+ /**
+ * Time when the order was created. Useful for filtering by
+ * 'date' (in #TALER_MERCHANT_orders_get2()).
+ */
+ struct GNUNET_TIME_Absolute timestamp;
+
+ /**
+ * Serial ID of the order. Useful for filtering by 'start_row'
+ * (in #TALER_MERCHANT_orders_get2()).
+ */
+ uint64_t order_serial;
+
};
diff --git a/src/lib/merchant_api_get_orders.c
b/src/lib/merchant_api_get_orders.c
index 92d3142..df96c57 100644
--- a/src/lib/merchant_api_get_orders.c
+++ b/src/lib/merchant_api_get_orders.c
@@ -86,8 +86,10 @@ parse_orders (const json_t *ia,
struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_string ("order_id",
&ie->order_id),
- // FIXME: also parse and return row_id and timestamp fields!
- // (=> needed to enable client to filter by those!)
+ GNUNET_JSON_spec_absolute_time ("timestamp",
+ &ie->timestamp),
+ GNUNET_JSON_spec_uint64 ("row_id",
+ &ie->order_serial),
GNUNET_JSON_spec_end ()
};
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-merchant] 207/277: test DELETE /private/reserves/, (continued)
- [taler-merchant] 207/277: test DELETE /private/reserves/, gnunet, 2020/07/05
- [taler-merchant] 210/277: fix #5957, gnunet, 2020/07/05
- [taler-merchant] 220/277: test for GET /private/reserves, gnunet, 2020/07/05
- [taler-merchant] 222/277: fix/test for POST tips//pickup, gnunet, 2020/07/05
- [taler-merchant] 225/277: stricter tests for query reserve(s) methods, gnunet, 2020/07/05
- [taler-merchant] 228/277: start with reserve processing logic, gnunet, 2020/07/05
- [taler-merchant] 227/277: implement library method for DELETE /orders/ and tests, gnunet, 2020/07/05
- [taler-merchant] 231/277: address 413 fixme, gnunet, 2020/07/05
- [taler-merchant] 237/277: fix type conversion warning and test failure for backenddb, gnunet, 2020/07/05
- [taler-merchant] 239/277: more checks for GET /private/products/, gnunet, 2020/07/05
- [taler-merchant] 242/277: also parse and return timestamp and row_id,
gnunet <=
- [taler-merchant] 250/277: got refunds working and tested, gnunet, 2020/07/05
- [taler-merchant] 245/277: DCE: removing legacy code and APIs, gnunet, 2020/07/05
- [taler-merchant] 246/277: implement taler-merchant-setup-reserve CLI tool, gnunet, 2020/07/05
- [taler-merchant] 252/277: minor style improvements, gnunet, 2020/07/05
- [taler-merchant] 253/277: fix FIXME, gnunet, 2020/07/05
- [taler-merchant] 254/277: logic to update 'wired' status of an order, gnunet, 2020/07/05
- [taler-merchant] 255/277: deeper checks for merchant get order, gnunet, 2020/07/05
- [taler-merchant] 248/277: deeper checks on GET /private/orders, gnunet, 2020/07/05
- [taler-merchant] 241/277: clarify with/without wire fee issue, gnunet, 2020/07/05
- [taler-merchant] 244/277: use and handle all /pay status codes, gnunet, 2020/07/05