summaryrefslogtreecommitdiff
path: root/taler-merchant-api-tutorial.rst
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-11-06 23:49:37 +0100
committerChristian Grothoff <christian@grothoff.org>2020-11-06 23:49:37 +0100
commit655e5eb6c386b5e5bdc1c9de0831c579af5b26fe (patch)
treea1bb5cd36b74396e498bacf8a65e987d766def41 /taler-merchant-api-tutorial.rst
parent1e36811c2e084704248c466b9927d29512b696d1 (diff)
parent12a3571f5de4b3751973b3f50d149edb938a7018 (diff)
downloaddocs-655e5eb6c386b5e5bdc1c9de0831c579af5b26fe.tar.gz
docs-655e5eb6c386b5e5bdc1c9de0831c579af5b26fe.tar.bz2
docs-655e5eb6c386b5e5bdc1c9de0831c579af5b26fe.zip
Merge branch 'master' of git+ssh://git.taler.net/docs
Diffstat (limited to 'taler-merchant-api-tutorial.rst')
-rw-r--r--taler-merchant-api-tutorial.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/taler-merchant-api-tutorial.rst b/taler-merchant-api-tutorial.rst
index 7f371f0..e7af9a4 100644
--- a/taler-merchant-api-tutorial.rst
+++ b/taler-merchant-api-tutorial.rst
@@ -388,7 +388,7 @@ are recognized in the JSON request object:
- amount: Amount that should be given to the visitor as a tip.
- instance: Merchant instance that grants the tip (each instance may
- have its own independend tipping funds configured).
+ have its own independent tipping funds configured).
- justification: Description of why the tip was granted. Human-readable
text not exposed to the customer, but used by the Back Office.
@@ -544,14 +544,14 @@ signature (``session_sig``). This signature certifies that the wallet
showed a payment receipt for the respective order in the current
session. cookie
-Session-bound payments are triggerd by passing the ``session_id``
+Session-bound payments are triggered by passing the ``session_id``
parameter to the ``/check-payment`` endpoint. The wallet will then
redirect to the fulfillment page, but include an additional
``session_sig`` parameter. The frontend can query ``/check-payment``
with both the ``session_id`` and the ``session_sig`` to verify that the
signature is correct.
-The last session ID that was successfuly used to prove that the payment
+The last session ID that was successfully used to prove that the payment
receipt is in the user’s wallet is also available as ``last_session_id``
in the response to ``/check-payment``.