INVITATION JEu

G1BILLETS.sh

@@ -19,7 +19,7 @@ STYLE="$3"
 NBbillets=6
 
 [[ $MONTANT == "" ]] && MONTANT="___"
-[[ $UNIQID == "" ]] && UNIQID=$(date -u +%s%N | cut -b1-13)$RANDOM
+[[ $UNIQID == "" ]] && UNIQID=$(${MY_PATH}/diceware.sh 1 | xargs)${RANDOM:0:2}$(${MY_PATH}/diceware.sh 1 | xargs)
 [[ "$STYLE" == "xbian" ]] && NBbillets=1 ## STYLE=xbian => 1 BILLET
 [[ "$STYLE" == "1" ]] && NBbillets=1 && STYLE="" ## 1 BILLET PDF
 [[ "$STYLE" == "ticket" ]] && NBbillets=1 && echo "TICKET" ## 1 BILLET JPG

MAKE_G1BILLET.sh

@@ -68,25 +68,36 @@ esac
 # Add June LOGO to Billet
 composite -compose Over -gravity NorthEast -geometry +50+25  -dissolve 90% "/tmp/g1billet/${UNIQID}/g1.png" "/tmp/${BILLETNAME}.jpg" "/tmp/${BILLETNAME}.jpg"
 
-# xbian style (ASTROPORT/KODI)
-if [[ "${STYLE}" == "xbian" ]]
+# xbian style (ASTROPORT/KODI) + JEU
+if [[ "${STYLE}" == "xbian" || "${STYLE}" == "jeu" ]]
 then
 	# CREATE PSEUDO for Gchange.fr
 	XZUID=$(${MY_PATH}/diceware.sh 1 | xargs)${RANDOM:0:2}$(${MY_PATH}/diceware.sh 1 | xargs)
-	BOTTOM="CARTE EMBARQUEMENT ASTROPORT  ---  https://gchange.fr  ---"
+	BOTTOM="INVITATION JEu                               [MADEINZION / ASTROPORT]"
 else	
 	XZUID="G1 BILLET"
 	BOTTOM="Porte Monnaie Libre!!          https://gchange.fr         https://cesium.app"
 fi
 
+
+if [[ "$MONTANT" != "___" ]]; then
 convert -font 'Liberation-Sans' \
--pointsize 120 -fill black -draw 'text 325,250 "'"$MONTANT DU"'"' \
 -pointsize 40 -fill black -draw 'text 70,50 "'"$XZUID"'"' \
+-pointsize 120 -fill black -draw 'text 325,250 "'"$MONTANT DU"'"' \
 -pointsize 20 -fill black -draw 'text 380,20 "'"${NOTERIB}"'"' \
 -pointsize 30 -draw 'text 50,100 "'"Identifiant: $NUMERO"'"' \
 -pointsize 22 -fill black -draw 'text 50,130 "'"Code Secret:  $SECRET"'"' \
 -pointsize 25 -fill black -draw 'text 150,440 "'"$BOTTOM"'"' \
 "/tmp/${BILLETNAME}.jpg" "/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"
+else
+convert -font 'Liberation-Sans' \
+-pointsize 40 -fill black -draw 'text 70,60 "'"$XZUID"'"' \
+-pointsize 20 -fill black -draw 'text 380,30 "'"${NOTERIB}"'"' \
+-pointsize 30 -draw 'text 50,100 "'"Identifiant: $NUMERO"'"' \
+-pointsize 22 -fill black -draw 'text 50,130 "'"Code Secret:  $SECRET"'"' \
+-pointsize 25 -fill black -draw 'text 150,440 "'"$BOTTOM"'"' \
+"/tmp/${BILLETNAME}.jpg" "/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"
+fi
 
 rm -f /tmp/${BILLETNAME}.jpg