diff --git a/logtrans.txt b/logtrans.txt
index 04171f7..3f131dc 100644
--- a/logtrans.txt
+++ b/logtrans.txt
@@ -120,4 +120,12 @@ paoloar77: 13 RIS]
Gio 04/01 ORE 14:00: [Euro]: Inviate Monete da PaoloRiso a piuchebuono 44.4 € [causale: Pagato Ordine n.101]
Saldi:
PaoloRiso: -44.4 €]
-piuchebuono: 44.4 €]
\ No newline at end of file
+piuchebuono: 44.4 €]
+Dom 07/01 ORE 16:22: [Euro]: Inviate Monete da PaoloRiso a 44.4 € [causale: Pagato Ordine n.101]
+Saldi:
+PaoloRiso: -44.4 €]
+: 44.4 €]
+Dom 07/01 ORE 16:24: [Euro]: Inviate Monete da PaoloRiso a 44.4 € [causale: Pagato Ordine n.101]
+Saldi:
+PaoloRiso: -88.8 €]
+: 88.8 €]
\ No newline at end of file
diff --git a/src/server/models/circuit.js b/src/server/models/circuit.js
index c342e88..efa7ccb 100755
--- a/src/server/models/circuit.js
+++ b/src/server/models/circuit.js
@@ -84,9 +84,6 @@ const CircuitSchema = new Schema({
totCircolante: {
type: Number,
},
- showAlways: {
- type: Boolean,
- },
totTransato: {
type: Number,
},
@@ -227,6 +224,10 @@ const CircuitSchema = new Schema({
type: Number,
default: 0,
},
+ ignoreLimits: {
+ type: Boolean,
+ default: false,
+ },
});
CircuitSchema.pre('save', async function (next) {
@@ -695,15 +696,17 @@ CircuitSchema.statics.sendCoins = async function (onlycheck, idapp, usernameOrig
const circolantePrec = this.getCircolanteSingolaTransaz(accountorigTable, accountdestTable);
- // Check if Sender has enough money
- if (accountorigTable.saldo - myqty < -accountorigTable.fidoConcesso) {
- ris.cansend = false;
- ris.errormsg = i18n.__('CIRCUIT_AMOUNT_EXCEED_FIDO', usernameOrig);
- }
+ if (!circuittable.ignoreLimits) {
+ // Check if Sender has enough money
+ if (accountorigTable.saldo - myqty < -accountorigTable.fidoConcesso) {
+ ris.cansend = false;
+ ris.errormsg = i18n.__('CIRCUIT_AMOUNT_EXCEED_FIDO', usernameOrig);
+ }
- if (accountdestTable.saldo + myqty > accountdestTable.qta_maxConcessa) {
- ris.cansend = false;
- ris.errormsg = i18n.__('CIRCUIT_AMOUNT_EXCEED_QTAMAX', extrarec.dest);
+ if (accountdestTable.saldo + myqty > accountdestTable.qta_maxConcessa) {
+ ris.cansend = false;
+ ris.errormsg = i18n.__('CIRCUIT_AMOUNT_EXCEED_QTAMAX', extrarec.dest);
+ }
}
if (!onlycheck) {
diff --git a/src/server/models/orderscart.js b/src/server/models/orderscart.js
index ccdbd5c..d5d55f9 100755
--- a/src/server/models/orderscart.js
+++ b/src/server/models/orderscart.js
@@ -716,10 +716,14 @@ module.exports.updateCmd = async function (ordersCart, status, value, req, optio
} else if (status === shared_consts.OrderStatus.PAYED) {
if (value) {
- await OrdersCart.addOrderToMovement(myOrderCart, usernameStore, groupnameStore, req);
+ // myOrderCart.pagato = false;
+ if (!myOrderCart.pagato) { // Se ancora non è stato confermato:
+ await OrdersCart.addOrderToMovement(myOrderCart, usernameStore, groupnameStore, req);
+
+ ris = await OrdersCart.setPagatoById(value, myOrderCart);
+ }
}
- ris = await OrdersCart.setPagatoById(value, myOrderCart);
} else if (status === shared_consts.OrderStatus.DELIVERED) { // Consegnato
if (value) {
diff --git a/src/server/tools/shared_nodejs.js b/src/server/tools/shared_nodejs.js
index db4b2f1..fd727f1 100755
--- a/src/server/tools/shared_nodejs.js
+++ b/src/server/tools/shared_nodejs.js
@@ -776,6 +776,7 @@ module.exports = {
fido_scoperto_default: 1,
deperimento: 1,
showAlways: 1,
+ ignoreLimits: 1,
status: 1,
transactionsEnabled: 1,
qta_max_default: 1,