From b1dfca207ea5a41d297aa9c87bd3771611ec6e92 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Wed, 21 Oct 2015 23:30:29 +0200 Subject: Fixing crosslinking issues --- api-merchant.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'api-merchant.rst') diff --git a/api-merchant.rst b/api-merchant.rst index 00a2324c..31151599 100644 --- a/api-merchant.rst +++ b/api-merchant.rst @@ -86,7 +86,7 @@ from scripted languages like, for example, PHP. Thus the typical work-cycle of a Encodings +++++++++ -The used encodings are the same described in :ref:`encodings-ref`. +Data such as dates, binary blobs, and other useful formats, are encoded as described in :ref:`encodings-ref`. Contract -------- @@ -182,11 +182,11 @@ The following are the API made available by the merchant's frontend to the walle A `contract` is a JSON object having the following structure: - :>json object amount: an `Amount` indicating the total price for this deal. Note that, in tha act of paying, the mint will subtract from this amount the total cost of deposit fee due to the choice of coins made by wallets, and finally transfer the remaining amount to the merchant's bank account. - :>json object max fee: `Amount` indicating the maximum deposit fee accepted by the merchant + :>json object amount: an :ref:`amount ` indicating the total price for this deal. Note that, in tha act of paying, the mint will subtract from this amount the total cost of deposit fee due to the choice of coins made by wallets, and finally transfer the remaining amount to the merchant's bank account. + :>json object max fee: :ref:`amount ` indicating the maximum deposit fee accepted by the merchant :>json int trans_id: an identification number for this deal :>json array details: a collection of `product` objects (described below), for each different item purchased within this deal. - :>json base32 H_wire: the hash of the merchant's wire details, see :ref:`wireformats` + :>json base32 H_wire: the hash of the merchant's :ref:`wire details ` :>json base32 merchant_pub: merchant's EdDSA key used to sign this contract :>json `date` timestamp: this contract's generation time :>json `date` refund: the maximum time until which the merchant can reimburse the wallet in case of a problem, or some request @@ -288,15 +288,15 @@ gotten JSON as a further argument, which the wallet is waiting for. accounts for only `one` coin. :reqheader Content-Type: application/json - :` this coin is paying, including this coin's deposit fee + :` of this merchant. The wallet takes this value as-is from the contract :` on the mint's specifications. :` explains them in detail. ---------------- Frontend-Backend -- cgit v1.2.3