- catalogo

- corretto logica del RefreshToken che non richiedeva il nuovo token, quindi scadeva tutte le volte, richiedendo sempre l'accesso !

src/server/tools/general.js

@@ -1234,7 +1234,12 @@ module.exports = {
           typeid = shared_consts.TypeNotifs.ID_CIRCUIT_REQUEST_TO_ENTER;
           // paramsObj.options = MessageOptions.Notify_OnlyToNotifinApp + MessageOptions.Notify_ByBotTelegram;
           const myuserdata = await User.getUserShortDataByUsername(idapp, username_action);
-          telegrambot.askConfirmationUser(idapp, shared_consts.CallFunz.RICHIESTA_FIDO, myuserdata, usernameDest, circuitname,
+          let cmdrichiesta = shared_consts.CallFunz.RICHIESTA_FIDO;
+          if (mycircuit && mycircuit.askManagerToEnter) {
+            cmdrichiesta = shared_consts.CallFunz.RICHIESTA_CIRCUIT;
+          }
+            
+          telegrambot.askConfirmationUser(idapp, cmdrichiesta, myuserdata, usernameDest, circuitname,
             myreccircuit._id, '', extrarec.groupname);
           onlysave = false;
         } else if (cmd === shared_consts.CIRCUITCMD.ADDADMIN) {

src/server/tools/globalTables.js

@@ -68,6 +68,7 @@ const Gasordine = require('../models/gasordine');
 const Scontistica = require('../models/scontistica');
 const Department = require('../models/department');
 const CatProd = require('../models/catprod');
+const Collana = require('../models/collana');
 const CatAI = require('../models/catai');
 const QueryAI = require('../models/queryai');
 const SubCatProd = require('../models/subcatprod');
@@ -130,6 +131,8 @@ module.exports = {
       mytable = Category;
     else if (tablename === 'catprods')
       mytable = CatProd;
+    else if (tablename === 'collanas')
+      mytable = Collana;
     else if (tablename === 'catais')
       mytable = CatAI;
     else if (tablename === 'queryais')
@@ -777,5 +780,14 @@ module.exports = {
     return null;
   },
 
+  checkIfTokenExpired(req, res) {
+    let ret = null;
+
+    if (true) {
+      res.status(408).send({});
+
+    }
+  }
+
 
 };

src/server/tools/shared_nodejs.js

@@ -830,11 +830,17 @@ module.exports = {
         deperimento: 1,
         showAlways: 1,
         ignoreLimits: 1,
+        askManagerToEnter: 1,
+        sendEmailAfterAskingToEnter: 1,
+        circuitoIndipendente: 1,
+        creditodiPartenza: 1,
         status: 1,
         transactionsEnabled: 1,
         qta_max_default: 1,
         fido_scoperto_default_grp: 1,
         qta_max_default_grp: 1,
+        fido_scoperto_default_contocom: 1,
+        qta_max_default_contocom: 1,
         valuta_per_euro: 1,
         symbol: 1,
         idCity: 1,