vers: 1.1.3

- aggiornato ncu -u

.env.development

@@ -1,12 +1,12 @@
-DATABASE=test_FreePlanet
+DATABASE=test_PiuCheBuono
 UDB=paofreeplanet
 PDB=mypassword@1A
 SEND_EMAIL=0
 SEND_EMAIL_ORDERS=1
 PORT=3000
-appTelegram_TEST=["1","13"]
-appTelegram=["1","13"]
-appTelegram_DEVELOP=["13"]
+appTelegram_TEST=["1","17"]
+appTelegram=["1","17"]
+appTelegram_DEVELOP=["17"]
 DOMAIN=mongodb://localhost:27017/
 AUTH_MONGODB=1
 MONGODB_USER=admin
@@ -41,4 +41,7 @@ FTPSERVER_USER=ftpusrsrv_
 FTPSERVER_PWD=ftpmypwd@1A_
 AUTH_NEW_SITES=123123123
 SCRIPTS_DIR=admin_scripts
-CLOUDFLARE_TOKENS=[{"label":"Paolo.arena77@gmail.com","value":"M9EM309v8WFquJKpYgZCw-TViM2wX6vB3wlK6GD0"},{"label":"gruppomacro.com","value":"bqmzGShoX7WqOBzkXocoECyBkPq3GfqcM5t6VFd8"}]
+CLOUDFLARE_TOKENS=[{"label":"Paolo.arena77@gmail.com","value":"M9EM309v8WFquJKpYgZCw-TViM2wX6vB3wlK6GD0"},{"label":"gruppomacro.com","value":"bqmzGShoX7WqOBzkXocoECyBkPq3GfqcM5t6VFd8"}]
+MIAB_HOST=box.lamiaposta.org
+MIAB_ADMIN_EMAIL=admin@lamiaposta.org
+MIAB_ADMIN_PASSWORD=passpao1pabox@1A

emails/ecommerce/makeorder/it/html.pug

@@ -64,7 +64,7 @@ html
 
                 each rec in orders.items
                   - var descr = rec.order.product.productInfo.name
-                  - var img = rec.order.product.productInfo.imagefile
+                  - var img = dirimg + rec.order.product.productInfo.imagefile
                   - var price = rec.order.price
                   - var after_price = rec.order.after_price
                   - var TotalPriceProduct = rec.order.TotalPriceProductstr

emails/ecommerce/order_confirmed/it/html.pug

@@ -62,7 +62,7 @@ html
 
             each rec in orders.items
               - var descr = rec.order.product.productInfo.name
-              - var img = rec.order.product.productInfo.imagefile
+              - var img = dirimg + rec.order.product.productInfo.imagefile
               - var price = rec.order.product.price
               - var after_price = rec.order.product.after_price
               if (rec.order.gasordine)

emails/ecommerce/order_consegnato/it/html.pug

@@ -45,7 +45,7 @@ html
             p Ciao #{mioname},
             p L'ordine n. #{ordernumber} è stato Consegnato correttamente 📦 !
             p Grazie per averci scelto 🙏🏻 e alla prossima !
-            p  
+            p            
 
             if (orders.items[0].order.quantitypreordered > 0)
               - var miomakeorder = mystorehouse.email_html_GAS_order_consegnato
@@ -61,7 +61,7 @@ html
 
             each rec in orders.items
               - var descr = rec.order.product.productInfo.name
-              - var img = rec.order.product.productInfo.imagefile
+              - var img = dirimg + rec.order.product.productInfo.imagefile
               - var price = rec.order.product.price
               - var after_price = rec.order.product.after_price
               if (rec.order.gasordine)

logtrans.txt

@@ -369,4 +369,8 @@ ElenaEspx: 30.41 RIS]
 Mer 02/10 ORE 03:31: [<b>Circuito RIS Bologna</b>]: Inviate Monete da paoloar77 a ElenaEspx 3 RIS [causale: ]
 Saldi:
 paoloar77: 16.99 RIS] 
-ElenaEspx: 33.41 RIS]
+ElenaEspx: 33.41 RIS]
+Gio 03/10 ORE 15:13: [<b>Circuito RIS Bologna</b>]: Inviate Monete da paoloar77 a TestTransazPao 2 RIS [causale: ]
+Saldi:
+paoloar77: 14.99 RIS] 
+TestTransazPao: 2.00 RIS]

src/server/models/movement.js

@@ -1048,6 +1048,13 @@ MovementSchema.statics.getLastN_Transactions = async function (idapp, numtransaz
    
   */
 
+  lastNtransac.forEach(function (mov) {
+    let ris = tools.getStringaConto(mov)
+    mov.userfrom = ris.userfrom
+    mov.userto = ris.userto
+    mov.tipocontofrom = ris.tipocontofrom
+    mov.tipocontoto = ris.tipocontoto
+  });
 
   return lastNtransac;
 };

src/server/models/stat.js

@@ -67,16 +67,9 @@ const StatSchema = new Schema({
   },
 });
 
-StatSchema.statics.updateStats = async function (datastat) {
-
-  datastat.last_transactions.forEach(function (mov) {
-    let ris = tools.getStringaConto(mov)
-    mov.userfrom = ris.userfrom
-    mov.userto = ris.userto
-    mov.tipocontofrom = ris.tipocontofrom
-    mov.tipocontoto = ris.tipocontoto
-  });
+StatSchema.statics.updateStats = async function (idapp, datastat) {
 
+  datastat.last_transactions = await Movement.getLastN_Transactions(idapp, 5);
 
   return datastat;
 };
@@ -112,7 +105,6 @@ StatSchema.statics.calculateStats = async function (idapp) {
       num_circuiti: await Circuit.getnumCircuits(idapp),
       num_circuiti_attivi: await Circuit.getnumActiveCircuits(idapp),
       num_annunci: await User.getnumAnnunci(idapp),
-      last_transactions: await Movement.getLastN_Transactions(idapp, 10),
     };
 
     // Trova il record di oggi:
@@ -169,7 +161,7 @@ StatSchema.statics.getStats = async function (idapp) {
     datastat = rec;
   }
 
-  datastat = await Stat.updateStats(datastat);
+  datastat = await Stat.updateStats(idapp, datastat);
 
   return datastat;
 

src/server/sendemail.js

@@ -798,6 +798,7 @@ module.exports = {
           baseurl: tools.getHostByIdApp(idapp),
           dataemail: await this.getdataemail(idapp),
           ordernumber: orders.numorder,
+          dirimg: 'upload/products/',
           user,
         };