From 8dcebcc59bf063f3f4e36be237c17a17701281f8 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Wed, 10 Jul 2024 16:52:54 +0200
Subject: [PATCH] adjustments

---
 MAKE_G1BILLET.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/MAKE_G1BILLET.sh b/MAKE_G1BILLET.sh
index 933de5f..1fa00b2 100755
--- a/MAKE_G1BILLET.sh
+++ b/MAKE_G1BILLET.sh
@@ -148,14 +148,14 @@ else
     ASTROLINK="https://opencollective.com/monnaie-libre"
 fi
 
-    amzqr "${ASTROLINK}" \
-        -l H -p "$MY_PATH/${IMAGES}/${TWIMG}" \
-        -c -n QRTWavatar.png \
-        -d ${MY_PATH}/tmp/g1billet/${UNIQID}/ \
-    || qrencode -s 6 -o "${MY_PATH}/tmp/g1billet/${UNIQID}/QRTWavatar.png" "${ASTROLINK}"
-
-    convert ${MY_PATH}/tmp/g1billet/${UNIQID}/QRTWavatar.png -resize 280 ${MY_PATH}/tmp/g1billet/${UNIQID}/TW.${ASTRONS}.png
+amzqr "${ASTROLINK}" \
+    -l H -p "$MY_PATH/${IMAGES}/${TWIMG}" \
+    -c -n QRTWavatar.png \
+    -d ${MY_PATH}/tmp/g1billet/${UNIQID}/ \
+|| qrencode -s 6 -o "${MY_PATH}/tmp/g1billet/${UNIQID}/QRTWavatar.png" "${ASTROLINK}"
 
+convert ${MY_PATH}/tmp/g1billet/${UNIQID}/QRTWavatar.png \
+        -resize 200 ${MY_PATH}/tmp/g1billet/${UNIQID}/TW.${ASTRONS}.png
 
 [[ "${EMAIL}" != ""  ]] && XZUID="${EMAIL}"
 
@@ -225,15 +225,15 @@ if [[ "${STYLE:0:1}" != "_" && "${STYLE:0:1}" != "x" && ${MONTANT} != "___" ]];
 convert -font 'Liberation-Sans' \
 -pointsize 40 -fill black -draw 'text 70,50 "'"$XZUID"'"' \
 -pointsize 150 -fill black -draw 'text 120,380 "'"$MONTANT"'"' \
--pointsize 20 -fill black -draw 'text 340,22 "'"${NOTERIB}"'"' \
+-pointsize 20 -fill black -draw 'text 70,85 "'"${NOTERIB}"'"' \
 -pointsize 25 -fill black -draw 'text 50,440 "'"$BOTTOM"'"' \
 "${MY_PATH}/tmp/${BILLETNAME}.jpg" "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"
 else
 convert -font 'Liberation-Sans' \
 -pointsize 35 -fill black -draw 'text 60,56 "'"$XZUID"'"' \
--pointsize 22 -fill black -draw 'text 300,26 "'"${NOTERIB}"'"' \
--pointsize 22 -fill black -annotate 90x90+30+20 "(Secret 1) ${SECRET1}" \
--pointsize 22 -fill black -annotate 90x90+10+20 "(Secret 2) $SECRET2" \
+-pointsize 22 -fill black -draw 'text 70,85 "'"${NOTERIB}"'"' \
+-pointsize 18 -fill black -annotate 90x90+30+20 "${SECRET1}" \
+-pointsize 18 -fill black -annotate 90x90+10+20 "$SECRET2" \
 -pointsize 25 -fill grey -draw 'text 50,440 "'"$BOTTOM"'"' \
 "${MY_PATH}/tmp/${BILLETNAME}.jpg" "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"
 fi
@@ -249,7 +249,7 @@ composite -compose Over -gravity SouthWest -geometry +50+40 \
 
 ## ADD CENTER QRCODE
 [[ -s "${MY_PATH}/tmp/g1billet/${UNIQID}/CENTER.png" ]] && \
-composite -compose Over -gravity Center -geometry +40+40 \
+composite -compose Over -gravity Center -geometry +35+40 \
 "${MY_PATH}/tmp/g1billet/${UNIQID}/CENTER.png" \
 "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg" \
 "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"
@@ -269,7 +269,7 @@ composite -compose Over -gravity SouthEast -geometry +30+50 \
 
 # Add g1.png SIGLE
 [[ "${STYLE:0:1}" != "@" && ! "${STYLE}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$  ]] && \
-composite -compose Over -dissolve 90% \
+composite -compose Over -dissolve 70% \
 "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png" \
 "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg" \
 "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"