summaryrefslogtreecommitdiff
path: root/api-merchant.rst
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2015-10-21 14:53:12 +0200
committerMarcello Stanisci <marcello.stanisci@inria.fr>2015-10-21 14:53:12 +0200
commitad36f4646251f1a2935664e771326453240b04ff (patch)
treeebbf272e0f1baeb3c912d30169d111a4a070fb98 /api-merchant.rst
parentcc9c5a1c96006069ce5a5943a69fb839e26fd646 (diff)
parent3a27b3092ea9b34c88a3210c61ecdc0581a2a38d (diff)
downloaddocs-ad36f4646251f1a2935664e771326453240b04ff.tar.gz
docs-ad36f4646251f1a2935664e771326453240b04ff.tar.bz2
docs-ad36f4646251f1a2935664e771326453240b04ff.zip
Merge branch 'master' of ssh://taler.net:/var/git/api
Conflicts: api-merchant.rst
Diffstat (limited to 'api-merchant.rst')
-rw-r--r--api-merchant.rst14
1 files changed, 3 insertions, 11 deletions
diff --git a/api-merchant.rst b/api-merchant.rst
index 6bcd3fda..bc2bcf0d 100644
--- a/api-merchant.rst
+++ b/api-merchant.rst
@@ -88,8 +88,6 @@ Encodings
The used encodings are the same described in :ref:`encodings-ref`.
-.. _contract:
-
Contract
--------
The following structure is a container for the hashcode coming from the encoding of
@@ -98,7 +96,7 @@ as described in
the `libjansson documentation <https://jansson.readthedocs.org/en/2.7/apiref.html?highlight=json_dumps#c.json_dumps>`_.
The signature's purpose is set to TALER_SIGNATURE_MERCHANT_CONTRACT.
-.. sourcecode:: c
+ .. sourcecode:: c
struct Contract
{
@@ -174,7 +172,6 @@ The following are the API made available by the merchant's frontend to the walle
.. http:get:: /taler/contract
Ask the merchant to send a contract for the current deal
-
**Success Response**
:status 200 OK: The request was successful.
@@ -212,11 +209,6 @@ The following are the API made available by the merchant's frontend to the walle
:>json object jurisdiction: the minimal set of values that denotes a geographical jurisdiction. That information is strictly dependant on the jusrisdiction's Country, and it can comprehend at most the following fields: `country`, `city`, `state`, `region`, `province`, `ZIP code`. Each field, except `ZIP code` which requires an `int` type, can be represented by the type `string`.
-
-
-
-
-
**Failure Response**
In most cases, the response gotten by the wallet will just be the forwarded response
@@ -302,7 +294,7 @@ gotten JSON as a further argument, which the wallet is waiting for.
**Success Response: OK**
:status 200 OK: the payment has been received.
- **Failure Response: TBD **
+ **Failure Response: TBD**
**Error Response: Invalid signature**
@@ -352,7 +344,7 @@ The following API are made available by the merchant's backend to the merchant's
:<json base32 dep_perm: the signed deposit permission (link to the blob above)
:<json base32 eddsa_pub: the public key of the customer.
- **Failure Response: TBD **
+ **Failure Response: TBD**
**Error Response: Invalid signature**: