diff --git a/attached_assets/{04C31A6E-E082-4C70-BCCD-A3021D2DE73B}_1755005296646.png b/attached_assets/{04C31A6E-E082-4C70-BCCD-A3021D2DE73B}_1755005296646.png new file mode 100644 index 0000000..3c7acdf Binary files /dev/null and b/attached_assets/{04C31A6E-E082-4C70-BCCD-A3021D2DE73B}_1755005296646.png differ diff --git a/client/src/components/modals/OrderDetailModal.tsx b/client/src/components/modals/OrderDetailModal.tsx index 7123969..2a39f63 100644 --- a/client/src/components/modals/OrderDetailModal.tsx +++ b/client/src/components/modals/OrderDetailModal.tsx @@ -172,8 +172,8 @@ export default function OrderDetailModal({ setShowEditModal(true); }; - const canEdit = user?.role === 'admin' || user?.role === 'manager'; - const canDelete = user?.role === 'admin' || user?.role === 'manager'; + const canEdit = permissions.canEdit(isOrder ? 'orders' : 'deliveries'); + const canDelete = permissions.canDelete(isOrder ? 'orders' : 'deliveries'); const canValidate = (user?.role === 'admin' || user?.role === 'directeur' || user?.role === 'manager') && isDelivery && item.status !== 'delivered'; diff --git a/client/src/pages/Deliveries.tsx b/client/src/pages/Deliveries.tsx index 1c77056..c93b786 100644 --- a/client/src/pages/Deliveries.tsx +++ b/client/src/pages/Deliveries.tsx @@ -247,10 +247,10 @@ 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 === 'directeur' || user?.role === 'manager'; + const canCreate = permissions.canCreate('deliveries'); + const canEdit = permissions.canEdit('deliveries'); + const canDelete = permissions.canDelete('deliveries'); + const canValidate = permissions.canValidate('deliveries'); return (
diff --git a/client/src/pages/Orders.tsx b/client/src/pages/Orders.tsx index 3ae3d05..f4f18d4 100644 --- a/client/src/pages/Orders.tsx +++ b/client/src/pages/Orders.tsx @@ -219,9 +219,9 @@ export default function Orders() { } }; - const canCreate = true; // All users can create orders - const canEdit = user?.role === 'admin' || user?.role === 'manager'; - const canDelete = user?.role === 'admin' || user?.role === 'manager'; + const canCreate = permissions.canCreate('orders'); + const canEdit = permissions.canEdit('orders'); + const canDelete = permissions.canDelete('orders'); return (