mirror of
https://github.com/R0m1k3/LogiFlow.git
synced 2026-10-23 23:18:18 +02:00
Merge pull request #386 from R0m1k3/1.1
Send credit note details via webhook when status changes to received
This commit is contained in:
2 files changed
+54
-4
No files matched your search
@@ -1,6 +1,6 @@
|
|||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
|
import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
|
||||||
import { Plus, Search, FileText, CheckCircle, AlertCircle, Clock, Edit, Trash2, UserCheck } from "lucide-react";
|
import { Plus, Search, FileText, CheckCircle, AlertCircle, Clock, Edit, Trash2, UserCheck, Send } from "lucide-react";
|
||||||
import { useStore } from "@/components/Layout";
|
import { useStore } from "@/components/Layout";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Input } from "@/components/ui/input";
|
import { Input } from "@/components/ui/input";
|
||||||
@@ -159,7 +159,7 @@ export default function Avoirs() {
|
|||||||
// ✅ FIX: Invalider toutes les variations de queryKey avoirs
|
// ✅ FIX: Invalider toutes les variations de queryKey avoirs
|
||||||
queryClient.invalidateQueries({
|
queryClient.invalidateQueries({
|
||||||
predicate: (query) => {
|
predicate: (query) => {
|
||||||
return query.queryKey[0]?.toString().includes('/api/avoirs');
|
return query.queryKey[0]?.toString().includes('/api/avoirs') || false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
setIsCreateDialogOpen(false);
|
setIsCreateDialogOpen(false);
|
||||||
@@ -197,7 +197,7 @@ export default function Avoirs() {
|
|||||||
// ✅ FIX: Invalider toutes les variations de queryKey avoirs
|
// ✅ FIX: Invalider toutes les variations de queryKey avoirs
|
||||||
queryClient.invalidateQueries({
|
queryClient.invalidateQueries({
|
||||||
predicate: (query) => {
|
predicate: (query) => {
|
||||||
return query.queryKey[0]?.toString().includes('/api/avoirs');
|
return query.queryKey[0]?.toString().includes('/api/avoirs') || false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
setIsEditDialogOpen(false);
|
setIsEditDialogOpen(false);
|
||||||
@@ -232,7 +232,7 @@ export default function Avoirs() {
|
|||||||
// ✅ FIX: Invalider toutes les variations de queryKey avoirs
|
// ✅ FIX: Invalider toutes les variations de queryKey avoirs
|
||||||
queryClient.invalidateQueries({
|
queryClient.invalidateQueries({
|
||||||
predicate: (query) => {
|
predicate: (query) => {
|
||||||
return query.queryKey[0]?.toString().includes('/api/avoirs');
|
return query.queryKey[0]?.toString().includes('/api/avoirs') || false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
setIsDeleteDialogOpen(false);
|
setIsDeleteDialogOpen(false);
|
||||||
@@ -660,6 +660,11 @@ export default function Avoirs() {
|
|||||||
<UserCheck className="h-4 w-4 text-blue-600 ml-2" />
|
<UserCheck className="h-4 w-4 text-blue-600 ml-2" />
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
{avoir.webhookSent && (
|
||||||
|
<div title="Webhook envoyé">
|
||||||
|
<Send className="h-4 w-4 text-green-600 ml-2" />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td className="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
|
<td className="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
|
||||||
|
|||||||
@@ -2508,6 +2508,51 @@ export async function registerRoutes(app: Express): Promise<Server> {
|
|||||||
|
|
||||||
const updatedAvoir = await storage.updateAvoir(id, validatedData);
|
const updatedAvoir = await storage.updateAvoir(id, validatedData);
|
||||||
console.log('✅ Avoir updated:', id, 'by user:', user.id);
|
console.log('✅ Avoir updated:', id, 'by user:', user.id);
|
||||||
|
|
||||||
|
// 🎯 WEBHOOK QUAND STATUT PASSE À "Reçu"
|
||||||
|
if (validatedData.status === 'Reçu' && existingAvoir.status !== 'Reçu') {
|
||||||
|
try {
|
||||||
|
// Utiliser groupe par défaut (1) pour admin si pas de groupe sélectionné
|
||||||
|
const groupId = updatedAvoir.groupId || (user.role === 'admin' ? 1 : updatedAvoir.groupId);
|
||||||
|
const group = await storage.getGroup(groupId);
|
||||||
|
|
||||||
|
if (group && group.webhookUrl) {
|
||||||
|
const webhookData = {
|
||||||
|
type: "Avoir",
|
||||||
|
avoirId: updatedAvoir.id,
|
||||||
|
invoiceReference: updatedAvoir.invoiceReference,
|
||||||
|
amount: updatedAvoir.amount,
|
||||||
|
supplierName: "Fournisseur", // Sera enrichi avec relations
|
||||||
|
groupName: group.name,
|
||||||
|
comment: updatedAvoir.comment || "",
|
||||||
|
commercialProcessed: updatedAvoir.commercialProcessed,
|
||||||
|
status: "Reçu",
|
||||||
|
createdBy: user.firstName && user.lastName ? `${user.firstName} ${user.lastName}` : user.username,
|
||||||
|
processedAt: new Date().toISOString()
|
||||||
|
};
|
||||||
|
|
||||||
|
console.log('🌐 Envoi webhook avoir reçu:', { groupId, webhookUrl: group.webhookUrl });
|
||||||
|
|
||||||
|
const webhookResponse = await fetch(group.webhookUrl, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
body: JSON.stringify(webhookData)
|
||||||
|
});
|
||||||
|
|
||||||
|
if (webhookResponse.ok) {
|
||||||
|
await storage.updateAvoirWebhookStatus(updatedAvoir.id, true);
|
||||||
|
console.log('✅ Webhook avoir reçu envoyé:', updatedAvoir.id);
|
||||||
|
} else {
|
||||||
|
console.error('❌ Échec envoi webhook avoir:', webhookResponse.status);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (webhookError) {
|
||||||
|
console.error('❌ Erreur webhook avoir reçu:', webhookError);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
res.json(updatedAvoir);
|
res.json(updatedAvoir);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof z.ZodError) {
|
if (error instanceof z.ZodError) {
|
||||||
|
|||||||
Reference in new issue
Block a user