diff --git a/client/src/components/modals/ReconciliationModal.tsx b/client/src/components/modals/ReconciliationModal.tsx index 65ad580..0a82690 100644 --- a/client/src/components/modals/ReconciliationModal.tsx +++ b/client/src/components/modals/ReconciliationModal.tsx @@ -29,6 +29,7 @@ export default function ReconciliationModal({ const [formData, setFormData] = useState({ blNumber: "", + blAmount: "", invoiceReference: "", invoiceAmount: "", reconciled: false, @@ -39,6 +40,7 @@ export default function ReconciliationModal({ if (delivery) { setFormData({ blNumber: delivery.blNumber || "", + blAmount: delivery.blAmount || "", invoiceReference: delivery.invoiceReference || "", invoiceAmount: delivery.invoiceAmount || "", reconciled: delivery.reconciled || false, @@ -78,6 +80,7 @@ export default function ReconciliationModal({ updateDeliveryMutation.mutate({ blNumber: formData.blNumber.trim() || null, + blAmount: formData.blAmount ? formData.blAmount.toString() : null, invoiceReference: formData.invoiceReference.trim() || null, invoiceAmount: formData.invoiceAmount ? formData.invoiceAmount.toString() : null, }); @@ -152,6 +155,17 @@ export default function ReconciliationModal({ /> +
+ + setFormData(prev => ({ ...prev, blAmount: e.target.value }))} + placeholder="0.00" + /> +
{/* Données Facture */} diff --git a/client/src/components/modals/ValidateDeliveryModal.tsx b/client/src/components/modals/ValidateDeliveryModal.tsx index 03682b9..5024aef 100644 --- a/client/src/components/modals/ValidateDeliveryModal.tsx +++ b/client/src/components/modals/ValidateDeliveryModal.tsx @@ -14,7 +14,6 @@ import { Check, X } from "lucide-react"; const validateDeliverySchema = z.object({ blNumber: z.string().min(1, "Le numéro de bon de livraison est obligatoire"), - blAmount: z.string().optional(), }); type ValidateDeliveryForm = z.infer; @@ -39,20 +38,14 @@ export default function ValidateDeliveryModal({ resolver: zodResolver(validateDeliverySchema), defaultValues: { blNumber: "", - blAmount: "", }, }); const validateDeliveryMutation = useMutation({ mutationFn: async (data: ValidateDeliveryForm) => { - const payload: any = {}; - - // Le blNumber est maintenant obligatoire - payload.blNumber = data.blNumber.trim(); - - if (data.blAmount && data.blAmount.trim() !== '') { - payload.blAmount = parseFloat(data.blAmount); - } + const payload = { + blNumber: data.blNumber.trim() + }; await apiRequest(`/api/deliveries/${delivery.id}/validate`, "POST", payload); }, @@ -147,25 +140,6 @@ export default function ValidateDeliveryModal({ )} /> - {/* Montant BL */} - ( - - Montant BL (€) - Optionnel - - - - - - )} - /> {/* Actions */}