diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-02-19 23:00:21 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-02-19 23:00:21 +0100 |
commit | d1016d521da025f59e60a05c73621b4e4829f583 (patch) | |
tree | 7a8ab30175c1790d98a05662e3cc2fe2167c63dd /api-merchant.rst | |
parent | d4bd9ffacce6870f72500d2f3f5f8c3cde66ede1 (diff) | |
parent | 682b6d7eb0bfbb753245161172bd9f5a732b32f5 (diff) | |
download | docs-d1016d521da025f59e60a05c73621b4e4829f583.tar.gz docs-d1016d521da025f59e60a05c73621b4e4829f583.tar.bz2 docs-d1016d521da025f59e60a05c73621b4e4829f583.zip |
Merge branch 'master' of git+ssh://taler.net/var/git/api
Diffstat (limited to 'api-merchant.rst')
-rw-r--r-- | api-merchant.rst | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/api-merchant.rst b/api-merchant.rst index 6f175552..72b7592e 100644 --- a/api-merchant.rst +++ b/api-merchant.rst @@ -48,15 +48,6 @@ that is legally non-binding: // Signature over the contract made by the merchant. // Must confirm to the `Signature specification`_ below. sig: EddsaSignature; - - // URL where the customer's wallet - // must send the payment for the contract. - // May be relative to the URL of the page that - // delivered the contract. - pay_url: string; - - // URL to the `execution page`_. - exec_url: string; } The contract must have the following structure: @@ -76,6 +67,15 @@ The contract must have the following structure: // product instance. repurchase_correlation_id?: string; + // URL that the wallet will navigate to after the customer + // confirmed purchasing the contract. Responsible for + // doing the actual payment and making available the product (if digital) + // or displaying a confirmation. + // The placeholder ${H_contract} will be replaced + // with the contract hash by wallets before navigating + // to the fulfillment URL. + fulfillment_url: string; + // Maximum total deposit fee accepted by the merchant for this contract max_fee: Amount; |