- aggiungo campo "sfuso"

- aggiunto totale al carrello

.env.dev.pcb

@@ -4,8 +4,8 @@ PDB=mypassword@1A
 SEND_EMAIL=0
 SEND_EMAIL_ORDERS=1
 PORT=3000
-appTelegram_TEST=["1","13"]
+appTelegram_TEST=["1","17"]
-appTelegram=["1","13"]
+appTelegram=["1","17"]
 DOMAIN=mongodb://localhost:27017/
 AUTH_MONGODB=true
 MONGODB_USER=admin

.env.development

@@ -4,8 +4,8 @@ PDB=mypassword@1A
 SEND_EMAIL=0
 SEND_EMAIL_ORDERS=1
 PORT=3000
-appTelegram_TEST=["1","13"]
+appTelegram_TEST=["1","17"]
-appTelegram=["1","13"]
+appTelegram=["1","17"]
 DOMAIN=mongodb://localhost:27017/
 AUTH_MONGODB=true
 MONGODB_USER=admin

emails/ecommerce/makeorder/it/html.pug

@@ -67,7 +67,7 @@ html
                   - var img = rec.order.product.productInfo.img
                   - var price = rec.order.price
                   - var after_price = rec.order.after_price
-                  - var TotalPriceProduct = rec.order.TotalPriceProduct
+                  - var TotalPriceProduct = rec.order.TotalPriceProductstr
                   if (rec.order.gasordine)
                     - var gasordine = rec.order.gasordine.name
                   else

emails/ecommerce/order_confirmed/it/html consegnato.pug

@@ -65,7 +65,7 @@ html
                 - var gasordine = ''
               - var qty = rec.order.product.quantity
               - var qtypreordered = rec.order.quantitypreordered
-              - var TotalPriceProduct = rec.order.TotalPriceProduct
+              - var TotalPriceProduct = rec.order.TotalPriceProductstr
               - index = index + 1
 
               table(cellpadding="0", cellspacing="0", width="100%", summary="", border="0", align="center")

emails/ecommerce/order_confirmed/it/html.pug

@@ -72,7 +72,7 @@ html
               - var qty = rec.order.product.quantity
               - var qtypreordered = rec.order.quantitypreordered
               - var unit = rec.order.product.productInfo.unitstr
-              - var TotalPriceProduct = rec.order.TotalPriceProduct
+              - var TotalPriceProduct = rec.order.TotalPriceProductstr
               - index = index + 1
 
               table(cellpadding="0", cellspacing="0", width="100%", summary="", border="0", align="center")

emails/ecommerce/order_consegnato/it/html.pug

@@ -71,7 +71,7 @@ html
               - var qty = rec.order.product.quantity
               - var qtypreordered = rec.order.quantitypreordered
               - var unit = rec.order.product.productInfo.unitstr
-              - var TotalPriceProduct = rec.order.TotalPriceProduct
+              - var TotalPriceProduct = rec.order.TotalPriceProductstr
               - index = index + 1
 
               table(cellpadding="0", cellspacing="0", width="100%", summary="", border="0", align="center")

src/server/models/order.js

@@ -54,6 +54,9 @@ const orderSchema = new Schema({
     type: Number,
     default: 0,
   },
+  TotalPriceProductstr: {
+    type: String,
+  },
   TotalPriceProductCalc: {
     type: Number,
     default: 0,
@@ -362,6 +365,7 @@ module.exports.updateTotals = function (order) {
     
     order.TotalPriceProductCalc += mypricecalc;
     order.TotalPriceProduct += mypricecalc;
+    order.TotalPriceProductstr = parseFloat(order.TotalPriceProduct.toFixed(2));
 
     return order;
 

src/server/models/orderscart.js

@@ -919,10 +919,12 @@ module.exports.getmsgorderTelegram = async function (ordersCart) {
       if (ord.order.quantitypreordered > 0)
         qtynum += ord.order.quantitypreordered;
 
-      // if (ord.order.product.productInfo.weight)
+      if (ord.order.product.productInfo.sfuso && ord.order.product.productInfo.weight)
-      //   qtynum *= ord.order.product.productInfo.weight;
+        qtyrisult = qtynum * ord.order.product.productInfo.weight;
+      else
+        qtyrisult = qtynum + ' x ' + ord.order.product.productInfo.weight;
 
-      qtystr += qtynum + ' ' + tools.getUnitsMeasure(ord.order.product.productInfo.unit, true);
+      qtystr += qtyrisult + ' ' + tools.getUnitsMeasure(ord.order.product.productInfo.unit, true);
 
       if (ord.order.quantitypreordered > 0)
         qtystr += ' Pre-Ordinati';

src/server/models/productInfo.js

@@ -58,6 +58,9 @@ const productInfoSchema = new Schema({
     type: Number,
     default: 0,
   },
+  sfuso: {  // serve se moltiplicare le qta (es: 12 kg) oppure fare (2 x 20 ml)
+    type: Boolean
+  },
   vegan: {
     type: Boolean
   },

src/server/modules/Cart.js

@@ -254,6 +254,7 @@ class Cart {
         order.TotalPriceProductCalc += mypricecalc;
         if (updatecalcprice) {
           order.TotalPriceProduct += mypricecalc;
+          order.TotalPriceProductstr = parseFloat(order.TotalPriceProduct.toFixed(2));
         }
 
         // Qui lo calcolo sempre, anche se lo cambio manualmente

src/server/populate/sectorgoods.js

@@ -17,6 +17,7 @@ module.exports = {
     {_id: 15, descr: 'Sport'},
     {_id: 16, descr: 'Un po\' di Tutto'},
     {_id: 17, descr: 'Attrezzature'},
+    {_id: 18, descr: 'Animali'},
 
     ],
 };

src/server/router/admin_router.js

@@ -151,8 +151,11 @@ function extractArrayDataFromCSV(idapp, rec) {
     arrcampi_product = getValoriAndIndice_Product(null);
 
     for (const campoobj of arrcampi_productInfo) {
-      if (rec.hasOwnProperty(campoobj))
+      if (rec.hasOwnProperty(campoobj)) {
-        productInfo[campoobj] = rec[campoobj];
+        let myval = rec[campoobj];
+        productInfo[campoobj] = myval === 'TRUE' ? true : (myval === 'FALSE' ? false : myval);
+      }
+        
     }
 
     for (const campoobj of arrcampi_product) {
@@ -375,9 +378,9 @@ router.post('/import', authenticate, async (req, res) => {
 
       }
     } else if (cmd === shared_consts.Cmd.PRODUCTS_V2) {
-
+      let mydata = `[${data.arrdata}]`;
-      let arrrec = JSON.parse(`[${data.arrdata}]`);
+      let cleanmydata = mydata.replace(/\n/g, '');
-
+      let arrrec = JSON.parse(cleanmydata);
       let updated = 0;
       let imported = 0;
       let errors = 0;

src/server/telegram/telegrambot.js

@@ -712,7 +712,7 @@ const MyTelegramBot = {
       arrTeleg = appTelegram;
     }
     if (process.env.NODE_ENV === 'development') {
-      arrTeleg = appTelegram_DEVELOP;
+      arrTeleg = MyTelegramBot.getAppTelegramDevelop();
     } else if (process.env.NODE_ENV === 'test') {
       arrTeleg = MyTelegramBot.getAppTelegramTest();
     } else {
@@ -736,6 +736,15 @@ const MyTelegramBot = {
 
   },
 
+  getAppTelegramDevelop: function () {
+    if (process.env.appTelegram_TEST) {
+      return JSON.parse(process.env.appTelegram_TEST);
+    } else {
+      return appTelegram_DEVELOP;
+    }
+
+  },
+
   local_sendMsgTelegramByIdTelegram: async function (idapp, idtelegram, text,
     message_id, chat_id, ripr_menuPrec,
     MyForm = null) {

src/server/tools/shared_nodejs.js

@@ -980,6 +980,7 @@ module.exports = {
     'unit_lordo',
     'size',
     'vegan',
+    'sfuso',
     'img',
     'link',
     'ingredienti',