Michael/LogiFlow
1
0 Fork 0
mirror of https://github.com/R0m1k3/LogiFlow.git synced 2026-10-23 15:08:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24 from R0m1k3/1.1

Browse Source 
Allow directors and managers to validate deliveries in the system
This commit is contained in:
LogiFlow authored and GitHub committed 2025-08-12 14:24:58 +02:00
2 parents 3256f9adee b3386eb6b9
commit 0559f1aab4
3 files changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

client/src/components/modals/OrderDetailModal.tsx
+1 -1
View File
@@ -174,7 +174,7 @@ export default function OrderDetailModal({
const canEdit = user?.role === 'admin' || user?.role === 'manager'; const canEdit = user?.role === 'admin' || user?.role === 'manager';
const canDelete = 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'; isDelivery && item.status !== 'delivered';
const getStatusBadge = (status: string) => { const getStatusBadge = (status: string) => {
client/src/pages/Deliveries.tsx
+1 -1
View File
@@ -250,7 +250,7 @@ export default function Deliveries() {
const canCreate = true; // All users can create deliveries const canCreate = true; // All users can create deliveries
const canEdit = user?.role === 'admin' || user?.role === 'manager'; const canEdit = user?.role === 'admin' || user?.role === 'manager';
const canDelete = 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 ( return (
<div className="p-6 space-y-6"> <div className="p-6 space-y-6">
shared/permissions.ts
+4 -4
View File
@@ -40,11 +40,11 @@ const PERMISSIONS: Record<Module, Record<Role, Permission[]>> = {
employee: [] 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: { deliveries: {
admin: ['view', 'create', 'edit', 'delete'], admin: ['view', 'create', 'edit', 'delete', 'validate'],
directeur: ['view', 'create', 'edit', 'delete'], directeur: ['view', 'create', 'edit', 'delete', 'validate'],
manager: ['view', 'create', 'edit'], manager: ['view', 'create', 'edit', 'validate'],
employee: [] employee: []
}, },