diff --git a/.env.production b/.env.production index ede6a6fc..e0e866cf 100644 --- a/.env.production +++ b/.env.production @@ -1,27 +1,28 @@ APP_VERSION="1.1.22" SERVICE_WORKER_FILE="service-worker.js" -APP_ID="13" -DIRECTORY_LOCAL=newfreeplanet -DIRECTORY_SERVER=freeplanet_serverside -SERVERDIR_WEBSITE=riso.app -SERVERPW_WEBSITE=pwdadmin@1AOK -APP_URL="https://riso.app" +APP_ID="17" +DIRECTORY_LOCAL="newfreeplanet" +DIRECTORY_SERVER="/var/www/nodejs_piuchebuono_server" +SERVERDIR_WEBSITE="/var/www/piuchebuono.app" +SERVERPW_WEBSITE="pwdadmin@1AOK" +APP_URL="https://piuchebuono.app" URL_FACEBOOK="" PROVA_PAOLO="" LANG_DEFAULT="it" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" -MONGODB_HOST="https://www.freeplanet.app:3000" -LOGO_REG='riso-logo-full.png' +MONGODB_HOST="https://api.piuchebuono.app" +LOGO_REG="piuchebuono-logo-full.png" TEST_NAME="" TEST_SURNAME="" TEST_EMAIL="" TEST_USERNAME="" TEST_PASSWORD="" TEST_APORTADOR="------" -PUBLICKEY_PUSH="BNM-cEpTbPVc_ujXf3QOC8ggf7b-X44P44esfJUWqNOFq1XhWCoZJpOi71_cbXC5SnfO9HassQ6OouAYgtBA9Pw" +PUBLICKEY_PUSH="BJgo8XR_upbnbMLWgCAUELo6DK7dRXffYAnFOxbaMMz5favBgcQBKT-eISqouO-jRad4Sw8l5nd2wCF6KorGiTc" DEBUG="1" TELEGRAM_SUPPORT="" PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" TEST_CELL="" -VUE_APP_ISTEST=0 +VUE_APP_ISTEST="0" +API_KEY_MSSQL="m68yADSr123MIVIDA@154$DSAGVOK" \ No newline at end of file diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index a57a9bb9..ef2bf5f1 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -1308,7 +1308,7 @@ export const shared_consts = { value: 1, }, { - label: 'Ordine in Lavorazione', + label: 'in Lavorazione', value: 2, }, { @@ -1316,7 +1316,7 @@ export const shared_consts = { value: 15, }, { - label: 'Ordine Confermato', + label: 'Confermato', value: 3, }, { @@ -1340,7 +1340,7 @@ export const shared_consts = { value: 10, }, { - label: 'Elimina Definitivamente !!', + label: 'Elimina 🗑 !!', value: 20, }, @@ -1354,7 +1354,7 @@ export const shared_consts = { color: 'secondary', }, { - label: '📩 Conferma Ordine Evaso (e aggiorna le quantità in Magsazzino)', //ORDER_CONFIRMED + label: '📩 Conferma Ordine Evaso (e aggiorna le qtà)', //ORDER_CONFIRMED value: 3, icon: 'fas fa-calendar-check', color: 'primary', diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index 774951ab..0a434084 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -1943,10 +1943,10 @@ const msg_it = { update_TotalPrice: 'Aggiorna Totale', TotalPriceProduct: 'Prezzo Totale', order_confirm: 'Conferma Ordini (aggiorna Qta magazzino)', - check_invia_email: 'Abilita l\'Invio delle email (📩)', - mostra_codice: 'Mostra Codice', - mostra_cat: 'Mostra Categoria', - mostra_solo_ordini_produttore: 'Filtra Ordini del Produttore', + check_invia_email: 'Abilita Invio email (📩)', + mostra_codice: 'Codice', + mostra_cat: 'Categoria', + mostra_solo_ordini_produttore: 'Filtra Ordini Produttore', }, cash: { creatorUserId: 'Creatore', diff --git a/src/views/ecommerce/orderInfo/orderInfo.ts b/src/views/ecommerce/orderInfo/orderInfo.ts index 8956acd8..cd9c9781 100755 --- a/src/views/ecommerce/orderInfo/orderInfo.ts +++ b/src/views/ecommerce/orderInfo/orderInfo.ts @@ -301,7 +301,10 @@ export default defineComponent({ }) watch(() => tabpages.value, (newval, oldval) => { tools.setCookie(tools.COOK_TABPAGES, tabpages.value.toString()) - updateorders(false) + if (tabpages.value === shared_consts.OrderPages.LISTA_TOTALI.value) { + taborders.value = -1 + } + updateorders(true) }) watch(() => storeGasordine.value, (newval, oldval) => { diff --git a/src/views/ecommerce/orderInfo/orderInfo.vue b/src/views/ecommerce/orderInfo/orderInfo.vue index e0468164..26d7dbdb 100755 --- a/src/views/ecommerce/orderInfo/orderInfo.vue +++ b/src/views/ecommerce/orderInfo/orderInfo.vue @@ -38,8 +38,8 @@ -
-
+
+
@@ -94,7 +94,8 @@ emit-value map-options > - +
+
- +
- {{ - props.row.strSubCatProds - }} + {{ props.row.strSubCatProds }}