diff --git a/client/src/components/modals/OrderDetailModal.tsx b/client/src/components/modals/OrderDetailModal.tsx index 50c664f..ea03454 100644 --- a/client/src/components/modals/OrderDetailModal.tsx +++ b/client/src/components/modals/OrderDetailModal.tsx @@ -174,7 +174,7 @@ export default function OrderDetailModal({ const canEdit = user?.role === 'admin' || user?.role === 'manager'; const canDelete = user?.role === 'admin' || user?.role === 'manager'; - const canValidate = (user?.role === 'admin' || user?.role === 'manager') && + const canValidate = (user?.role === 'admin' || user?.role === 'directeur' || user?.role === 'manager') && isDelivery && item.status !== 'delivered'; const getStatusBadge = (status: string) => { diff --git a/client/src/pages/Deliveries.tsx b/client/src/pages/Deliveries.tsx index cbddfd7..73e630e 100644 --- a/client/src/pages/Deliveries.tsx +++ b/client/src/pages/Deliveries.tsx @@ -250,7 +250,7 @@ export default function Deliveries() { const canCreate = true; // All users can create deliveries const canEdit = user?.role === 'admin' || user?.role === 'manager'; const canDelete = user?.role === 'admin' || user?.role === 'manager'; - const canValidate = user?.role === 'admin' || user?.role === 'manager'; + const canValidate = user?.role === 'admin' || user?.role === 'directeur' || user?.role === 'manager'; return (
diff --git a/shared/permissions.ts b/shared/permissions.ts index 2a4ef65..4b54fed 100644 --- a/shared/permissions.ts +++ b/shared/permissions.ts @@ -40,11 +40,11 @@ const PERMISSIONS: Record> = { employee: [] }, - // Livraisons - Admin/Directeur tout, Manager tout sauf delete, Employé aucun accès + // Livraisons - Admin/Directeur tout + validate, Manager tout sauf delete + validate, Employé aucun accès deliveries: { - admin: ['view', 'create', 'edit', 'delete'], - directeur: ['view', 'create', 'edit', 'delete'], - manager: ['view', 'create', 'edit'], + admin: ['view', 'create', 'edit', 'delete', 'validate'], + directeur: ['view', 'create', 'edit', 'delete', 'validate'], + manager: ['view', 'create', 'edit', 'validate'], employee: [] },