From 6df7ab6eab0ede693dbde3a3fc8454f10d82be2e Mon Sep 17 00:00:00 2001 From: Sibunnayak Date: Fri, 25 Oct 2024 16:54:39 +0530 Subject: [PATCH 1/2] update --- resources/Stock/StockController.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/Stock/StockController.js b/resources/Stock/StockController.js index dbfce80..51d1ff7 100644 --- a/resources/Stock/StockController.js +++ b/resources/Stock/StockController.js @@ -89,8 +89,9 @@ export const uploadOpeningInventory = async (req, res) => { // Validate required fields if (!item.SKU) missingFields.add("SKU"); if (!item.productName) missingFields.add("Product Name"); - if (!item.openingInventory) missingFields.add("Opening Inventory (Qty)"); - + if (item.openingInventory === null || item.openingInventory === undefined) { + missingFields.add("Opening Inventory (Qty)"); + } // Combine all errors into a single message let errorMessage = ""; if (missingFields.size > 0) { From 2ade217606aa91b56ba4fb833af385e75cd3e03d Mon Sep 17 00:00:00 2001 From: Sibunnayak Date: Mon, 28 Oct 2024 14:09:27 +0530 Subject: [PATCH 2/2] getting pd/rd for sc and tm fixed --- resources/Inventory/InventoryController.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/resources/Inventory/InventoryController.js b/resources/Inventory/InventoryController.js index aff5e9c..6b7fa9d 100644 --- a/resources/Inventory/InventoryController.js +++ b/resources/Inventory/InventoryController.js @@ -86,16 +86,18 @@ export const addInventory = async (req, res) => { export const getDistributors = async (req, res) => { try { const { type } = req.params; - + // console.log(req.params); if (!["PrincipalDistributor", "RetailDistributor"].includes(type)) { return res.status(400).json({ message: "Invalid distributor type" }); } + // console.log(req.userType); let filter = { role: "principal-Distributor" }; let query = {}; // Check the user type and adjust the filter accordingly + // console.log(req.user); if (req.userType === "SalesCoOrdinator") { // If userType is "SalesCoOrdinator", filter by req.user.mappedBy - filter.mappedby = req.user.mappedby; + filter.mappedbySC = req.user._id; query.mappedSC = req.user._id; } else { // Otherwise, filter by req.user._id @@ -195,7 +197,9 @@ export const getAllInventories = async (req, res) => { addedForData.shippingAddress?.tradeName?.toLowerCase() || ""; } } else if (inventory.addedFor === "RetailDistributor") { - addedForData = await RetailDistributor.findById(inventory.addedForId).populate("kyc"); + addedForData = await RetailDistributor.findById( + inventory.addedForId + ).populate("kyc"); tradeName = addedForData?.kyc?.trade_name?.toLowerCase() || ""; } @@ -273,7 +277,9 @@ export const getSingleInventory = async (req, res) => { shippingAddress, }; } else if (inventory.addedFor === "RetailDistributor") { - addedForData = await RetailDistributor.findById(inventory.addedForId).populate("kyc"); + addedForData = await RetailDistributor.findById( + inventory.addedForId + ).populate("kyc"); } res.status(200).json({