diff --git a/attached_assets/{0BF0A44D-52E5-4F5B-91DC-6A324D45044E}_1755006376031.png b/attached_assets/{0BF0A44D-52E5-4F5B-91DC-6A324D45044E}_1755006376031.png new file mode 100644 index 0000000..9812220 Binary files /dev/null and b/attached_assets/{0BF0A44D-52E5-4F5B-91DC-6A324D45044E}_1755006376031.png differ diff --git a/attached_assets/{8C93A7A2-1A60-4CA5-BFDF-EAA969D8C50E}_1755006306671.png b/attached_assets/{8C93A7A2-1A60-4CA5-BFDF-EAA969D8C50E}_1755006306671.png new file mode 100644 index 0000000..3fa95f2 Binary files /dev/null and b/attached_assets/{8C93A7A2-1A60-4CA5-BFDF-EAA969D8C50E}_1755006306671.png differ diff --git a/client/src/components/modals/OrderDetailModal.tsx b/client/src/components/modals/OrderDetailModal.tsx index 2a39f63..c81f18d 100644 --- a/client/src/components/modals/OrderDetailModal.tsx +++ b/client/src/components/modals/OrderDetailModal.tsx @@ -12,6 +12,7 @@ import EditOrderModal from "./EditOrderModal"; import EditDeliveryModal from "./EditDeliveryModal"; import ValidateDeliveryModal from "./ValidateDeliveryModal"; import { Package, Truck, Edit, Trash2, Check, X, CheckCircle } from "lucide-react"; +import { hasPermission } from "@/lib/permissions"; interface OrderDetailModalProps { isOpen: boolean; @@ -172,8 +173,8 @@ export default function OrderDetailModal({ setShowEditModal(true); }; - const canEdit = permissions.canEdit(isOrder ? 'orders' : 'deliveries'); - const canDelete = permissions.canDelete(isOrder ? 'orders' : 'deliveries'); + const canEdit = hasPermission(user?.role || '', isOrder ? 'orders' : 'deliveries', 'edit'); + const canDelete = hasPermission(user?.role || '', isOrder ? 'orders' : 'deliveries', 'delete'); const canValidate = (user?.role === 'admin' || user?.role === 'directeur' || user?.role === 'manager') && isDelivery && item.status !== 'delivered';