surya/freeplanet_serverside
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Invia e Ricevi RIS (grafica aggiornata)

Browse Source 
- Visualizzazione Movimenti (ultimi e successivi), per singolo e di tutti
This commit is contained in:
Surya Paolo
2024-10-11 02:29:21 +02:00
parent 491c9bc220
commit c82bc117cc
9 changed files with 134 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/models/circuit.js
View File

@@ -733,7 +733,7 @@ CircuitSchema.statics.sendCoins = async function (onlycheck, idapp, usernameOrig
if (!onlycheck) {
// Add a Transaction !
if (ris.cansend) {
ris.rec = await Movement.addMov(idapp, accountorigTable, accountdestTable, myqty, extrarec.causal, extrarec.notifId, extrarec.idOrdersCart);
ris.rec = await Movement.addMov(idapp, accountorigTable, accountdestTable, myqty, extrarec.causal, extrarec.causalDest, extrarec.notifId, extrarec.idOrdersCart);
}
if (ris.cansend && ris.rec) {
@@ -764,8 +764,9 @@ CircuitSchema.statics.sendCoins = async function (onlycheck, idapp, usernameOrig
let dest = (extrarec.dest ? extrarec.dest : '') + (extrarec.groupdest ? extrarec.groupdest : '') + (extrarec.contoComDest ? extrarec.contoComDest : '');
ris.result = true;
let causalDest = extrarec.causalDest ? 'Causale Destinatario: ' + extrarec.causalDest : ''
let msg = '[<b>' + circuittable.name + '</b>]: Inviate Monete da ' + orig + ' a ' + dest + ' ' + myqty + ' ' + circuittable.symbol + ' [causale: ' + extrarec.causal +
`]\nSaldi:\n${orig}: ` + extrarec.saldoOrig + ' ' + circuittable.symbol + '] ' + `\n${dest}: ` + extrarec.saldoDest + ' ' + circuittable.symbol + ']';
`]\n` + causalDest+ `\nSaldi:\n${orig}: ` + extrarec.saldoOrig + ' ' + circuittable.symbol + '] ' + `\n${dest}: ` + extrarec.saldoDest + ' ' + circuittable.symbol + ']';
console.log(msg);
ris.useraccounts = await Account.getUserAccounts(idapp, usernameOrig);
@@ -782,6 +783,7 @@ CircuitSchema.statics.sendCoins = async function (onlycheck, idapp, usernameOrig
symbol: circuittable.symbol, qty: myqty,
transactionDate: ris.rec.transactionDate,
causale: extrarec.causal,
causalDest: extrarec.causalDest,
};
if (extrarec.dest) {
let myuserDest = await User.getUserByUsername(idapp, extrarec.dest);
@@ -1723,6 +1725,7 @@ CircuitSchema.statics.addMovementByOrdersCart = async function (ordersCart, user
dest: usernameDest,
groupdest: groupDest,
contoComDest: '',
causalDest: '',
};
const usernameOrig = await User.getUsernameById(idapp, ordersCart.userId);

10
src/server/models/movement.js
View File

@@ -50,6 +50,10 @@ const MovementSchema = new Schema({
type: String,
default: '',
},
causalDest: {
type: String,
default: '',
},
residual: {
type: Number,
default: 0,
@@ -95,7 +99,7 @@ MovementSchema.statics.executeQueryTable = function (idapp, params) {
return tools.executeQueryTable(this, 0, params);
};
MovementSchema.statics.addMov = async function (idapp, accountFromIdTable, accountToIdTable, amount, causal, notifId, idOrdersCart) {
MovementSchema.statics.addMov = async function (idapp, accountFromIdTable, accountToIdTable, amount, causal, causalDest, notifId, idOrdersCart) {
try {
// Only positive values
@@ -110,6 +114,7 @@ MovementSchema.statics.addMov = async function (idapp, accountFromIdTable, accou
idOrdersCart,
amount,
causal,
causalDest,
residual: 0,
notifId,
// expiringDate:
@@ -365,6 +370,7 @@ MovementSchema.statics.getQueryMovsByCircuitId = async function (idapp, username
transactionDate: 1,
amount: 1,
causal: 1,
causalDest: 1,
notifId: 1,
'circuitfrom.symbol': 1,
'circuitto.symbol': 1,
@@ -642,6 +648,7 @@ MovementSchema.statics.getQueryAllUsersMovsByCircuitId = async function (idapp,
transactionDate: 1,
amount: 1,
causal: 1,
causalDest: 1,
notifId: 1,
'circuitfrom.symbol': 1,
'circuitto.symbol': 1,
@@ -1008,6 +1015,7 @@ MovementSchema.statics.getLastN_Transactions = async function (idapp, numtransaz
transactionDate: 1,
amount: 1,
causal: 1,
causalDest: 1,
notifId: 1,
'circuitfrom.symbol': 1,
'circuitfrom.name': 1,