- Cataloghi: pagine, schede, formato

2024-11-19 19:18:54 +01:00
parent 73cf977754
commit b1b952d120
16 changed files with 74 additions and 54 deletions
--- a/.env.dev.pcb
+++ b/.env.dev.pcb
@@ -32,7 +32,6 @@ GCM_API_KEY=""
 PROD=0
 PROJECT_DESCR_MAIN='__PROJECTS'
 SECRK=Askb38v23jjDFaoskBOWj92axXCQ
-SECRTK=prova123prova567ASDADASDAS
 TOKEN_LIFE=2h
 REFRESH_TOKEN_LIFE=14d
 FTPSERVER_HOST=139.162.166.31
--- a/.env.dev.riso
+++ b/.env.dev.riso
@@ -32,7 +32,6 @@ GCM_API_KEY=""
 PROD=0
 PROJECT_DESCR_MAIN='__PROJECTS'
 SECRK=Askb38v23jjDFaoskBOWj92axXCQ
-SECRTK=prova123prova567ASDADASDAS
 TOKEN_LIFE=2h
 REFRESH_TOKEN_LIFE=14d
 FTPSERVER_HOST=139.162.166.31
--- a/.env.development
+++ b/.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
@@ -32,7 +32,6 @@ GCM_API_KEY=""
 PROD=0
 PROJECT_DESCR_MAIN='__PROJECTS'
 SECRK=Askb38v23jjDFaoskBOWj92axXCQ
-SECRTK=prova123prova567ASDADASDAS
 TOKEN_LIFE=2h
 REFRESH_TOKEN_LIFE=14d
 FTPSERVER_HOST=139.162.166.31
@@ -41,4 +40,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
--- a/.env.prod.pcb
+++ b/.env.prod.pcb
@@ -29,11 +29,10 @@ PATH_SSL_CHAIN_PEM=chain.pem
 PROD=1
 PROJECT_DESCR_MAIN='__PROJECTS'
 SECRK=iUUb38v23jjDFaosWj92axkBOXCQ
-SECRTK=jAxKm02emx5SeJvz2IGmtRf6YqCgope
 TOKEN_LIFE=2h
 REFRESH_TOKEN_LIFE=14d
 AUTH_NEW_SITES=B234HDSAOJ734ndcsdKWNVZZ
-DOMAINS=[{"hostname":"piuchebuono.app","port":"3000"},{"hostname":"gruppomacro.app","port":"3010"}]
+DOMAINS=[{"hostname":"piuchebuono.app","port":"3030"},{"hostname":"gruppomacro.app","port":"3010"}]
 SCRIPTS_DIR=admin_scripts
 CLOUDFLARE_TOKENS=[{"label":"Paolo.arena77@gmail.com","value":"M9EM309v8WFquJKpYgZCw-TViM2wX6vB3wlK6GD0"},{"label":"gruppomacro.com","value":"bqmzGShoX7WqOBzkXocoECyBkPq3GfqcM5t6VFd8"}]
 MIAB_HOST=box.lamiaposta.org
--- a/.env.prod.riso
+++ b/.env.prod.riso
@@ -29,7 +29,7 @@ SECRK=iUUb38v23jjDFaosWj92axkBOXCQ
 TOKEN_LIFE=2h
 REFRESH_TOKEN_LIFE=14d
 AUTH_NEW_SITES=B234HDSAOJ734ndcsdKWNV
-DOMAINS=[{"hostname":"riso.app","port":"3006"}]
+DOMAINS=[{"hostname":"riso.app","port":"3006"},{"hostname":"freeplanet.app","port":"3000"}]
 #DOMAINS=[{"hostname":"abitaregliiblei.it","port":"3021"},{"hostname":"riso.app","port":"3005"}]
 SCRIPTS_DIR=admin_scripts
 CLOUDFLARE_TOKENS=[{"label":"Paolo.arena77@gmail.com","value":"M9EM309v8WFquJKpYgZCw-TViM2wX6vB3wlK6GD0"},{"label":"gruppomacro.com","value":"bqmzGShoX7WqOBzkXocoECyBkPq3GfqcM5t6VFd8"}]
--- a/.env.test.pcb
+++ b/.env.test.pcb
@@ -32,7 +32,7 @@ SECRK=iUUb38v23jjDFaosWj92axkBOXCQ
 TOKEN_LIFE=2h
 REFRESH_TOKEN_LIFE=14d
 AUTH_NEW_SITES=B234HDSAOJ734ndcsdKWNV
-DOMAINS=[{"hostname":"piuchebuono.app","port":"3001"},{"hostname":"gruppomacro.app","port":"3011"}]
+DOMAINS=[{"hostname":"piuchebuono.app","port":"3031"},{"hostname":"gruppomacro.app","port":"3011"}]
 SCRIPTS_DIR=admin_scripts
 CLOUDFLARE_TOKENS=[{"label":"Paolo.arena77@gmail.com","value":"M9EM309v8WFquJKpYgZCw-TViM2wX6vB3wlK6GD0"},{"label":"gruppomacro.com","value":"bqmzGShoX7WqOBzkXocoECyBkPq3GfqcM5t6VFd8"}]
 MIAB_HOST=box.lamiaposta.org
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ node_modules/
 .env.production
 .env.production.bak
 ESEMPI/
+OFF/
 .idea
 package-lock.json
 deploynodejs_on_production.sh
--- a/logtrans.txt
+++ b/logtrans.txt
@@ -403,4 +403,14 @@ Dom 27/10 ORE 23:55: [<b>Circuito RIS Campania</b>]: Inviate Monete da Unicorno_

 Saldi:
 Unicorno_Giacomo: 227.30 RIS] 
-zacc50: -62.00 RIS]
+zacc50: -62.00 RIS]
+Dom 03/11 ORE 19:28: [<b>Circuito RIS Italia</b>]: Inviate Monete da paoloar77 a ElenaEspx 1 RIS [causale: prova]
+
+Saldi:
+paoloar77: 82.00 RIS] 
+ElenaEspx: -49.10 RIS]
+Dom 03/11 ORE 19:32: [<b>Circuito RIS Italia</b>]: Inviate Monete da paoloar77 a ElenaEspx 1 RIS [causale: provaaaa]
+
+Saldi:
+paoloar77: 81.00 RIS] 
+ElenaEspx: -48.10 RIS]
--- a/public/upload/myschedas/background.png
+++ b/public/upload/myschedas/background.png
--- a/src/server/models/myelem.js
+++ b/src/server/models/myelem.js
@@ -4,7 +4,7 @@ const Schema = mongoose.Schema;
 const tools = require('../tools/general');
 const { ObjectID, ObjectId } = require('mongodb');

-const { MySchedaSchema, IDimensioni } = require('../models/myscheda');
+const { MySchedaSchema, IDimensioni, IImg } = require('../models/myscheda');

 mongoose.Promise = global.Promise;
 mongoose.level = "F";
@@ -15,6 +15,10 @@ mongoose.plugin(schema => {
  schema.options.usePushEach = true
 });

+const IElementiPagina = new Schema({
+  pagina: IDimensioni,
+});
+
 const myCard = new Schema(
  {
    imagefile: String,
@@ -48,13 +52,6 @@ const elemText = new Schema(
  }
 );

-const IElementiPagina = new Schema(
-  {
-    pagina: IDimensioni,
-    riga: IDimensioni,
-  }
-);
-

 const catalogo = new Schema(
  {
@@ -63,9 +60,8 @@ const catalogo = new Schema(
    excludeproductTypes: [{ type: Number }],
    Editore: [{ type: String }],
    pdf: { type: Boolean },
+    pdf_filename: { type: String },
    printable: { type: Boolean },
-    width: { type: String },
-    height: { type: String },

    first_page_img: { type: String },
    first_page_html: { type: String },
@@ -76,17 +72,10 @@ const catalogo = new Schema(
    last_page_height: { type: Number },
    last_page_width: { type: Number },

-    margine_pagina: { type: String },
-    margine_riga: { type: String },
-    margine_paginaPrintable: { type: String },
-    margine_rigaPrintable: { type: String },
+    imgsfondo_def: IImg,
+
+    dimensioni_def: IElementiPagina,

-    backgroundimage: { type: String },
-    backgroundimage_printable: { type: String },
-    backgroundSize: { type: String },
-    backgroundSize_printable: { type: String },
-    widthpagPrintable: { type: Number },
-  
    // -------------------
    arrSchede: [
      {
--- a/src/server/models/myscheda.js
+++ b/src/server/models/myscheda.js
@@ -16,6 +16,11 @@ mongoose.plugin(schema => {
 const ISize = new Schema({
  width: { type: String },
  height: { type: String },
+  fit: { type: String },
+});
+const IFont = new Schema({
+  name: { type: String },
+  size: { type: String },
 });

 const IBorders = new Schema({
@@ -24,12 +29,33 @@ const IBorders = new Schema({
  left: { type: String },
  right: { type: String },
 })
+const IImg = new Schema({
+  imagefile: { type: String },
+  fit: { type: String },
+})
+
 const IDimensioni = new Schema({
  size: ISize,
  margini: IBorders,
  padding: IBorders,
+  imgsfondo: IImg,
 });

+const IBarCode = new Schema(
+  {
+    show: Boolean,
+    format: String,
+    size: ISize,
+    font: IFont,
+  }
+);
+const IText = new Schema(
+  {
+    contenuto: String,
+    maxlength: Number,
+  }
+);
+
 const IElementiScheda = new Schema({
  pagina: IDimensioni,
  riga: IDimensioni,
@@ -44,16 +70,13 @@ const scheletroScheda = {
  line_height: { type: Number },
  numschede_perRiga: { type: Number },
  numschede_perCol: { type: Number },
-  text: { type: String },
+  testo_right: IText,
+  testo_bottom: IText,
  posiz_text: { type: Number },
-
+  barcode: IBarCode,
+  
  dimensioni: IElementiScheda,

-  bgimg: { type: String },
-  bgimg_printable: { type: String },
-  bgSize: { type: String },
-  bgSize_Printable: { type: String },
-
  productTypes: [{ type: Number }],
  excludeproductTypes: [{ type: Number }],
  editore: [{ type: String }],
@@ -90,4 +113,4 @@ MyScheda.createIndexes((err) => {
  if (err) throw err;
 });

-module.exports = { MyScheda, MySchedaSchema, IDimensioni };
+module.exports = { MyScheda, MySchedaSchema, IDimensioni, IImg };
--- a/src/server/models/product.js
+++ b/src/server/models/product.js
@@ -76,9 +76,12 @@ const productSchema = new Schema({
      quantita: {  // in magazzino
        type: Number,
      },
-      numpages: {
+      pagine: {
        type: Number,
      },
+      misure: {
+        type: String,
+      },
      formato: {
        type: String,
      },
--- a/src/server/router/admin_router.js
+++ b/src/server/router/admin_router.js
@@ -481,15 +481,6 @@ router.post('/import', authenticate, async (req, res) => {

          productInfo.name = productInfo.name.replace(/ - Usato$| - Nuovo$| - Epub$| - Ebook$| - Mobi$| - DVD$| - Streaming$| - Download$/, "");

-          if (product.Pagine) {
-            try {
-              productInfo.numpages = 0;
-              productInfo.numpages = parseInt(product.Pagine);
-            } catch (e) {
-              console.error(e);
-            }
-          }
-
          let reccateg = null;
          if (product.categories) {
            arrcat = product.categories.trim().split(',');
@@ -703,12 +694,15 @@ router.post('/import', authenticate, async (req, res) => {

            variazione.active = true; // ++ ??
            variazione.versione = versione;
+            variazione.versione = versione;
            variazione.status = product.Stato ? product.Stato : null;
            variazione.price = product.price ? parseFloat(tools.convertPriceEurToValue(product.price)) : null;
            variazione.sale_price = product.sale_price ? parseFloat(tools.convertPriceEurToValue(product.sale_price)) : null;
            variazione.formato = product.formato ? product.formato : '';
            variazione.tipologia = product.Tipologia ? product.Tipologia : '';
            variazione.edizione = product.Edizione ? product.Edizione : '';
+            variazione.pagine = product.Pagine ? parseInt(product.Pagine) : '';
+            variazione.misure = product.misure ? product.misure : '';
            variazione.eta = product.eta ? product.eta : '';
            variazione.addtocart_link = product.addtocart_link ? product.addtocart_link : '';

--- a/src/server/router/users_router.js
+++ b/src/server/router/users_router.js
@@ -164,7 +164,7 @@ router.post('/', async (req, res) => {
      if (lastrec.ipaddr === user.ipaddr) {
        // Se l'ha fatto troppo ravvicinato
        if (lastrec.date_reg) {
-          let ris = tools.isdiffSecDateLess(lastrec.date_reg, 5);
+          let ris = tools.isdiffSecDateLess(lastrec.date_reg, 3);
          if (ris) {
            const msg = user.ipaddr + ': [' + user.username + '] ' + user.name + ' ' +
              user.surname;
--- a/src/server/tools/shared_nodejs.js
+++ b/src/server/tools/shared_nodejs.js
@@ -1075,7 +1075,8 @@ module.exports = {
    { name: 'author', type: '' },
    { name: 'collezione', type: '' },
    { name: 'publisher', type: '' },
-    { name: 'numpages', type: '' },
+    { name: 'pagine', type: '' },
+    { name: 'misure', type: '' },
    { name: 'note', type: '' },
  ],

--- a/src/server/version.txt
+++ b/src/server/version.txt
@@ -1 +1 @@
-1.1.11
+1.1.12
@@ -1 +1 @@
 .1.11
 .1.12