mirror of
https://github.com/R0m1k3/LogiFlow.git
synced 2026-10-12 01:37:40 +02:00
michaelschal
2aa9d82dbd
Update permission checks to enable 'directeur' role for deleting orders and deliveries in Order, Delivery, and Calendar modules, aligning with user requirements. Replit-Commit-Author: Agent Replit-Commit-Session-Id: b163d4c0-de5e-4f4e-a9c0-aed4c7049718 Replit-Commit-Checkpoint-Type: full_checkpoint Replit-Commit-Screenshot-Url: https://storage.googleapis.com/screenshot-production-us-central1/1957c339-2757-4d1f-8e92-e9f71a1ce58e/b163d4c0-de5e-4f4e-a9c0-aed4c7049718/x9HQyBS
475 lines
17 KiB
TypeScript
475 lines
17 KiB
TypeScript
import { useState } from "react";
|
|
import { useMutation, useQueryClient } from "@tanstack/react-query";
|
|
import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
|
|
import { Button } from "@/components/ui/button";
|
|
import { Badge } from "@/components/ui/badge";
|
|
import { useAuthUnified } from "@/hooks/useAuthUnified";
|
|
import { useToast } from "@/hooks/use-toast";
|
|
import { apiRequest } from "@/lib/queryClient";
|
|
import { isUnauthorizedError } from "@/lib/authUtils";
|
|
import { safeFormat } from "@/lib/dateUtils";
|
|
import EditOrderModal from "./EditOrderModal";
|
|
import EditDeliveryModal from "./EditDeliveryModal";
|
|
import ValidateDeliveryModal from "./ValidateDeliveryModal";
|
|
import { Package, Truck, Edit, Trash2, Check, X, CheckCircle } from "lucide-react";
|
|
|
|
interface OrderDetailModalProps {
|
|
isOpen: boolean;
|
|
onClose: () => void;
|
|
item: any;
|
|
}
|
|
|
|
export default function OrderDetailModal({
|
|
isOpen,
|
|
onClose,
|
|
item,
|
|
}: OrderDetailModalProps) {
|
|
const { user } = useAuthUnified();
|
|
const { toast } = useToast();
|
|
const queryClient = useQueryClient();
|
|
const [showDeleteConfirm, setShowDeleteConfirm] = useState(false);
|
|
const [showEditModal, setShowEditModal] = useState(false);
|
|
|
|
const isOrder = item?.type === 'order';
|
|
const isDelivery = item?.type === 'delivery';
|
|
|
|
const validateOrderMutation = useMutation({
|
|
mutationFn: async (orderId: number) => {
|
|
await apiRequest(`/api/orders/${orderId}`, "PUT", { status: 'delivered' });
|
|
},
|
|
onSuccess: () => {
|
|
toast({
|
|
title: "Succès",
|
|
description: "Commande validée avec succès",
|
|
});
|
|
queryClient.invalidateQueries({ queryKey: ['/api/orders'] });
|
|
queryClient.invalidateQueries({ queryKey: ['/api/deliveries'] });
|
|
onClose();
|
|
},
|
|
onError: (error) => {
|
|
if (isUnauthorizedError(error)) {
|
|
toast({
|
|
title: "Non autorisé",
|
|
description: "Vous êtes déconnecté. Reconnexion...",
|
|
variant: "destructive",
|
|
});
|
|
setTimeout(() => {
|
|
window.location.href = "/api/login";
|
|
}, 500);
|
|
return;
|
|
}
|
|
toast({
|
|
title: "Erreur",
|
|
description: "Impossible de valider la commande",
|
|
variant: "destructive",
|
|
});
|
|
},
|
|
});
|
|
|
|
const validateDeliveryMutation = useMutation({
|
|
mutationFn: async (data: { id: number; blNumber: string; blAmount: number }) => {
|
|
await apiRequest(`/api/deliveries/${data.id}/validate`, "POST", data);
|
|
},
|
|
onSuccess: () => {
|
|
toast({
|
|
title: "Succès",
|
|
description: "Livraison validée avec succès",
|
|
});
|
|
queryClient.invalidateQueries({ queryKey: ['/api/deliveries'] });
|
|
queryClient.invalidateQueries({ queryKey: ['/api/orders'] });
|
|
onClose();
|
|
},
|
|
onError: (error) => {
|
|
if (isUnauthorizedError(error)) {
|
|
toast({
|
|
title: "Non autorisé",
|
|
description: "Vous êtes déconnecté. Reconnexion...",
|
|
variant: "destructive",
|
|
});
|
|
setTimeout(() => {
|
|
window.location.href = "/api/login";
|
|
}, 500);
|
|
return;
|
|
}
|
|
toast({
|
|
title: "Erreur",
|
|
description: "Impossible de valider la livraison",
|
|
variant: "destructive",
|
|
});
|
|
},
|
|
});
|
|
|
|
const deleteMutation = useMutation({
|
|
mutationFn: async (id: number) => {
|
|
const endpoint = isOrder ? `/api/orders/${id}` : `/api/deliveries/${id}`;
|
|
console.log(`🗑️ Deleting ${isOrder ? 'order' : 'delivery'}:`, id);
|
|
await apiRequest(endpoint, "DELETE");
|
|
},
|
|
onSuccess: () => {
|
|
console.log(`✅ ${isOrder ? 'Order' : 'Delivery'} deleted successfully, clearing cache...`);
|
|
toast({
|
|
title: "Succès",
|
|
description: `${isOrder ? 'Commande' : 'Livraison'} supprimée avec succès`,
|
|
});
|
|
|
|
// SOLUTION PRODUCTION : Cache clearing radical pour éviter incohérences storeId
|
|
console.log('🗑️ Cache cleared, forcing page reload to maintain storeId consistency...');
|
|
|
|
// SOLUTION HYBRIDE : Invalidation sélective pour éviter perte storeId
|
|
console.log('🧹 Using selective invalidation to preserve storeId context...');
|
|
|
|
// Invalidation ciblée sans clear() pour préserver le contexte
|
|
queryClient.invalidateQueries({
|
|
predicate: (query) => {
|
|
const key = query.queryKey[0]?.toString() || '';
|
|
return key.includes('/api/orders') || key.includes('/api/deliveries');
|
|
}
|
|
});
|
|
|
|
// Force refetch pour garantir synchronisation immédiate
|
|
queryClient.refetchQueries({
|
|
predicate: (query) => {
|
|
const key = query.queryKey[0]?.toString() || '';
|
|
return key.includes('/api/orders') || key.includes('/api/deliveries');
|
|
}
|
|
});
|
|
|
|
onClose();
|
|
},
|
|
onError: (error) => {
|
|
if (isUnauthorizedError(error)) {
|
|
toast({
|
|
title: "Non autorisé",
|
|
description: "Vous êtes déconnecté. Reconnexion...",
|
|
variant: "destructive",
|
|
});
|
|
setTimeout(() => {
|
|
window.location.href = "/api/login";
|
|
}, 500);
|
|
return;
|
|
}
|
|
toast({
|
|
title: "Erreur",
|
|
description: `Impossible de supprimer la ${isOrder ? 'commande' : 'livraison'}`,
|
|
variant: "destructive",
|
|
});
|
|
},
|
|
});
|
|
|
|
const [showValidateModal, setShowValidateModal] = useState(false);
|
|
|
|
const handleValidateDelivery = () => {
|
|
setShowValidateModal(true);
|
|
};
|
|
|
|
const handleDelete = () => {
|
|
if (item.id) {
|
|
deleteMutation.mutate(item.id);
|
|
}
|
|
};
|
|
|
|
const handleEdit = () => {
|
|
setShowEditModal(true);
|
|
};
|
|
|
|
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';
|
|
|
|
const getStatusBadge = (status: string) => {
|
|
switch (status) {
|
|
case 'pending':
|
|
return <Badge variant="secondary">En attente</Badge>;
|
|
case 'planned':
|
|
return <Badge className="bg-blue-100 text-blue-800">Planifié</Badge>;
|
|
case 'delivered':
|
|
return <Badge className="bg-green-100 text-green-800">Livré</Badge>;
|
|
default:
|
|
return <Badge variant="outline">{status}</Badge>;
|
|
}
|
|
};
|
|
|
|
const formatQuantity = (quantity: number, unit: string) => {
|
|
return `${quantity} ${unit === 'palettes' ? 'Palettes' : 'Colis'}`;
|
|
};
|
|
|
|
if (!item) return null;
|
|
|
|
return (
|
|
<>
|
|
<Dialog open={isOpen} onOpenChange={onClose}>
|
|
<DialogContent className="sm:max-w-2xl max-h-[90vh] overflow-hidden" aria-describedby="order-detail-modal-description">
|
|
{/* Header */}
|
|
<div className="bg-gradient-to-r from-primary to-blue-600 text-white p-6 -m-6 mb-4">
|
|
<DialogHeader>
|
|
<div className="flex items-center space-x-3">
|
|
<div className="w-10 h-10 bg-white bg-opacity-20 rounded-lg flex items-center justify-center">
|
|
{isOrder ? (
|
|
<Package className="w-5 h-5 text-white" />
|
|
) : (
|
|
<Truck className="w-5 h-5 text-white" />
|
|
)}
|
|
</div>
|
|
<div>
|
|
<DialogTitle className="text-xl font-bold">
|
|
Détails de la {isOrder ? 'Commande' : 'Livraison'}
|
|
</DialogTitle>
|
|
<p className="text-blue-100">
|
|
#{isOrder ? 'CMD' : 'LIV'}-{item.id}
|
|
</p>
|
|
<p id="order-detail-modal-description" className="sr-only">
|
|
Affichage détaillé de {isOrder ? 'la commande' : 'la livraison'} avec options de gestion
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</DialogHeader>
|
|
</div>
|
|
|
|
{/* Content */}
|
|
<div className="overflow-y-auto max-h-96">
|
|
{/* Status */}
|
|
<div className="mb-6">
|
|
{getStatusBadge(item.status)}
|
|
</div>
|
|
|
|
{/* Information Grid */}
|
|
<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
|
|
{/* Left Column */}
|
|
<div className="space-y-4">
|
|
<div>
|
|
<label className="block text-sm font-medium text-gray-700 mb-1">
|
|
Fournisseur
|
|
</label>
|
|
<p className="text-gray-900 font-medium">{item.supplier?.name}</p>
|
|
</div>
|
|
<div>
|
|
<label className="block text-sm font-medium text-gray-700 mb-1">
|
|
Date prévue
|
|
</label>
|
|
<p className="text-gray-900">
|
|
{safeFormat(isDelivery ? item.scheduledDate : item.plannedDate, 'dd MMMM yyyy')}
|
|
</p>
|
|
</div>
|
|
{/* Afficher la quantité seulement pour les livraisons */}
|
|
{isDelivery && (
|
|
<div>
|
|
<label className="block text-sm font-medium text-gray-700 mb-1">
|
|
Quantité
|
|
</label>
|
|
<Badge variant="outline" className="text-sm">
|
|
{formatQuantity(item.quantity, item.unit)}
|
|
</Badge>
|
|
</div>
|
|
)}
|
|
</div>
|
|
|
|
{/* Right Column */}
|
|
<div className="space-y-4">
|
|
<div>
|
|
<label className="block text-sm font-medium text-gray-700 mb-1">
|
|
Magasin/Groupe
|
|
</label>
|
|
<div className="flex items-center space-x-2">
|
|
<div
|
|
className="w-3 h-3 rounded-full"
|
|
style={{ backgroundColor: item.group?.color }}
|
|
/>
|
|
<span className="text-gray-900">{item.group?.name}</span>
|
|
</div>
|
|
</div>
|
|
{item.deliveredDate && (
|
|
<div>
|
|
<label className="block text-sm font-medium text-gray-700 mb-1">
|
|
Date de livraison
|
|
</label>
|
|
<p className="text-gray-900">
|
|
{safeFormat(item.deliveredDate, 'dd MMMM yyyy, HH:mm')}
|
|
</p>
|
|
</div>
|
|
)}
|
|
<div>
|
|
<label className="block text-sm font-medium text-gray-700 mb-1">
|
|
Créé par
|
|
</label>
|
|
<p className="text-gray-900">
|
|
{item.creator?.firstName} {item.creator?.lastName}
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
{/* Comments */}
|
|
{item.notes && (
|
|
<div className="mt-6">
|
|
<label className="block text-sm font-medium text-gray-700 mb-2">
|
|
Commentaires
|
|
</label>
|
|
<div className="bg-gray-50 rounded-lg p-4">
|
|
<p className="text-gray-700">{item.notes}</p>
|
|
</div>
|
|
</div>
|
|
)}
|
|
|
|
{/* Linked Items */}
|
|
{isOrder && item.deliveries && item.deliveries.length > 0 && (
|
|
<div className="mt-6">
|
|
<label className="block text-sm font-medium text-gray-700 mb-3">
|
|
Livraisons associées
|
|
</label>
|
|
<div className="space-y-2">
|
|
{item.deliveries.map((delivery: any) => (
|
|
<div key={delivery.id} className="flex items-center justify-between p-3 bg-green-50 rounded-lg border border-green-200">
|
|
<div className="flex items-center space-x-3">
|
|
<Truck className="w-4 h-4 text-secondary" />
|
|
<div>
|
|
<p className="font-medium text-gray-900">#LIV-{delivery.id}</p>
|
|
<p className="text-sm text-gray-600">
|
|
{delivery.status === 'delivered' && delivery.deliveredDate
|
|
? `Livré le ${safeFormat(delivery.deliveredDate, 'dd MMMM yyyy')}`
|
|
: delivery.scheduledDate
|
|
? `Prévu le ${safeFormat(delivery.scheduledDate, 'dd MMMM yyyy')}`
|
|
: 'Date non disponible'
|
|
}
|
|
</p>
|
|
</div>
|
|
</div>
|
|
{getStatusBadge(delivery.status)}
|
|
</div>
|
|
))}
|
|
</div>
|
|
</div>
|
|
)}
|
|
|
|
{isDelivery && item.order && (
|
|
<div className="mt-6">
|
|
<label className="block text-sm font-medium text-gray-700 mb-3">
|
|
Commande associée
|
|
</label>
|
|
<div className="flex items-center justify-between p-3 bg-blue-50 rounded-lg border border-blue-200">
|
|
<div className="flex items-center space-x-3">
|
|
<Package className="w-4 h-4 text-primary" />
|
|
<div>
|
|
<p className="font-medium text-gray-900">#CMD-{item.order.id}</p>
|
|
<p className="text-sm text-gray-600">
|
|
{safeFormat(item.order.plannedDate, 'dd MMMM yyyy')}
|
|
</p>
|
|
</div>
|
|
</div>
|
|
{getStatusBadge(item.order.status)}
|
|
</div>
|
|
</div>
|
|
)}
|
|
</div>
|
|
|
|
{/* Actions */}
|
|
<div className="bg-gray-50 p-4 -m-6 mt-4 border-t border-gray-200 flex items-center justify-between">
|
|
<div className="flex items-center space-x-3">
|
|
{canDelete && (
|
|
<Button
|
|
variant="destructive"
|
|
size="sm"
|
|
onClick={() => setShowDeleteConfirm(true)}
|
|
disabled={deleteMutation.isPending}
|
|
>
|
|
<Trash2 className="w-4 h-4 mr-2" />
|
|
Supprimer
|
|
</Button>
|
|
)}
|
|
</div>
|
|
<div className="flex items-center space-x-3">
|
|
<Button variant="outline" onClick={onClose}>
|
|
Fermer
|
|
</Button>
|
|
{canEdit && (
|
|
<Button onClick={handleEdit}>
|
|
<Edit className="w-4 h-4 mr-2" />
|
|
Modifier
|
|
</Button>
|
|
)}
|
|
{/* Bouton de validation pour les commandes (admin seulement) */}
|
|
{isOrder && user?.role === 'admin' && item?.status !== 'delivered' && (
|
|
<Button
|
|
onClick={() => validateOrderMutation.mutate(item.id)}
|
|
disabled={validateOrderMutation.isPending}
|
|
className="bg-green-600 hover:bg-green-700"
|
|
>
|
|
<CheckCircle className="w-4 h-4 mr-2 border border-gray-300 rounded p-0.5" />
|
|
{validateOrderMutation.isPending ? 'Validation...' : 'Valider Commande'}
|
|
</Button>
|
|
)}
|
|
|
|
{canValidate && (
|
|
<Button
|
|
onClick={handleValidateDelivery}
|
|
className="bg-secondary hover:bg-green-700"
|
|
>
|
|
<Check className="w-4 h-4 mr-2 border border-gray-300 rounded p-0.5" />
|
|
Valider livraison
|
|
</Button>
|
|
)}
|
|
</div>
|
|
</div>
|
|
|
|
{/* Delete Confirmation */}
|
|
{showDeleteConfirm && (
|
|
<div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
|
|
<div className="bg-white rounded-lg p-6 max-w-md mx-4">
|
|
<h3 className="text-lg font-semibold text-gray-900 mb-2">
|
|
Confirmer la suppression
|
|
</h3>
|
|
<p className="text-gray-600 mb-4">
|
|
Êtes-vous sûr de vouloir supprimer cette {isOrder ? 'commande' : 'livraison'} ?
|
|
Cette action est irréversible.
|
|
</p>
|
|
<div className="flex items-center space-x-3">
|
|
<Button
|
|
variant="outline"
|
|
onClick={() => setShowDeleteConfirm(false)}
|
|
>
|
|
Annuler
|
|
</Button>
|
|
<Button
|
|
variant="destructive"
|
|
onClick={handleDelete}
|
|
disabled={deleteMutation.isPending}
|
|
>
|
|
Supprimer
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
)}
|
|
</DialogContent>
|
|
</Dialog>
|
|
|
|
{/* Edit Modals */}
|
|
{showEditModal && isOrder && (
|
|
<EditOrderModal
|
|
isOpen={showEditModal}
|
|
onClose={() => setShowEditModal(false)}
|
|
order={item}
|
|
/>
|
|
)}
|
|
|
|
{showEditModal && isDelivery && (
|
|
<EditDeliveryModal
|
|
isOpen={showEditModal}
|
|
onClose={() => setShowEditModal(false)}
|
|
delivery={item}
|
|
/>
|
|
)}
|
|
|
|
{/* Validate Delivery Modal */}
|
|
{showValidateModal && isDelivery && (
|
|
<ValidateDeliveryModal
|
|
isOpen={showValidateModal}
|
|
onClose={() => setShowValidateModal(false)}
|
|
delivery={item}
|
|
onValidated={onClose} // Fermer le modal de détail après validation
|
|
/>
|
|
)}
|
|
</>
|
|
);
|
|
}
|