From 75ef581635add31810d0cc55798bd03e5721f8a6 Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Tue, 2 Jan 2024 15:39:29 +0100 Subject: [PATCH] update --- src/server/models/cash.js | 10 +++++----- src/server/models/orderscart.js | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/server/models/cash.js b/src/server/models/cash.js index 1b937cd..8c676e1 100755 --- a/src/server/models/cash.js +++ b/src/server/models/cash.js @@ -30,8 +30,8 @@ const CashSchema = new Schema({ type: Number, required: true, }, - fromUserId: { type: Schema.Types.ObjectId, ref: 'User' }, - toUserId: { type: Schema.Types.ObjectId, ref: 'User' }, + fromUsername: { type: Schema.Types.String }, + toUsername: { type: Schema.Types.String }, idOrdersCart: { type: Schema.Types.ObjectId, ref: 'OrdersCart' }, date_created: { type: Date, @@ -95,15 +95,15 @@ module.exports.getCashByID = function (id, callback) { Cash.findById(id, callback); } -module.exports.createMovementCashByOrdersCart = async function (ordersCart, userIdStore, req, internal) { +module.exports.createMovementCashByOrdersCart = async function (ordersCart, usernameStore, req, internal) { let casjobj = { idapp: req.user.iapp, idOrdersCart: ordersCart._id, creatorUserId: req.user ? req.user._id : null, type: shared_consts.TYPECASH.IN, - fromUserId: ordersCart.userId, - toUserId: userIdStore, + fromUsername: ordersCart.user.username, + toUsername: usernameStore, causale: 'Pagato Ordine n.' + ordersCart.numorder, date_payment: new Date(), price: ordersCart.totalPrice, diff --git a/src/server/models/orderscart.js b/src/server/models/orderscart.js index 167d3e5..a6208a8 100755 --- a/src/server/models/orderscart.js +++ b/src/server/models/orderscart.js @@ -471,13 +471,13 @@ module.exports.createOrdersCart = async function (newOrdersCart) { } -module.exports.addOrderToCash = async function (idorderscart, userIdStore, req) { +module.exports.addOrderToCash = async function (idorderscart, usernameStore, req) { try { const myorderscart = await OrdersCart.findOne({ _id: idorderscart }).populate('items.order').lean(); - const mycash = await Cash.createMovementCashByOrdersCart(myorderscart, userIdStore, req); + const mycash = await Cash.createMovementCashByOrdersCart(myorderscart, usernameStore, req); } catch (e) { console.error('Err', e); @@ -649,7 +649,7 @@ module.exports.updateStockQtaPerCancellazioneOrdine = async function (idordersca module.exports.updateCmd = async function (ordersCart, status, value, req, options) { - const userIdStore = options.userIdStore ?? null; + const usernameStore = options.usernameStore ?? null; let myOrderCart = await OrdersCart.findOne({ _id: ordersCart._id }) .populate('items.order').lean(); @@ -675,7 +675,7 @@ module.exports.updateCmd = async function (ordersCart, status, value, req, optio } else if (status === shared_consts.OrderStatus.PAYED) { if (value) { - await OrdersCart.addOrderToCash(id, userIdStore, req); + await OrdersCart.addOrderToCash(id, usernameStore, req); } ris = await OrdersCart.setPagatoById(value, myOrderCart);