summaryrefslogtreecommitdiff
path: root/src/include/taler_merchant_service.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/taler_merchant_service.h')
-rw-r--r--src/include/taler_merchant_service.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h
index 7ffa6b32..6a401ae1 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -1384,6 +1384,8 @@ struct TALER_MERCHANT_RefundDetail
* was no refund
* @param taler_pay_uri the URI that instructs the wallets to process
* the payment
+ * @param already_paid_order_id equivalent order that this customer
+ * paid already, or NULL for none
* @param merchant_pub public key of the merchant
* @param num_refunds length of the @a refunds array
* @param refunds details about the refund processing
@@ -1396,6 +1398,7 @@ typedef void
enum GNUNET_GenericReturnValue refunded,
struct TALER_Amount *refund_amount,
const char *taler_pay_uri,
+ const char *already_paid_order_id,
const struct TALER_MerchantPublicKeyP *merchant_pub,
unsigned int num_refunds,
const struct TALER_MERCHANT_RefundDetail *refunds);
@@ -1414,6 +1417,7 @@ typedef void
* before generating an unpaid response). Note that this is just provided to
* the server, we as client will block until the response comes back or until
* #TALER_MERCHANT_order_get_cancel() is called.
+ * @param session_id for which session should the payment status be checked
* @param min_refund long poll for the service to approve a refund exceeding this value;
* use NULL to not wait for any refund (only for payment). Only makes sense
* with a non-zero @a timeout. Can be NULL.
@@ -1422,11 +1426,12 @@ typedef void
* @return handle for this operation, NULL upon errors
*/
struct TALER_MERCHANT_OrderWalletGetHandle *
-TALER_MERCHANT_order_wallet_get (struct GNUNET_CURL_Context *ctx,
+TALER_MERCHANT_wallet_order_get (struct GNUNET_CURL_Context *ctx,
const char *backend_url,
const char *order_id,
const struct GNUNET_HashCode *h_contract,
struct GNUNET_TIME_Relative timeout,
+ const char *session_id,
const struct TALER_Amount *min_refund,
TALER_MERCHANT_OrderWalletGetCallback cb,
void *cb_cls);
@@ -1437,7 +1442,7 @@ TALER_MERCHANT_order_wallet_get (struct GNUNET_CURL_Context *ctx,
* @param owgh handle to the request to be canceled
*/
void
-TALER_MERCHANT_order_wallet_get_cancel (
+TALER_MERCHANT_wallet_order_get_cancel (
struct TALER_MERCHANT_OrderWalletGetHandle *owgh);
@@ -1699,7 +1704,7 @@ typedef void
* @return handle for this operation, NULL upon errors
*/
struct TALER_MERCHANT_OrderMerchantGetHandle *
-TALER_MERCHANT_order_merchant_get (struct GNUNET_CURL_Context *ctx,
+TALER_MERCHANT_merchant_order_get (struct GNUNET_CURL_Context *ctx,
const char *backend_url,
const char *order_id,
const char *session_id,
@@ -1715,7 +1720,7 @@ TALER_MERCHANT_order_merchant_get (struct GNUNET_CURL_Context *ctx,
* @param omgh handle to the request to be canceled
*/
void
-TALER_MERCHANT_order_merchant_get_cancel (
+TALER_MERCHANT_merchant_order_get_cancel (
struct TALER_MERCHANT_OrderMerchantGetHandle *omgh);