diff options
author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-06-23 11:16:35 +0200 |
---|---|---|
committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-06-23 11:16:52 +0200 |
commit | 507eebd2706d4395d541a7f5b997454233fb64c8 (patch) | |
tree | 981962f2674508fcb5c75443d21c8b3dc5aa4563 /src | |
parent | 984e503b7af70ad6ff5c75025eadf045e0ebe155 (diff) | |
download | merchant-507eebd2706d4395d541a7f5b997454233fb64c8.tar.gz merchant-507eebd2706d4395d541a7f5b997454233fb64c8.tar.bz2 merchant-507eebd2706d4395d541a7f5b997454233fb64c8.zip |
caring about 'summary' field
Diffstat (limited to 'src')
-rw-r--r-- | src/backend/taler-merchant-httpd_history.c | 11 | ||||
-rw-r--r-- | src/lib/test_merchant_api.c | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/backend/taler-merchant-httpd_history.c b/src/backend/taler-merchant-httpd_history.c index 4ad6a266..e4058722 100644 --- a/src/backend/taler-merchant-httpd_history.c +++ b/src/backend/taler-merchant-httpd_history.c @@ -45,23 +45,26 @@ pd_cb (void *cls, json_t *amount; json_t *timestamp; json_t *instance; + json_t *summary; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "/history's row_id: %llu\n", (unsigned long long) row_id); GNUNET_assert (-1 != json_unpack ((json_t *) contract_terms, - "{s:o, s:o, s:{s:o}}", + "{s:o, s:o, s:{s:o}, s:o}", "amount", &amount, "timestamp", ×tamp, - "merchant", "instance", &instance)); + "merchant", "instance", &instance, + "summary", &summary)); - GNUNET_break (NULL != (entry = json_pack ("{s:I, s:s, s:O, s:O, s:O}", + GNUNET_break (NULL != (entry = json_pack ("{s:I, s:s, s:O, s:O, s:O, s:O}", "row_id", row_id, "order_id", order_id, "amount", amount, "timestamp", timestamp, - "instance", instance))); + "instance", instance, + "summary", summary))); GNUNET_break (0 == json_array_append_new (response, entry)); diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c index fa6de6be..cafd427d 100644 --- a/src/lib/test_merchant_api.c +++ b/src/lib/test_merchant_api.c @@ -1610,6 +1610,7 @@ cleanup_state (struct InterpreterState *is) TALER_MERCHANT_refund_lookup_cancel (cmd->details.refund_lookup.rlo); cmd->details.refund_lookup.rlo = NULL; } + break; default: GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Shutdown: unknown instruction %d at %u (%s)\n", @@ -2405,6 +2406,7 @@ run (void *cls) \"refund_deadline\":\"\\/Date(0)\\/\",\ \"pay_deadline\":\"\\/Date(9999999999)\\/\",\ \"amount\":{\"currency\":\"EUR\", \"value\":5, \"fraction\":0},\ + \"summary\":\"useful product\",\ \"products\":\ [ {\"description\":\"ice cream\", \"value\":\"{EUR:5}\"} ] }" }, |