diff --git a/.env.dev.pcb b/.env.dev.pcb new file mode 100644 index 0000000..4e08963 --- /dev/null +++ b/.env.dev.pcb @@ -0,0 +1,38 @@ +DATABASE=test_PiuCheBuono +UDB=paofreeplanet +PDB=mypassword@1A +SEND_EMAIL=0 +SEND_EMAIL_ORDERS=1 +PORT=3000 +appTelegram_TEST=["1","13"] +appTelegram=["1","13"] +DOMAIN=mongodb://localhost:27017/ +AUTH_MONGODB=true +MONGODB_USER=admin +MONGODB_PWD=mypwadmin@1A +ENABLE_PUSHNOTIFICATION=1 +URLBASE_APP1=https://localhost +PORT_APP1=8080 +SIGNCODE=SU2134hncaskjdbo231oihJSDNHEI$1@AB +HTTPS_LOCALHOST=true +DEBUG=0 +DEBUG=0 +TESTING_ON=1 +LOCALE=1 +DELAY_SENDEMAIL=2000 +VAPI_KEY_SUBJECT=mailto:paolo@freeplanet.app +PUBLIC_VAPI_KEY=BDncvMiUZmjaCG2Kr1V9N0_33hOG-AuNSbHSvL24y2dzBiUjAxKm02emx5SeJvz2IGmtRf6YqCgopeQwCwUmZw8 +PRIVATE_VAPI_KEY=uB2-jQkrbysyDtqN3ziMBDsVn0wdEaDsksX81zoOGQo +PATH_CERT_KEY=localhost.key +PATH_SERVER_CRT=localhost.crt +PATH_SSL_ROOT_PEM=root.pem +PATH_SSL_CHAIN_PEM=chain.pem +GCM_API_KEY="" +PROD=0 +PROJECT_DESCR_MAIN='__PROJECTS' +SECRK=Askb38v23jjDFaoskBOWj92axXCQ +FTPSERVER_HOST=139.162.166.31 +FTPSERVER_PORT=21 +FTPSERVER_USER=ftpusrsrv_ +FTPSERVER_PWD=ftpmypwd@1A_ +AUTH_NEW_SITES=123123123 \ No newline at end of file diff --git a/.env.dev.riso b/.env.dev.riso new file mode 100644 index 0000000..3136acd --- /dev/null +++ b/.env.dev.riso @@ -0,0 +1,38 @@ +DATABASE=test_FreePlanet +UDB=paofreeplanet +PDB=mypassword@1A +SEND_EMAIL=0 +SEND_EMAIL_ORDERS=1 +PORT=3000 +appTelegram_TEST=["1","13"] +appTelegram=["1","13"] +DOMAIN=mongodb://localhost:27017/ +AUTH_MONGODB=true +MONGODB_USER=admin +MONGODB_PWD=mypwadmin@1A +ENABLE_PUSHNOTIFICATION=1 +URLBASE_APP1=https://localhost +PORT_APP1=8080 +SIGNCODE=SU2134hncaskjdbo231oihJSDNHEI$1@AB +HTTPS_LOCALHOST=true +DEBUG=0 +DEBUG=0 +TESTING_ON=1 +LOCALE=1 +DELAY_SENDEMAIL=2000 +VAPI_KEY_SUBJECT=mailto:paolo@freeplanet.app +PUBLIC_VAPI_KEY=BDncvMiUZmjaCG2Kr1V9N0_33hOG-AuNSbHSvL24y2dzBiUjAxKm02emx5SeJvz2IGmtRf6YqCgopeQwCwUmZw8 +PRIVATE_VAPI_KEY=uB2-jQkrbysyDtqN3ziMBDsVn0wdEaDsksX81zoOGQo +PATH_CERT_KEY=localhost.key +PATH_SERVER_CRT=localhost.crt +PATH_SSL_ROOT_PEM=root.pem +PATH_SSL_CHAIN_PEM=chain.pem +GCM_API_KEY="" +PROD=0 +PROJECT_DESCR_MAIN='__PROJECTS' +SECRK=Askb38v23jjDFaoskBOWj92axXCQ +FTPSERVER_HOST=139.162.166.31 +FTPSERVER_PORT=21 +FTPSERVER_USER=ftpusrsrv_ +FTPSERVER_PWD=ftpmypwd@1A_ +AUTH_NEW_SITES=123123123 \ No newline at end of file diff --git a/.env.development b/.env.development index 4e08963..3136acd 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -DATABASE=test_PiuCheBuono +DATABASE=test_FreePlanet UDB=paofreeplanet PDB=mypassword@1A SEND_EMAIL=0 diff --git a/src/server/models/account.js b/src/server/models/account.js index 764acf8..e2d304d 100755 --- a/src/server/models/account.js +++ b/src/server/models/account.js @@ -30,6 +30,9 @@ const AccountSchema = new Schema({ idapp: { type: String, }, + numtransactions: { + type: Number, + }, username: { type: String, }, @@ -232,6 +235,11 @@ AccountSchema.statics.addtoSaldo = async function (myaccount, amount, mitt) { myaccount.totTransato = 0; } myaccount.totTransato += Math.abs(amount); + + if (!myaccount.numtransactions) + myaccount.numtransactions = 0; + myaccount.numtransactions++; + myaccount.date_updated = new Date(); myaccountupdate.saldo = myaccount.saldo; @@ -308,6 +316,7 @@ AccountSchema.statics.getAccountByUsernameAndCircuitId = async function (idapp, fidoConcesso: 0, qta_maxConcessa: 0, totTransato: 0, + numtransactions: 0, totTransato_pend: 0, }); diff --git a/src/server/models/orderscart.js b/src/server/models/orderscart.js index d5d55f9..cb7bd4b 100755 --- a/src/server/models/orderscart.js +++ b/src/server/models/orderscart.js @@ -716,7 +716,6 @@ module.exports.updateCmd = async function (ordersCart, status, value, req, optio } else if (status === shared_consts.OrderStatus.PAYED) { if (value) { - // myOrderCart.pagato = false; if (!myOrderCart.pagato) { // Se ancora non รจ stato confermato: await OrdersCart.addOrderToMovement(myOrderCart, usernameStore, groupnameStore, req); diff --git a/src/server/router/users_router.js b/src/server/router/users_router.js index d090481..b254999 100755 --- a/src/server/router/users_router.js +++ b/src/server/router/users_router.js @@ -646,7 +646,7 @@ router.post('/login', (req, res) => { console.error('ERRORE IN LOGIN: ' + e.message); if (!resalreadysent) res.status(400). - send({ code: server_constants.RIS_CODE_LOGIN_ERR_GENERIC }); + send({ code: server_constants.RIS_CODE_LOGIN_ERR_GENERIC, msgerr: e.message }); }); });