From 522ef7934c30f10b4910adbb16c31ceea9bd5c1b Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Sun, 22 Dec 2019 09:43:33 +0100
Subject: [PATCH] G1Billets + G1Tag cosmetics and shaping

---
 shell/sms_BILLET_MAKE.sh |  2 +-
 shell/sms_G1TAG.sh       | 34 +++++++++++++++++++++-------------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/shell/sms_BILLET_MAKE.sh b/shell/sms_BILLET_MAKE.sh
index 62fca10..684cc9b 100755
--- a/shell/sms_BILLET_MAKE.sh
+++ b/shell/sms_BILLET_MAKE.sh
@@ -104,7 +104,7 @@ convert -font 'Liberation-Sans' \
 -pointsize 30 -draw 'text 60,100 "'"CHK $NUMERO"'"' \
 -pointsize 22 -fill black -draw 'text 520,340 "'"$SECRET"'"' \
 -pointsize 22 -fill black -draw 'text 400,410 "'"A encaisser avant le 01/$valid/$year"'"' \
--pointsize 20 -draw 'text 50,444 "'"SMS: CHK $NUMERO + mots secrets à gratter ou https://cesium.app "'"' \
+-pointsize 20 -draw 'text 50,444 "'"[https://g1sms.fr] SMS CHK $NUMERO + mots secrets à découvrir ou https://cesium.app"'"' \
 "/tmp/$NUMERO.jpg" "/tmp/BILL.$year.$valid.$NUMERO.$MONTANT.$UNIT.jpg"
 
 # Payable par SMS en envoyant les codes grattant la case comportant le SECRET
diff --git a/shell/sms_G1TAG.sh b/shell/sms_G1TAG.sh
index e022f48..dc8f4bc 100755
--- a/shell/sms_G1TAG.sh
+++ b/shell/sms_G1TAG.sh
@@ -82,7 +82,7 @@ if [[ ! $PASSENGER && ! $G1DAB ]]; then
     if [[ -f ./wallets/$PHONE/ipfsid.G1TAGNODE ]]; then
         DABnode=$(cat ./wallets/$PHONE/ipfsid.G1TAGNODE)
         if [[ "$DABnode" == "$IPFSNODEID" ]]; then
-        	sms_ERROR "$PHONE" "IMPRIMANTE G1Tag non détectée!! Choisissez un autre NODE G1Dab... $spot"
+        	sms_ERROR "$PHONE" "IMPRIMANTE G1Tag non détectée!! Choisissez un autre G1Dab... $spot"
             log "__SUB:sms_G1TAG.sh: IMPRIMANTE G1Tag non détectée!!"
         	exit
         fi
@@ -217,15 +217,17 @@ TAGCHAIN="./TAG/${RR}/TAG_chain" # contains IPFS current ipfs hash
     composite -compose Over -resize 133% -gravity West "./TAG/${RR}/TAG_READ.png" "./shell/g1tag.png" "./TAG/${RR}/${RR}.png"
     composite -compose Over -gravity SouthEast "./TAG/${RR}/TAG_WRITE.png" "./TAG/${RR}/${RR}.png" "./TAG/${RR}/${RR}.png"
     # ADD Avatar in the Center
-    if [[ $(file "./wallets/$PHONE/$PHONE.avatar.png" | grep 'PNG') ]]; then
-        composite -compose Over -resize 150% -gravity Center "./wallets/$PHONE/$PHONE.avatar.png" "./TAG/${RR}/${RR}.png" "./TAG/${RR}/${RR}.png"
-    else
-        composite -compose Over -resize 100% -gravity Center "./shell/Portefeuille.png" "./TAG/${RR}/${RR}.png" "./TAG/${RR}/${RR}.png"
-    fi
+#    if [[ $(file "./wallets/$PHONE/$PHONE.avatar.png" | grep 'PNG') ]]; then
+#        composite -compose Over -resize 150% -gravity Center "./wallets/$PHONE/$PHONE.avatar.png" "./TAG/${RR}/${RR}.png" "./TAG/${RR}/${RR}.png"
+#    else
+#        composite -compose Over -resize 100% -gravity Center "./shell/Portefeuille.png" "./TAG/${RR}/${RR}.png" "./TAG/${RR}/${RR}.png"
+#    fi
 
     # WRITE G1Tag G1 amount
-    convert -pointsize 150 -fill black -gravity Center -draw 'text 300,-140 "'"$2"'"' "./TAG/${RR}/${RR}.png" "./TAG/${RR}/${RR}.png"
-    convert -pointsize 50 -fill black -gravity North -draw 'text 20,0 "'"${PR}"'"' "./TAG/${RR}/${RR}.png" "./TAG/${RR}/${RR}.png"
+#    if [[ $NUMBER -ne 1 ]]; then 
+        convert -pointsize 60 -fill black -gravity Center -draw 'text 0,-100 "'"$2"'"' "./TAG/${RR}/${RR}.png" "./TAG/${RR}/${RR}.png";
+#    fi
+    convert -pointsize 40 -fill black -gravity NorthEast -draw 'text 80,0 "'"${PR}"'"' "./TAG/${RR}/${RR}.png" "./TAG/${RR}/${RR}.png"
     # WRITE G1Tag RR
     convert -pointsize 40 -fill black -gravity SouthWest -draw 'text 3,0 "'"${RR}"'"' "./TAG/${RR}/${RR}.png" "./TAG/${RR}/${RR}.png"
 
@@ -258,13 +260,19 @@ done
 if [[ "$destnode" == "" || "$destnode" == "$IPFSNODEID" ]]; then
     # PRINT $PHONE WALLET PUBKEY
     qrencode -s 5 -o "/tmp/G1PubQR.$PHONE.png" "$(cat ./wallets/$PHONE/$PHONE.pub)"
-    composite -compose Over -resize 133% -gravity West "/tmp/G1PubQR.$PHONE.png" "./shell/g1tag.png" "/tmp/G1PubQR.$PHONE.png"
+    composite -compose Over -gravity West "/tmp/G1PubQR.$PHONE.png" "./shell/g1tag.png" "/tmp/G1PubQR.$PHONE.png"
+
     if [[ $(file "./wallets/$PHONE/$PHONE.avatar.png" | grep 'PNG') ]]; then
-        composite -compose Over -resize 150% -gravity Center "./wallets/$PHONE/$PHONE.avatar.png" "/tmp/G1PubQR.$PHONE.png" "/tmp/G1PubQR.$PHONE.png"
+        composite -compose Over -gravity Center "./wallets/$PHONE/$PHONE.avatar.png" "/tmp/G1PubQR.$PHONE.png" "/tmp/G1PubQR.$PHONE.png"
     fi
-    convert -pointsize 60 -fill black -gravity Center -draw 'text 340,-160 "'"$MEMBER"'"' "/tmp/G1PubQR.$PHONE.png" "/tmp/G1PubQR.$PHONE.png"
-    convert -pointsize 70 -fill black -gravity Center -draw 'text 345,-5 "'"$UIDNA"'"' "/tmp/G1PubQR.$PHONE.png" "/tmp/G1PubQR.$PHONE.png"
-    convert -pointsize 60 -fill black -gravity Center -draw 'text 350,80 "'"$PHONE"'"' "/tmp/G1PubQR.$PHONE.png" "/tmp/G1PubQR.$PHONE.png"
+    if [[ -f ./wallets/$PHONE/$PHONE.uidrib ]]; then
+        qrencode -s 6 -o "/tmp/G1MemQR.$PHONE.png" "$(cat ./wallets/$PHONE/$PHONE.uidrib)";
+        composite -compose Over -gravity SouthEast "/tmp/G1MemQR.$PHONE.png" "/tmp/G1PubQR.$PHONE.png" "/tmp/G1PubQR.$PHONE.png" && rm /tmp/G1MemQR.$PHONE.png
+    fi
+
+    convert -pointsize 40 -fill black -gravity NorthEast -draw 'text 100,0 "'"G1                 $MEMBER"'"' "/tmp/G1PubQR.$PHONE.png" "/tmp/G1PubQR.$PHONE.png"
+    convert -pointsize 40 -fill black -gravity SouthWest -draw 'text 10,0 "'"$UIDNA"'"' "/tmp/G1PubQR.$PHONE.png" "/tmp/G1PubQR.$PHONE.png"
+    #convert -pointsize 60 -fill black -gravity Center -draw 'text 350,80 "'"$PHONE"'"' "/tmp/G1PubQR.$PHONE.png" "/tmp/G1PubQR.$PHONE.png"
     brother_ql_create --model QL-700 "/tmp/G1PubQR.$PHONE.png" --label-size 62 > "/tmp/G1PubQR.$PHONE.bin"
     brother_ql_print "/tmp/G1PubQR.$PHONE.bin" /dev/usb/lp0
     rm -f /tmp/G1PubQR.*