summaryrefslogtreecommitdiff
path: root/core/api-merchant.rst
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-07-19 00:45:45 +0200
committerChristian Grothoff <christian@grothoff.org>2020-07-19 00:45:45 +0200
commitd56340472832041383572e81517470fa93e9127f (patch)
tree8796e0f83a0237d355b430c37ec676d4f7b4dae6 /core/api-merchant.rst
parentece354edbceb6a8708642c4f1a55ac6af8b56231 (diff)
downloaddocs-d56340472832041383572e81517470fa93e9127f.tar.gz
docs-d56340472832041383572e81517470fa93e9127f.tar.bz2
docs-d56340472832041383572e81517470fa93e9127f.zip
document 409 case, add session_id optional argument to /paid specification
Diffstat (limited to 'core/api-merchant.rst')
-rw-r--r--core/api-merchant.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/api-merchant.rst b/core/api-merchant.rst
index 1dcdfbb..a136eea 100644
--- a/core/api-merchant.rst
+++ b/core/api-merchant.rst
@@ -976,6 +976,8 @@ Payment processing
:status 404 Not found:
The merchant backend could not find the order or the instance
and thus cannot process the request.
+ :status 409 Conflict:
+ The provided contract hash does not match this order.
.. ts:def:: PaidRequest
@@ -988,6 +990,9 @@ Payment processing
// wallet/customer and to enable signature verification without
// database access).
h_contract: HashCode;
+
+ // Session id for which the payment is proven. Optional.
+ session_id?: string;
}
.. _order-abort: