diff --git a/.env.development b/.env.development index 076722d..7013049 100644 --- a/.env.development +++ b/.env.development @@ -1,12 +1,12 @@ -DATABASE=test_PiuCheBuono +DATABASE=test_FreePlanet UDB=paofreeplanet PDB=mypassword@1A SEND_EMAIL=0 SEND_EMAIL_ORDERS=1 PORT=3000 -appTelegram_TEST=["1","17"] -appTelegram=["1","17"] -appTelegram_DEVELOP=["17"] +appTelegram_TEST=["1","13"] +appTelegram=["1","13"] +appTelegram_DEVELOP=["13"] DOMAIN=mongodb://localhost:27017/ AUTH_MONGODB=0 ENABLE_PUSHNOTIFICATION=1 @@ -29,7 +29,7 @@ GCM_API_KEY="" PROD=0 PROJECT_DESCR_MAIN='__PROJECTS' SECRK=Askb38v23jjDFaoskBOWj92axXCQ -TOKEN_LIFE=2h +TOKEN_LIFE=1m REFRESH_TOKEN_LIFE=14d FTPSERVER_HOST=139.162.166.31 FTPSERVER_PORT=21 @@ -38,9 +38,4 @@ FTPSERVER_PWD=ftpmypwd@1A_ AUTH_NEW_SITES=123123123 SCRIPTS_DIR=admin_scripts CLOUDFLARE_TOKENS=[{"label":"Paolo.arena77@gmail.com","value":"M9EM309v8WFquJKpYgZCw-TViM2wX6vB3wlK6GD0"},{"label":"gruppomacro.com","value":"bqmzGShoX7WqOBzkXocoECyBkPq3GfqcM5t6VFd8"}] -MIAB_HOST=box.lamiaposta.org -MIAB_ADMIN_EMAIL=admin@lamiaposta.org -MIAB_ADMIN_PASSWORD=passpao1pabox@1A DS_API_KEY="sk-222e3addb3d8455d8b0516d93906eec7" -SERVER_A_URL="http://51.77.156.69:3000" -API_KEY_MSSQL="m68yADSr123MIVIDA@154$DSAGVOK" \ No newline at end of file diff --git a/filelog.txt b/filelog.txt index b6cc479..fd1318d 100644 --- a/filelog.txt +++ b/filelog.txt @@ -4,3 +4,5 @@ Dom 02/03 ORE 16:32: USER [surya1977]: ciao Lun 10/03 ORE 15:52: USER [surya1977]: ciao Lun 10/03 ORE 15:56: USER [surya1977]: ciao + +Lun 07/07 ORE 10:45: USER [surya1977]: ciao diff --git a/logevents.txt b/logevents.txt index 046dd4d..9266f96 100644 --- a/logevents.txt +++ b/logevents.txt @@ -835,4 +835,6 @@ https://t.me/riso_canale/739 In attesa di riscontri, salutiamo! 🍚💚 Il gruppo dei Facilitatori Territoriali RISO Mer 24/04 ORE 22:02: 🤖: Da Sùrya (Paolo) (paoloar77): -✅ la regolarizzazione può avv \ No newline at end of file +✅ la regolarizzazione può avv +Lun 07/07 ORE 10:50: 🤖: Da Sùrya undefined (surya1977): +✅ provatest7 è stato Ammesso correttamente (da surya1977)! \ No newline at end of file diff --git a/src/server/models/mygroup.js b/src/server/models/mygroup.js index 772f8a9..c71fff5 100755 --- a/src/server/models/mygroup.js +++ b/src/server/models/mygroup.js @@ -11,7 +11,7 @@ mongoose.level = 'F'; const { ObjectId } = require('mongodb'); // Resolving error Unknown modifier: $pushAll -mongoose.plugin(schema => { +mongoose.plugin((schema) => { schema.options.usePushEach = true; }); @@ -34,9 +34,11 @@ const MyGroupSchema = new Schema({ descr: { type: String, }, - idCatGrp: [{ - type: Number, - }], + idCatGrp: [ + { + type: Number, + }, + ], userId: { type: String, }, @@ -51,11 +53,13 @@ const MyGroupSchema = new Schema({ description: { type: String, }, - }], + }, + ], idCity: [ { type: Number, - }], + }, + ], website: { type: String, }, @@ -104,13 +108,15 @@ const MyGroupSchema = new Schema({ _id: false, username: { type: String }, date: { type: Date }, - }], // username + }, + ], // username refused_users: [ { _id: false, username: { type: String }, date: { type: Date }, - }], // username + }, + ], // username deleted: { type: Boolean, default: false, @@ -120,14 +126,14 @@ const MyGroupSchema = new Schema({ _id: false, circuitname: { type: String }, date: { type: Date }, - }], + }, + ], lastdate_reqRisGroup: { type: Date, }, //**ADDFIELD_MYGROUPS ...tools.getFieldsForAnnunci(), - }); MyGroupSchema.statics.getFieldsForSearch = function () { @@ -152,8 +158,7 @@ MyGroupSchema.statics.executeQueryTable = function (idapp, params, user) { MyGroupSchema.pre('save', async function (next) { if (this.isNew) { - if (!this.date_created) - this.date_created = new Date(); + if (!this.date_created) this.date_created = new Date(); } next(); @@ -166,75 +171,74 @@ MyGroupSchema.statics.findAllIdApp = async function (idapp) { }; MyGroupSchema.statics.findAllGroups = async function (idapp) { - const whatToShow = this.getWhatToShow(idapp, ''); - return await MyGroup.find({ - idapp, - $or: [ - { deleted: { $exists: false } }, - { deleted: { $exists: true, $eq: false } }], - }, whatToShow).lean(); + return await MyGroup.find( + { + idapp, + $or: [{ deleted: { $exists: false } }, { deleted: { $exists: true, $eq: false } }], + }, + whatToShow + ).lean(); }; // Rimuovo la Richiesta del Gruppo MyGroupSchema.statics.removeReqGroup = async function (idapp, username, groupnameDest) { - - return await MyGroup.updateOne({ idapp, groupname: groupnameDest }, - { $pull: { req_users: { username: { $in: [username] } } } }); + return await MyGroup.updateOne( + { idapp, groupname: groupnameDest }, + { $pull: { req_users: { username: { $in: [username] } } } } + ); }; // Aggiungi agli utenti Rifiutati del Gruppo MyGroupSchema.statics.refuseReqGroup = async function (idapp, username, groupnameDest) { - - return await MyGroup.updateOne({ idapp, groupname: groupnameDest }, + return await MyGroup.updateOne( + { idapp, groupname: groupnameDest }, { - $push: - { + $push: { refused_users: { username, date: new Date(), }, }, - }); - + } + ); }; // Aggiungi agli Admin del Gruppo MyGroupSchema.statics.addToAdminOfMyGroup = async function (idapp, username, groupnameDest) { - - return await MyGroup.updateOne({ idapp, groupname: groupnameDest }, + return await MyGroup.updateOne( + { idapp, groupname: groupnameDest }, { - $push: - { + $push: { admins: { username, date: new Date(), }, }, - }); - + } + ); }; // Rimuovi dagli Admin del Gruppo MyGroupSchema.statics.removeAdminOfMyGroup = async function (idapp, username, groupnameDest) { - - return await MyGroup.updateOne({ idapp, groupname: groupnameDest }, - { $pull: { admins: { username: { $in: [username] } } } }); + return await MyGroup.updateOne( + { idapp, groupname: groupnameDest }, + { $pull: { admins: { username: { $in: [username] } } } } + ); }; MyGroupSchema.statics.getListAdminsByGroupName = async function (idapp, groupname) { - - let arr = await MyGroup.findOne({ - idapp, - groupname, - $or: [ - { deleted: { $exists: false } }, - { deleted: { $exists: true, $eq: false } }], - }, { admins: 1 }).lean(); + let arr = await MyGroup.findOne( + { + idapp, + groupname, + $or: [{ deleted: { $exists: false } }, { deleted: { $exists: true, $eq: false } }], + }, + { admins: 1 } + ).lean(); return arr && arr.admins ? arr.admins : []; - }; MyGroupSchema.statics.getWhatToShow = function (idapp, username) { @@ -267,7 +271,6 @@ MyGroupSchema.statics.getWhatToShow = function (idapp, username) { whatToShow = { ...whatToShow, ...shared_consts.ANNUNCI_FIELDS }; return whatToShow; - }; MyGroupSchema.statics.getWhatToShow_Unknown = function (idapp, username) { @@ -289,32 +292,30 @@ MyGroupSchema.statics.getWhatToShow_Unknown = function (idapp, username) { whatToShow = { ...whatToShow, ...shared_consts.ANNUNCI_FIELDS }; return whatToShow; - }; -MyGroupSchema.statics.getArrUsernameFromFieldByGroupname = async function ( - idapp, groupname, field) { - +MyGroupSchema.statics.getArrUsernameFromFieldByGroupname = async function (idapp, groupname, field) { const { User } = require('../models/user'); const myobj = {}; myobj[field] = 1; - const ris = await User.findOne({ - idapp, - groupname, - $or: [{ deleted: { $exists: false } }, { deleted: { $exists: true, $eq: false } }], - }, myobj); + const ris = await User.findOne( + { + idapp, + groupname, + $or: [{ deleted: { $exists: false } }, { deleted: { $exists: true, $eq: false } }], + }, + myobj + ); if (ris) { - return ris[field].map(m => m.username); + return ris[field].map((m) => m.username); } return []; - }; MyGroupSchema.statics.getInfoGroupByGroupname = async function (idapp, groupname) { - const whatToShow = this.getWhatToShow(idapp, groupname); const myfind = { @@ -333,14 +334,11 @@ MyGroupSchema.statics.getInfoGroupByGroupname = async function (idapp, groupname }, }, { - '$replaceRoot': { - 'newRoot': { - '$mergeObjects': [ + $replaceRoot: { + newRoot: { + $mergeObjects: [ { - '$arrayElemAt': [ - '$mycircuits', - 0, - ], + $arrayElemAt: ['$mycircuits', 0], }, '$$ROOT', ], @@ -359,21 +357,17 @@ MyGroupSchema.statics.getInfoGroupByGroupname = async function (idapp, groupname { $project: shared_consts.getProjectByTable(shared_consts.TABLES_MYGROUPS, {}), }, - ]; - try { const ris = await MyGroup.aggregate(query); - if (ris && ris.length > 0) - return ris[0]; + if (ris && ris.length > 0) return ris[0]; } catch (e) { return null; } return null; - }; MyGroupSchema.statics.deleteGroup = async function (idapp, usernameOrig, groupname) { @@ -382,7 +376,6 @@ MyGroupSchema.statics.deleteGroup = async function (idapp, usernameOrig, groupna }; MyGroupSchema.statics.getGroupsByUsername = async function (idapp, username, req) { - try { const { User } = require('../models/user'); @@ -391,20 +384,22 @@ MyGroupSchema.statics.getGroupsByUsername = async function (idapp, username, req const arrUsernameGroups = await User.getUsernameGroupsByUsername(idapp, username); // const arrUsernameReqGroups = await MyGroup.getUsernameReqGroupsByGroupname(idapp, username); - let listUsersGroup = await User.find({ - idapp, - username: { $in: arrUsernameGroups }, - $or: [ - { deleted: { $exists: false } }, - { deleted: { $exists: true, $eq: false } }], - }, whatToShow); + let listUsersGroup = await User.find( + { + idapp, + username: { $in: arrUsernameGroups }, + $or: [{ deleted: { $exists: false } }, { deleted: { $exists: true, $eq: false } }], + }, + whatToShow + ); - let listgroups = await MyGroup.find({ - idapp, - $or: [ - { deleted: { $exists: false } }, - { deleted: { $exists: true, $eq: false } }], - }, whatToShow_Unknown); + let listgroups = await MyGroup.find( + { + idapp, + $or: [{ deleted: { $exists: false } }, { deleted: { $exists: true, $eq: false } }], + }, + whatToShow_Unknown + ); /*let listRequestUsersGroup = await User.find({ idapp, @@ -416,25 +411,27 @@ MyGroupSchema.statics.getGroupsByUsername = async function (idapp, username, req */ - let listSentRequestGroups = await MyGroup.find({ - idapp, - 'req_users': { - $elemMatch: { username: { $eq: username } }, + let listSentRequestGroups = await MyGroup.find( + { + idapp, + req_users: { + $elemMatch: { username: { $eq: username } }, + }, + $or: [{ deleted: { $exists: false } }, { deleted: { $exists: true, $eq: false } }], }, - $or: [ - { deleted: { $exists: false } }, - { deleted: { $exists: true, $eq: false } }], - }, whatToShow_Unknown); + whatToShow_Unknown + ); - let listRefusedGroups = await MyGroup.find({ - idapp, - 'refused_users': { - $elemMatch: { username: { $eq: username } }, + let listRefusedGroups = await MyGroup.find( + { + idapp, + refused_users: { + $elemMatch: { username: { $eq: username } }, + }, + $or: [{ deleted: { $exists: false } }, { deleted: { $exists: true, $eq: false } }], }, - $or: [ - { deleted: { $exists: false } }, - { deleted: { $exists: true, $eq: false } }], - }, whatToShow_Unknown); + whatToShow_Unknown + ); return { listUsersGroup, @@ -443,7 +440,6 @@ MyGroupSchema.statics.getGroupsByUsername = async function (idapp, username, req listRefusedGroups, mygroups: await User.getMyGroupsById(req.user._id), }; - } catch (e) { console.log('Error', e); } @@ -454,12 +450,10 @@ MyGroupSchema.statics.getGroupsByUsername = async function (idapp, username, req listTrusted: [], listSentRequestGroups: [], listRefusedGroups: [], - }; }; MyGroupSchema.statics.extractCitiesName = async function (idapp, id) { - try { let aggr1 = [ { @@ -474,14 +468,11 @@ MyGroupSchema.statics.extractCitiesName = async function (idapp, id) { }, }, { - '$replaceRoot': { - 'newRoot': { - '$mergeObjects': [ + $replaceRoot: { + newRoot: { + $mergeObjects: [ { - '$arrayElemAt': [ - '$mycities', - 0, - ], + $arrayElemAt: ['$mycities', 0], }, '$$ROOT', ], @@ -490,8 +481,8 @@ MyGroupSchema.statics.extractCitiesName = async function (idapp, id) { }, { $project: { - "mycities.comune": 1, - "mycities.prov": 1 + 'mycities.comune': 1, + 'mycities.prov': 1, }, }, ]; @@ -502,16 +493,14 @@ MyGroupSchema.statics.extractCitiesName = async function (idapp, id) { } catch (e) { console.error('e', e); } - }; MyGroupSchema.statics.ifCircuitAlreadyInGroup = async function (idapp, groupname, circuitname) { - // Controllo se è stato già inserito il circuito sul gruppo return await this.findOne({ idapp, groupname, - 'mycircuits': { + mycircuits: { $elemMatch: { circuitname: { $eq: circuitname } }, }, }).lean(); @@ -519,70 +508,78 @@ MyGroupSchema.statics.ifCircuitAlreadyInGroup = async function (idapp, groupname // aggiungo il Circuito all'interno del Gruppo MyGroupSchema.statics.addCircuitFromGroup = async function (idapp, groupname, circuitname) { - return await this.updateOne({ idapp, groupname }, + return await this.updateOne( + { idapp, groupname }, { $push: { - 'mycircuits': { + mycircuits: { circuitname, date: new Date(), - } - } - }); - + }, + }, + } + ); }; // Rimuovo il Circuito all'interno del Gruppo MyGroupSchema.statics.removeCircuitFromGroup = async function (idapp, groupname, circuitname) { + const { Circuit } = require('../models/circuit'); + const { Account } = require('../models/account'); - const ris = await this.updateOne({ idapp, groupname }, - { $pull: { 'mycircuits': { circuitname: { $in: [circuitname] } } } }); + const ris = await this.updateOne( + { idapp, groupname }, + { $pull: { mycircuits: { circuitname: { $in: [circuitname] } } } } + ); const circuitId = await Circuit.getCircuitIdByName(idapp, circuitname); let remove = false; // Se il mio account non è stato utilizzato, allora lo cancello anche questo - const myaccount = await Account.getAccountByUsernameAndCircuitId(idapp, username, circuitId, false, false, groupname, ''); + const myaccount = await Account.getAccountByUsernameAndCircuitId( + idapp, + '', + circuitId, + false, + false, + groupname, + '' + ); if (myaccount && myaccount.totTransato === 0) { remove = true; } else { remove = true; } - if (remove) { + if (remove && myaccount) { await Account.removeAccount(myaccount._id); } - }; MyGroupSchema.statics.getQueryReceiveRISGroups = function (idapp, hours) { - const query = [ { $match: { idapp, - 'lastdate_reqRisGroup': { $gte: tools.IncDateNow(-(1000 * 60 * 60 * hours)) }, - $or: [ - { deleted: { $exists: false } }, - { deleted: { $exists: true, $eq: false } }], + lastdate_reqRisGroup: { $gte: tools.IncDateNow(-(1000 * 60 * 60 * hours)) }, + $or: [{ deleted: { $exists: false } }, { deleted: { $exists: true, $eq: false } }], }, }, { - $group: - { - _id: "$groupname", + $group: { + _id: '$groupname', count: { $sum: 1, }, - } + }, }, - { $sort: { 'lastdate_reqRisGroup': -1 } }, + { $sort: { lastdate_reqRisGroup: -1 } }, { $limit: 30 }, { $lookup: { - from: "mygroups", + from: 'mygroups', let: { - groupname: "$_id", + groupname: '$_id', idapp, }, pipeline: [ @@ -591,30 +588,24 @@ MyGroupSchema.statics.getQueryReceiveRISGroups = function (idapp, hours) { $expr: { $and: [ { - $eq: [ - "$$groupname", - "$groupname", - ], + $eq: ['$$groupname', '$groupname'], }, { - $eq: [ - "$$idapp", - "$idapp", - ], + $eq: ['$$idapp', '$idapp'], }, ], }, }, }, ], - as: "mygroup", + as: 'mygroup', }, }, - { $unwind: "$mygroup" }, + { $unwind: '$mygroup' }, { $replaceRoot: { newRoot: { - $mergeObjects: ["$mygroup", "$$ROOT"], + $mergeObjects: ['$mygroup', '$$ROOT'], }, }, }, @@ -645,27 +636,23 @@ MyGroupSchema.statics.getQueryReceiveRISGroups = function (idapp, hours) { return query; }; - MyGroupSchema.statics.getReceiveRISGroups = async function (idapp) { - - return await this.aggregate(this.getQueryReceiveRISGroups(idapp, 8)).then(ris => { + return await this.aggregate(this.getQueryReceiveRISGroups(idapp, 8)).then((ris) => { return ris; }); - }; - MyGroupSchema.statics.renameCircuitName = async function (idapp, oldcircuitname, newcircuitname) { - - return await this.updateMany({ idapp, 'mycircuits.circuitname': oldcircuitname }, { $set: { 'profile.mycircuits.$.circuitname': newcircuitname } }); + return await this.updateMany( + { idapp, 'mycircuits.circuitname': oldcircuitname }, + { $set: { 'profile.mycircuits.$.circuitname': newcircuitname } } + ); }; - MyGroupSchema.statics.setReceiveRisGroup = async function (idapp, groupname) { - const record = await this.findOneAndUpdate( { idapp, groupname }, - { $set: { 'lastdate_reqRisGroup': new Date() } }, + { $set: { lastdate_reqRisGroup: new Date() } }, { new: false } ).lean(); @@ -675,8 +662,9 @@ MyGroupSchema.statics.setReceiveRisGroup = async function (idapp, groupname) { const MyGroup = mongoose.model('MyGroup', MyGroupSchema); MyGroup.createIndexes() - .then(() => { }) - .catch((err) => { throw err; }); - + .then(() => {}) + .catch((err) => { + throw err; + }); module.exports = { MyGroup }; diff --git a/src/server/router/users_router.js b/src/server/router/users_router.js index 7cf0531..5e9052d 100755 --- a/src/server/router/users_router.js +++ b/src/server/router/users_router.js @@ -393,7 +393,7 @@ router.post('/', async (req, res) => { res.status(400).send(e); }); } catch (e) { - console.error(e.message); + console.error('Error: /users REG: ' + e.message); } }); diff --git a/src/server/sendemail.js b/src/server/sendemail.js index b3af33c..788dbc4 100755 --- a/src/server/sendemail.js +++ b/src/server/sendemail.js @@ -42,19 +42,19 @@ function checkifSendEmail() { } module.exports = { - sendEmail_base_e_manager: function (idapp, template, to, mylocalsconf, replyTo, transport, previewonly) { - this.sendEmail_base(template, to, mylocalsconf, replyTo, transport, previewonly); + sendEmail_base_e_manager: async function (idapp, template, to, mylocalsconf, replyTo, transport, previewonly) { + await this.sendEmail_base(template, to, mylocalsconf, replyTo, transport, previewonly); - this.sendEmail_base(template, tools.getAdminEmailByIdApp(idapp), mylocalsconf, '', transport, previewonly); + await this.sendEmail_base(template, tools.getAdminEmailByIdApp(idapp), mylocalsconf, '', transport, previewonly); if (tools.isManagAndAdminDifferent(idapp)) { const email = tools.getManagerEmailByIdApp(idapp); - this.sendEmail_base(template, email, mylocalsconf, '', transport, previewonly); + await this.sendEmail_base(template, email, mylocalsconf, '', transport, previewonly); } }, - sendEmail_base: function (template, to, mylocalsconf, replyTo, transport, previewonly) { + sendEmail_base: async function (template, to, mylocalsconf, replyTo, transport, previewonly) { if (to === '') return false; @@ -199,10 +199,10 @@ module.exports = { mylocalsconf = this.setParamsForTemplate(user, mylocalsconf); - this.sendEmail_base(tools.getpathregByIdApp(idapp, lang), emailto, mylocalsconf, tools.getreplyToEmailByIdApp(idapp)); + await this.sendEmail_base(tools.getpathregByIdApp(idapp, lang), emailto, mylocalsconf, tools.getreplyToEmailByIdApp(idapp)); // Send to the Admin an Email - this.sendEmail_base('admin/registration/' + tools.LANGADMIN, tools.getAdminEmailByIdApp(idapp), mylocalsconf, ''); + await this.sendEmail_base('admin/registration/' + tools.LANGADMIN, tools.getAdminEmailByIdApp(idapp), mylocalsconf, ''); await telegrambot.notifyToTelegram(telegrambot.phase.REGISTRATION, mylocalsconf); @@ -242,17 +242,17 @@ module.exports = { mylocalsconf = this.setParamsForTemplate(iscritto, mylocalsconf); - this.sendEmail_base('iscrizione_conacreis/' + lang, emailto, mylocalsconf, tools.getreplyToEmailByIdApp(idapp)); + await this.sendEmail_base('iscrizione_conacreis/' + lang, emailto, mylocalsconf, tools.getreplyToEmailByIdApp(idapp)); // Send to the Admin an Email - this.sendEmail_base('admin/iscrizione_conacreis/' + tools.LANGADMIN, tools.getAdminEmailByIdApp(idapp), mylocalsconf, ''); + await this.sendEmail_base('admin/iscrizione_conacreis/' + tools.LANGADMIN, tools.getAdminEmailByIdApp(idapp), mylocalsconf, ''); await telegrambot.notifyIscrizioneToTelegram(telegrambot.phase.ISCRIZIONE_CONACREIS, mylocalsconf, 'MSG_ISCRITTO_CONACREIS'); tools.sendNotifToAdmin(idapp, true, 'Iscrizione Conacreis : ' + mylocalsconf.name + ' ' + mylocalsconf.surname + ' (' + mylocalsconf.username + ')'); if (tools.isManagAndAdminDifferent(idapp)) { - this.sendEmail_base('admin/iscrizione_conacreis/' + tools.LANGADMIN, tools.getManagerEmailByIdApp(idapp), mylocalsconf, ''); + await this.sendEmail_base('admin/iscrizione_conacreis/' + tools.LANGADMIN, tools.getManagerEmailByIdApp(idapp), mylocalsconf, ''); } }, @@ -275,17 +275,17 @@ module.exports = { mylocalsconf = this.setParamsForTemplate(iscritto, mylocalsconf); - this.sendEmail_base('iscrizione_arcadei/' + lang, emailto, mylocalsconf, tools.getreplyToEmailByIdApp(idapp)); + await this.sendEmail_base('iscrizione_arcadei/' + lang, emailto, mylocalsconf, tools.getreplyToEmailByIdApp(idapp)); // Send to the Admin an Email - this.sendEmail_base('admin/iscrizione_arcadei/' + tools.LANGADMIN, tools.getAdminEmailByIdApp(idapp), mylocalsconf, ''); + await this.sendEmail_base('admin/iscrizione_arcadei/' + tools.LANGADMIN, tools.getAdminEmailByIdApp(idapp), mylocalsconf, ''); await telegrambot.notifyIscrizioneToTelegram(telegrambot.phase.ISCRIZIONE_ARCADEI, mylocalsconf, 'MSG_ISCRITTO_ARCADEI'); tools.sendNotifToAdmin(idapp, true, 'Iscrizione Arcadei : ' + mylocalsconf.name + ' ' + mylocalsconf.surname + ' (' + mylocalsconf.username + ')'); if (tools.isManagAndAdminDifferent(idapp)) { - this.sendEmail_base('admin/iscrizione_arcadei/' + tools.LANGADMIN, tools.getManagerEmailByIdApp(idapp), mylocalsconf, ''); + await this.sendEmail_base('admin/iscrizione_arcadei/' + tools.LANGADMIN, tools.getManagerEmailByIdApp(idapp), mylocalsconf, ''); } } catch (e) { console.error('Err', e); @@ -307,7 +307,7 @@ module.exports = { mylocalsconf = this.setParamsForTemplate(user, mylocalsconf); - this.sendEmail_base('resetpwd/' + lang, emailto, mylocalsconf, ''); + await this.sendEmail_base('resetpwd/' + lang, emailto, mylocalsconf, ''); }, sendEmail_RisRicevuti: async function (lang, userDest, emailto, idapp, myrec) { @@ -332,7 +332,7 @@ module.exports = { mylocalsconf = this.setParamsForTemplate(userDest, mylocalsconf); - this.sendEmail_base('risricevuti/' + lang, emailto, mylocalsconf, ''); + await this.sendEmail_base('risricevuti/' + lang, emailto, mylocalsconf, ''); }, sendEmail_Booking: async function (res, lang, emailto, user, idapp, recbooking) { @@ -370,13 +370,13 @@ module.exports = { texthtml = 'makebooking'; } - this.sendEmail_base('booking/' + texthtml + '/' + lang, emailto, mylocalsconf, tools.getreplyToEmailByIdApp(idapp)); + await this.sendEmail_base('booking/' + texthtml + '/' + lang, emailto, mylocalsconf, tools.getreplyToEmailByIdApp(idapp)); // Send Email also to the Admin - this.sendEmail_base('admin/' + texthtml + '/' + tools.LANGADMIN, tools.getAdminEmailByIdApp(idapp), mylocalsconf, ''); + await this.sendEmail_base('admin/' + texthtml + '/' + tools.LANGADMIN, tools.getAdminEmailByIdApp(idapp), mylocalsconf, ''); if (tools.isManagAndAdminDifferent(idapp)) { - this.sendEmail_base('admin/' + texthtml + '/' + tools.LANGADMIN, tools.getManagerEmailByIdApp(idapp), mylocalsconf, ''); + await this.sendEmail_base('admin/' + texthtml + '/' + tools.LANGADMIN, tools.getManagerEmailByIdApp(idapp), mylocalsconf, ''); } }); @@ -459,13 +459,13 @@ module.exports = { telegrambot.sendMsgTelegramToTheManagers(idapp, msgtelegram); - this.sendEmail_base('booking/cancelbooking/' + lang, emailto, mylocalsconf, tools.getreplyToEmailByIdApp(idapp)); + await this.sendEmail_base('booking/cancelbooking/' + lang, emailto, mylocalsconf, tools.getreplyToEmailByIdApp(idapp)); // Send Email also to the Admin - this.sendEmail_base('admin/cancelbooking/' + tools.LANGADMIN, tools.getAdminEmailByIdApp(idapp), mylocalsconf, ''); + await this.sendEmail_base('admin/cancelbooking/' + tools.LANGADMIN, tools.getAdminEmailByIdApp(idapp), mylocalsconf, ''); if (tools.isManagAndAdminDifferent(idapp)) { - this.sendEmail_base('admin/cancelbooking/' + tools.LANGADMIN, tools.getManagerEmailByIdApp(idapp), mylocalsconf, ''); + await this.sendEmail_base('admin/cancelbooking/' + tools.LANGADMIN, tools.getManagerEmailByIdApp(idapp), mylocalsconf, ''); } }, @@ -607,10 +607,10 @@ module.exports = { if (sendnews) { // Send to the Admin an Email - this.sendEmail_base('admin/added_to_newsletter/' + tools.LANGADMIN, tools.getAdminEmailByIdApp(idapp), mylocalsconf, ''); + await this.sendEmail_base('admin/added_to_newsletter/' + tools.LANGADMIN, tools.getAdminEmailByIdApp(idapp), mylocalsconf, ''); if (tools.isManagAndAdminDifferent(idapp)) { - this.sendEmail_base('admin/added_to_newsletter/' + tools.LANGADMIN, tools.getManagerEmailByIdApp(idapp), mylocalsconf, ''); + await this.sendEmail_base('admin/added_to_newsletter/' + tools.LANGADMIN, tools.getManagerEmailByIdApp(idapp), mylocalsconf, ''); } } @@ -845,7 +845,7 @@ module.exports = { mylocalsconf = this.setParamsForTemplate(user, mylocalsconf); - this.sendEmail_base_e_manager(idapp, 'ecommerce/makeorder/' + lang, mylocalsconf.emailto, mylocalsconf, + await this.sendEmail_base_e_manager(idapp, 'ecommerce/makeorder/' + lang, mylocalsconf.emailto, mylocalsconf, mylocalsconf.dataemail.email_reply); } else { console.log('Invio Email non eseguito perchè sei in TEST !'); @@ -881,7 +881,7 @@ module.exports = { mylocalsconf = this.setParamsForTemplate(user, mylocalsconf); if ((status !== shared_consts.OrderStatus.CANCELED) && (status !== shared_consts.OrderStatus.COMPLETED)) { - const esito = this.sendEmail_base('ecommerce/' + ordertype + '/' + lang, mylocalsconf.emailto, mylocalsconf, + const esito = await this.sendEmail_base('ecommerce/' + ordertype + '/' + lang, mylocalsconf.emailto, mylocalsconf, mylocalsconf.dataemail.email_reply); // this.sendEmail_base('ecommerce/' + ordertype + '/' + lang, tools.getAdminEmailByIdApp(idapp), mylocalsconf, ''); @@ -980,7 +980,7 @@ module.exports = { // Send Email to the User // console.log('-> Invio Email (', mynewsrec.numemail_sent, '/', mynewsrec.numemail_tot, ')'); - const esito = this.sendEmail_base('newsletter/' + lang, mylocalsconf.emailto, mylocalsconf, + const esito = await this.sendEmail_base('newsletter/' + lang, mylocalsconf.emailto, mylocalsconf, mylocalsconf.dataemail.email_reply, smtpTransport); if ((mynewsrec.numemail_sent % 100) === 0) {