From 6fe4f6396515cdf13c76e96f7006fd3ebd63f018 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Fri, 31 Mar 2023 18:49:40 +0200
Subject: [PATCH] explore JSON astro.js API use

---
 API/QRCODE.sh           | 49 ++++++++++++++++++++++++-----------------
 www/G1PalPay/index.html |  2 +-
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/API/QRCODE.sh b/API/QRCODE.sh
index 47cade6e..0b1a22d0 100755
--- a/API/QRCODE.sh
+++ b/API/QRCODE.sh
@@ -102,30 +102,39 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
             [[ ${WHAT} == "" ]] &&  echo "<br> Missing amount <br>" >> ~/.zen/tmp/${MOATS}/disco
             [[ ${VAL} == "" ]] &&  echo "<br> Missing Destination PublicKey <br>" >> ~/.zen/tmp/${MOATS}/disco
 
-             if [[ ${WHAT} != "" && ${VAL} != "" && ${CURCOINS} != "null" && ${CURCOINS} != "" ]]; then
-                ## COMMAND A PAYMENT
-                if [[ $APPNAME == "pay" ]]; then
-                    if [[ $WHAT =~ ^[0-9]+$ ]]; then
+            if [[ $APPNAME == "pay" ]]; then
 
-                        echo "${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'ASTRO:Bro' -m"
-                        ${MY_PATH}/../tools/timeout.sh -t 3 \
-                        ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'ASTRO:Bro' -m 2>&1 >> ~/.zen/tmp/${MOATS}/disco
-                        ####################################
-                        if [ $? == 0 ]; then
-                            echo "ADJUSTING LOCAL CACHE ACOUNTING"
-                            COINSFILE=$HOME/.zen/tmp/coucou/${VAL}.COINS
-                            CUR=$(cat ${COINFILE})
-                            [[ ${CUR} != "" && ${CUR} != "null" ]] \
-                            && echo $((CUR+WHAT)) > ${COINFILE} \
-                            || echo ${WHAT} > ${COINFILE}
-                            cat ${COINFILE}
+                 if [[ ${WHAT} != "" && ${VAL} != "" && ${CURCOINS} != "null" && ${CURCOINS} != "" ]]; then
+                    ## COMMAND A PAYMENT
+                        if [[ $WHAT =~ ^[0-9]+$ ]]; then
+
+                            echo "${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'ASTRO:Bro' -m"
+                            ${MY_PATH}/../tools/timeout.sh -t 3 \
+                            ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'ASTRO:Bro' -m 2>&1 >> ~/.zen/tmp/${MOATS}/disco
+                            ####################################
+                            if [ $? == 0 ]; then
+                                echo "ADJUSTING LOCAL CACHE ACOUNTING"
+                                COINSFILE=$HOME/.zen/tmp/coucou/${VAL}.COINS
+                                CUR=$(cat ${COINFILE})
+                                [[ ${CUR} != "" && ${CUR} != "null" ]] \
+                                && echo $((CUR+WHAT)) > ${COINFILE} \
+                                || echo ${WHAT} > ${COINFILE}
+                                cat ${COINFILE}
+                            fi
                         fi
-                    fi
-                fi
-            else
 
-                 echo "<br>${WHAT} ${VAL} ${CURCOINS} PROBLEM " >> ~/.zen/tmp/${MOATS}/disco
+                else
+
+                     echo "<br>${WHAT} ${VAL} ${CURCOINS} PROBLEM " >> ~/.zen/tmp/${MOATS}/disco
+                fi
+
+            else
+                ## history & read
+                ${MY_PATH}/../tools/timeout.sh -t 6 \
+                ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key $APPNAME 2>&1 >> ~/.zen/tmp/${MOATS}/disco
+
             fi
+
         else
 
             echo "<br>BAD PASS FOR ${QRCODE} ${WHAT} ${VAL} " >> ~/.zen/tmp/${MOATS}/disco
diff --git a/www/G1PalPay/index.html b/www/G1PalPay/index.html
index f94be558..5f98fe49 100644
--- a/www/G1PalPay/index.html
+++ b/www/G1PalPay/index.html
@@ -115,7 +115,7 @@ a {
             <video id="preview" style="transform: scaleX(-1);width: 240px;height: 240px;" autoplay="autoplay" class="active"></video>
                 <strong><div id="countdown"></div></strong>
                 <div id="appname">
-                  <input type="radio" id="r1" name="appname" value="messaging"> Messagerie
+                  <input type="radio" id="r1" name="appname" value="read"> Messagerie
                   <input type="radio" id="r2" name="appname" value="history"> Historique
                   <input type="radio" id="r3" name="appname" value="pay" checked="checked"> Payer
                 </div>