diff --git a/public/temp/tmp-1-1726740645735 b/public/temp/tmp-1-1726740645735 new file mode 100644 index 0000000..a8bf667 Binary files /dev/null and b/public/temp/tmp-1-1726740645735 differ diff --git a/public/temp/tmp-2-1726740645736 b/public/temp/tmp-2-1726740645736 new file mode 100644 index 0000000..a8bf667 Binary files /dev/null and b/public/temp/tmp-2-1726740645736 differ diff --git a/public/temp/tmp-3-1726740697903 b/public/temp/tmp-3-1726740697903 new file mode 100644 index 0000000..a8bf667 Binary files /dev/null and b/public/temp/tmp-3-1726740697903 differ diff --git a/public/temp/tmp-4-1726740697904 b/public/temp/tmp-4-1726740697904 new file mode 100644 index 0000000..a8bf667 Binary files /dev/null and b/public/temp/tmp-4-1726740697904 differ diff --git a/public/temp/tmp-5-1726740697905 b/public/temp/tmp-5-1726740697905 new file mode 100644 index 0000000..a8bf667 Binary files /dev/null and b/public/temp/tmp-5-1726740697905 differ diff --git a/public/temp/tmp-6-1726740697908 b/public/temp/tmp-6-1726740697908 new file mode 100644 index 0000000..a8bf667 Binary files /dev/null and b/public/temp/tmp-6-1726740697908 differ diff --git a/public/temp/tmp-7-1726740697911 b/public/temp/tmp-7-1726740697911 new file mode 100644 index 0000000..a8bf667 Binary files /dev/null and b/public/temp/tmp-7-1726740697911 differ diff --git a/resources/PD_Orders/pdOrderController.js b/resources/PD_Orders/pdOrderController.js index d0d5a61..b531f6a 100644 --- a/resources/PD_Orders/pdOrderController.js +++ b/resources/PD_Orders/pdOrderController.js @@ -806,13 +806,13 @@ export const getProcessingInvoices = async (req, res) => { try { const page = parseInt(req.query.page, 10) || 1; const limit = parseInt(req.query.limit, 10) || 5; - const { invoiceId, orderId } = req.query; + const { invoiceId, orderId } = req.query; const skip = (page - 1) * limit; let query = { courierStatus: "processing" }; if (invoiceId) { - query.invoiceId = { $regex: invoiceId, $options: "i" }; + query.invoiceId = { $regex: invoiceId, $options: "i" }; } const invoices = await Invoice.find(query) .sort({ createdAt: -1 }) @@ -824,9 +824,11 @@ export const getProcessingInvoices = async (req, res) => { }); if (orderId) { - const filteredInvoices = invoices.filter(invoice => - invoice.orderId && invoice.orderId.uniqueId && - invoice.orderId.uniqueId.toLowerCase().includes(orderId.toLowerCase()) + const filteredInvoices = invoices.filter( + (invoice) => + invoice.orderId && + invoice.orderId.uniqueId && + invoice.orderId.uniqueId.toLowerCase().includes(orderId.toLowerCase()) ); res.status(200).json({ totalCount: filteredInvoices.length, @@ -858,7 +860,7 @@ export const getInvoiceDetailsById = async (req, res) => { populate: { path: "addedBy", model: "User", - select: "name email phone", // Select only specific fields + select: "name email phone SBU", // Select only specific fields }, }); @@ -1008,13 +1010,13 @@ export const getDispatchedInvoices = async (req, res) => { try { const page = parseInt(req.query.page, 10) || 1; const limit = parseInt(req.query.limit, 10) || 5; - const { invoiceId, orderId } = req.query; + const { invoiceId, orderId } = req.query; const skip = (page - 1) * limit; let query = { courierStatus: "dispatched" }; if (invoiceId) { - query.invoiceId = { $regex: invoiceId, $options: "i" }; + query.invoiceId = { $regex: invoiceId, $options: "i" }; } const invoices = await Invoice.find(query) .sort({ createdAt: -1 }) @@ -1026,9 +1028,11 @@ export const getDispatchedInvoices = async (req, res) => { }); if (orderId) { - const filteredInvoices = invoices.filter(invoice => - invoice.orderId && invoice.orderId.uniqueId && - invoice.orderId.uniqueId.toLowerCase().includes(orderId.toLowerCase()) + const filteredInvoices = invoices.filter( + (invoice) => + invoice.orderId && + invoice.orderId.uniqueId && + invoice.orderId.uniqueId.toLowerCase().includes(orderId.toLowerCase()) ); res.status(200).json({ totalCount: filteredInvoices.length, @@ -1193,13 +1197,13 @@ export const getDeliveredInvoices = async (req, res) => { try { const page = parseInt(req.query.page, 10) || 1; const limit = parseInt(req.query.limit, 10) || 5; - const { invoiceId, orderId } = req.query; + const { invoiceId, orderId } = req.query; const skip = (page - 1) * limit; let query = { courierStatus: "delivered" }; if (invoiceId) { - query.invoiceId = { $regex: invoiceId, $options: "i" }; + query.invoiceId = { $regex: invoiceId, $options: "i" }; } const invoices = await Invoice.find(query) .sort({ createdAt: -1 }) @@ -1211,9 +1215,11 @@ export const getDeliveredInvoices = async (req, res) => { }); if (orderId) { - const filteredInvoices = invoices.filter(invoice => - invoice.orderId && invoice.orderId.uniqueId && - invoice.orderId.uniqueId.toLowerCase().includes(orderId.toLowerCase()) + const filteredInvoices = invoices.filter( + (invoice) => + invoice.orderId && + invoice.orderId.uniqueId && + invoice.orderId.uniqueId.toLowerCase().includes(orderId.toLowerCase()) ); res.status(200).json({ totalCount: filteredInvoices.length,