merge(main): resolve conflicts keeping codefou + email on suppliers

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-10-22 06:28:19 +02:00 · 2026-05-15 11:14:35 +02:00
commit b8ecacee3b
@@ -29,7 +29,7 @@ import {
  SelectValue,
 } from "@/components/ui/select";
 import { Pagination, usePagination } from "@/components/ui/pagination";
-import { Plus, Edit, Trash2, Phone, PhoneCall, Printer, Eye, Package, AlertCircle } from "lucide-react";
+import { Plus, Edit, Trash2, Phone, PhoneCall, Printer, Eye, Package, AlertCircle, MessageSquare } from "lucide-react";
 import JsBarcode from 'jsbarcode';
 import { safeFormat, safeDate } from "@/lib/dateUtils";
 import { format } from "date-fns";
@@ -56,6 +56,9 @@ export default function CustomerOrders() {
  const [showStatusModal, setShowStatusModal] = useState(false);
  const [showClientCallsModal, setShowClientCallsModal] = useState(false);
  const [selectedOrder, setSelectedOrder] = useState<CustomerOrderWithRelations | null>(null);
+  const [showContactModal, setShowContactModal] = useState(false);
+  const [contactOrder, setContactOrder] = useState<CustomerOrderWithRelations | null>(null);
+  const [contactComment, setContactComment] = useState("");
  const [searchTerm, setSearchTerm] = useState("");
  const [sortBy, setSortBy] = useState<"date" | "status" | "supplier">("date");
  const [sortOrder, setSortOrder] = useState<"asc" | "desc">("desc");
@@ -177,16 +180,28 @@ export default function CustomerOrders() {
    },
  });

-  // Notification mutation
-  const notificationMutation = useMutation({
-    mutationFn: ({ id, customerNotified }: { id: number; customerNotified: boolean }) =>
-      apiRequest(`/api/customer-orders/${id}`, 'PUT', { customerNotified }),
+  // Mutation marquer client contacté (avec date + commentaire)
+  const markCalledMutation = useMutation({
+    mutationFn: ({ id, comment }: { id: number; comment?: string }) =>
+      apiRequest(`/api/customer-orders/${id}/mark-called`, 'PATCH', { comment }),
    onSuccess: () => {
      queryClient.invalidateQueries({ predicate: (query) => query.queryKey[0]?.toString()?.includes('/api/customer-orders') ?? false });
-      toast({
-        title: "Succès",
-        description: "Statut de notification mis à jour",
-      });
+      toast({ title: "Client marqué comme contacté" });
+      setShowContactModal(false);
+      setContactComment("");
+      setContactOrder(null);
+    },
+  });
+
+  // Mutation annuler contact
+  const unmarkCalledMutation = useMutation({
+    mutationFn: (id: number) =>
+      apiRequest(`/api/customer-orders/${id}`, 'PUT', { customerNotified: false, notifiedAt: null, notifiedComment: null }),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ predicate: (query) => query.queryKey[0]?.toString()?.includes('/api/customer-orders') ?? false });
+      toast({ title: "Contact annulé" });
+      setShowContactModal(false);
+      setContactOrder(null);
    },
  });

@@ -266,10 +281,9 @@ export default function CustomerOrders() {
  };

  const handleNotificationToggle = (order: CustomerOrderWithRelations) => {
-    notificationMutation.mutate({
-      id: order.id,
-      customerNotified: !order.customerNotified
-    });
+    setContactOrder(order);
+    setContactComment("");
+    setShowContactModal(true);
  };

  // Fonction pour calculer le checksum EAN13
@@ -892,28 +906,30 @@ export default function CustomerOrders() {
                          <Edit className="h-4 w-4" />
                        </Button>
                        {canShowButtons(order.status) && (
-                          <>
-                            <Button
-                              variant="outline"
-                              size="sm"
-                              onClick={() => handlePrintLabel(order)}
-                            >
-                              <Printer className="h-4 w-4" />
-                            </Button>
-                            <Button
-                              variant="outline"
-                              size="sm"
-                              onClick={() => handleNotificationToggle(order)}
-                              className={order.customerNotified ? "bg-green-100" : ""}
-                            >
-                              {order.customerNotified ? (
-                                <PhoneCall className="h-4 w-4" />
-                              ) : (
-                                <Phone className="h-4 w-4" />
-                              )}
-                            </Button>
-                          </>
+                          <Button
+                            variant="outline"
+                            size="sm"
+                            onClick={() => handlePrintLabel(order)}
+                          >
+                            <Printer className="h-4 w-4" />
+                          </Button>
                        )}
+                        <Button
+                          variant="outline"
+                          size="sm"
+                          onClick={() => handleNotificationToggle(order)}
+                          className={order.customerNotified ? "bg-green-100 border-green-300" : ""}
+                          title={order.customerNotified && (order as any).notifiedAt
+                            ? `Contacté le ${format(new Date((order as any).notifiedAt), "dd/MM/yyyy 'à' HH:mm", { locale: fr })}${(order as any).notifiedComment ? ` — ${(order as any).notifiedComment}` : ''}`
+                            : "Marquer client comme contacté"
+                          }
+                        >
+                          {order.customerNotified ? (
+                            <PhoneCall className="h-4 w-4 text-green-700" />
+                          ) : (
+                            <Phone className="h-4 w-4" />
+                          )}
+                        </Button>
                        {permissions.canDelete('customer-orders') && (
                          <Button
                            variant="outline"
@@ -1053,6 +1069,71 @@ export default function CustomerOrders() {
        onClose={() => setShowClientCallsModal(false)}
        pendingCalls={pendingCalls}
      />
+
+      {/* Modal contact client */}
+      <Dialog open={showContactModal} onOpenChange={(open) => { setShowContactModal(open); if (!open) { setContactOrder(null); setContactComment(""); } }}>
+        <DialogContent className="max-w-md">
+          <DialogHeader>
+            <DialogTitle className="flex items-center gap-2">
+              {contactOrder?.customerNotified ? (
+                <><PhoneCall className="h-5 w-5 text-green-600" /> Client déjà contacté</>
+              ) : (
+                <><Phone className="h-5 w-5 text-blue-600" /> Marquer client comme contacté</>
+              )}
+            </DialogTitle>
+            {contactOrder && (
+              <DialogDescription>
+                {contactOrder.customerName} — {contactOrder.productDesignation}
+              </DialogDescription>
+            )}
+          </DialogHeader>
+
+          {contactOrder?.customerNotified ? (
+            <div className="space-y-4">
+              <div className="rounded-md bg-green-50 border border-green-200 p-3 space-y-1 text-sm">
+                <p className="font-medium text-green-800">
+                  Contacté le {contactOrder.notifiedAt ? format(new Date((contactOrder as any).notifiedAt), "dd/MM/yyyy 'à' HH:mm", { locale: fr }) : "—"}
+                </p>
+                {(contactOrder as any).notifiedComment && (
+                  <p className="text-green-700 flex items-start gap-1.5">
+                    <MessageSquare className="h-4 w-4 mt-0.5 shrink-0" />
+                    {(contactOrder as any).notifiedComment}
+                  </p>
+                )}
+              </div>
+              <div className="flex justify-end gap-2">
+                <Button variant="outline" onClick={() => { setShowContactModal(false); setContactOrder(null); }}>Fermer</Button>
+                <Button variant="destructive" onClick={() => unmarkCalledMutation.mutate(contactOrder.id)} disabled={unmarkCalledMutation.isPending}>
+                  Annuler le contact
+                </Button>
+              </div>
+            </div>
+          ) : (
+            <div className="space-y-4">
+              <div>
+                <label className="text-sm font-medium text-gray-700">Commentaire (optionnel)</label>
+                <textarea
+                  className="mt-1 w-full rounded-md border border-gray-300 px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
+                  rows={3}
+                  placeholder="Ex : Laissé un message, Rappeler demain matin..."
+                  value={contactComment}
+                  onChange={(e) => setContactComment(e.target.value)}
+                />
+              </div>
+              <div className="flex justify-end gap-2">
+                <Button variant="outline" onClick={() => { setShowContactModal(false); setContactOrder(null); setContactComment(""); }}>Annuler</Button>
+                <Button
+                  onClick={() => markCalledMutation.mutate({ id: contactOrder!.id, comment: contactComment || undefined })}
+                  disabled={markCalledMutation.isPending}
+                  className="bg-green-600 hover:bg-green-700"
+                >
+                  <PhoneCall className="h-4 w-4 mr-2" /> Confirmer
+                </Button>
+              </div>
+            </div>
+          )}
+        </DialogContent>
+      </Dialog>
    </div>
  );
 }
@@ -198,7 +198,8 @@ export default function Dashboard() {
    queryKey: ['/api/ad-campaigns', 'upcoming'],
    queryFn: async () => {
      // Essayer d'abord 2024, puis 2025 pour avoir toutes les publicités
-      const years = [2024, 2025];
+      const currentYear = new Date().getFullYear();
+      const years = [currentYear - 1, currentYear, currentYear + 1];
      let allPublicities: PublicityWithRelations[] = [];

      for (const year of years) {
@@ -307,15 +308,9 @@ export default function Dashboard() {
    }) : []; // Afficher toutes les commandes en attente

  const upcomingDeliveries = Array.isArray(allDeliveries) ? allDeliveries
-    .filter((d: any) => {
-      const isPlanned = d.status === 'planned';
-      console.log('🚚 Dashboard - Delivery filter:', { id: d.id, status: d.status, isPlanned, scheduledDate: d.scheduledDate });
-      return isPlanned;
-    })
+    .filter((d: any) => d.status === 'planned')
    .sort((a: any, b: any) => new Date(a.scheduledDate).getTime() - new Date(b.scheduledDate).getTime())
-    .slice(0, 4) : []; // Afficher les 4 prochaines livraisons
-
-  console.log('🚚 Dashboard - Upcoming deliveries result:', upcomingDeliveries.length, upcomingDeliveries);
+    .slice(0, 4) : [];

  // Calculs pour les statistiques
  const pendingOrdersCount = Array.isArray(allOrders) ? allOrders.filter((order: any) => order.status === 'pending').length : 0;
@@ -372,19 +367,6 @@ export default function Dashboard() {
    }
  };

-  console.log('📊 Dashboard Debug - Raw Data:', {
-    allOrders: Array.isArray(allOrders) ? allOrders.length : 'NOT_ARRAY',
-    allDeliveries: Array.isArray(allDeliveries) ? allDeliveries.length : 'NOT_ARRAY',
-    customerOrders: Array.isArray(customerOrders) ? customerOrders.length : 'NOT_ARRAY',
-    upcomingPublicities: Array.isArray(upcomingPublicities) ? upcomingPublicities.length : 'NOT_ARRAY',
-    stats: stats,
-    samples: {
-      order: Array.isArray(allOrders) && allOrders.length > 0 ? allOrders[0] : null,
-      delivery: Array.isArray(allDeliveries) && allDeliveries.length > 0 ? allDeliveries[0] : null,
-      customerOrder: Array.isArray(customerOrders) && customerOrders.length > 0 ? customerOrders[0] : null,
-      publicity: Array.isArray(upcomingPublicities) && upcomingPublicities.length > 0 ? upcomingPublicities[0] : null
-    }
-  });

  // Statistiques pour les commandes clients
  const ordersByStatus = {
@@ -1,4 +1,4 @@
-import { useState, useEffect, useMemo } from "react";
+import { useState, useEffect, useMemo, useRef } from "react";
 import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Button } from "@/components/ui/button";
@@ -12,7 +12,7 @@ import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from
 import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle, AlertDialogTrigger } from "@/components/ui/alert-dialog";
 import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
 import { Textarea } from "@/components/ui/textarea";
-import { AlertTriangle, Plus, Eye, Edit, Trash2, CheckCircle, CheckCircle2, Package, Clock, AlertCircle, Filter, Download, FileText, PackageX, RotateCcw, X } from "lucide-react";
+import { AlertTriangle, Plus, Eye, Edit, Trash2, CheckCircle, CheckCircle2, Package, Clock, AlertCircle, Filter, Download, FileText, PackageX, RotateCcw, X, Loader2 } from "lucide-react";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -115,6 +115,66 @@ export default function DlcPage() {
    },
  });

+  // EAN lookup from external API
+  const [eanLookupLoading, setEanLookupLoading] = useState(false);
+  const eanDebounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const gencodeValue = form.watch("gencode");
+
+  useEffect(() => {
+    if (!gencodeValue || gencodeValue.length < 8) return;
+
+    if (eanDebounceRef.current) clearTimeout(eanDebounceRef.current);
+
+    eanDebounceRef.current = setTimeout(async () => {
+      setEanLookupLoading(true);
+      try {
+        // Étape 1 : récupérer l'article par EAN
+        const res = await fetch(`/api/ffnancy/articles?ean=${encodeURIComponent(gencodeValue)}&limit=1`, { credentials: 'include' });
+        if (!res.ok) return;
+        const data = await res.json();
+        const article = data.articles?.[0];
+        if (!article) return;
+
+        form.setValue("productName", article.libelle1, { shouldValidate: true });
+
+        // Étape 2 : chercher le fournisseur de la dernière entrée en stock
+        let codefouToMatch = article.codefou_principal;
+        try {
+          const mvtRes = await fetch(
+            `/api/ffnancy/mouvements/entrees?artNoId=${article.no_id}&limit=1&dateDebut=2000-01-01`,
+            { credentials: 'include' }
+          );
+          if (mvtRes.ok) {
+            const mvtData = await mvtRes.json();
+            const lastEntree = mvtData.entrees?.[0];
+            if (lastEntree?.codefou) codefouToMatch = lastEntree.codefou;
+          }
+        } catch { /* fallback sur codefou_principal */ }
+
+        // Matching : codefou exact en priorité, fallback par nom
+        if (codefouToMatch) {
+          const matched = (suppliers as any[]).find((s: any) =>
+            s.codefou && s.codefou.trim().toLowerCase() === codefouToMatch.trim().toLowerCase()
+          ) || (suppliers as any[]).find((s: any) =>
+            s.name.toLowerCase().trim().includes(article.nom_fou_principal?.toLowerCase().trim() || '') ||
+            (article.nom_fou_principal?.toLowerCase().trim() || '').includes(s.name.toLowerCase().trim())
+          );
+          if (matched) {
+            form.setValue("supplierId", matched.id, { shouldValidate: true });
+          }
+        }
+      } catch {
+        // Lookup best-effort, on ignore les erreurs
+      } finally {
+        setEanLookupLoading(false);
+      }
+    }, 600);
+
+    return () => {
+      if (eanDebounceRef.current) clearTimeout(eanDebounceRef.current);
+    };
+  }, [gencodeValue, suppliers]);
+
  // Create mutation - optimized cache invalidation
  const createMutation = useMutation({
    mutationFn: (data: InsertDlcProduct) => apiRequest("/api/dlc-products", "POST", data),
@@ -670,11 +730,17 @@ export default function DlcPage() {
                    <FormItem>
                      <FormLabel>Code EAN13 (optionnel)</FormLabel>
                      <FormControl>
-                        <Input 
-                          {...field} 
-                          value={field.value || ""} 
-                          placeholder="1234567890123" 
-                        />
+                        <div className="relative">
+                          <Input
+                            {...field}
+                            value={field.value || ""}
+                            placeholder="1234567890123"
+                            className={eanLookupLoading ? "pr-8" : ""}
+                          />
+                          {eanLookupLoading && (
+                            <Loader2 className="absolute right-2 top-1/2 -translate-y-1/2 w-4 h-4 animate-spin text-blue-500" />
+                          )}
+                        </div>
                      </FormControl>
                      <FormMessage />
                    </FormItem>
@@ -44,6 +44,7 @@ export default function Suppliers() {
    name: "",
    contact: "",
    phone: "",
+    codefou: "",
    email: "",
    hasDlc: false,
    automaticReconciliation: false,
@@ -200,6 +201,7 @@ export default function Suppliers() {
      name: "",
      contact: "",
      phone: "",
+      codefou: "",
      email: "",
      hasDlc: false,
      automaticReconciliation: false,
@@ -239,6 +241,7 @@ export default function Suppliers() {
      name: supplier.name || "",
      contact: supplier.contact || "",
      phone: supplier.phone || "",
+      codefou: (supplier as any).codefou || "",
      email: (supplier as any).email || "",
      hasDlc: supplier.hasDlc || false,
      automaticReconciliation: supplier.automaticReconciliation || false,
@@ -538,6 +541,16 @@ export default function Suppliers() {
              />
            </div>

+            <div>
+              <Label htmlFor="codefou">Code fournisseur API <span className="text-xs text-gray-400 font-normal">(liaison ffnancy)</span></Label>
+              <Input
+                id="codefou"
+                value={formData.codefou}
+                onChange={(e) => handleChange('codefou', e.target.value)}
+                placeholder="ex: FOU01"
+              />
+            </div>
+
            <div>
              <Label htmlFor="email">Email de contact</Label>
              <Input
@@ -9,7 +9,6 @@ import {
  Cloud,
  Send,
  Code,
-  TrendingUp
 } from "lucide-react";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
@@ -22,7 +21,6 @@ import DatabaseDebug from "./DatabaseDebug";
 import WeatherSettings from "./WeatherSettings";
 import WebhookBAPConfig from "./WebhookBAPConfig";
 import SQLExecutor from "./SQLExecutor";
-import SalesAnalysisConfig from "./SalesAnalysisConfig";

 export default function Utilities() {
  const { user } = useAuthUnified();
@@ -43,10 +41,8 @@ export default function Utilities() {
  const canManageWeather = user?.role === 'admin';
  const canManageWebhookBAP = user?.role === 'admin';
  const canExecuteSQL = user?.role === 'admin';
-  const canManageSalesAnalysis = user?.role === 'admin' || user?.role === 'directeur';
-
  // Si l'utilisateur n'a aucune permission, afficher le message d'accès refusé
-  if (!canManageBackups && !canManageNocoDB && !canDebugDatabase && !canManageWeather && !canManageWebhookBAP && !canExecuteSQL && !canManageSalesAnalysis) {
+  if (!canManageBackups && !canManageNocoDB && !canDebugDatabase && !canManageWeather && !canManageWebhookBAP && !canExecuteSQL) {
    return (
      <div className="flex-1 flex items-center justify-center">
        <Card className="w-96">
@@ -82,7 +78,7 @@ export default function Utilities() {
      {/* Content avec onglets */}
      <div className="flex-1 p-6 overflow-hidden">
        <Tabs value={activeTab} onValueChange={setActiveTab} className="h-full flex flex-col">
-          <TabsList className="grid w-full grid-cols-7 mb-6">
+          <TabsList className="grid w-full grid-cols-6 mb-6">
            {canManageBackups && (
              <TabsTrigger value="backups" className="flex items-center gap-2">
                <Database className="w-4 h-4" />
@@ -119,12 +115,6 @@ export default function Utilities() {
                Exécution SQL
              </TabsTrigger>
            )}
-            {canManageSalesAnalysis && (
-              <TabsTrigger value="salesanalysis" className="flex items-center gap-2">
-                <TrendingUp className="w-4 h-4" />
-                Analyse Vente
-              </TabsTrigger>
-            )}
          </TabsList>

          {/* Contenu des onglets */}
@@ -176,13 +166,6 @@ export default function Utilities() {
            </TabsContent>
          )}

-          {canManageSalesAnalysis && (
-            <TabsContent value="salesanalysis" className="flex-1 overflow-hidden">
-              <div className="h-full bg-gray-50 -m-6 p-6">
-                <SalesAnalysisConfig />
-              </div>
-            </TabsContent>
-          )}
        </Tabs>
      </div>
    </div>
@@ -163,7 +163,7 @@ export default function WebhookBAPConfig() {
            Configuration Webhook BAP
          </CardTitle>
          <CardDescription>
-            Configurez l'URL du webhook n8n pour l'envoi des fichiers BAP vers Prissela et Jeremy
+            Configurez l'URL du webhook n8n pour l'envoi des fichiers BAP vers Laurie et Jeremy
          </CardDescription>
        </CardHeader>
        <CardContent className="space-y-6">
@@ -2,7 +2,7 @@
 * MobileCustomerOrdersPage.tsx
 * Version mobile de la page Commandes Clients avec création
 */
-import { useState } from "react";
+import { useState, useEffect, useRef } from "react";
 import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
 import { useAuthUnified } from "@/hooks/useAuthUnified";
 import { useStore } from "@/contexts/StoreContext";
@@ -15,12 +15,16 @@ import {
    Package,
    Search,
    Phone,
+    PhoneCall,
    User,
    ClipboardList,
    Plus,
    MoreVertical,
    X,
-    Filter
+    Filter,
+    Loader2,
+    MessageSquare,
+    Search
 } from "lucide-react";
 import { format } from "date-fns";
 import { fr } from "date-fns/locale";
@@ -79,6 +83,8 @@ export default function MobileCustomerOrdersPage() {
    const { selectedStoreId } = useStore();
    const [searchTerm, setSearchTerm] = useState("");
    const [isCreateOpen, setIsCreateOpen] = useState(false);
+    const [contactOrder, setContactOrder] = useState<any | null>(null);
+    const [contactComment, setContactComment] = useState("");
    const { toast } = useToast();
    const queryClient = useQueryClient();

@@ -123,6 +129,27 @@ export default function MobileCustomerOrdersPage() {
        },
    });

+    const markCalledMutation = useMutation({
+        mutationFn: ({ id, comment }: { id: number; comment?: string }) =>
+            apiRequest(`/api/customer-orders/${id}/mark-called`, 'PATCH', { comment }),
+        onSuccess: () => {
+            queryClient.invalidateQueries({ queryKey: ["/api/customer-orders"] });
+            toast({ title: "Client marqué comme contacté" });
+            setContactOrder(null);
+            setContactComment("");
+        },
+    });
+
+    const unmarkCalledMutation = useMutation({
+        mutationFn: (id: number) =>
+            apiRequest(`/api/customer-orders/${id}`, 'PUT', { customerNotified: false, notifiedAt: null, notifiedComment: null }),
+        onSuccess: () => {
+            queryClient.invalidateQueries({ queryKey: ["/api/customer-orders"] });
+            toast({ title: "Contact annulé" });
+            setContactOrder(null);
+        },
+    });
+
    const createMutation = useMutation({
        mutationFn: (data: any) => apiRequest('/api/customer-orders', 'POST', data),
        onSuccess: () => {
@@ -157,6 +184,62 @@ export default function MobileCustomerOrdersPage() {
        }
    });

+    // Lookup API ffnancy par gencode ou référence (déclenché manuellement)
+    const [articleLookupLoading, setArticleLookupLoading] = useState(false);
+    const [articleNotFound, setArticleNotFound] = useState(false);
+
+    const fetchAndFillArticle = async (params: URLSearchParams) => {
+        setArticleLookupLoading(true);
+        setArticleNotFound(false);
+        try {
+            const res = await fetch(`/api/ffnancy/articles?${params}&limit=1`, { credentials: 'include' });
+            if (!res.ok) { setArticleNotFound(true); return; }
+            const data = await res.json();
+            const article = data.articles?.[0];
+            if (!article) { setArticleNotFound(true); return; }
+
+            setArticleNotFound(false);
+            form.setValue("productName", article.libelle1, { shouldValidate: true });
+            if (article.gtin) form.setValue("gencode", article.gtin, { shouldValidate: true });
+            if (article.ref_fou_principale) form.setValue("productReference", article.ref_fou_principale, { shouldValidate: true });
+
+            let codefouToMatch = article.codefou_principal;
+            try {
+                const mvtRes = await fetch(
+                    `/api/ffnancy/mouvements/entrees?artNoId=${article.no_id}&limit=1&dateDebut=2000-01-01`,
+                    { credentials: 'include' }
+                );
+                if (mvtRes.ok) {
+                    const mvtData = await mvtRes.json();
+                    const lastEntree = mvtData.entrees?.[0];
+                    if (lastEntree?.codefou) codefouToMatch = lastEntree.codefou;
+                }
+            } catch { /* fallback codefou_principal */ }
+
+            if (codefouToMatch) {
+                const matched = (suppliers as any[]).find((s: any) =>
+                    s.codefou && s.codefou.trim().toLowerCase() === codefouToMatch.trim().toLowerCase()
+                ) || (suppliers as any[]).find((s: any) =>
+                    s.name.toLowerCase().trim().includes(article.nom_fou_principal?.toLowerCase().trim() || '') ||
+                    (article.nom_fou_principal?.toLowerCase().trim() || '').includes(s.name.toLowerCase().trim())
+                );
+                if (matched) form.setValue("supplierId", matched.id, { shouldValidate: true });
+            }
+        } catch { setArticleNotFound(true); } finally {
+            setArticleLookupLoading(false);
+        }
+    };
+
+    const handleSearchByGencode = () => {
+        const val = form.getValues("gencode");
+        if (val) fetchAndFillArticle(new URLSearchParams({ ean: val }));
+    };
+
+    const handleSearchByReference = () => {
+        const val = form.getValues("productReference");
+        if (val) fetchAndFillArticle(new URLSearchParams({ codein: val }));
+    };
+
    const onSubmit = (data: any) => {
        // Validation basique groupe
        let groupId = selectedStoreId;
@@ -274,7 +357,7 @@ export default function MobileCustomerOrdersPage() {
                                        </DropdownMenu>
                                    </div>

-                                    <div className="flex items-center gap-4 mt-3 pt-3 border-t border-gray-100 text-sm text-gray-600">
+                                    <div className="flex items-center gap-2 mt-3 pt-3 border-t border-gray-100 text-sm text-gray-600 flex-wrap">
                                        {order.customerPhone && (
                                            <a
                                                href={`tel:${order.customerPhone}`}
@@ -284,6 +367,13 @@ export default function MobileCustomerOrdersPage() {
                                                <span className="font-medium">Appeler</span>
                                            </a>
                                        )}
+                                        <button
+                                            onClick={() => { setContactOrder(order); setContactComment(""); }}
+                                            className={`flex items-center gap-1.5 px-3 py-1.5 rounded-full transition-colors text-xs font-medium ${order.customerNotified ? 'bg-green-100 text-green-700' : 'bg-gray-100 text-gray-600 hover:bg-gray-200'}`}
+                                        >
+                                            <PhoneCall className="h-3.5 w-3.5" />
+                                            {order.customerNotified ? 'Contacté' : 'Marquer contacté'}
+                                        </button>
                                        <div className="flex items-center gap-1.5 ml-auto">
                                            <div className="bg-gray-100 px-2 py-1 rounded text-xs">
                                                Qty: {order.quantity || 1}
@@ -380,7 +470,12 @@ export default function MobileCustomerOrdersPage() {
                                        <FormItem>
                                            <FormLabel>Référence (Optionnel)</FormLabel>
                                            <FormControl>
-                                                <Input placeholder="REF-123..." {...field} />
+                                                <div className="flex gap-2">
+                                                    <Input placeholder="REF-123..." {...field} />
+                                                    <Button type="button" variant="outline" size="sm" onClick={handleSearchByReference} disabled={articleLookupLoading} className="shrink-0">
+                                                        {articleLookupLoading ? <Loader2 className="w-4 h-4 animate-spin" /> : <Search className="w-4 h-4" />}
+                                                    </Button>
+                                                </div>
                                            </FormControl>
                                        </FormItem>
                                    )}
@@ -444,7 +539,12 @@ export default function MobileCustomerOrdersPage() {
                                        <FormItem>
                                            <FormLabel>Gencode (Scanner si dispo)</FormLabel>
                                            <FormControl>
-                                                <Input placeholder="EAN13" {...field} />
+                                                <div className="flex gap-2">
+                                                    <Input placeholder="EAN13" {...field} />
+                                                    <Button type="button" variant="outline" size="sm" onClick={handleSearchByGencode} disabled={articleLookupLoading} className="shrink-0">
+                                                        {articleLookupLoading ? <Loader2 className="w-4 h-4 animate-spin" /> : <Search className="w-4 h-4" />}
+                                                    </Button>
+                                                </div>
                                            </FormControl>
                                        </FormItem>
                                    )}
@@ -504,7 +604,12 @@ export default function MobileCustomerOrdersPage() {
                                )}
                            />

-                            <Button type="submit" className="w-full bg-blue-600 h-12 text-lg font-bold shadow-lg mt-4" disabled={createMutation.isPending}>
+                            {articleNotFound && (
+                                <div className="rounded-md border border-red-200 bg-red-50 px-3 py-2 text-sm text-red-700">
+                                    <span className="font-medium">Produit non référencé</span> — ce produit n'existe pas dans la base. La commande ne peut pas être créée.
+                                </div>
+                            )}
+                            <Button type="submit" className="w-full bg-blue-600 h-12 text-lg font-bold shadow-lg mt-4" disabled={createMutation.isPending || articleNotFound || articleLookupLoading}>
                                {createMutation.isPending ? "Création..." : "Valider la commande"}
                            </Button>
                        </form>
@@ -519,6 +624,68 @@ export default function MobileCustomerOrdersPage() {
            >
                <Plus className="h-6 w-6 text-white" />
            </Button>
+
+            {/* Modal contact client */}
+            {contactOrder && (
+                <div className="fixed inset-0 z-50 flex items-end justify-center bg-black/50" onClick={() => { setContactOrder(null); setContactComment(""); }}>
+                    <div className="w-full max-w-lg bg-white rounded-t-2xl p-5 space-y-4" onClick={(e) => e.stopPropagation()}>
+                        <div className="flex items-center gap-2">
+                            {contactOrder.customerNotified
+                                ? <PhoneCall className="h-5 w-5 text-green-600" />
+                                : <Phone className="h-5 w-5 text-blue-600" />}
+                            <h3 className="font-semibold text-gray-900">
+                                {contactOrder.customerNotified ? "Client déjà contacté" : "Marquer comme contacté"}
+                            </h3>
+                        </div>
+                        <p className="text-sm text-gray-500">{contactOrder.customerName} — {contactOrder.productDesignation}</p>
+
+                        {contactOrder.customerNotified ? (
+                            <div className="rounded-md bg-green-50 border border-green-200 p-3 space-y-1 text-sm">
+                                <p className="font-medium text-green-800">
+                                    Contacté le {contactOrder.notifiedAt ? format(new Date(contactOrder.notifiedAt), "dd/MM/yyyy 'à' HH:mm") : "—"}
+                                </p>
+                                {contactOrder.notifiedComment && (
+                                    <p className="text-green-700 flex items-start gap-1.5">
+                                        <MessageSquare className="h-4 w-4 mt-0.5 shrink-0" />
+                                        {contactOrder.notifiedComment}
+                                    </p>
+                                )}
+                            </div>
+                        ) : (
+                            <textarea
+                                className="w-full rounded-md border border-gray-300 px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
+                                rows={3}
+                                placeholder="Commentaire optionnel (ex: laissé un message...)"
+                                value={contactComment}
+                                onChange={(e) => setContactComment(e.target.value)}
+                            />
+                        )}
+
+                        <div className="flex gap-2 pt-1">
+                            <button onClick={() => { setContactOrder(null); setContactComment(""); }} className="flex-1 py-2.5 rounded-lg border border-gray-300 text-sm font-medium text-gray-700">
+                                {contactOrder.customerNotified ? "Fermer" : "Annuler"}
+                            </button>
+                            {contactOrder.customerNotified ? (
+                                <button
+                                    onClick={() => unmarkCalledMutation.mutate(contactOrder.id)}
+                                    disabled={unmarkCalledMutation.isPending}
+                                    className="flex-1 py-2.5 rounded-lg bg-red-600 text-white text-sm font-medium"
+                                >
+                                    Annuler le contact
+                                </button>
+                            ) : (
+                                <button
+                                    onClick={() => markCalledMutation.mutate({ id: contactOrder.id, comment: contactComment || undefined })}
+                                    disabled={markCalledMutation.isPending}
+                                    className="flex-1 py-2.5 rounded-lg bg-green-600 text-white text-sm font-medium flex items-center justify-center gap-2"
+                                >
+                                    <PhoneCall className="h-4 w-4" /> Confirmer
+                                </button>
+                            )}
+                        </div>
+                    </div>
+                </div>
+            )}
        </MobileLayout>
    );
 }
@@ -2,7 +2,7 @@
 * MobileDlcPage.tsx
 * Version mobile de la page Gestion des DLC
 */
-import { useState, useMemo } from "react";
+import { useState, useMemo, useEffect, useRef } from "react";
 import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
 import { useAuthUnified } from "@/hooks/useAuthUnified";
 import { useStore } from "@/contexts/StoreContext";
@@ -20,7 +20,8 @@ import {
    CheckCircle,
    X,
    Calendar,
-    MoreVertical
+    MoreVertical,
+    Loader2
 } from "lucide-react";
 import { format, parseISO } from "date-fns";
 import { fr } from "date-fns/locale";
@@ -139,6 +140,66 @@ export default function MobileDlcPage() {
        }
    });

+    // EAN lookup from external API
+    const [eanLookupLoading, setEanLookupLoading] = useState(false);
+    const eanDebounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+    const gencodeValue = form.watch("gencode");
+
+    useEffect(() => {
+        if (!gencodeValue || gencodeValue.length < 8) return;
+
+        if (eanDebounceRef.current) clearTimeout(eanDebounceRef.current);
+
+        eanDebounceRef.current = setTimeout(async () => {
+            setEanLookupLoading(true);
+            try {
+                // Étape 1 : récupérer l'article par EAN
+                const res = await fetch(`/api/ffnancy/articles?ean=${encodeURIComponent(gencodeValue)}&limit=1`, { credentials: 'include' });
+                if (!res.ok) return;
+                const data = await res.json();
+                const article = data.articles?.[0];
+                if (!article) return;
+
+                form.setValue("productName", article.libelle1, { shouldValidate: true });
+
+                // Étape 2 : chercher le fournisseur de la dernière entrée en stock
+                let codefouToMatch = article.codefou_principal;
+                try {
+                    const mvtRes = await fetch(
+                        `/api/ffnancy/mouvements/entrees?artNoId=${article.no_id}&limit=1&dateDebut=2000-01-01`,
+                        { credentials: 'include' }
+                    );
+                    if (mvtRes.ok) {
+                        const mvtData = await mvtRes.json();
+                        const lastEntree = mvtData.entrees?.[0];
+                        if (lastEntree?.codefou) codefouToMatch = lastEntree.codefou;
+                    }
+                } catch { /* fallback sur codefou_principal */ }
+
+                // Matching : codefou exact en priorité, fallback par nom
+                if (codefouToMatch) {
+                    const matched = (suppliers as any[]).find((s: any) =>
+                        s.codefou && s.codefou.trim().toLowerCase() === codefouToMatch.trim().toLowerCase()
+                    ) || (suppliers as any[]).find((s: any) =>
+                        s.name.toLowerCase().trim().includes(article.nom_fou_principal?.toLowerCase().trim() || '') ||
+                        (article.nom_fou_principal?.toLowerCase().trim() || '').includes(s.name.toLowerCase().trim())
+                    );
+                    if (matched) {
+                        form.setValue("supplierId", matched.id, { shouldValidate: true });
+                    }
+                }
+            } catch {
+                // Lookup best-effort, on ignore les erreurs
+            } finally {
+                setEanLookupLoading(false);
+            }
+        }, 600);
+
+        return () => {
+            if (eanDebounceRef.current) clearTimeout(eanDebounceRef.current);
+        };
+    }, [gencodeValue, suppliers]);
+
    const onSubmit = (data: any) => {
        let groupId = selectedStoreId;
        if (!groupId && user?.userGroups?.[0]?.groupId) groupId = user.userGroups[0].groupId;
@@ -386,7 +447,16 @@ export default function MobileDlcPage() {
                                    <FormItem>
                                        <FormLabel>Gencode (Scanner si dispo)</FormLabel>
                                        <FormControl>
-                                            <Input placeholder="EAN13" {...field} />
+                                            <div className="relative">
+                                                <Input
+                                                    placeholder="EAN13"
+                                                    {...field}
+                                                    className={eanLookupLoading ? "pr-8" : ""}
+                                                />
+                                                {eanLookupLoading && (
+                                                    <Loader2 className="absolute right-2 top-1/2 -translate-y-1/2 w-4 h-4 animate-spin text-blue-500" />
+                                                )}
+                                            </div>
                                        </FormControl>
                                    </FormItem>
                                )}