From e4504bcf9efbca2f6d249f4e7f487266ed2c1c4c Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Fri, 19 Jan 2024 23:38:08 +0100 Subject: [PATCH] regNameSurnameMandatory askUSernameTelegramToTheReg @ davanti all'username --- src/server/router/admin_router.js | 2 +- src/server/sendemail.js | 10 +++++----- src/server/tools/shared_nodejs.js | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/server/router/admin_router.js b/src/server/router/admin_router.js index 5181ca2..217c3d6 100755 --- a/src/server/router/admin_router.js +++ b/src/server/router/admin_router.js @@ -152,7 +152,7 @@ router.post('/import', authenticate, async (req, res) => { recGas = await Gasordine.findOne({ idapp, name: product.gas_name }).lean(); } - if (!recGas) { + if (!recGas && !!product.gas_name) { recGas = new Gasordine({ idapp, name: product.gas_name, active: true }); // Non esiste questo GAS, quindi lo creo ! ris = await recGas.save(); diff --git a/src/server/sendemail.js b/src/server/sendemail.js index b81250e..395fe89 100755 --- a/src/server/sendemail.js +++ b/src/server/sendemail.js @@ -784,7 +784,7 @@ module.exports = { const msginizio = msg; console.log(msginizio); - await telegrambot.sendMsgTelegramToTheManagers(idapp, msginizio); + // await telegrambot.sendMsgTelegramToTheManagers(idapp, msginizio); if (process.env.SEND_EMAIL_ORDERS === '1') { @@ -805,11 +805,11 @@ module.exports = { const esito = this.sendEmail_base('ecommerce/' + ordertype + '/' + lang, mylocalsconf.emailto, mylocalsconf, mylocalsconf.dataemail.email_reply); - this.sendEmail_base('ecommerce/' + ordertype + '/' + lang, tools.getAdminEmailByIdApp(idapp), mylocalsconf, ''); + // this.sendEmail_base('ecommerce/' + ordertype + '/' + lang, tools.getAdminEmailByIdApp(idapp), mylocalsconf, ''); - if (tools.isManagAndAdminDifferent(idapp)) { - this.sendEmail_base('ecommerce/' + ordertype + '/' + lang, tools.getManagerEmailByIdApp(idapp), mylocalsconf, ''); - } + // if (tools.isManagAndAdminDifferent(idapp)) { + // this.sendEmail_base('ecommerce/' + ordertype + '/' + lang, tools.getManagerEmailByIdApp(idapp), mylocalsconf, ''); + // } } } else { console.log('Invio Email non eseguito perchè sei in TEST !'); diff --git a/src/server/tools/shared_nodejs.js b/src/server/tools/shared_nodejs.js index ab124dd..81285fa 100755 --- a/src/server/tools/shared_nodejs.js +++ b/src/server/tools/shared_nodejs.js @@ -497,6 +497,8 @@ module.exports = { AskInvitantesulBot: 8, AskUsernameSulBot: 16, registerUserWithBot: 32, + regNameSurnameMandatory: 64, + askUSernameTelegramToTheReg: 128, }, MsgTeleg: {