diff --git a/resources/Orders/CheckoutController.js b/resources/Orders/CheckoutController.js index 1c981a2..ab9f8d0 100644 --- a/resources/Orders/CheckoutController.js +++ b/resources/Orders/CheckoutController.js @@ -248,7 +248,9 @@ export const captureOrderPayment = async (req, res) => { return res.status(httpStatusCode).json(responseData); } catch (error) { - console.error("Failed to create order:", error); - res.status(500).json({ error: "Failed to capture order." }); + // console.error("Failed to create order:", error); + res + .status(500) + .json({ message: error.message || "Failed to capture order." }); } }; diff --git a/resources/Orders/orderController.js b/resources/Orders/orderController.js index 68e9357..799d5fc 100644 --- a/resources/Orders/orderController.js +++ b/resources/Orders/orderController.js @@ -2,8 +2,10 @@ import { Order } from "./orderModel.js"; export const getAllOrder = async (req, res) => { try { + const { status } = req.params; const order = await Order.find({ payment_status: { $in: ["success", "failed"] }, + // orderStatus: status, }) .populate({ path: "user", @@ -47,11 +49,6 @@ export const getSingleOrder = async (req, res) => { }) .populate({ path: "shippingInfo", - - populate: { - path: "Franchisee", - select: "banner price_Lable ", - }, }) .sort({ createdAt: -1 }); if (order) { diff --git a/resources/Orders/orderRoute.js b/resources/Orders/orderRoute.js index d90f7bd..b9df210 100644 --- a/resources/Orders/orderRoute.js +++ b/resources/Orders/orderRoute.js @@ -22,15 +22,15 @@ router.route("/user/self").get(isAuthenticatedUser, getUserSelf); //admin route router - .route("/order/getAll") + .route("/getAll/:status") .get(isAuthenticatedUser, authorizeRoles("admin"), getAllOrder); -router.route("/order/getOne/:id").get(isAuthenticatedUser, getSingleOrder); +router.route("/getOne/:id").get(isAuthenticatedUser, getSingleOrder); // router // .route("/order/edit/:id") // .put(isAuthenticatedUser, authorizeRoles("admin"), EditOrderBeforePayment); router - .route("/order/delete/:id") + .route("/delete/:id") .delete(isAuthenticatedUser, authorizeRoles("admin"), deleteOneOrder); // router.route("/product/getAll/").get(getAllProduct)