From 757bf44c68fdb482512e4d8f1070f5492982bcf2 Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Wed, 26 Feb 2025 19:08:00 +0100 Subject: [PATCH] Aggiornamento PiuChebuono: lista Totali del Produttore. --- .env.development | 14 ++++++++++---- src/server/models/gasordine.js | 2 +- src/server/models/productInfo.js | 3 +++ src/server/router/admin_router.js | 7 +++++-- src/server/tools/shared_nodejs.js | 1 + 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.env.development b/.env.development index b7f4c66..da25409 100644 --- 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 @@ -41,4 +41,10 @@ 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"}] +MIAB_HOST=box.lamiaposta.org +MIAB_ADMIN_EMAIL=admin@lamiaposta.org +MIAB_ADMIN_PASSWORD=passpao1pabox@1A DS_API_KEY="sk-222e3addb3d8455d8b0516d93906eec7" + +API_KEY_MSSQL="m68yADSr123MIVIDA@154$DSAGVOK" +SERVER_A_URL="http://51.77.156.69:3000" \ No newline at end of file diff --git a/src/server/models/gasordine.js b/src/server/models/gasordine.js index 910ebab..9fbe02c 100755 --- a/src/server/models/gasordine.js +++ b/src/server/models/gasordine.js @@ -70,7 +70,7 @@ module.exports.executeQueryTable = function (idapp, params) { module.exports.findAllIdApp = async function (idapp) { const myfind = { idapp }; - return await Gasordine.find(myfind); + return await Gasordine.find(myfind).sort({dataora_chiusura_ordini: -1}).lean(); }; diff --git a/src/server/models/productInfo.js b/src/server/models/productInfo.js index d840632..4fa8360 100755 --- a/src/server/models/productInfo.js +++ b/src/server/models/productInfo.js @@ -27,6 +27,9 @@ const productInfoSchema = new Schema({ unique: true, required: true, }, + codice: { // codice interno prodotto + type: String, + }, id_wp: { // id in wordpress type: String, }, diff --git a/src/server/router/admin_router.js b/src/server/router/admin_router.js index 80bf6f7..02cb2d2 100755 --- a/src/server/router/admin_router.js +++ b/src/server/router/admin_router.js @@ -604,8 +604,11 @@ async function extractArrayDataFromCSV(idapp, rec) { arrcampi_product = getValoriAndIndice_Product(null); for (const campoobj of arrcampi_productInfo) { - if (rec.hasOwnProperty(campoobj.name)) { - let myval = tools.ripulisciCampo(rec[campoobj.name]); + + // TODO: controlla che il campo rec[campoobj.name] esista anche se minuscolo/maiuscolo + const mykey = Object.keys(rec).find(key => key.toLowerCase() === campoobj.name.toLowerCase()); + if (mykey) { + let myval = tools.ripulisciCampo(rec[mykey]); productInfo[campoobj.name] = (myval === 'TRUE' || myval.toUpperCase() === 'SI') ? true : ((myval === 'FALSE' || myval.toUpperCase() === 'NO') ? false : myval); } diff --git a/src/server/tools/shared_nodejs.js b/src/server/tools/shared_nodejs.js index 7d5352e..6a2699d 100755 --- a/src/server/tools/shared_nodejs.js +++ b/src/server/tools/shared_nodejs.js @@ -1095,6 +1095,7 @@ module.exports = { CAMPI_PRODUCTINFO: [ { name: 'name', type: '' }, { name: 'code', type: '' }, + { name: 'codice', type: '' }, { name: 'description', type: 1 }, { name: 'link_scheda', type: '' }, { name: 'idCatProds', type: '' },