From 79ca364e84b81653fd9558ecf20564fafaf656b5 Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Sat, 13 Jan 2024 16:21:07 +0100
Subject: [PATCH] product

---
 src/server/models/order.js           |  2 +-
 src/server/models/orderscart.js      |  6 ++++++
 src/server/models/product.js         | 11 ++++++++---
 src/server/router/index_router.js    |  2 +-
 src/server/router/products_router.js |  8 +++++++-
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/server/models/order.js b/src/server/models/order.js
index ed2cd04..e1c0794 100755
--- a/src/server/models/order.js
+++ b/src/server/models/order.js
@@ -113,7 +113,7 @@ const orderSchema = new Schema({
   date_delivered: {
     type: Date
   },
-  notes: {
+  note: {
     type: String
   },
   modify_at: {
diff --git a/src/server/models/orderscart.js b/src/server/models/orderscart.js
index f88196f..1e60ac5 100755
--- a/src/server/models/orderscart.js
+++ b/src/server/models/orderscart.js
@@ -89,6 +89,12 @@ const OrdersCartSchema = new Schema({
   note: {
     type: String
   },
+  note_per_gestore: {
+    type: String
+  },
+  note_per_admin: {
+    type: String
+  },
   modify_at: {
     type: Date
   },
diff --git a/src/server/models/product.js b/src/server/models/product.js
index eb3d0d6..9960e5a 100755
--- a/src/server/models/product.js
+++ b/src/server/models/product.js
@@ -193,15 +193,20 @@ module.exports.getProductById = async function (id) {
   return arrris && arrris.length > 0 ? arrris[0] : null
 }
 
-module.exports.findAllIdApp = async function (idapp, code, id) {
+module.exports.findAllIdApp = async function (idapp, code, id, all) {
   let myfind = {};
   let myqueryadd = {};
   let query = [];
 
   try {
 
-    if (idapp)
-      myfind = { idapp, active: true };
+    if (idapp){
+      myfind = { idapp };
+    }
+
+    if (!all) {
+      myfind = { ...myfind, active: true }
+    }
 
     if (code) {
       myfind = { ...myfind, code }
diff --git a/src/server/router/index_router.js b/src/server/router/index_router.js
index e333d82..c337a64 100755
--- a/src/server/router/index_router.js
+++ b/src/server/router/index_router.js
@@ -1443,7 +1443,7 @@ function load(req, res, version) {
   let catprods = CatProd.findAllIdApp(idapp);
   let subcatprods = SubCatProd.findAllIdApp(idapp);
   let gasordines = Gasordine.findAllIdApp(idapp);
-  let products = Product.findAllIdApp(idapp);
+  let products = Product.findAllIdApp(idapp, undefined, undefined, User.isManager(req.user.perm));
   let productInfos = ProductInfo.findAllIdApp(idapp);
   let scontisticas = Scontistica.findAllIdApp(idapp);
   let departments = Department.findAllIdApp(idapp);
diff --git a/src/server/router/products_router.js b/src/server/router/products_router.js
index f67a16f..1057adb 100755
--- a/src/server/router/products_router.js
+++ b/src/server/router/products_router.js
@@ -32,7 +32,13 @@ router.post('/', auth_default, async function (req, res, next) {
   const idapp = req.body.idapp;
   let userId = req.body.userId;
 
-  let products = await Product.findAllIdApp(idapp, "");
+  const myuser = await User.getUserById(idapp, userId);
+  let ismanager = false;
+  if (myuser && myuser.perm) {
+    ismanager = User.isManager(myuser.perm);
+  }
+
+  let products = await Product.findAllIdApp(idapp, "", undefined, ismanager);
   let orders = null;
   if (await User.isManagerById(userId)) {
     // Prende Tutti gli Ordini !