Compare commits
No commits in common. "fb1ed55ebf7b664d61e08beeea9d2479f8a944db" and "16dcfae79ee08e9711ba92b1d0147506cd617379" have entirely different histories.
fb1ed55ebf
...
16dcfae79e
@ -383,6 +383,7 @@ export const processOrder = async (req, res) => {
|
|||||||
|
|
||||||
// Update stock and validate
|
// Update stock and validate
|
||||||
const updatedInvoiceItems = invoiceItems.filter((item) => {
|
const updatedInvoiceItems = invoiceItems.filter((item) => {
|
||||||
|
|
||||||
// Find the product in the stock
|
// Find the product in the stock
|
||||||
const productInStock = pdStock.products.find(
|
const productInStock = pdStock.products.find(
|
||||||
(p) => p.productid.toString() === item.productId.toString()
|
(p) => p.productid.toString() === item.productId.toString()
|
||||||
@ -661,525 +662,7 @@ export const processOrder = async (req, res) => {
|
|||||||
.json({ error: "An error occurred while processing the order" });
|
.json({ error: "An error occurred while processing the order" });
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
// get invoice by id
|
|
||||||
export const getProcessingInvoicesForPd = async (req, res) => {
|
|
||||||
console.log("req , cames");
|
|
||||||
try {
|
|
||||||
// Ensure this is passed in your route, or retrieve it from the logged-in user
|
|
||||||
const page = parseInt(req.query.page, 10) || 1; // Default page is 1
|
|
||||||
const limit = parseInt(req.query.limit, 10) || 5; // Default limit is 5
|
|
||||||
const skip = (page - 1) * limit;
|
|
||||||
const { invoiceId, orderId } = req.query; // Search parameters
|
|
||||||
const pdId = req.user._id;
|
|
||||||
if (!pdId) {
|
|
||||||
return res.status(400).json({ message: "PD ID is required" });
|
|
||||||
}
|
|
||||||
console.log(pdId);
|
|
||||||
|
|
||||||
// Build the base query for fetching processing invoices
|
|
||||||
let query = { courierStatus: "processing" };
|
|
||||||
|
|
||||||
// If invoiceId is provided, add regex search for invoiceId
|
|
||||||
if (invoiceId) {
|
|
||||||
query.invoiceId = { $regex: invoiceId, $options: "i" }; // Case-insensitive search
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fetch the invoices matching the query, along with pagination and population
|
|
||||||
const invoices = await InvoiceRd.find(query)
|
|
||||||
.skip(skip)
|
|
||||||
.limit(limit)
|
|
||||||
.populate({
|
|
||||||
path: "orderId",
|
|
||||||
match: { pd: pdId }, // Match the associated PD in the RdOrder model
|
|
||||||
select: "uniqueId", // Only select uniqueId from the order
|
|
||||||
})
|
|
||||||
.sort({ "courierstatus_timeline.processing": -1 }); // Sort by processing date, newest first
|
|
||||||
console.log(invoices);
|
|
||||||
// Filter invoices where the orderId exists and matches the search (if orderId is provided)
|
|
||||||
let filteredInvoices = invoices.filter(
|
|
||||||
(invoice) => invoice.orderId !== null
|
|
||||||
);
|
|
||||||
|
|
||||||
if (orderId) {
|
|
||||||
filteredInvoices = filteredInvoices.filter(
|
|
||||||
(invoice) =>
|
|
||||||
invoice.orderId &&
|
|
||||||
invoice.orderId.uniqueId &&
|
|
||||||
invoice.orderId.uniqueId.toLowerCase().includes(orderId.toLowerCase())
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Pagination metadata
|
|
||||||
const totalCount = filteredInvoices.length;
|
|
||||||
const totalPages = Math.ceil(totalCount / limit);
|
|
||||||
|
|
||||||
// Send the filtered invoices with pagination details
|
|
||||||
res.status(200).json({
|
|
||||||
totalCount,
|
|
||||||
currentPage: page,
|
|
||||||
totalPages,
|
|
||||||
invoices: filteredInvoices,
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
console.error(error);
|
|
||||||
res.status(500).json({ error: error.message });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
export const getInvoiceDetailsByIdForPD = async (req, res) => {
|
|
||||||
const { invoiceId } = req.params;
|
|
||||||
|
|
||||||
try {
|
|
||||||
// Find the invoice by ID and populate the orderId and addedBy fields
|
|
||||||
const invoice = await InvoiceRd.findById(invoiceId).populate({
|
|
||||||
path: "orderId",
|
|
||||||
model: "PdOrder",
|
|
||||||
populate: {
|
|
||||||
path: "addedBy",
|
|
||||||
model: "RetailDistributor",
|
|
||||||
select: "name email phone ", // Select only specific fields
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!invoice) {
|
|
||||||
return res.status(404).json({ error: "Invoice not found" });
|
|
||||||
}
|
|
||||||
|
|
||||||
res.status(200).json(invoice);
|
|
||||||
} catch (error) {
|
|
||||||
res.status(500).json({ error: error.message });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
export const updateCourierStatusToDispatchedForPD = async (req, res) => {
|
|
||||||
const { invoiceId } = req.params;
|
|
||||||
const { courierName, couriertrackingId } = req.body;
|
|
||||||
try {
|
|
||||||
// Find the invoice by ID
|
|
||||||
const invoice = await InvoiceRd.findById(invoiceId).populate({
|
|
||||||
path: "orderId",
|
|
||||||
populate: {
|
|
||||||
path: "addedBy",
|
|
||||||
select: "email",
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!invoice) {
|
|
||||||
return res.status(404).json({ error: "Invoice not found" });
|
|
||||||
}
|
|
||||||
|
|
||||||
invoice.courierStatus = "dispatched";
|
|
||||||
invoice.courierstatus_timeline.dispatched = new Date();
|
|
||||||
invoice.courier_name = courierName;
|
|
||||||
invoice.courier_tracking_id = couriertrackingId;
|
|
||||||
|
|
||||||
// Save the updated invoice
|
|
||||||
await invoice.save();
|
|
||||||
|
|
||||||
const order = invoice.orderId;
|
|
||||||
const allItemsDispatched = order.orderItem.every(
|
|
||||||
(item) => item.remainingQuantity === 0
|
|
||||||
);
|
|
||||||
|
|
||||||
if (allItemsDispatched) {
|
|
||||||
order.status = "dispatched";
|
|
||||||
await order.save();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send email to the user
|
|
||||||
await sendEmail({
|
|
||||||
to: `${order?.addedBy?.email}`, // Assuming 'addedBy' references the user who placed the order
|
|
||||||
from: `${process.env.SEND_EMAIL_FROM}`, // Change to your verified sender
|
|
||||||
subject: `Your Order #${order?.uniqueId} is On Its Way!`,
|
|
||||||
html: `
|
|
||||||
<strong style="color: #1b03a3; font-size: 16px">Hi,</strong>
|
|
||||||
<h3 style="color: #333; font-family: Arial, sans-serif;">Exciting news! Your order #${
|
|
||||||
order?.uniqueId
|
|
||||||
} has been dispatched and is en route to you. 🚚 Here are the details:</h3>
|
|
||||||
|
|
||||||
<h4 style="color: #333; font-family: Arial, sans-serif;">Courier Name: ${
|
|
||||||
invoice?.courier_name || "N/A"
|
|
||||||
}</h4>
|
|
||||||
<h4 style="color: #333; font-family: Arial, sans-serif;">Courier Tracking ID: ${
|
|
||||||
invoice?.courier_tracking_id || "N/A"
|
|
||||||
}</h4>
|
|
||||||
|
|
||||||
<h4 style="color: #333; font-family: Arial, sans-serif;">Items:</h4>
|
|
||||||
<table style="border-collapse: collapse; width: 100%;">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th style="border: 1px solid #555; padding: 2px; text-align: center;">S No.</th>
|
|
||||||
<th style="border: 1px solid #555; padding: 2px; text-align: center;">Product Name</th>
|
|
||||||
<th style="border: 1px solid #555; padding: 2px; text-align: center;">SKU</th>
|
|
||||||
<th style="border: 1px solid #555; padding: 2px; text-align: center;">Image</th>
|
|
||||||
<th style="border: 1px solid #555; padding: 2px; text-align: center;">Quantity</th>
|
|
||||||
<th style="border: 1px solid #555; padding: 2px; text-align: center;">Price</th>
|
|
||||||
<th style="border: 1px solid #555; padding: 2px; text-align: center;">GST Amount</th>
|
|
||||||
<th style="border: 1px solid #555; padding: 2px; text-align: center;">SubTotal</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
${invoice?.items
|
|
||||||
?.map(
|
|
||||||
(product, index) => `
|
|
||||||
<tr>
|
|
||||||
<td style="border: 1px solid #555; padding: 2px; text-align: center;">${
|
|
||||||
index + 1
|
|
||||||
}</td>
|
|
||||||
<td style="border: 1px solid #555; padding: 2px; text-align: center;">${
|
|
||||||
product.name
|
|
||||||
}</td>
|
|
||||||
<td style="border: 1px solid #555; padding: 2px; text-align: center;">${
|
|
||||||
product.SKU
|
|
||||||
}</td>
|
|
||||||
<td style="border: 1px solid #555; padding: 2px; text-align: center;">
|
|
||||||
${
|
|
||||||
product.image && product.image.length > 0
|
|
||||||
? `<img src="${product.image[0]?.url}" alt="${product.name}" style="max-width: 40px; height: auto;">`
|
|
||||||
: "No Image"
|
|
||||||
}
|
|
||||||
</td>
|
|
||||||
<td style="border: 1px solid #555; padding: 2px; text-align: center;">${
|
|
||||||
product.processquantity
|
|
||||||
}</td>
|
|
||||||
<td style="border: 1px solid #555; padding: 2px; text-align: center;">₹${
|
|
||||||
product.price
|
|
||||||
}</td>
|
|
||||||
<td style="border: 1px solid #555; padding: 2px; text-align: center;">₹${(
|
|
||||||
(product.GST * product.price) /
|
|
||||||
100
|
|
||||||
).toFixed(2)}</td>
|
|
||||||
<td style="border: 1px solid #555; padding: 2px; text-align: center;">₹${(
|
|
||||||
(product.price + (product.GST * product.price) / 100) *
|
|
||||||
product.processquantity
|
|
||||||
).toFixed(2)}</td>
|
|
||||||
</tr>
|
|
||||||
`
|
|
||||||
)
|
|
||||||
.join("")}
|
|
||||||
<tr>
|
|
||||||
<th colspan="7" style="border: 1px solid #555; padding: 2px; text-align: right;">Total Amount:</th>
|
|
||||||
<td style="border: 1px solid #555; padding: 2px; text-align: center;">₹${
|
|
||||||
invoice.invoiceAmount
|
|
||||||
}</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
<h3 style="color: #333; font-family: Arial, sans-serif;">Order Status: Dispatched</h3>
|
|
||||||
<h4 style="color: #333; font-family: Arial, sans-serif;">If you have any questions or need assistance, feel free to reply to this email.</h4>
|
|
||||||
<h5 style="color: #333; font-family: Arial, sans-serif;">Thanks for choosing Cheminova! We hope you enjoy your purchase.</h5>
|
|
||||||
<br/>
|
|
||||||
<span style="color: #555; font-size: 13px;">Best regards,</span><br/>
|
|
||||||
<span style="color: #555; font-size: 13px;">Team Cheminova</span>
|
|
||||||
`,
|
|
||||||
});
|
|
||||||
|
|
||||||
res.status(200).json({
|
|
||||||
message: "Courier status updated to dispatched",
|
|
||||||
orderStatus: order.status,
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
res.status(500).json({ error: error.message });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
export const updateCourierStatusToDeliveredForPD = async (req, res) => {
|
|
||||||
const { invoiceId } = req.params;
|
|
||||||
|
|
||||||
try {
|
|
||||||
// Find the invoice by ID
|
|
||||||
const invoice = await InvoiceRd.findById(invoiceId).populate({
|
|
||||||
path: "orderId",
|
|
||||||
populate: {
|
|
||||||
path: "addedBy",
|
|
||||||
select: "email",
|
|
||||||
},
|
|
||||||
});
|
|
||||||
if (!invoice) {
|
|
||||||
return res.status(404).json({ error: "Invoice not found" });
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update courier status and timeline
|
|
||||||
invoice.courierStatus = "delivered";
|
|
||||||
invoice.courierstatus_timeline.delivered = new Date();
|
|
||||||
|
|
||||||
// Save the updated invoice
|
|
||||||
await invoice.save();
|
|
||||||
|
|
||||||
const order = invoice.orderId;
|
|
||||||
const allItemsDelivered = order.orderItem.every(
|
|
||||||
(item) => item.remainingQuantity === 0
|
|
||||||
);
|
|
||||||
|
|
||||||
if (allItemsDelivered) {
|
|
||||||
order.status = "delivered";
|
|
||||||
await order.save();
|
|
||||||
}
|
|
||||||
// Get the userId from the order's addedBy
|
|
||||||
const userId = order?.addedBy?._id;
|
|
||||||
|
|
||||||
if (!userId) {
|
|
||||||
return res.status(400).json({ error: "User not found for the order" });
|
|
||||||
}
|
|
||||||
// Check if PDStock exists for the user
|
|
||||||
// let pdStock = await PDStock.findOne({ userId });
|
|
||||||
|
|
||||||
// if (!pdStock) {
|
|
||||||
// // If no stock record exists, create a new one
|
|
||||||
// pdStock = new PDStock({
|
|
||||||
// userId,
|
|
||||||
// products: [], // Initialize with empty products array
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
// // Iterate over each item in the invoice
|
|
||||||
// for (let item of invoice.items) {
|
|
||||||
// const { productId, processquantity } = item;
|
|
||||||
|
|
||||||
// // Check if the product already exists in the PDStock for the user
|
|
||||||
// const existingProduct = pdStock.products.find(
|
|
||||||
// (p) => p.productid.toString() === productId.toString()
|
|
||||||
// );
|
|
||||||
|
|
||||||
// if (existingProduct) {
|
|
||||||
// // If the product exists, update the stock by adding the processquantity
|
|
||||||
// existingProduct.Stock += processquantity;
|
|
||||||
// } else {
|
|
||||||
// // If the product doesn't exist, add a new entry for the product
|
|
||||||
// pdStock.products.push({
|
|
||||||
// productid: productId,
|
|
||||||
// Stock: processquantity,
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// Save the updated PDStock
|
|
||||||
// await pdStock.save();
|
|
||||||
// Format the current date for display
|
|
||||||
const formattedDate = formatDate(new Date());
|
|
||||||
|
|
||||||
// Send email to the user
|
|
||||||
await sendEmail({
|
|
||||||
to: `${order?.addedBy?.email}`, // Using 'addedBy' to reference the user's email
|
|
||||||
from: `${process.env.SEND_EMAIL_FROM}`, // Your verified sender
|
|
||||||
subject: `Your Order #${order?.uniqueId} Has Been Delivered!`,
|
|
||||||
html: `
|
|
||||||
<strong style="color: #1b03a3; font-size: 16px">Hi,</strong>
|
|
||||||
<h3 style="color: #333; font-family: Arial, sans-serif;">
|
|
||||||
Great news! Your order #${
|
|
||||||
order?.uniqueId
|
|
||||||
} has been successfully delivered to your doorstep. We hope everything is just as you expected!
|
|
||||||
</h3>
|
|
||||||
|
|
||||||
<h4 style="color: #333; font-family: Arial, sans-serif;">Items:</h4>
|
|
||||||
<table style="border-collapse: collapse; width: 100%;">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th style="border: 1px solid #555; padding: 2px; text-align: center;">S No.</th>
|
|
||||||
<th style="border: 1px solid #555; padding: 2px; text-align: center;">Product Name</th>
|
|
||||||
<th style="border: 1px solid #555; padding: 2px; text-align: center;">SKU</th>
|
|
||||||
<th style="border: 1px solid #555; padding: 2px; text-align: center;">Image</th>
|
|
||||||
<th style="border: 1px solid #555; padding: 2px; text-align: center;">Quantity</th>
|
|
||||||
<th style="border: 1px solid #555; padding: 2px; text-align: center;">Price</th>
|
|
||||||
<th style="border: 1px solid #555; padding: 2px; text-align: center;">GST Amount</th>
|
|
||||||
<th style="border: 1px solid #555; padding: 2px; text-align: center;">SubTotal</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
${invoice?.items
|
|
||||||
?.map(
|
|
||||||
(product, index) => `
|
|
||||||
<tr>
|
|
||||||
<td style="border: 1px solid #555; padding: 2px; text-align: center;">${
|
|
||||||
index + 1
|
|
||||||
}</td>
|
|
||||||
<td style="border: 1px solid #555; padding: 2px; text-align: center;">${
|
|
||||||
product.name
|
|
||||||
}</td>
|
|
||||||
<td style="border: 1px solid #555; padding: 2px; text-align: center;">${
|
|
||||||
product.SKU
|
|
||||||
}</td>
|
|
||||||
<td style="border: 1px solid #555; padding: 2px; text-align: center;">
|
|
||||||
${
|
|
||||||
product.image && product.image.length > 0
|
|
||||||
? `<img src="${product.image[0]?.url}" alt="${product.name}" style="max-width: 40px; height: auto;">`
|
|
||||||
: "No Image"
|
|
||||||
}
|
|
||||||
</td>
|
|
||||||
<td style="border: 1px solid #555; padding: 2px; text-align: center;">${
|
|
||||||
product.processquantity
|
|
||||||
}</td>
|
|
||||||
<td style="border: 1px solid #555; padding: 2px; text-align: center;">₹${
|
|
||||||
product.price
|
|
||||||
}</td>
|
|
||||||
<td style="border: 1px solid #555; padding: 2px; text-align: center;">₹${(
|
|
||||||
(product.GST * product.price) /
|
|
||||||
100
|
|
||||||
).toFixed(2)}</td>
|
|
||||||
<td style="border: 1px solid #555; padding: 2px; text-align: center;">₹${(
|
|
||||||
(product.price + (product.GST * product.price) / 100) *
|
|
||||||
product.processquantity
|
|
||||||
).toFixed(2)}</td>
|
|
||||||
</tr>
|
|
||||||
`
|
|
||||||
)
|
|
||||||
.join("")}
|
|
||||||
<tr>
|
|
||||||
<th colspan="7" style="border: 1px solid #555; padding: 2px; text-align: right;">Total Amount:</th>
|
|
||||||
<td style="border: 1px solid #555; padding: 2px; text-align: center;">₹${invoice.invoiceAmount.toFixed(
|
|
||||||
2
|
|
||||||
)}</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
<h3 style="color: #333; font-family: Arial, sans-serif;">Delivery Date: ${formattedDate}</h3>
|
|
||||||
|
|
||||||
<h4 style="color: #333; font-family: Arial, sans-serif;">
|
|
||||||
Your satisfaction is our priority, and we'd love to hear about your experience. Please take a moment to share your thoughts by leaving a review. Your feedback is invaluable to us!
|
|
||||||
</h4>
|
|
||||||
|
|
||||||
<h5 style="color: #333; font-family: Arial, sans-serif;">
|
|
||||||
If you have any questions or concerns about your order, feel free to reply to this email.
|
|
||||||
</h5>
|
|
||||||
|
|
||||||
<h5 style="color: #333; font-family: Arial, sans-serif;">
|
|
||||||
Thank you for choosing Cheminova! We hope to serve you again soon.
|
|
||||||
</h5>
|
|
||||||
|
|
||||||
<br/>
|
|
||||||
<span style="color: #555; font-size: 13px;">Best regards,</span><br/>
|
|
||||||
<span style="color: #555; font-size: 13px;">Team Cheminova</span>
|
|
||||||
`,
|
|
||||||
});
|
|
||||||
|
|
||||||
res.status(200).json({
|
|
||||||
message: "Courier status updated to delivered",
|
|
||||||
orderStatus: order.status,
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
res.status(500).json({ error: error.message });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
export const getDispatchedInvoicesForPd = async (req, res) => {
|
|
||||||
try {
|
|
||||||
const pdId = req.params.pdId; // Ensure this is passed in your route, or retrieve it from the logged-in user
|
|
||||||
const page = parseInt(req.query.page, 10) || 1; // Default page is 1
|
|
||||||
const limit = parseInt(req.query.limit, 10) || 5; // Default limit is 5
|
|
||||||
const skip = (page - 1) * limit;
|
|
||||||
const { invoiceId, orderId } = req.query; // Search parameters
|
|
||||||
|
|
||||||
if (!pdId) {
|
|
||||||
return res.status(400).json({ message: "PD ID is required" });
|
|
||||||
}
|
|
||||||
|
|
||||||
// Build the base query for fetching processing invoices
|
|
||||||
let query = { courierStatus: "dispatched" };
|
|
||||||
|
|
||||||
// If invoiceId is provided, add regex search for invoiceId
|
|
||||||
if (invoiceId) {
|
|
||||||
query.invoiceId = { $regex: invoiceId, $options: "i" }; // Case-insensitive search
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fetch the invoices matching the query, along with pagination and population
|
|
||||||
const invoices = await InvoiceRd.find(query)
|
|
||||||
.skip(skip)
|
|
||||||
.limit(limit)
|
|
||||||
.populate({
|
|
||||||
path: "orderId",
|
|
||||||
match: { pd: pdId }, // Match the associated PD in the RdOrder model
|
|
||||||
select: "uniqueId", // Only select uniqueId from the order
|
|
||||||
})
|
|
||||||
.sort({ "courierstatus_timeline.processing": -1 }); // Sort by processing date, newest first
|
|
||||||
|
|
||||||
// Filter invoices where the orderId exists and matches the search (if orderId is provided)
|
|
||||||
let filteredInvoices = invoices.filter(
|
|
||||||
(invoice) => invoice.orderId !== null
|
|
||||||
);
|
|
||||||
|
|
||||||
if (orderId) {
|
|
||||||
filteredInvoices = filteredInvoices.filter(
|
|
||||||
(invoice) =>
|
|
||||||
invoice.orderId &&
|
|
||||||
invoice.orderId.uniqueId &&
|
|
||||||
invoice.orderId.uniqueId.toLowerCase().includes(orderId.toLowerCase())
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Pagination metadata
|
|
||||||
const totalCount = filteredInvoices.length;
|
|
||||||
const totalPages = Math.ceil(totalCount / limit);
|
|
||||||
|
|
||||||
// Send the filtered invoices with pagination details
|
|
||||||
res.status(200).json({
|
|
||||||
totalCount,
|
|
||||||
currentPage: page,
|
|
||||||
totalPages,
|
|
||||||
invoices: filteredInvoices,
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
console.error(error);
|
|
||||||
res.status(500).json({ error: error.message });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
export const getDeliveredInvoicesForPd = async (req, res) => {
|
|
||||||
try {
|
|
||||||
const pdId = req.params.pdId; // Ensure this is passed in your route, or retrieve it from the logged-in user
|
|
||||||
const page = parseInt(req.query.page, 10) || 1; // Default page is 1
|
|
||||||
const limit = parseInt(req.query.limit, 10) || 5; // Default limit is 5
|
|
||||||
const skip = (page - 1) * limit;
|
|
||||||
const { invoiceId, orderId } = req.query; // Search parameters
|
|
||||||
|
|
||||||
if (!pdId) {
|
|
||||||
return res.status(400).json({ message: "PD ID is required" });
|
|
||||||
}
|
|
||||||
|
|
||||||
// Build the base query for fetching processing invoices
|
|
||||||
let query = { courierStatus: "delivered" };
|
|
||||||
|
|
||||||
// If invoiceId is provided, add regex search for invoiceId
|
|
||||||
if (invoiceId) {
|
|
||||||
query.invoiceId = { $regex: invoiceId, $options: "i" }; // Case-insensitive search
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fetch the invoices matching the query, along with pagination and population
|
|
||||||
const invoices = await InvoiceRd.find(query)
|
|
||||||
.skip(skip)
|
|
||||||
.limit(limit)
|
|
||||||
.populate({
|
|
||||||
path: "orderId",
|
|
||||||
match: { pd: pdId }, // Match the associated PD in the RdOrder model
|
|
||||||
select: "uniqueId", // Only select uniqueId from the order
|
|
||||||
})
|
|
||||||
.sort({ "courierstatus_timeline.processing": -1 }); // Sort by processing date, newest first
|
|
||||||
|
|
||||||
// Filter invoices where the orderId exists and matches the search (if orderId is provided)
|
|
||||||
let filteredInvoices = invoices.filter(
|
|
||||||
(invoice) => invoice.orderId !== null
|
|
||||||
);
|
|
||||||
|
|
||||||
if (orderId) {
|
|
||||||
filteredInvoices = filteredInvoices.filter(
|
|
||||||
(invoice) =>
|
|
||||||
invoice.orderId &&
|
|
||||||
invoice.orderId.uniqueId &&
|
|
||||||
invoice.orderId.uniqueId.toLowerCase().includes(orderId.toLowerCase())
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Pagination metadata
|
|
||||||
const totalCount = filteredInvoices.length;
|
|
||||||
const totalPages = Math.ceil(totalCount / limit);
|
|
||||||
|
|
||||||
// Send the filtered invoices with pagination details
|
|
||||||
res.status(200).json({
|
|
||||||
totalCount,
|
|
||||||
currentPage: page,
|
|
||||||
totalPages,
|
|
||||||
invoices: filteredInvoices,
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
console.error(error);
|
|
||||||
res.status(500).json({ error: error.message });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
// cancell order
|
// cancell order
|
||||||
|
|
||||||
export const cancelOrderController = async (req, res) => {
|
export const cancelOrderController = async (req, res) => {
|
||||||
@ -1411,18 +894,6 @@ export const cancelOrderController = async (req, res) => {
|
|||||||
.json({ message: "An error occurred while cancelling the order" });
|
.json({ message: "An error occurred while cancelling the order" });
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
const formatDate = (date) => {
|
|
||||||
const options = {
|
|
||||||
weekday: "short",
|
|
||||||
year: "numeric",
|
|
||||||
month: "short",
|
|
||||||
day: "2-digit",
|
|
||||||
// hour: "2-digit",
|
|
||||||
// minute: "2-digit",
|
|
||||||
// hour12: true,
|
|
||||||
};
|
|
||||||
return new Intl.DateTimeFormat("en-US", options).format(new Date(date));
|
|
||||||
};
|
|
||||||
|
|
||||||
export const getAllOrdersByDistributor = async (req, res) => {
|
export const getAllOrdersByDistributor = async (req, res) => {
|
||||||
const { distributorId } = req.params;
|
const { distributorId } = req.params;
|
||||||
|
|||||||
@ -4,24 +4,16 @@ import {
|
|||||||
createOrderRD,
|
createOrderRD,
|
||||||
getAllOrdersByDistributor,
|
getAllOrdersByDistributor,
|
||||||
getCancelledOrders,
|
getCancelledOrders,
|
||||||
getDeliveredInvoicesForPd,
|
|
||||||
getDispatchedInvoicesForPd,
|
|
||||||
getInvoiceDetailsByIdForPD,
|
|
||||||
getNewOrders,
|
getNewOrders,
|
||||||
getPendignOrders,
|
getPendignOrders,
|
||||||
getPlacedOrderById,
|
getPlacedOrderById,
|
||||||
getPlacedOrdersForPD,
|
getPlacedOrdersForPD,
|
||||||
getPlacedOrdersForRD,
|
getPlacedOrdersForRD,
|
||||||
getProcessingInvoicesForPd,
|
|
||||||
getSinglePlacedOrderForPD,
|
getSinglePlacedOrderForPD,
|
||||||
getSinglePlacedOrderForRD,
|
getSinglePlacedOrderForRD,
|
||||||
processOrder,
|
processOrder,
|
||||||
updateCourierStatusToDeliveredForPD,
|
|
||||||
updateCourierStatusToDispatchedForPD,
|
|
||||||
} from "./rdOrderController.js";
|
} from "./rdOrderController.js";
|
||||||
import { isAuthenticatedRD } from "../../middlewares/rdAuth.js";
|
import { isAuthenticatedRD } from "../../middlewares/rdAuth.js";
|
||||||
import { isAuthenticatedUser } from "../../middlewares/auth.js";
|
|
||||||
|
|
||||||
import { authorizeRoles, isAuthenticatedUser } from "../../middlewares/auth.js";
|
import { authorizeRoles, isAuthenticatedUser } from "../../middlewares/auth.js";
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
|
|
||||||
@ -54,32 +46,8 @@ router
|
|||||||
router
|
router
|
||||||
.route("/pd-get-cancelled-orders")
|
.route("/pd-get-cancelled-orders")
|
||||||
.get(isAuthenticatedUser, getCancelledOrders);
|
.get(isAuthenticatedUser, getCancelledOrders);
|
||||||
|
|
||||||
router
|
|
||||||
.route("/pd-get-processing-invoices")
|
|
||||||
.get(isAuthenticatedUser, getProcessingInvoicesForPd);
|
|
||||||
router
|
|
||||||
.route("/pd-get-dispatched-invoices")
|
|
||||||
.get(isAuthenticatedUser, getDispatchedInvoicesForPd);
|
|
||||||
router
|
|
||||||
.route("/pd-get-delivered-invoices")
|
|
||||||
.get(isAuthenticatedUser, getDeliveredInvoicesForPd);
|
|
||||||
router
|
|
||||||
.route("/pd-get-invoices/:invoiceId")
|
|
||||||
.get(isAuthenticatedUser, getInvoiceDetailsByIdForPD);
|
|
||||||
router
|
router
|
||||||
.route("/pd-cancel-order/:id")
|
.route("/pd-cancel-order/:id")
|
||||||
.put(isAuthenticatedUser, cancelOrderController);
|
.put(isAuthenticatedUser, cancelOrderController);
|
||||||
router.route("/invoice/dispatched/:invoiceId").put(
|
|
||||||
isAuthenticatedUser,
|
|
||||||
|
|
||||||
updateCourierStatusToDispatchedForPD
|
|
||||||
);
|
|
||||||
|
|
||||||
router.route("/invoice/delivered/:invoiceId").put(
|
|
||||||
isAuthenticatedUser,
|
|
||||||
|
|
||||||
updateCourierStatusToDeliveredForPD
|
|
||||||
);
|
|
||||||
|
|
||||||
export default router;
|
export default router;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user