From 54443e784e9271c43a4971a485bae8826df77a34 Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Wed, 8 May 2024 16:07:32 +0200 Subject: [PATCH] - caaloghi, categorie --- src/server/models/product.js | 8 ++++---- src/server/models/productInfo.js | 8 ++++++++ src/server/router/admin_router.js | 18 +++++++++++++++++- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/server/models/product.js b/src/server/models/product.js index 77c991f..44f5841 100755 --- a/src/server/models/product.js +++ b/src/server/models/product.js @@ -390,17 +390,17 @@ module.exports.findAllIdApp = async function (idapp, code, id, all) { { $lookup: { from: 'catprods', - localField: 'idCatProds', + localField: 'productInfo.idCatProds', foreignField: '_id', - as: 'catprods' + as: 'productInfo.catprods' } }, { $lookup: { from: 'subcatprods', - localField: 'idSubCatProds', + localField: 'productInfo.idSubCatProds', foreignField: '_id', - as: 'subcatprods' + as: 'productInfo.subcatprods' } }, { diff --git a/src/server/models/productInfo.js b/src/server/models/productInfo.js index 1a495e3..daabef9 100755 --- a/src/server/models/productInfo.js +++ b/src/server/models/productInfo.js @@ -179,6 +179,14 @@ module.exports.findAllIdApp = async function (idapp, code, id) { as: 'authors' } }, + { + $lookup: { + from: 'publishers', + localField: 'idPublisher', + foreignField: '_id', + as: 'publisher' + } + }, { $lookup: { from: 'subcatprods', diff --git a/src/server/router/admin_router.js b/src/server/router/admin_router.js index 5f16a0f..8bf7c3e 100755 --- a/src/server/router/admin_router.js +++ b/src/server/router/admin_router.js @@ -512,6 +512,22 @@ router.post('/import', authenticate, async (req, res) => { } } } + if (productInfo.publisher) { + publisher = productInfo.publisher.trim(); + // Cerca la Sotto Categoria + let recpublisher = await Publisher.findOne({ idapp, name: publisher }).lean(); + if (!recpublisher) { + // Non esiste questo Editore, quindi la creo ! + recpublisher = new Publisher({ idapp, name: publisher }); + ris = await recpublisher.save(); + recpublisher = await Publisher.findOne({ idapp, name: publisher }).lean(); + } + + if (recpublisher) { + productInfo.idPublisher.push(recpublisher._id); + } + } + if (!product.hasOwnProperty('active')) { product.active = true; @@ -600,7 +616,7 @@ router.post('/import', authenticate, async (req, res) => { variazione.edizione = product.Edizione ? product.Edizione : ''; variazione.eta = product.eta ? product.eta : ''; variazione.addtocart_link = product.addtocart_link ? product.addtocart_link : ''; - + if (!options.aggiornaStockQty && !nuovaVariazione) { // non aggiornare la Quantita in magazzino