diff options
Diffstat (limited to 'src/backend/taler-merchant-httpd_private-post-orders.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-post-orders.c | 70 |
1 files changed, 46 insertions, 24 deletions
diff --git a/src/backend/taler-merchant-httpd_private-post-orders.c b/src/backend/taler-merchant-httpd_private-post-orders.c index baaf3de9..4631a18c 100644 --- a/src/backend/taler-merchant-httpd_private-post-orders.c +++ b/src/backend/taler-merchant-httpd_private-post-orders.c @@ -354,18 +354,22 @@ execute_order (struct MHD_Connection *connection, &merchant), GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_json ("summary_i18n", - &summary_i18n)), + &summary_i18n), + NULL), GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_string ("fulfillment_message", - &fulfillment_msg)), + &fulfillment_msg), + NULL), GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_json ("fulfillment_message_i18n", - &fulfillment_i18n)), + &fulfillment_i18n), + NULL), GNUNET_JSON_spec_timestamp ("timestamp", ×tamp), GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_timestamp ("refund_deadline", - &refund_deadline)), + &refund_deadline), + NULL), GNUNET_JSON_spec_timestamp ("pay_deadline", &pay_deadline), GNUNET_JSON_spec_timestamp ("wire_transfer_deadline", @@ -676,49 +680,62 @@ patch_order (struct MHD_Connection *connection, struct GNUNET_JSON_Specification spec[] = { GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_string ("merchant_base_url", - &merchant_base_url)), + &merchant_base_url), + NULL), GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_json ("merchant", - &jmerchant)), + &jmerchant), + NULL), GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_string ("order_id", - &order_id)), + &order_id), + NULL), GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_string ("fulfillment_url", - &fulfillment_url)), + &fulfillment_url), + NULL), GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_timestamp ("timestamp", - ×tamp)), + ×tamp), + NULL), GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_timestamp ("refund_deadline", - &refund_deadline)), + &refund_deadline), + NULL), GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_timestamp ("pay_deadline", - &pay_deadline)), + &pay_deadline), + NULL), GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_timestamp ("wire_transfer_deadline", - &wire_deadline)), + &wire_deadline), + NULL), GNUNET_JSON_spec_mark_optional ( TALER_JSON_spec_amount ("max_fee", TMH_currency, - &max_fee)), + &max_fee), + NULL), GNUNET_JSON_spec_mark_optional ( TALER_JSON_spec_amount ("max_wire_fee", TMH_currency, - &max_wire_fee)), + &max_wire_fee), + NULL), GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_uint32 ("wire_fee_amortization", - &wire_fee_amortization)), + &wire_fee_amortization), + NULL), GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_timestamp ("delivery_date", - &delivery_date)), + &delivery_date), + NULL), GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_relative_time ("auto_refund", - &auto_refund)), + &auto_refund), + NULL), GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_json ("delivery_location", - &delivery_location)), - + &delivery_location), + NULL), GNUNET_JSON_spec_end () }; enum GNUNET_GenericReturnValue ret; @@ -1351,19 +1368,24 @@ TMH_private_post_orders (const struct TMH_RequestHandler *rh, &order), GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_relative_time ("refund_delay", - &refund_delay)), + &refund_delay), + NULL), GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_string ("payment_target", - &payment_target)), + &payment_target), + NULL), GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_json ("inventory_products", - &ip)), + &ip), + NULL), GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_json ("lock_uuids", - &uuid)), + &uuid), + NULL), GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_bool ("create_token", - &create_token)), + &create_token), + NULL), GNUNET_JSON_spec_end () }; enum GNUNET_GenericReturnValue ret; |