conflict resolved
This commit is contained in:
parent
7056d178f9
commit
5cb19705eb
@ -22,7 +22,7 @@ import {
|
|||||||
} from "./rdOrderController.js";
|
} from "./rdOrderController.js";
|
||||||
import { isAuthenticatedRD } from "../../middlewares/rdAuth.js";
|
import { isAuthenticatedRD } from "../../middlewares/rdAuth.js";
|
||||||
|
|
||||||
import { authorizeRoles } from "../../middlewares/auth.js";
|
import { authorizeRoles, isAuthenticatedUser } from "../../middlewares/auth.js";
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
|
|
||||||
router.route("/rd-place-order").post(isAuthenticatedRD, createOrderRD);
|
router.route("/rd-place-order").post(isAuthenticatedRD, createOrderRD);
|
||||||
@ -82,6 +82,6 @@ router.route("/pd-invoice/delivered/:invoiceId").put(
|
|||||||
updateCourierStatusToDeliveredForPD
|
updateCourierStatusToDeliveredForPD
|
||||||
);
|
);
|
||||||
router
|
router
|
||||||
.route("/single-rd-ordercount/:distributorId")
|
.route("/single-rd-ordercount/:distributorId")
|
||||||
.get(isAuthenticatedUser, authorizeRoles("admin"), gettotalorderandvalueofrd);
|
.get(isAuthenticatedUser, authorizeRoles("admin"), gettotalorderandvalueofrd);
|
||||||
export default router;
|
export default router;
|
||||||
|
Loading…
Reference in New Issue
Block a user