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

++ Cassa - parte 1

Browse Source
This commit is contained in:
Surya Paolo
2024-01-02 15:24:44 +01:00
parent 3fb78ff39a
commit 4e0c18f47c
6 changed files with 89 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/router/cart_router.js
View File

@@ -97,7 +97,7 @@ router.post('/:userId', authenticate, async function (req, res, next) {
myord = arrord ? arrord[0] : null;
}
} else {
return res.send({ code: server_constants.RIS_CODE_ERR, cart: null, myord: null, msgerr: 'Non è possibile acquistare nello stesso ordine, su negozi differenti!' });
return res.send({ code: server_constants.RIS_CODE_ERR, cart: null, myord: null, msgerr: 'Non è possibile acquistare nello stesso ordine, su negozi differenti!' });
}
} else {
await newCart.updatetotals();
@@ -239,6 +239,7 @@ router.post('/:userId/createorderscart', authenticate, async function (req, res,
const user = req.user;
let status = req.body.status;
let note = req.body.note;
let options = req.body.options;
try {
let mycart = await Cart.findOne({ _id: cart_id });
@@ -290,7 +291,7 @@ router.post('/:userId/createorderscart', authenticate, async function (req, res,
return res.send({ code: server_constants.RIS_CODE_ERR, status: 0 });
else {
await Order.updateStatusOrders(mycart.items, status);
await Order.updateStatusOrders(mycart.items, status);
const myris = ris;
// Cancella il Cart appena salvato in OrdersCart
@@ -299,10 +300,10 @@ router.post('/:userId/createorderscart', authenticate, async function (req, res,
.then((ris) => {
return OrdersCart.getOrdersCartByUserId(userId, idapp, numorder)
.then((orders) => {
.then(async (orders) => {
if (!!orders) {
OrdersCart.updateCmd(orders[0], status, true);
await OrdersCart.updateCmd(orders[0], status, true, req, options);
// Invia la email dell'Ordine
sendemail.sendEmail_OrderProduct(user.lang, idapp, orders[0], user)
@@ -351,6 +352,7 @@ router.post('/:userId/ordercartstatus', authenticate, async function (req, res,
let order_id = req.body.order_id;
const user = req.user;
let status = req.body.status;
let options = req.body.options;
const { User } = require('../models/user');
@@ -373,7 +375,7 @@ router.post('/:userId/ordercartstatus', authenticate, async function (req, res,
if (ris) {
// Aggiorna gli Stati Interni !
orderCart = await OrdersCart.updateCmd(orderCart, status, true);
orderCart = await OrdersCart.updateCmd(orderCart, status, true, options);
let ordertype = '';

8
src/server/router/index_router.js
View File

@@ -68,6 +68,7 @@ const Storehouse = require('../models/storehouse');
const Provider = require('../models/provider');
const CatProd = require('../models/catprod');
const Gasordine = require('../models/gasordine');
const Product = require('../models/product');
const ProductInfo = require('../models/productInfo');
const Scontistica = require('../models/scontistica');
const Department = require('../models/department');
@@ -1440,6 +1441,7 @@ function load(req, res, version) {
let providers = Provider.findAllIdApp(idapp);
let catprods = CatProd.findAllIdApp(idapp);
let gasordines = Gasordine.findAllIdApp(idapp);
let products = Product.findAllIdApp(idapp);
let productInfos = ProductInfo.findAllIdApp(idapp);
let scontisticas = Scontistica.findAllIdApp(idapp);
let departments = Department.findAllIdApp(idapp);
@@ -1531,6 +1533,7 @@ function load(req, res, version) {
providers,
scontisticas,
gasordines,
products,
productInfos,
catprods,
]).then((arrdata) => {
@@ -1618,8 +1621,9 @@ function load(req, res, version) {
providers: arrdata[40],
scontisticas: arrdata[41],
gasordines: arrdata[42],
productInfos: arrdata[43],
catprods: arrdata[44],
products: arrdata[43],
productInfos: arrdata[44],
catprods: arrdata[45],
});
const prova = 1;