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

- abilitato circuits e groups

Browse Source
This commit is contained in:
Surya Paolo
2024-01-03 23:46:31 +01:00
parent 0aaa331b3f
commit b754492b41
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -473,13 +473,13 @@ module.exports.createOrdersCart = async function (newOrdersCart) {
} }
module.exports.addOrderToMovement = async function (idorderscart, usernameStore, req) { module.exports.addOrderToMovement = async function (idorderscart, usernameStore, groupnameStore, 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 mymov = await Circuit.addMovementByOrdersCart(id, myOrderCart, usernameStore, ''); const mymov = await Circuit.addMovementByOrdersCart(id, myOrderCart, usernameStore, groupnameStore);
// const mycash = await Cash.createMovementCashByOrdersCart(myorderscart, usernameStore, req); // const mycash = await Cash.createMovementCashByOrdersCart(myorderscart, usernameStore, req);
} catch (e) { } catch (e) {
@@ -661,20 +661,28 @@ module.exports.updateStockQtaPerCancellazioneOrdine = async function (idordersca
} }
module.exports.getStorehouseActual = async function (ordersCart) { module.exports.getUsernameStorehouseActual = async function (ordersCart) {
return ordersCart && ordersCart.storehouse && ordersCart.storehouse.lenght > 0 return ordersCart && ordersCart.storehouse && ordersCart.storehouse.lenght > 0
? ordersCart.storehouse[0].username ? ordersCart.storehouse[0].username
: null : null
} }
module.exports.getGroupnameStorehouseActual = async function (ordersCart) {
return ordersCart && ordersCart.storehouse && ordersCart.storehouse.lenght > 0
? ordersCart.storehouse[0].groupname
: null
}
module.exports.updateCmd = async function (ordersCart, status, value, req, options) { module.exports.updateCmd = async function (ordersCart, status, value, req, options) {
let myOrderCart = await OrdersCart.findOne({ _id: ordersCart._id }) let myOrderCart = await OrdersCart.findOne({ _id: ordersCart._id })
.populate('items.order').lean(); .populate('items.order').lean();
const usernameStore = OrdersCart.getStorehouseActual(ordersCart); const usernameStore = OrdersCart.getUsernameStorehouseActual(ordersCart);
const groupnameStore = OrdersCart.getGroupnameStorehouseActual(ordersCart);
try { try {
if (!!myOrderCart) { if (!!myOrderCart) {
@@ -697,7 +705,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.addOrderToMovement(id, usernameStore, req); await OrdersCart.addOrderToMovement(id, usernameStore, groupnameStore, req);
} }
ris = await OrdersCart.setPagatoById(value, myOrderCart); ris = await OrdersCart.setPagatoById(value, myOrderCart);

4
src/server/models/storehouse.js
View File

@@ -22,7 +22,9 @@ const storehouseSchema = new Schema({
}, },
username: { username: {
type: String, type: String,
required: true, },
groupname: {
type: String,
}, },
description: { description: {
type: String, type: String,