From 5cb19705eb0524b5fd763eed4f1c47877f4112bb Mon Sep 17 00:00:00 2001 From: ROSHAN GARG Date: Thu, 3 Oct 2024 16:28:51 +0530 Subject: [PATCH] conflict resolved --- resources/RD_Ordes/rdOrderRoutes.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/RD_Ordes/rdOrderRoutes.js b/resources/RD_Ordes/rdOrderRoutes.js index 696afd5..e023e68 100644 --- a/resources/RD_Ordes/rdOrderRoutes.js +++ b/resources/RD_Ordes/rdOrderRoutes.js @@ -22,7 +22,7 @@ import { } from "./rdOrderController.js"; import { isAuthenticatedRD } from "../../middlewares/rdAuth.js"; -import { authorizeRoles } from "../../middlewares/auth.js"; +import { authorizeRoles, isAuthenticatedUser } from "../../middlewares/auth.js"; const router = express.Router(); router.route("/rd-place-order").post(isAuthenticatedRD, createOrderRD); @@ -82,6 +82,6 @@ router.route("/pd-invoice/delivered/:invoiceId").put( updateCourierStatusToDeliveredForPD ); router -.route("/single-rd-ordercount/:distributorId") -.get(isAuthenticatedUser, authorizeRoles("admin"), gettotalorderandvalueofrd); + .route("/single-rd-ordercount/:distributorId") + .get(isAuthenticatedUser, authorizeRoles("admin"), gettotalorderandvalueofrd); export default router;