- aggiunta campi Gas data + fix

src/server/models/gasordine.js

@@ -38,6 +38,9 @@ const gasordineSchema = new Schema({
   dataora_chiusura_ordini: {
     type: Date,
   },
+  data_arrivo_merce: {
+    type: Date,
+  },
   dataora_ritiro: {
     type: Date,
   },

src/server/models/order.js

@@ -258,6 +258,9 @@ module.exports.getOrderByID = function (id, callback) {
 module.exports.createOrder = async function (order) {
 
   try {
+    if (order.idGasordine === '') {
+      order.idGasordine = undefined;
+    }
     Order.updateTotals(order);
     return await Order.create(order)
       .then((ris) => {

src/server/models/orderscart.js

@@ -10,7 +10,7 @@ const Storehouse = require('../models/storehouse');
 const Provider = require('../models/provider');
 const Gasordine = require('../models/gasordine');
 const Product = require('../models/product');
-const ProductInfo = require('../models/productinfo');
+const ProductInfo = require('../models/productInfo');
 
 const tools = require('../tools/general');
 

src/server/router/admin_router.js

@@ -9,7 +9,7 @@ const tools = require('../tools/general');
 
 const { City } = require('../models/city');
 const Product = require('../models/product');
-const ProductInfo = require('../models/productinfo');
+const ProductInfo = require('../models/productInfo');
 const CatProd = require('../models/catprod');
 
 var { authenticate } = require('../middleware/authenticate');
@@ -104,7 +104,7 @@ router.post('/import', authenticate, async (req, res) => {
           if (risrecInfo._id) {
             // Record existed, so it was updated
             let arrfieldchange = tools.differentObjects(productInfo, recnewInfo);
-            if (arrfieldchange.length > 0) {
+            if (arrfieldchange && arrfieldchange.length > 0) {
               // updated++;
               console.log('Changed: ', recnewInfo.name + ': ' + arrfieldchange);
             }

src/server/router/index_router.js

@@ -68,7 +68,7 @@ const Storehouse = require('../models/storehouse');
 const Provider = require('../models/provider');
 const CatProd = require('../models/catprod');
 const Gasordine = require('../models/gasordine');
-const ProductInfo = require('../models/productinfo');
+const ProductInfo = require('../models/productInfo');
 const Scontistica = require('../models/scontistica');
 const Department = require('../models/department');
 const { Category } = require('../models/category');

src/server/tools/general.js

@@ -4353,7 +4353,7 @@ module.exports = {
 
 
       commonFields.forEach((field) => {
-        if (obj1 && obj2 && obj1 && obj2 && obj1[field].toString() !== obj2[field].toString()) {
+        if (obj1 && obj2 && obj1 && obj2 && ((obj1[field] && obj1[field].toString()) !== (obj2[field] && obj2[field].toString()))) {
           fieldsUpdated.push(field);
         }
       });

src/server/tools/globalTables.js

@@ -56,7 +56,7 @@ const { Permission } = require('../models/permission');
 const { MsgTemplate } = require('../models/msg_template');
 const { Graduatoria } = require('../models/graduatoria');
 const Product = require('../models/product');
-const ProductInfo = require('../models/productinfo');
+const ProductInfo = require('../models/productInfo');
 const Producer = require('../models/producer');
 const Cart = require('../models/cart');
 const OrdersCart = require('../models/orderscart');