[GNUnet-SVN] [taler-api] branch master updated: update tipping documentation

[gnunet]

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 4e75399  update tipping documentation
4e75399 is described below

commit 4e753999bac2afc5fae1d18a16c5e1c98c1bbb10
Author: Florian Dold <address@hidden>
AuthorDate: Mon Dec 11 17:51:09 2017 +0100

    update tipping documentation
---
 api-merchant.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/api-merchant.rst b/api-merchant.rst
index 996bbb3..d57fd01 100644
--- a/api-merchant.rst
+++ b/api-merchant.rst
@@ -381,12 +381,25 @@ The following API are made available by the merchant's 
`backend` to the merchant
 
       // Justification for giving the tip
       justification: string;
+
+      // URL that the wallet should pick up the tip from,
+      // will be included in the tip_token.
+      pickup_url: string;
+
+      // URL that the user should be directed to after tipping,
+      // will be included in the tip_token.
+      next_url: string;
     }
 
   .. _TipCreateConfirmation:
   .. code-block:: tsref
 
     interface TipCreateConfirmation {
+      // Token that will be handed to the wallet,
+      // contains all relevant information to accept
+      // a tip.
+      tip_token: string;
+
       // Identifier for the tip authorization
       tip_id: HashCode;
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden