diff --git a/tools/PAY4SURE.sh b/tools/PAY4SURE.sh index 387f870b..6ab62d34 100755 --- a/tools/PAY4SURE.sh +++ b/tools/PAY4SURE.sh @@ -64,13 +64,13 @@ bash '${ME}' "'${PENDINGDIR}'/'${MOATS}'.key" "'${AMOUNT}'" "'${G1PUB}'" "'${COM ' > ${PENDINGDIR}/${MOATS}_replay.sh chmod +x ${PENDINGDIR}/${MOATS}_replay.sh -rm -f ${PENDINGDIR}/${MOATS}.result +rm -f ${PENDINGDIR}/${MOATS}.result.html ################################################ # MAKE PAYMENT -${MY_PATH}/jaklis/jaklis.py -k ${PENDINGDIR}/${MOATS}.key pay -a ${AMOUNT} -p ${G1PUB} -c "${COMMENT}" -m 2>&1> ${PENDINGDIR}/${MOATS}.result -CHK1=$(cat ${PENDINGDIR}/${MOATS}.result | head -n 1 ) -CHK2=$(cat ${PENDINGDIR}/${MOATS}.result | head -n 2 ) +${MY_PATH}/jaklis/jaklis.py -k ${PENDINGDIR}/${MOATS}.key pay -a ${AMOUNT} -p ${G1PUB} -c "${COMMENT}" -m 2>&1> ${PENDINGDIR}/${MOATS}.result.html +CHK1=$(cat ${PENDINGDIR}/${MOATS}.result.html | head -n 1 ) +CHK2=$(cat ${PENDINGDIR}/${MOATS}.result.html | head -n 2 ) echo ${CHK1} echo ${CHK2} @@ -97,17 +97,18 @@ if [[ $? == 0 || $(echo "${CHK2}" | grep 'succès') || $(echo "${CHK1}" | grep ZENDES=$(echo "$DES * 10" | bc | cut -d '.' -f 1) echo "

ZEN OPERATION

-

${ISSUERPUB} +

${ISSUERPUB}
${ZENCUR} - ${ZENAMOUNT}

-

${G1PUB} +

${G1PUB}
${ZENDES} + ${ZENAMOUNT}

-

OK

" > ${PENDINGDIR}/${MOATS}.result +

OK

" > ${PENDINGDIR}/${MOATS}.result.html - $MY_PATH/mailjet.sh "support@qo-op.com" ${PENDINGDIR}/${MOATS}.result "${ZENAMOUNT} ZEN OPERATION" + $MY_PATH/mailjet.sh "support@qo-op.com" ${PENDINGDIR}/${MOATS}.result.html "${ZENAMOUNT} ZEN OPERATION" ## REMOVE IF YOU WANT TO MONITOR "SENT" WINDOW INCERTITUDE rm ${PENDINGDIR}/${MOATS}.key rm ${PENDINGDIR}/${MOATS}_replay.sh + rm ${PENDINGDIR}/${MOATS}.result.html rm ${PENDINGFILE} else @@ -118,16 +119,16 @@ else rm ${PENDINGFILE} echo "

BLOCKCHAIN CONNEXION ERROR

- MUST RETRY -

- LAUNCHING SUB SHELL" >> ${PENDINGDIR}/${MOATS}.result + LAUNCHING SUB SHELL" >> ${PENDINGDIR}/${MOATS}.result.html ## COUNT NUMBER OF TRY try=$(cat ${PENDINGDIR}/${MOATS}.try 2>/dev/null) || try=0 [ $try -gt 2 ] \ - && echo "${MOATS} TOO MANY TRY ( $try )" >> ${PENDINGDIR}/${MOATS}.result \ - && $MY_PATH/mailjet.sh "support@qo-op.com" ${PENDINGDIR}/${MOATS}.result "PAYMENT CANCELED" \ + && echo "${MOATS} TOO MANY TRY ( $try )" >> ${PENDINGDIR}/${MOATS}.result.html \ + && $MY_PATH/mailjet.sh "support@qo-op.com" ${PENDINGDIR}/${MOATS}.result.html "PAYMENT CANCELED" \ && exit 1 \ - || $MY_PATH/mailjet.sh "support@qo-op.com" ${PENDINGDIR}/${MOATS}.result "PAYMENT REPLAY" + || $MY_PATH/mailjet.sh "support@qo-op.com" ${PENDINGDIR}/${MOATS}.result.html "PAYMENT REPLAY" ( ((try++)) && echo $try > ${PENDINGDIR}/${MOATS}.try