surya/freeplanet_serverside
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Aggiunte opzioni per il Gestore: richiede che l'invitante confermi la Reg, Notifica sul BOT , Notifica all'Admin la Reg.

Browse Source
This commit is contained in:
paoloar77
2022-02-27 16:56:02 +01:00
parent 2749506de7
commit 8d98726f1f
9 changed files with 175 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/server/router/index_router.js
View File

@@ -71,23 +71,12 @@ const {MailingList} = require('../models/mailinglist');
const {Settings} = require('../models/settings');
const {SendMsg} = require('../models/sendmsg');
const {Permission} = require('../models/permission');
const {MsgTemplate} = require('../models/msg_template');
const Product = require('../models/product');
const Producer = require('../models/producer');
const Cart = require('../models/cart');
const OrdersCart = require('../models/orderscart');
const Storehouse = require('../models/storehouse');
const Department = require('../models/department');
const ShareWithUs = require('../models/sharewithus');
const Site = require('../models/site');
const IscrittiConacreis = require('../models/iscrittiConacreis');
const Group = require('../models/group');
const {Todo} = require('../models/todo');
const Hours = require('../models/hours');
const Order = require('../models/order');
const Cash = require('../models/cash');
const CashCategory = require('../models/cashCategory');
const CashSubCategory = require('../models/cashSubCategory');
const tools = require('../tools/general');
@@ -424,6 +413,7 @@ router.post('/setsubrec', authenticate, (req, res) => {
router.post('/gettable', authenticate, (req, res) => {
const params = req.body;
let idapp = req.user.idapp
const mytable = globalTables.getTableByTableName(params.table);
// console.log('mytable', mytable);
if (!mytable) {
@@ -433,7 +423,7 @@ router.post('/gettable', authenticate, (req, res) => {
try {
return mytable.executeQueryTable(req.user.idapp, params).then(ris => {
return mytable.executeQueryTable(idapp, params, req.user).then(ris => {
return res.send(ris);
}).catch((e) => {
@@ -449,6 +439,7 @@ router.post('/gettable', authenticate, (req, res) => {
router.post('/pickup', authenticate, (req, res) => {
const params = req.body;
let idapp = req.user.idapp
let mytable = globalTables.getTableByTableName(params.table);
// console.log('mytable', mytable);
if (!mytable) {
@@ -456,7 +447,7 @@ router.post('/pickup', authenticate, (req, res) => {
return res.status(400).send({});
}
return mytable.executeQueryPickup(req.user.idapp, params).then(ris => {
return mytable.executeQueryPickup(idapp, params).then(ris => {
return res.send(ris);
}).catch((e) => {
@@ -482,7 +473,7 @@ router.post('/getpage', async (req, res) => {
router.patch('/setlang', authenticate, async (req, res) => {
const username = req.body.data.username;
const idapp = req.body.idapp;
const idapp = req.user.idapp;
const mydata = req.body.data;
const lang = mydata.lang;
@@ -509,7 +500,7 @@ router.patch('/setlang', authenticate, async (req, res) => {
router.patch('/chval', authenticate, async (req, res) => {
// const idapp = req.body.idapp;
const id = req.body.data.id;
const idapp = req.body.idapp;
const idapp = req.user.idapp;
const mydata = req.body.data;
const mytable = globalTables.getTableByTableName(mydata.table);
@@ -576,9 +567,8 @@ router.patch('/chval', authenticate, async (req, res) => {
});
}
if (mydata.table === shared_consts.TAB_MYBOTS) {
telegrambot.reloadMenuBot(idapp);
}
tools.refreshAllTablesInMem(idapp, mydata.table);
if (mydata.table === shared_consts.TAB_SETTINGS) {
if (shared_consts.KEY_TO_CRYPTED.includes(fieldsvalue.key)) {
fieldsvalue.crypted = true;
@@ -702,7 +692,7 @@ router.patch('/askfunz', authenticate, async (req, res) => {
const id = req.body.data.id;
// const ind_order = req.body.data.ind_order;
// const username = req.body.data.username;
const idapp = req.body.idapp;
const idapp = req.user.idapp;
const mydata = req.body.data;
let entra = false;
@@ -751,7 +741,7 @@ router.patch('/callfunz', authenticate, async (req, res) => {
const id = req.body.data.id;
// const ind_order = req.body.data.ind_order;
const username = req.body.data.username;
const idapp = req.body.idapp;
const idapp = req.user.idapp;
const mydata = req.body.data;
// const telegrambot = require('../telegram/telegrambot');
@@ -1217,7 +1207,7 @@ router.get(process.env.LINK_CHECK_UPDATES, authenticate, async (req, res) => {
// msgs = SendMsg.findAllByUserIdAndIdApp(userId, req.user.username, req.user.idapp);
let last_msgs = SendMsg.findLastGroupByUserIdAndIdApp(userId,
req.user.username, req.user.idapp);
req.user.username, idapp);
let usersList = null;
@@ -1227,7 +1217,7 @@ router.get(process.env.LINK_CHECK_UPDATES, authenticate, async (req, res) => {
User.isManager(req.user.perm)) {
// Send UsersList
usersList = User.getUsersList(req.user.idapp);
usersList = User.getUsersList(idapp);
// usersList = null;
}
}
@@ -1314,7 +1304,7 @@ router.post('/upload_from_other_server/:dir', authenticate, (req, res) => {
function uploadFile(req, res, version) {
// console.log('/upload dir:' + dir);
const dir = tools.invertescapeslash(req.params.dir);
const idapp = req.user.idapp;
const idapp = req.body.idapp;
const form = new formidable.IncomingForm();
@@ -1402,7 +1392,8 @@ function uploadFile(req, res, version) {
});
}
console.log(err);
if (err)
console.error('Error Upload: ', err);
});
} catch (e) {
console.error('newname', e);