diff --git a/emails/risricevuti/it/html.pug b/emails/risricevuti/it/html.pug
index 0b071a5..9d1cdc0 100755
--- a/emails/risricevuti/it/html.pug
+++ b/emails/risricevuti/it/html.pug
@@ -14,7 +14,7 @@ if causale
p Commento di #{mittente}: #{causale}
p
p Apri
- strong #{nomeapp}
+ strong #{nomeapp}
span per vedere il tuo nuovo saldo.
p
p Cordiali Saluti
diff --git a/logtrans.txt b/logtrans.txt
index 910d515..3c241d1 100644
--- a/logtrans.txt
+++ b/logtrans.txt
@@ -413,4 +413,9 @@ Dom 03/11 ORE 19:32: [Circuito RIS Italia]: Inviate Monete da paoloar77 a
Saldi:
paoloar77: 81.00 RIS]
-ElenaEspx: -48.10 RIS]
\ No newline at end of file
+ElenaEspx: -48.10 RIS]
+Gio 09/01 ORE 17:04: [Circuito RIS TerraNFT]: Inviate Monete da terranft (paoloar77) a SuryaArena 30 RIS [causale: Iniziale]
+
+Saldi:
+terranft (paoloar77): -30.00 RIS]
+SuryaArena: 30.00 RIS]
\ No newline at end of file
diff --git a/src/server/models/circuit.js b/src/server/models/circuit.js
index 1cc0df1..3d47684 100755
--- a/src/server/models/circuit.js
+++ b/src/server/models/circuit.js
@@ -127,6 +127,12 @@ const CircuitSchema = new Schema({
qta_max_default_grp: {
type: Number,
},
+ fido_scoperto_default_contocom: {
+ type: Number,
+ },
+ qta_max_default_contocom: {
+ type: Number,
+ },
data_costituz: {
type: Date,
},
diff --git a/src/server/models/user.js b/src/server/models/user.js
index ffe3503..6c26da4 100755
--- a/src/server/models/user.js
+++ b/src/server/models/user.js
@@ -2219,7 +2219,7 @@ UserSchema.statics.removeFromCircuits = async function (idapp, username, circuit
if (myaccount && myaccount.totTransato === 0) {
remove = true;
} else {
- remove = true;
+ remove = false;
}
if (remove) {
@@ -3045,33 +3045,8 @@ UserSchema.statics.setCircuitCmd = async function (idapp, usernameOrig, circuitn
outres.result = await Circuit.getInfoCircuitByName(idapp, circuitname);
}
} else {
- const foundIfAlreadyCircuit = await this.ifAlreadyInCircuit(idapp, usernameOrig, circuitname);
- if (!foundIfAlreadyCircuit) {
- update = {
- $push: {
- 'profile.mycircuits': {
- circuitname,
- date: new Date(),
- },
- },
- };
- ris = await User.updateOne({ idapp, username: usernameOrig }, update);
-
- // Elimina la richiesta:
- update = { $pull: { req_users: { username: { $in: [usernameOrig] } } } };
- await Circuit.updateOne({ idapp, name: circuitname }, update);
-
- // Elimina eventualmente se era bloccato:
- update = { $pull: { refused_users: { username: { $in: [usernameOrig] } } } };
- await Circuit.updateOne({ idapp, name: circuitname }, update);
-
- await Account.createAccount(idapp, usernameOrig, circuitname);
-
-
- } else {
- ris = false;
- }
+ ris = await this.addCircuitToUser(idapp, usernameOrig, circuitname, true, '');
await Circuit.updateData(idapp, circuitname)
if (ris) {
diff --git a/src/server/router/index_router.js b/src/server/router/index_router.js
index 1241d59..369f91c 100755
--- a/src/server/router/index_router.js
+++ b/src/server/router/index_router.js
@@ -1713,7 +1713,7 @@ router.post('/duprec/:table/:id', authenticate, async (req, res) => {
return await mytable.findById(id).then(async (mydata) => {
- const datadup = tools.CloneRecordToNew(mydata);
+ const datadup = tools.CloneRecordToNew(mydata, mytable.modelName);
const mynewrec = new mytable(datadup);
return await mynewrec.save().then(async (rec) => {
diff --git a/src/server/tools/general.js b/src/server/tools/general.js
index 191f777..317d382 100755
--- a/src/server/tools/general.js
+++ b/src/server/tools/general.js
@@ -842,11 +842,16 @@ module.exports = {
return JSON.parse(JSON.stringify(src));
},
- CloneRecordToNew(src) {
+ CloneRecordToNew(src, modelTable) {
const myrec = Object.assign({}, src);
delete myrec._doc['_id'];
myrec._id = new ObjectId();
+ if (modelTable === 'Circuit') {
+ myrec._doc.name = myrec._doc.name + ' copia';
+ myrec._doc.path = myrec._doc.path + '_copia';
+ }
+
return myrec._doc;
},
diff --git a/src/server/version.txt b/src/server/version.txt
index f662c7e..8d2c87f 100644
--- a/src/server/version.txt
+++ b/src/server/version.txt
@@ -1 +1 @@
-1.1.14
\ No newline at end of file
+1.1.15
\ No newline at end of file