diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-03-11 21:57:36 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-03-11 21:57:36 +0100 |
commit | 16dc7d44e19b181f5aad4d47f06ec3c1798b76de (patch) | |
tree | 7ab219f44a2e93561b88745d83c05f36efded5fd | |
parent | b28464f41501ea45363592012b35e8b80665b6b1 (diff) | |
download | merchant-frontend-examples-16dc7d44e19b181f5aad4d47f06ec3c1798b76de.tar.gz merchant-frontend-examples-16dc7d44e19b181f5aad4d47f06ec3c1798b76de.tar.bz2 merchant-frontend-examples-16dc7d44e19b181f5aad4d47f06ec3c1798b76de.zip |
minor edits
-rw-r--r-- | php/doc/tutorial.texi | 19 | ||||
-rw-r--r-- | python/doc/tutorial.texi | 25 |
2 files changed, 27 insertions, 17 deletions
diff --git a/php/doc/tutorial.texi b/php/doc/tutorial.texi index f410f26..d5e9ba1 100644 --- a/php/doc/tutorial.texi +++ b/php/doc/tutorial.texi @@ -16,7 +16,7 @@ This tutorial is about implementing a merchant frontend to run against a GNU Taler merchant backend (version @value{VERSION}, @value{UPDATED}), -Copyright @copyright{} 2016, 2017 Taler Systems SA +Copyright @copyright{} 2016, 2017, 2018 Taler Systems SA @quotation Permission is granted to copy, distribute and/or modify this document @@ -55,11 +55,11 @@ Texts. A copy of the license is included in the section entitled @end ifnottex @menu -* Introduction:: Whom this tutorial is addressed to -* Hello-world:: How to set up a donation page -* Back-office-integration:: How to integrate with the back office -* Advanced topics:: Detailed solutions to specific issues -* Reference:: Merchant integration reference +* Introduction:: Whom this tutorial is addressed to +* Setting up a simple donation page:: How to set up a donation page +* Back-office-integration:: How to integrate with the back office +* Advanced topics:: Detailed solutions to specific issues +* Reference:: Merchant integration reference Appendices @@ -107,8 +107,6 @@ payments to orders, and persisting and retrieving contracts. You can download all of the code examples given in this tutorial from @url{https://git.taler.net/merchant-frontend-examples.git/tree/php/}. -@c Add section giving an overview of what we will do in the tutorial! - @section Architecture overview @@ -146,7 +144,7 @@ key components: @image{arch, 3in, 4in} -Basically, the backend provides the cryptographic protocol support, +The backend provides the cryptographic protocol support, stores Taler-specific financial information and communicates with the GNU Taler exchange over the Internet. The frontend accesses the backend via a RESTful API. As a result, the frontend never has to @@ -154,7 +152,7 @@ directly communicate with the exchange, and also does not deal with sensitive data. In particular, the merchant's signing keys and bank account information are encapsulated within the Taler backend. -@node Hello-world +@node Setting up a simple donation page @chapter Setting up a simple donation page This section describes how to setup a simple shop, which exposes a @@ -168,6 +166,7 @@ All the code samples shown below in the tutorial can be found at @c NOTE: include explaining wallet installation to Web developer here! +@c Next sentence is inconsistent with Python version. Why? Note that if the customer does not have the Taler wallet installed, they should instead be prompted to proceed with a classic dialog for credit card payments. diff --git a/python/doc/tutorial.texi b/python/doc/tutorial.texi index 0ff23ce..a6ce933 100644 --- a/python/doc/tutorial.texi +++ b/python/doc/tutorial.texi @@ -16,7 +16,7 @@ This tutorial is about implementing a merchant frontend to run against a GNU Taler merchant backend (version @value{VERSION}, @value{UPDATED}), -Copyright @copyright{} 2016, 2017 Taler Systems SA +Copyright @copyright{} 2016, 2017, 2018 Taler Systems SA @quotation Permission is granted to copy, distribute and/or modify this document @@ -95,17 +95,18 @@ regulation (such as GDPR). This tutorial is for Python Web developers and addresses how to integrate GNU Taler with Web shops. It describes how to create a Web shop that processes payments with the help of a GNU Taler merchant -@emph{backend}. In the second chapter, you will learn how to trigger +@emph{backend}. In the second chapter, you will learn how to trigger the payment process from the Web site, how to communicate with the -backend, how to generate a proposal and process the payment. +backend, how to generate a order and process the payment. The +third chapter covers the integration of a back office with the +backend, which includes tracking payments for orders, matching +payments to orders, and persisting and retrieving contracts. @cindex examples @cindex git You can download all of the code examples given in this tutorial from @url{https://git.taler.net/merchant-frontend-examples.git/tree/python/example/}. -@c Add section giving an overview of what we will do in the tutorial! - @section Architecture overview @@ -120,6 +121,15 @@ main components: to satisfy the order. This component is not included with Taler, but rather assumed to exist at the merchant. This tutorial describes how to develop a Taler frontend. +@cindex back office +@item A back office application that enables the shop operators to + view customer orders, match them to financial transfers, and possibly + approve refunds if an order cannot be satisfied. This component is + again not included with Taler, but rather assumed to exist at the + merchant. This tutorial will describe how to integrate such a component + to handle payments managed by Taler. Such integration is shown by + adding the back office functionality to the frontend implemented + in the second part of this tutorial. @cindex backend @item A Taler-specific payment backend which makes it easy for the frontend to process financial transactions with Taler. For this @@ -134,7 +144,7 @@ key components: @image{arch_nobo, 3in, 4in} -Basically, the backend provides the cryptographic protocol support, +The backend provides the cryptographic protocol support, stores Taler-specific financial information and communicates with the GNU Taler exchange over the Internet. The frontend accesses the backend via a RESTful API. As a result, the frontend never has to @@ -156,10 +166,11 @@ All the code samples shown below in the tutorial can be found at @url{https://git.taler.net/merchant-frontend-examples.git/tree/python/example/}. Each sample is part of a functional frontend. The language is Python, and the Web is served by -Flask@footnote{http://flask.pocoo.org}. +Flask@footnote{http://flask.pocoo.org/}. @c NOTE: include explaining wallet installation to Web developer here! +@c Next sentence is inconsistent with PHP version. Why? An error message will be shown to the user if no Taler wallet is installed in the browser. |