From 6d45ad8ca7c12e932e1e03c3fa8afb022421e764 Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Tue, 23 Apr 2024 22:47:28 +0200 Subject: [PATCH] ++ poter inviare un msg telegram ai appartenenti ai Circuiti RIS. --- .env.test2 | 28 ++++++++++++++++++++++++++++ deploy_on_test2_server.sh | 28 ++++++++++++++++++++++++++++ send_pwa_to_test2.sh | 12 ++++++++++++ src/common/shared_vuejs.ts | 10 +++++++--- 4 files changed, 75 insertions(+), 3 deletions(-) create mode 100755 .env.test2 create mode 100755 deploy_on_test2_server.sh create mode 100755 send_pwa_to_test2.sh diff --git a/.env.test2 b/.env.test2 new file mode 100755 index 00000000..9fe4d27e --- /dev/null +++ b/.env.test2 @@ -0,0 +1,28 @@ +APP_VERSION="1.0.36" +SERVICE_WORKER_FILE="service-worker.js" +APP_ID="13" +DIRECTORY_LOCAL=newfreeplanet +DIRECTORY_SERVER=test2.freeplanet_serverside +SERVERDIR_WEBSITE="test2.riso.app" +SERVERPW_WEBSITE="pwdadmin@1AOK" +APP_URL="https://test2.riso.app" +URL_FACEBOOK="" +PROVA_PAOLO="" +LANG_DEFAULT="it" +PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" +MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" +MONGODB_HOST="https://freeplanet.app:3001" +LOGO_REG='riso-logo-full.png' +TEST_NAME="" +TEST_SURNAME="" +TEST_EMAIL="" +TEST_USERNAME="" +TEST_PASSWORD="" +TEST_APORTADOR="" +PUBLICKEY_PUSH="BGXRf1TgcqocqD6J7qnRgCG7AvM2lxAoW7peb7UEzB4SxBb6DxGRdJ0UvD9ewnrB9KrSrh0-aDCODXBm7sZ1DDs" +IN_CONSTRUCTION="0" +DEBUG="1" +TELEGRAM_SUPPORT="" +PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" +TEST_CELL="" +ISTEST=1 diff --git a/deploy_on_test2_server.sh b/deploy_on_test2_server.sh new file mode 100755 index 00000000..26815e49 --- /dev/null +++ b/deploy_on_test2_server.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +source ./.env.test2 + +msg="*** Sincronizzazione ??? $DIRECTORY_LOCAL e $SERVERDIR_WEBSITE (Y/N) ? " + +if [ "$1" = "" ]; then + read -p "$msg" risposta +else + risposta=$1 +fi + +cp .env.production .env.prod.bak +cp .env.test2 .env.production + +sleep 1 + +npm run buildpwa + +echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." +sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ suryapaolo@servereng:/var/www/$SERVERDIR_WEBSITE/ +sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' dist/pwa/index.html suryapaolo@servereng:/var/www/$SERVERDIR_WEBSITE/ + +cp .env.prod.bak .env.production + +sleep 1 + +echo "Finito $SERVERDIR_WEBSITE" diff --git a/send_pwa_to_test2.sh b/send_pwa_to_test2.sh new file mode 100755 index 00000000..128b7d74 --- /dev/null +++ b/send_pwa_to_test2.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +source ./.env.test2 + +cp .env.test2 .env.production + +echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." +sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ suryapaolo@servereng:/var/www/$SERVERDIR_WEBSITE/ +sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' dist/pwa/index.html suryapaolo@servereng:/var/www/$SERVERDIR_WEBSITE/ +echo "Finito $SERVERDIR_WEBSITE" + +cp .env.prod.bak .env.production diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 60c31352..4c29eca9 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -397,17 +397,21 @@ export const shared_consts = { Shippings: [ { - label: 'Di Persona', + label: 'Da Ritirare Personalmente', value: 1, }, { - label: 'Tramite Corriere', + label: 'Spedizione Tramite Corriere', value: 2, }, { - label: 'Tramite Posta', + label: 'Spedizione Tramite Posta', value: 3, }, + { + label: 'Consegna a Domicilio', + value: 4, + }, ], OtherFilters: [