[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-api] branch master updated: proposal structure docs
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-api] branch master updated: proposal structure docs |
Date: |
Fri, 03 Mar 2017 13:33:12 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository api.
The following commit(s) were added to refs/heads/master by this push:
new 34d7e45 proposal structure docs
34d7e45 is described below
commit 34d7e45b7b29ae9b3f485f2019dbd377041a923a
Author: Florian Dold <address@hidden>
AuthorDate: Fri Mar 3 13:31:54 2017 +0100
proposal structure docs
---
api/api-merchant.rst | 29 ++++++++++++-----------------
1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/api/api-merchant.rst b/api/api-merchant.rst
index c5a3385..eb6986a 100644
--- a/api/api-merchant.rst
+++ b/api/api-merchant.rst
@@ -533,16 +533,6 @@ The `offer` must have the following structure:
// before transfering it to the merchant.
amount: Amount;
- // Needed by the wallet to detect if a payment needs
- // to be replayed. It can have the values:
- // 1. 'BYURL', in this case the wallet will search for contracts
- // where the fulfillment URL matches the one associated with the
- // current purchase.
- // 2. <TOKEN>, in this case the wallet will search for contracts
- // whose repurchase_correlation_id matches this field.
- // 3. If not given, no replay occurs.
- repurchase_correlation_id?: string;
-
// The URL where the wallet has to send coins.
pay_url: string;
@@ -567,7 +557,7 @@ The `offer` must have the following structure:
refund_deadline: Timestamp;
// After this deadline, the merchant won't accept payments for the
contact
- expiry: Timestamp;
+ pay_deadline: Timestamp;
// Merchant's public key used to sign this proposal; this information
// is typically added by the backend Note that this can be an ephemeral
key.
@@ -576,12 +566,6 @@ The `offer` must have the following structure:
// More info about the merchant, see below
merchant: Merchant;
- // Which instance is working this proposal.
- // See `Merchant Instances
<https://docs.taler.net/operate-merchant.html#instances-lab>`_.
- // This field is optional, as the "default" instance is not forced to
provide any
- // `instance` identificator.
- instance: string;
-
// The hash of the merchant instance's wire details.
H_wire: HashCode;
@@ -593,6 +577,11 @@ The `offer` must have the following structure:
// Map from labels to locations
locations: { [label: string]: [location: Location], ... };
+
+ // Extra data that is only interpreted by the merchant frontend.
+ // Useful when the merchant needs to store extra information on a
+ // contract without storing it separately in their database.
+ extra: any;
}
The wallet must select a exchange that either the mechant accepts directly by
@@ -644,6 +633,12 @@ The `offer` must have the following structure:
// label for a location that denotes the jurisdiction for disputes.
// Some of the typical fields for a location (such as a street address)
may be absent.
jurisdiction: string;
+
+ // Which instance is working this proposal.
+ // See `Merchant Instances
<https://docs.taler.net/operate-merchant.html#instances-lab>`_.
+ // This field is optional, as the "default" instance is not forced to
provide any
+ // `instance` identificator.
+ instance: string;
}
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-api] branch master updated: proposal structure docs,
gnunet <=