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

update

Browse Source
This commit is contained in:
Surya Paolo
2024-01-02 15:39:29 +01:00
parent 4e0c18f47c
commit 75ef581635
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,8 +30,8 @@ const CashSchema = new Schema({
type: Number, type: Number,
required: true, required: true,
}, },
fromUserId: { type: Schema.Types.ObjectId, ref: 'User' }, fromUsername: { type: Schema.Types.String },
toUserId: { type: Schema.Types.ObjectId, ref: 'User' }, toUsername: { type: Schema.Types.String },
idOrdersCart: { type: Schema.Types.ObjectId, ref: 'OrdersCart' }, idOrdersCart: { type: Schema.Types.ObjectId, ref: 'OrdersCart' },
date_created: { date_created: {
type: Date, type: Date,
@@ -95,15 +95,15 @@ module.exports.getCashByID = function (id, callback) {
Cash.findById(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 = { let casjobj = {
idapp: req.user.iapp, idapp: req.user.iapp,
idOrdersCart: ordersCart._id, idOrdersCart: ordersCart._id,
creatorUserId: req.user ? req.user._id : null, creatorUserId: req.user ? req.user._id : null,
type: shared_consts.TYPECASH.IN, type: shared_consts.TYPECASH.IN,
fromUserId: ordersCart.userId, fromUsername: ordersCart.user.username,
toUserId: userIdStore, toUsername: usernameStore,
causale: 'Pagato Ordine n.' + ordersCart.numorder, causale: 'Pagato Ordine n.' + ordersCart.numorder,
date_payment: new Date(), date_payment: new Date(),
price: ordersCart.totalPrice, price: ordersCart.totalPrice,

8
src/server/models/orderscart.js
View File

@@ -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 { try {
const myorderscart = await OrdersCart.findOne({ _id: idorderscart }).populate('items.order').lean(); 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) { } catch (e) {
console.error('Err', 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) { 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 }) let myOrderCart = await OrdersCart.findOne({ _id: ordersCart._id })
.populate('items.order').lean(); .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) { } else if (status === shared_consts.OrderStatus.PAYED) {
if (value) { if (value) {
await OrdersCart.addOrderToCash(id, userIdStore, req); await OrdersCart.addOrderToCash(id, usernameStore, req);
} }
ris = await OrdersCart.setPagatoById(value, myOrderCart); ris = await OrdersCart.setPagatoById(value, myOrderCart);