summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-03-03 21:59:07 +0100
committerChristian Grothoff <christian@grothoff.org>2020-03-03 21:59:07 +0100
commitd68cc7ae97d70f8b73a618a7071b722235ed1b8a (patch)
treea5d5fe091d85192548273d7576a7f2e21f868817
parentf5e154860f5a23fa184adb44adf21246042d1ab7 (diff)
parent457ca97b0fef655eace0125f9f9341a43a788126 (diff)
downloaddocs-d68cc7ae97d70f8b73a618a7071b722235ed1b8a.tar.gz
docs-d68cc7ae97d70f8b73a618a7071b722235ed1b8a.tar.bz2
docs-d68cc7ae97d70f8b73a618a7071b722235ed1b8a.zip
Merge branch 'master' of git+ssh://git.taler.net/docs
-rw-r--r--developers-manual.rst38
-rw-r--r--taler-merchant-pos-terminal.rst19
2 files changed, 53 insertions, 4 deletions
diff --git a/developers-manual.rst b/developers-manual.rst
index ee8fc28..6e39082 100644
--- a/developers-manual.rst
+++ b/developers-manual.rst
@@ -594,6 +594,44 @@ for that.
There is also the possibility to trigger builds manually, but this is
only reserved to "admin" users.
+Android App Nightly Builds
+==========================
+
+There are currently three Android apps:
+
+* Wallet
+ [`Git Repo <https://git.taler.net/wallet-android.git>`__]
+ [`Git Mirror <https://gitlab.com/gnu-taler/wallet-android>`__]
+ [`CI <https://git.taler.net/wallet-android.git/tree/.gitlab-ci.yml>`__]
+* Merchant PoS Terminal
+ [`Git Repo <https://git.taler.net/merchant-terminal-android.git/>`__]
+ [`Git Mirror <https://gitlab.com/gnu-taler/merchant-terminal-android>`__]
+ [`CI <https://git.taler.net/merchant-terminal-android.git/tree/.gitlab-ci.yml>`__]
+* Cashier
+ [`Git Repo <https://git.taler.net/cashier-terminal-android.git/>`__]
+ [`Git Mirror <https://gitlab.com/gnu-taler/cashier-terminal-android>`__]
+ [`CI <https://git.taler.net/cashier-terminal-android.git/tree/.gitlab-ci.yml>`__]
+
+Their git repositories are mirrored at Gitlab to utilize their CI
+and `F-Droid <https://f-droid.org>`_'s Gitlab integration
+to `publish automatic nightly builds <https://f-droid.org/docs/Publishing_Nightly_Builds/>`_
+for each change on the ``master`` branch.
+
+All three apps publish their builds to the same F-Droid nightly repository
+(which is stored as a git repository):
+https://gitlab.com/gnu-taler/fdroid-repo-nightly
+
+You can download the APK files directly from that repository
+or add it to the F-Droid app for automatic updates
+by clicking the following link (on the phone that has F-Droid installed).
+
+ `GNU Taler Nightly F-Droid Repository <fdroidrepos://gnu-taler.gitlab.io/fdroid-repo-nightly/fdroid/repo?fingerprint=55F8A24F97FAB7B0960016AF393B7E57E7A0B13C2D2D36BAC50E1205923A7843>`_
+
+.. note::
+ Nightly apps can be installed alongside official releases
+ and thus are meant **only for testing purposes**.
+ Use at your own risk!
+
.. _Code-coverage:
Code Coverage
diff --git a/taler-merchant-pos-terminal.rst b/taler-merchant-pos-terminal.rst
index b606461..ea27fe8 100644
--- a/taler-merchant-pos-terminal.rst
+++ b/taler-merchant-pos-terminal.rst
@@ -50,11 +50,19 @@ At the bottom of the main UI there is a row of buttons:
* Restart: Clears the current order and turns into an Undo button which restores the order.
* -1/+1: Available when ordered items are selected
and allows you to increment/decrement their quantity.
-* Reconfigure: Allows you to change the app configuration settings (URL and username/password)
- and to forget the password (for locking the app).
-* History: Shows the payment history.
+* Prev: Goes to the previous order (if available)
+* Next: Goes to the next order or creates a new one
+ if the current is not empty and there is no next.
* Complete: Finalize an order and prompt the customer to pay.
+The top left corner features a hamburger icon.
+Clicking this opens a menu with these items:
+
+* Orders: Show current open orders.
+* History: Shows the payment history.
+* Settings: Allows you to change the app configuration settings (URL and username/password)
+ and to forget the password (for locking the app).
+
Testing nightly builds
----------------------
@@ -70,6 +78,9 @@ and then click the following link (on your phone) to add the nightly repository.
and thus are meant **only for testing purposes**.
Use at your own risk!
+While not recommended, APKs can also be
+`downloaded directly <https://gitlab.com/gnu-taler/fdroid-repo-nightly/-/tree/master/fdroid%2Frepo>`__.
+
Building from source
--------------------
@@ -136,7 +147,7 @@ The elements of the JSON file are defined as follows:
interface MerchantProduct {
// A merchant-internal unique identifier for the product
- product_id: string;
+ product_id?: string;
// Human-readable product description
// that will be shown to the user and used in contract terms