Merge pull request #472 from R0m1k3/1.1

1.1

client/src/components/modals/ValidateDeliveryModal.tsx

@@ -10,7 +10,7 @@ import { Input } from "@/components/ui/input";
 import { useToast } from "@/hooks/use-toast";
 import { apiRequest } from "@/lib/queryClient";
 import { isUnauthorizedError } from "@/lib/authUtils";
-import { Check, X } from "lucide-react";
+import { Check, X, AlertTriangle } from "lucide-react";
 
 const validateDeliverySchema = z.object({
   blNumber: z.string().min(1, "Le numéro de bon de livraison est obligatoire"),
@@ -110,6 +110,21 @@ export default function ValidateDeliveryModal({
           </p>
         </DialogHeader>
 
+        {/* Alerte si le fournisseur nécessite un contrôle */}
+        {delivery.supplier?.requiresControl && (
+          <div className="bg-orange-50 border border-orange-200 rounded-lg p-3 flex items-start space-x-3">
+            <AlertTriangle className="w-5 h-5 text-orange-600 flex-shrink-0 mt-0.5" />
+            <div className="flex-1">
+              <h4 className="text-sm font-semibold text-orange-800">
+                ⚠️ Contrôle à effectuer sur cette livraison
+              </h4>
+              <p className="text-xs text-orange-700 mt-1">
+                Ce fournisseur nécessite un contrôle qualité lors de la réception de la livraison.
+              </p>
+            </div>
+          </div>
+        )}
+
         <Form {...form}>
           <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
             {/* Informations de la livraison */}

client/src/pages/Suppliers.tsx

@@ -38,6 +38,7 @@ export default function Suppliers() {
     phone: "",
     hasDlc: false,
     automaticReconciliation: false,
+    requiresControl: false,
   });
 
   const { data: suppliers = [], isLoading } = useQuery<Supplier[]>({
@@ -191,6 +192,7 @@ export default function Suppliers() {
       phone: "",
       hasDlc: false,
       automaticReconciliation: false,
+      requiresControl: false,
     });
   };
 
@@ -227,6 +229,7 @@ export default function Suppliers() {
       phone: supplier.phone || "",
       hasDlc: supplier.hasDlc || false,
       automaticReconciliation: supplier.automaticReconciliation || false,
+      requiresControl: supplier.requiresControl || false,
     });
     setShowEditModal(true);
   };
@@ -410,10 +413,16 @@ export default function Suppliers() {
                               <span className="text-xs font-medium">Auto-rapprochement</span>
                             </div>
                           )}
+                          {supplier.requiresControl && (
+                            <div className="flex items-center text-orange-600 bg-orange-50 px-2 py-1 rounded-full">
+                              <CheckCircle className="w-3 h-3 mr-1" />
+                              <span className="text-xs font-medium">Contrôle requis</span>
+                            </div>
+                          )}
                         </div>
                       </div>
 
-                      {!supplier.hasDlc && !supplier.automaticReconciliation && (
+                      {!supplier.hasDlc && !supplier.automaticReconciliation && !supplier.requiresControl && (
                         <div className="text-xs text-gray-500 mt-2">
                           Aucune option activée
                         </div>
@@ -524,6 +533,18 @@ export default function Suppliers() {
               </Label>
             </div>
 
+            <div className="flex items-center space-x-2">
+              <Checkbox 
+                id="requiresControl"
+                checked={formData.requiresControl}
+                onCheckedChange={(checked) => handleChange('requiresControl', checked === true)}
+                data-testid="checkbox-requires-control"
+              />
+              <Label htmlFor="requiresControl" className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70">
+                Fournisseur à contrôler
+              </Label>
+            </div>
+
             <div className="flex items-center space-x-3 pt-4">
               <Button 
                 type="button" 

init.sql

@@ -23,6 +23,9 @@ CREATE TABLE "deliveries" (
         "scheduled_date" date NOT NULL,
         "notes" text,
         "validated_at" timestamp,
+        "control_validated" boolean DEFAULT false,
+        "control_validated_by" varchar,
+        "control_validated_at" timestamp,
         CONSTRAINT "deliveries_status_check_fixed" CHECK ((status)::text = ANY ((ARRAY['planned'::character varying, 'delivered'::character varying])::text[]))
 );
 
@@ -66,7 +69,9 @@ CREATE TABLE "suppliers" (
         "phone" varchar,
         "created_at" timestamp DEFAULT now(),
         "updated_at" timestamp DEFAULT now(),
-        "has_dlc" boolean DEFAULT false
+        "has_dlc" boolean DEFAULT false,
+        "automatic_reconciliation" boolean DEFAULT false,
+        "requires_control" boolean DEFAULT false
 );
 
 CREATE TABLE "user_groups" (

server/routes.ts

@@ -1655,6 +1655,40 @@ export async function registerRoutes(app: Express): Promise<Server> {
     }
   });
 
+  // Marquer le contrôle d'une livraison comme effectué
+  app.put('/api/deliveries/:id/control', isAuthenticated, async (req: any, res) => {
+    try {
+      const user = await storage.getUserWithGroups(req.user.claims ? req.user.claims.sub : req.user.id);
+      if (!user) {
+        return res.status(404).json({ message: "User not found" });
+      }
+
+      const id = parseInt(req.params.id);
+      if (isNaN(id)) {
+        return res.status(400).json({ message: "Invalid delivery ID" });
+      }
+
+      // Vérifier que la livraison existe
+      const delivery = await storage.getDeliveryById(id);
+      if (!delivery) {
+        return res.status(404).json({ message: "Delivery not found" });
+      }
+
+      // Vérifier les permissions
+      if (!hasPermission(user.role, 'deliveries', 'edit')) {
+        return res.status(403).json({ message: "Insufficient permissions" });
+      }
+
+      // Mettre à jour le contrôle
+      await storage.markDeliveryControlValidated(id, user.id);
+      
+      res.json({ message: "Delivery control validated successfully" });
+    } catch (error) {
+      console.error("Error validating delivery control:", error);
+      res.status(500).json({ message: "Failed to validate delivery control" });
+    }
+  });
+
   // Route pour diagnostiquer le cache des livraisons
   app.get('/api/cache/diagnosis', isAuthenticated, async (req: any, res) => {
     try {

server/storage.ts

@@ -1165,6 +1165,15 @@ export class DatabaseStorage implements IStorage {
     await db.update(deliveries).set(updateData).where(eq(deliveries.id, id));
   }
 
+  async markDeliveryControlValidated(id: number, userId: string): Promise<void> {
+    await db.update(deliveries).set({
+      controlValidated: true,
+      controlValidatedBy: userId,
+      controlValidatedAt: new Date(),
+      updatedAt: new Date(),
+    }).where(eq(deliveries.id, id));
+  }
+
   // User-Group operations
   async getUserGroups(userId: string): Promise<UserGroup[]> {
     return await db.select().from(userGroups).where(eq(userGroups.userId, userId));

shared/schema.ts

@@ -82,6 +82,7 @@ export const suppliers = pgTable("suppliers", {
   createdAt: timestamp("created_at").defaultNow(),
   updatedAt: timestamp("updated_at").defaultNow(),
   automaticReconciliation: boolean("automatic_reconciliation").default(false), // Rapprochement automatique BL/Factures
+  requiresControl: boolean("requires_control").default(false), // Fournisseur nécessite un contrôle à la livraison
 });
 
 // Orders
@@ -118,6 +119,10 @@ export const deliveries = pgTable("deliveries", {
   invoiceAmount: decimal("invoice_amount", { precision: 10, scale: 2 }), // Montant facture
   reconciled: boolean("reconciled").default(false), // Rapprochement effectué
   validatedAt: timestamp("validated_at"), // Date de validation de la livraison
+  // Champs pour le contrôle des livraisons (fournisseurs nécessitant un contrôle)
+  controlValidated: boolean("control_validated").default(false), // Contrôle effectué
+  controlValidatedBy: varchar("control_validated_by"), // Utilisateur ayant validé le contrôle
+  controlValidatedAt: timestamp("control_validated_at"), // Date de validation du contrôle
   createdBy: varchar("created_by").notNull(),
   createdAt: timestamp("created_at").defaultNow(),
   updatedAt: timestamp("updated_at").defaultNow(),
@@ -553,9 +558,7 @@ export const insertPublicitySchema = createInsertSchema(publicities).omit({
   updatedAt: true,
 });
 
-export const insertPublicityParticipationSchema = createInsertSchema(publicityParticipations).omit({
-  createdAt: true,
-});
+export const insertPublicityParticipationSchema = createInsertSchema(publicityParticipations);