diff --git a/emails/ecommerce/makeorder/it/html.pug b/emails/ecommerce/makeorder/it/html.pug
index ef9a697..bfa9461 100755
--- a/emails/ecommerce/makeorder/it/html.pug
+++ b/emails/ecommerce/makeorder/it/html.pug
@@ -37,7 +37,14 @@ html
               p!= mioheader
             else
               p Ciao #{username},
-              p Ti confermiamo che hai appena inviato un'ordine di prenotazione dei seguenti prodotti:
+
+            - var miomakeorder = mystorehouse.email_html_makeorder
+            if (miomakeorder)
+              p!= miomakeorder
+            else
+              p Ti arriverà una email quando i prodotti saranno disponibili per poterli venire a ritirare.
+              p Il pagamento, se non diversamente comunicato, potrai farlo direttamente in sede.
+
 
         tr
           td(class="whitespace", height="10")
@@ -105,13 +112,6 @@ html
 
         tr
           td
-            - var miomakeorder = mystorehouse.email_html_makeorder
-            if (miomakeorder)
-              p!= miomakeorder
-            else
-              p Ti arriverà una email quando i prodotti saranno disponibili per poterli venire a ritirare.
-              p Il pagamento, se non diversamente comunicato, potrai farlo direttamente in sede.
-
             - var miofooter = mystorehouse.email_html_footer
             if (miofooter)
               p!= miofooter
diff --git a/emails/ecommerce/order_confirmed/it/html.pug b/emails/ecommerce/order_confirmed/it/html.pug
index 4119a66..d04c459 100755
--- a/emails/ecommerce/order_confirmed/it/html.pug
+++ b/emails/ecommerce/order_confirmed/it/html.pug
@@ -39,7 +39,12 @@ html
               p!= mioheader
             else
               p Ciao #{name},
-              p L'ordine dei seguenti prodotti è stato Confermato:
+
+            - var miordconfirmed = mystorehouse.email_html_order_confirmed
+            if (miordconfirmed)
+              p!= miordconfirmed
+            else
+              p Puoi pertanto venire a ritirarli direttamente in sede, negli orari che ti sono stati indicati.
 
         tr
           td(class="whitespace", height="10")
@@ -108,12 +113,6 @@ html
 
         tr
           td
-            - var miordconfirmed = mystorehouse.email_html_order_confirmed
-            if (miordconfirmed)
-              p!= miordconfirmed
-            else
-              p Puoi pertanto venire a ritirarli direttamente in sede, negli orari che ti sono stati indicati.
-
             - var miofooter = mystorehouse.email_html_footer
             if (miofooter)
               p!= miofooter
diff --git a/src/server/models/gasordine.js b/src/server/models/gasordine.js
index caa8786..e3f9e64 100755
--- a/src/server/models/gasordine.js
+++ b/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,
   },
diff --git a/src/server/models/order.js b/src/server/models/order.js
index ba8065f..04f16d3 100755
--- a/src/server/models/order.js
+++ b/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) => {
diff --git a/src/server/models/orderscart.js b/src/server/models/orderscart.js
index 1d124b6..7179166 100755
--- a/src/server/models/orderscart.js
+++ b/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');
 
diff --git a/src/server/router/admin_router.js b/src/server/router/admin_router.js
index 2c4f28e..5abda76 100755
--- a/src/server/router/admin_router.js
+++ b/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);
             }
diff --git a/src/server/router/index_router.js b/src/server/router/index_router.js
index 77cc676..95c0c44 100755
--- a/src/server/router/index_router.js
+++ b/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');
diff --git a/src/server/tools/general.js b/src/server/tools/general.js
index e936b4d..1151f74 100755
--- a/src/server/tools/general.js
+++ b/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);
         }
       });
diff --git a/src/server/tools/globalTables.js b/src/server/tools/globalTables.js
index 9bb43a8..603ee05 100755
--- a/src/server/tools/globalTables.js
+++ b/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');