aggiornamento ordini

src/server/router/admin_router.js

@@ -1,15 +1,16 @@
 const express = require('express');
 const router = express.Router();
 const mongoose = require('mongoose').set('debug', false);
-const {CfgServer} = require('../models/cfgserver');
+const { CfgServer } = require('../models/cfgserver');
 
 const shared_consts = require('../tools/shared_nodejs');
 
 const tools = require('../tools/general');
 
-const {City} = require('../models/city');
+const { City } = require('../models/city');
+const Product = require('../models/product');
 
-var {authenticate} = require('../middleware/authenticate');
+var { authenticate } = require('../middleware/authenticate');
 
 router.post('/updateval', authenticate, async (req, res) => {
   console.log('/updateval', req.body.pairval);
@@ -17,24 +18,24 @@ router.post('/updateval', authenticate, async (req, res) => {
   pair = req.body.pairval;
 
   return await CfgServer.findOneAndUpdate(
-      {chiave: pair.chiave, idapp, userId: pair.userId}, {$set: pair},
-      {new: false}).then((item) => {
-    // CfgServer.find({ chiave: pair.chiave }, (err, item) => {
-    if (!!item) {
-      res.status(200).send();
-    } else {
+    { chiave: pair.chiave, idapp, userId: pair.userId }, { $set: pair },
+    { new: false }).then((item) => {
+      // CfgServer.find({ chiave: pair.chiave }, (err, item) => {
+      if (!!item) {
+        res.status(200).send();
+      } else {
+        res.status(400).send();
+      }
+    }).catch(err => {
+      console.log('ERR:', err);
       res.status(400).send();
-    }
-  }).catch(err => {
-    console.log('ERR:', err);
-    res.status(400).send();
-  });
+    });
 
 });
 
 router.post('/import', authenticate, async (req, res) => {
   const cmd = req.body.cmd;
-  const data = [];
+  const data = req.body.data;
 
   try {
     const liste = require('../data/liste');
@@ -44,8 +45,21 @@ router.post('/import', authenticate, async (req, res) => {
         return res.status(200).send(true);
       });
 
+    } else if (cmd === shared_consts.Cmd.PRODUCTS) {
+
+      let dataObjects = JSON.parse(`[${data}]`);
+
+      return await Product.insertMany(dataObjects).then((ris) => {
+
+        Product.convertAfterImport().then((ris) => {
+          return res.status(200).send(true);
+        });
+
+
+      });
+
     }
-  }catch (e) {
+  } catch (e) {
     console.error('e', e);
     res.status(400).send();
   }

src/server/router/cart_router.js

@@ -281,7 +281,9 @@ router.post('/:userId/ordercartstatus', authenticate, async function (req, res,
   const user = req.user;
   let status = req.body.status;
 
-  const orderCart = await OrdersCart.findOne({ idapp, _id: order_id }).lean();
+  const { User } = require('../models/user');
+
+  let orderCart = await OrdersCart.findOne({ idapp, _id: order_id }).lean();
 
   if ((userId !== String(req.user._id)) && !User.isManager(req.user.perm)) {
     // I'm trying to write something not mine!
@@ -300,7 +302,7 @@ router.post('/:userId/ordercartstatus', authenticate, async function (req, res,
           if (ris) {
 
             // Aggiorna gli Stati Interni !
-            await OrdersCart.updateCmd(orderCart, status, true);
+            orderCart = await OrdersCart.updateCmd(orderCart, status, true);
 
             let ordertype = '';
 
@@ -321,8 +323,16 @@ router.post('/:userId/ordercartstatus', authenticate, async function (req, res,
           }
 
         })
+      let orderscart = null;
 
-      return res.send({ code: server_constants.RIS_CODE_OK, status });
+      if (User.isManager(user.perm)) {
+        // Prende Tutti gli Ordini !
+        orderscart = await OrdersCart.getOrdersCartByUserId('ALL', idapp, 0);
+      } else {
+        orderscart = await OrdersCart.getOrdersCartByUserId(req.user.id, idapp, 0);
+      }
+
+      return res.send({ code: server_constants.RIS_CODE_OK, status, orders: orderscart });
 
     }
   } catch (e) {