diff options
author | Christian Grothoff <christian@grothoff.org> | 2021-08-01 19:59:40 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2021-08-01 19:59:44 +0200 |
commit | bcf5863eb45523615540ac99ab81fd131bd2f413 (patch) | |
tree | 0086e76a9009289073c7b07338d072d6baac8e11 /src/lib | |
parent | c4d13313b9beff9b8b2948604ae0f6561721c33c (diff) | |
download | merchant-bcf5863eb45523615540ac99ab81fd131bd2f413.tar.gz merchant-bcf5863eb45523615540ac99ab81fd131bd2f413.tar.bz2 merchant-bcf5863eb45523615540ac99ab81fd131bd2f413.zip |
-more json_pack fixes
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/merchant_api_merchant_get_order.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/merchant_api_merchant_get_order.c b/src/lib/merchant_api_merchant_get_order.c index f4dc8131..64116419 100644 --- a/src/lib/merchant_api_merchant_get_order.c +++ b/src/lib/merchant_api_merchant_get_order.c @@ -82,7 +82,7 @@ handle_unpaid (struct TALER_MERCHANT_OrderMerchantGetHandle *omgh, }; struct GNUNET_JSON_Specification spec[] = { TALER_JSON_spec_amount_any ("total_amount", - &osr.details.unpaid.contract_amount), + &osr.details.unpaid.contract_amount), GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_string ("already_paid_order_id", &osr.details.unpaid.already_paid_order_id)), @@ -183,13 +183,13 @@ handle_paid (struct TALER_MERCHANT_OrderMerchantGetHandle *omgh, GNUNET_JSON_spec_bool ("wired", &osr.details.paid.wired), TALER_JSON_spec_amount_any ("deposit_total", - &osr.details.paid.deposit_total), - GNUNET_JSON_spec_uint32 ("exchange_ec", + &osr.details.paid.deposit_total), + GNUNET_JSON_spec_uint32 ("exchange_code", &ec32), - GNUNET_JSON_spec_uint32 ("exchange_hc", + GNUNET_JSON_spec_uint32 ("exchange_http_status", &hc32), TALER_JSON_spec_amount_any ("refund_amount", - &osr.details.paid.refund_amount), + &osr.details.paid.refund_amount), GNUNET_JSON_spec_json ("contract_terms", (json_t **) &osr.details.paid.contract_terms), GNUNET_JSON_spec_json ("wire_details", @@ -251,7 +251,7 @@ handle_paid (struct TALER_MERCHANT_OrderMerchantGetHandle *omgh, TALER_JSON_spec_absolute_time ("execution_time", &wt->execution_time), TALER_JSON_spec_amount_any ("amount", - &wt->total_amount), + &wt->total_amount), GNUNET_JSON_spec_bool ("confirmed", &wt->confirmed), GNUNET_JSON_spec_end () @@ -285,9 +285,9 @@ handle_paid (struct TALER_MERCHANT_OrderMerchantGetHandle *omgh, &c32), GNUNET_JSON_spec_string ("hint", &wr->hint), - GNUNET_JSON_spec_uint32 ("exchange_ec", + GNUNET_JSON_spec_uint32 ("exchange_code", &eec32), - GNUNET_JSON_spec_uint32 ("exchange_hc", + GNUNET_JSON_spec_uint32 ("exchange_http_status", &ehs32), GNUNET_JSON_spec_fixed_auto ("coin_pub", &wr->coin_pub), @@ -320,7 +320,7 @@ handle_paid (struct TALER_MERCHANT_OrderMerchantGetHandle *omgh, i); struct GNUNET_JSON_Specification ispec[] = { TALER_JSON_spec_amount_any ("amount", - &ro->refund_amount), + &ro->refund_amount), GNUNET_JSON_spec_string ("reason", &ro->reason), TALER_JSON_spec_absolute_time ("timestamp", |