Michael/LogiFlow
1
0 Fork 0
mirror of https://github.com/R0m1k3/LogiFlow.git synced 2026-10-12 01:37:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30 from R0m1k3/1.1

Browse Source 
Allow directors to delete orders and deliveries across modules
This commit is contained in:
LogiFlow authored and GitHub committed 2025-08-12 15:30:32 +02:00
2 parents 04525fbf64 2aa9d82dbd
commit 904d442c36
4 files changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

attached_assets/{04C31A6E-E082-4C70-BCCD-A3021D2DE73B}_1755005296646.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 376 KiB

client/src/components/modals/OrderDetailModal.tsx
+2 -2
View File
@@ -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';
client/src/pages/Deliveries.tsx
+4 -4
View File
@@ -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 (
<div className="p-6 space-y-6">
client/src/pages/Orders.tsx
+3 -3
View File
@@ -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 (
<div className="p-6 space-y-6">