diff --git a/CALENDAR-PRODUCTION-FIX.md b/CALENDAR-PRODUCTION-FIX.md deleted file mode 100644 index ebfc1d1..0000000 --- a/CALENDAR-PRODUCTION-FIX.md +++ /dev/null @@ -1,77 +0,0 @@ -# Solution - Problème Calendrier Directeur en Production - -## Problème Identifié -Le rôle directeur rencontre une erreur réseau lors de l'accès au module calendrier en production. - -## Diagnostic Effectué - -### ✅ Corrections Appliquées -1. **Permissions côté serveur ajoutées** pour tous les modules: - - `GET /api/orders` utilise maintenant `requirePermission('orders', 'view')` - - `GET /api/deliveries` utilise maintenant `requirePermission('deliveries', 'view')` - - `POST /api/customer-orders` utilise `requirePermission('customer-orders', 'create')` - - `PUT /api/customer-orders/:id` utilise `requirePermission('customer-orders', 'edit')` - - `DELETE /api/customer-orders/:id` utilise `requirePermission('customer-orders', 'delete')` - - Toutes les routes DLC utilisent les bonnes permissions (`view`, `create`, `edit`, `delete`, `validate`) - -2. **Permissions directeur vérifiées** dans `shared/permissions.ts`: - - ✅ Directeur a `view` pour `orders` (ligne 38) - - ✅ Directeur a `view` pour `deliveries` (ligne 46) - - ✅ Directeur a toutes les permissions pour `customer-orders` (ligne 70) - -### 🔍 Analyse du Problème -Le problème n'est **PAS** lié aux permissions côté serveur. Les permissions sont correctement configurées pour le rôle directeur. - -### 🚨 Cause Probable -L'erreur réseau indique un problème de **connectivité** ou de **configuration serveur** en production: - -1. **Timeout réseau** - Les APIs `/api/orders` et `/api/deliveries` prennent trop de temps à répondre -2. **Problème de load balancer** - Les requêtes ne parviennent pas au serveur d'applications -3. **Configuration firewall** - Certaines requêtes sont bloquées -4. **Problème de base de données** - Lenteur ou indisponibilité temporaire - -## 🛠️ Script de Diagnostic -Un script de diagnostic a été créé: `debug-calendar-production.js` - -### Utilisation: -```bash -# 1. Configurez les variables d'environnement -export PRODUCTION_URL="https://votre-serveur-production.com" -export PROD_USERNAME="votre-directeur-username" -export PROD_PASSWORD="votre-directeur-password" - -# 2. Exécutez le diagnostic -node debug-calendar-production.js --run -``` - -### Le script teste: -- ✅ Connexion au serveur -- ✅ Authentification directeur -- ✅ Récupération du profil utilisateur -- ✅ API `/api/orders` (utilisée par le calendrier) -- ✅ API `/api/deliveries` (utilisée par le calendrier) -- ✅ Temps de réponse réseau - -## 📋 Actions Recommandées - -### 1. Vérifications Immédiates -- [ ] Vérifier que le serveur de production est démarré -- [ ] Tester la connectivité réseau depuis le navigateur du directeur -- [ ] Vérifier les logs serveur pour erreurs de timeout - -### 2. Diagnostic Approfondi -- [ ] Exécuter `debug-calendar-production.js` pour identifier l'API défaillante -- [ ] Vérifier les performances de la base de données en production -- [ ] Contrôler la configuration du load balancer/reverse proxy - -### 3. Solutions selon le diagnostic -- **Si timeout réseau**: Augmenter les timeouts du serveur web -- **Si problème DB**: Optimiser les requêtes ou redémarrer la DB -- **Si load balancer**: Vérifier la configuration du proxy - -## 📊 État du Projet -- ✅ **Permissions employé** - Customer Orders et DLC fonctionnent -- ✅ **Permissions directeur** - Système de permissions correct -- 🔄 **Connectivité production** - Diagnostic en cours avec script - -Le système de permissions est maintenant entièrement cohérent entre côté client et serveur pour tous les rôles. \ No newline at end of file diff --git a/CLEAN-VALIDATE-ORDER-BUTTON.md b/CLEAN-VALIDATE-ORDER-BUTTON.md deleted file mode 100644 index 0d4cc09..0000000 --- a/CLEAN-VALIDATE-ORDER-BUTTON.md +++ /dev/null @@ -1,65 +0,0 @@ -# Bouton de Validation Propre - Dans le Modal de Détail - -## Modifications Apportées - -J'ai nettoyé le code et déplacé le bouton de validation dans le modal de détail de commande pour une interface plus propre. - -### 1. Nettoyage du CalendarGrid -- ✅ Supprimé tout le code de debug (textes rouges, boutons de test) -- ✅ Retiré les props `user` et `onOrderValidated` non nécessaires -- ✅ Interface calendrier propre et sans encombrement - -### 2. Ajout du Bouton dans OrderDetailModal -- ✅ Nouveau bouton "Valider Commande" vert dans les actions du modal -- ✅ Visible uniquement pour les admins (`user?.role === 'admin'`) -- ✅ Apparaît seulement sur les commandes non-delivered (`item?.status !== 'delivered'`) -- ✅ État de chargement pendant la validation -- ✅ Toasts de confirmation/erreur - -### 3. Fonctionnement -Quand vous cliquez sur une commande dans le calendrier : -1. **Modal s'ouvre** avec les détails de la commande -2. **Si vous êtes admin** et que la commande n'est pas delivered -3. **Bouton vert "Valider Commande"** apparaît en bas à droite -4. **Un clic** marque la commande comme delivered -5. **Modal se ferme** automatiquement après validation - -### 4. Avantages de cette Approche -- **Interface propre** : Le calendrier n'est pas encombré -- **Actions centralisées** : Toutes les actions (modifier, supprimer, valider) au même endroit -- **Plus visible** : Le bouton est bien visible dans le modal -- **Meilleure UX** : L'utilisateur voit les détails avant de valider - -## Déploiement en Production - -### Fichiers Modifiés : -1. **`client/src/components/CalendarGrid.tsx`** - Nettoyé, code de debug supprimé -2. **`client/src/pages/Calendar.tsx`** - Props simplifiées -3. **`client/src/components/modals/OrderDetailModal.tsx`** - Bouton de validation ajouté - -### Commandes : -```bash -# Sauvegarder -cp -r client/src client/src.backup.clean - -# Appliquer les modifications -# (copiez le contenu des fichiers modifiés) - -# Reconstruire -npm run build - -# Redémarrer -pm2 restart your-app-name -``` - -## Test Final - -1. **Connectez-vous en admin** -2. **Cliquez sur CMD-55** dans le calendrier -3. **Vérifiez** que le bouton vert "Valider Commande" apparaît dans le modal -4. **Cliquez** sur le bouton pour valider -5. **Confirmez** que CMD-55 devient gris (delivered) dans le calendrier - ---- - -**Résultat** : Interface propre avec bouton de validation facilement accessible dans le modal de détail des commandes. \ No newline at end of file diff --git a/CUSTOMER-ORDER-GROUPID-FINAL-FIX.md b/CUSTOMER-ORDER-GROUPID-FINAL-FIX.md deleted file mode 100644 index a76a7b2..0000000 --- a/CUSTOMER-ORDER-GROUPID-FINAL-FIX.md +++ /dev/null @@ -1,59 +0,0 @@ -# Fix Final - Problème GroupId Commandes Client Production - -## Problème Identifié - -**DLC** ✅ → `groupId: 2` (fonctionne) -**Commandes Client** ❌ → `groupId: 1` (ne fonctionne pas) - -## Cause Racine - -Les `defaultValues` du formulaire sont calculés avant que `user.userGroups` soit complètement chargé depuis `/api/user`. - -**Séquence problématique :** -1. Formulaire se render → `user.userGroups` = `undefined` -2. `getDefaultGroupId()` → retourne `1` (fallback) -3. `/api/user` charge → `user.userGroups` = `[{groupId: 2}]` -4. Mais `defaultValues` déjà fixés à `1` ❌ - -## Solution Appliquée - -### 1. Double Sécurité (DefaultValues + Override) -```javascript -// ÉTAPE 1: defaultValues avec priorité groupe assigné -const getDefaultGroupId = () => { - if (user?.userGroups?.[0]?.groupId) { - return user.userGroups[0].groupId; // Priorité absolue - } - return 1; // Fallback temporaire -}; - -// ÉTAPE 2: Override dans handleSubmit si besoin -if (!groupId || groupId === 1) { - if (user?.userGroups?.[0]?.groupId) { - groupId = user.userGroups[0].groupId; // ✅ Force groupId correct - } -} -``` - -### 2. Logique de Priorité Unifiée -**PARTOUT (DLC + Commandes Client) :** -1. 🎯 **Groupe assigné utilisateur** - PRIORITÉ ABSOLUE -2. 🏪 **Admin store selection** - Si pas de groupe assigné -3. 🚨 **Fallback** `1` - Urgence seulement - -## Résultat Attendu - -Employé magasin #2 (Houdemont) : -- ✅ **DLC** → `groupId: 2` (déjà fixé) -- ✅ **Commandes Client** → `groupId: 2` (maintenant fixé avec override) - -**Test de Validation :** -```javascript -🎯 CustomerOrderForm defaultValue: Using user's assigned group: 2 -🔧 Customer Order Override: Using user's assigned group: 2 // ✅ Double sécurité -✅ Final groupId after override check: 2 -``` - -## Déploiement - -**PRÊT POUR PRODUCTION** - Fix double sécurité garantit le bon groupId même si defaultValues ne sont pas corrects au moment du render initial. \ No newline at end of file diff --git a/DEBUG-BUTTON-VISIBILITY.md b/DEBUG-BUTTON-VISIBILITY.md deleted file mode 100644 index 3a217bd..0000000 --- a/DEBUG-BUTTON-VISIBILITY.md +++ /dev/null @@ -1,55 +0,0 @@ -# Debug - Bouton de Validation Non Visible - -## Modifications de Debug Ajoutées - -J'ai ajouté du code de debug temporaire pour identifier pourquoi le bouton de validation n'est pas visible : - -### 1. Informations Utilisateur -Un petit texte rouge s'affiche au-dessus de la première commande montrant : -- Le rôle de l'utilisateur connecté -- Le statut de cette commande - -### 2. Bouton de Validation en Rouge -Le bouton de validation est maintenant **TOUJOURS VISIBLE** avec un fond rouge vif au lieu d'être masqué - -### 3. Indicateur de Test Jaune -Un petit "V" jaune apparaît sur toutes les commandes non-delivered pour confirmer que la condition fonctionne - -### 4. Logs de Debug -Quand vous cliquez sur le bouton, des logs détaillés s'affichent dans la console - -## Comment Diagnostiquer - -1. **Ouvrez la console du navigateur** (F12) -2. **Connectez-vous en admin** sur votre serveur de production -3. **Allez au calendrier** et regardez : - - Le texte rouge au-dessus de la première commande (rôle utilisateur) - - Les petits "V" jaunes sur les commandes non-delivered - - Le bouton rouge de validation s'il apparaît - -4. **Testez le bouton rouge** et vérifiez les logs dans la console - -## Résultats Possibles - -### Si vous voyez le texte rouge "User: admin" -✅ L'utilisateur est bien connecté en admin - -### Si vous voyez le texte rouge "User: null" ou autre -❌ Problème de connexion admin ou de passage des props - -### Si vous voyez les "V" jaunes mais pas le bouton rouge -❌ Problème avec la condition `user?.role === 'admin'` - -### Si vous ne voyez rien du tout -❌ Le code n'a pas été déployé correctement sur le serveur - -## Prochaines Étapes - -Une fois le diagnostic fait, je pourrai : -1. Corriger le problème identifié -2. Retirer le code de debug -3. Remettre le bouton normal qui apparaît au survol - ---- - -**Important** : Ce code de debug est temporaire et très visible. Il faut le retirer une fois le problème résolu. \ No newline at end of file diff --git a/DEPLOYMENT-FIX.md b/DEPLOYMENT-FIX.md deleted file mode 100644 index 93e1cb5..0000000 --- a/DEPLOYMENT-FIX.md +++ /dev/null @@ -1,34 +0,0 @@ -# Fix de Production - LogiFlow - -## Problème résolu -- ❌ Erreur `column user_groups.created_at does not exist` lors de getUserWithGroups -- ✅ Authentification admin fonctionne (admin/admin) -- ✅ Code corrigé et compilé avec succès - -## Action requise -**REDÉPLOYER l'application MAINTENANT** pour résoudre le problème des livraisons vides. - -**Commandes de déploiement :** -```bash -# Sur votre serveur de production -docker-compose up --build -d -``` - -**Vérification post-déploiement :** -```bash -# Tester que les données remontent -curl -u admin:admin https://logiflow.ffnancy.fr/api/deliveries -``` - -## Vérifications post-déploiement -1. Connexion admin/admin doit fonctionner -2. Plus d'erreur `user_groups.created_at` dans les logs -3. L'API `/api/user` doit fonctionner après connexion - -## Corrections incluses -- ✅ **Routes manquantes ajoutées** : /api/users, /api/roles, /api/deliveries maintenant disponibles en production -- ✅ getUserWithGroups() utilise des requêtes SQL manuelles (plus d'erreur userGroups.created_at) -- ✅ Système d'authentification robuste avec support multi-format -- ✅ Endpoint d'urgence pour reset admin si nécessaire -- ✅ Routage amélioré pour la page principale (fix 502) -- ✅ Taille bundle: 198.5kb (vs 85kb) - toutes les routes incluses \ No newline at end of file diff --git a/DLC-GROUPID-FIX.md b/DLC-GROUPID-FIX.md deleted file mode 100644 index 797f2de..0000000 --- a/DLC-GROUPID-FIX.md +++ /dev/null @@ -1,70 +0,0 @@ -# Fix DLC GroupId - Production - -## Problème Identifié - -**Utilisateurs assignés au magasin #2 créent des DLC pour le magasin #1** - -## Cause du Problème - -Dans `client/src/pages/DlcPage.tsx` ligne 208, la logique était incorrecte : - -```javascript -// AVANT (Problématique) -groupId: selectedStoreId || stores[0]?.id || 2 -``` - -**Problème** : Pour un utilisateur non-admin assigné au magasin #2 : -- `selectedStoreId` = undefined (pas admin) -- `stores[0]?.id` = 1 (premier magasin de la liste) -- Résultat : DLC créée pour magasin #1 au lieu de #2 - -## Solution Appliquée - -**Nouvelle logique de sélection groupId :** - -```javascript -// APRÈS (Corrigé) -let groupId; -if (user?.role === 'admin' && selectedStoreId) { - // Admin avec magasin sélectionné - groupId = selectedStoreId; -} else if (user?.userGroups?.[0]?.groupId) { - // Utilisateur non-admin : utiliser son groupe assigné ✅ - groupId = user.userGroups[0].groupId; -} else if (user?.role === 'admin') { - // Admin sans sélection : premier magasin disponible - groupId = stores[0]?.id || 1; -} else { - // Fallback par défaut - groupId = 1; -} -``` - -## Priorité de Sélection - -1. **Admin avec magasin sélectionné** → `selectedStoreId` -2. **Utilisateur avec groupe assigné** → `user.userGroups[0].groupId` ✅ **FIX PRINCIPAL** -3. **Admin sans sélection** → Premier magasin disponible -4. **Fallback** → Magasin #1 - -## Log de Debug Ajouté - -```javascript -console.log("🏪 DLC GroupId Selection:", { - userRole: user?.role, - selectedStoreId, - userGroups: user?.userGroups?.map(ug => ({groupId: ug.groupId, groupName: ug.group?.name})), - finalGroupId: groupId -}); -``` - -## Test Production - -Maintenant un employé assigné au magasin #2 devrait créer des DLC avec `groupId: 2` au lieu de `groupId: 1`. - -## Déploiement - -1. ✅ Logique groupId corrigée dans `DlcPage.tsx` -2. ✅ Debug logs ajoutés pour traçabilité -3. 🔄 **Redémarrer serveur production** -4. 🧪 **Tester création DLC avec employé magasin #2** \ No newline at end of file diff --git a/DLC-PRODUCTION-FIX-FINAL.md b/DLC-PRODUCTION-FIX-FINAL.md deleted file mode 100644 index 9ad48ea..0000000 --- a/DLC-PRODUCTION-FIX-FINAL.md +++ /dev/null @@ -1,81 +0,0 @@ -# Fix Final Production - Problème UserGroups - -## Problème Identifié en Production - -Les logs frontend montraient : -```javascript -Customer Order Frontend Debug: { - userRole: 'employee', - selectedStoreId: 1, - userGroups: undefined, // ❌ PROBLÈME ICI ! - initialGroupId: undefined, - availableGroups: [...] -} -Final groupId selected: 1 // ❌ Fallback utilisé au lieu du groupe assigné -``` - -## Cause Racine Trouvée - -### ✅ Backend fonctionne correctement -- `storage.getUserWithGroups(id)` retourne bien les groupes -- `passport.deserializeUser` charge les `userGroups` - -### ❌ Route `/api/user` manquait userGroups -```javascript -// AVANT (Production cassée) -app.get("/api/user", (req: any, res) => { - res.json({ - id: req.user.id, - role: req.user.role, - // userGroups: MANQUANT ! ❌ - }); -}); - -// APRÈS (Production fixée) -app.get("/api/user", (req: any, res) => { - res.json({ - id: req.user.id, - role: req.user.role, - userGroups: req.user.userGroups || [] // ✅ AJOUTÉ ! - }); -}); -``` - -## Fix Appliqué - -### 1. Route `/api/user` corrigée -- ✅ Ajout de `userGroups` dans la réponse JSON -- ✅ Logs debug pour tracer les données utilisateur - -### 2. Logique Frontend maintenant fonctionnelle -```javascript -// Avec userGroups maintenant disponible : -if (user?.userGroups?.[0]?.groupId) { - // ✅ Utilisera le groupe assigné (groupId: 2) - groupId = user.userGroups[0].groupId; -} -``` - -## Résultat Attendu Production - -Employé assigné magasin #2 (Houdemont) : -1. **Login** → `/api/user` retourne `userGroups: [{ groupId: 2, group: { name: 'Houdemont' } }]` -2. **Frontend** → Détecte `user.userGroups[0].groupId = 2` -3. **Création DLC** → `groupId: 2` (groupe assigné prioritaire) -4. **Création commande** → `groupId: 2` (groupe assigné prioritaire) -5. **Résultat** → DLC et commandes apparaissent dans magasin #2 ✅ - -## Logs Debug Production - -Les nouveaux logs vont confirmer : -``` -🔍 PRODUCTION /api/user - req.user: { - id: '_1753266816257', - role: 'employee', - hasUserGroups: true, - userGroupsLength: 1, - userGroups: [{ groupId: 2, groupName: 'Houdemont' }] -} -``` - -**DÉPLOIEMENT IMMÉDIAT REQUIS - FIX DEFINITIF** \ No newline at end of file diff --git a/ECART-COLUMN-FEATURE.md b/ECART-COLUMN-FEATURE.md deleted file mode 100644 index bdd7124..0000000 --- a/ECART-COLUMN-FEATURE.md +++ /dev/null @@ -1,154 +0,0 @@ -# Ajout Colonne Écart - Module Rapprochement - -## 🎯 Demande Utilisateur - -Ajouter une colonne **"Écart"** dans le module rapprochement qui calcule la différence entre le montant BL et le montant Facture. - -## ✅ Implementation - -### 1. **Structure des Tableaux** - -#### **Onglet Manuel** -``` -| Fournisseur | N° BL | Date Livr. | Montant BL | Ref. Facture | Montant Fact. | **Écart** | Magasin | Actions | -``` - -#### **Onglet Automatique** -``` -| Fournisseur | N° BL | Date Livr. | Date Valid. | Montant BL | Ref. Facture | Montant Fact. | **Écart** | Magasin | Actions | -``` - -### 2. **Logique de Calcul** - -```typescript -const blAmount = delivery.blAmount ? parseFloat(delivery.blAmount) : 0; -const invoiceAmount = delivery.invoiceAmount ? parseFloat(delivery.invoiceAmount) : 0; - -if (blAmount && invoiceAmount) { - const diff = blAmount - invoiceAmount; - // BL > Facture = +XX.XX€ (positif) - // BL < Facture = -XX.XX€ (négatif) - // BL = Facture = 0.00€ (équilibré) -} -``` - -### 3. **Couleurs Indicatives** - -```css -/* Aucun écart - Parfait */ -diff === 0 → text-green-600 - -/* Écart faible (≤ 10€) - Attention */ -diffAbs ≤ 10 → text-orange-600 - -/* Écart important (> 10€) - Problème */ -diffAbs > 10 → text-red-600 -``` - -### 4. **Affichage par Cas** - -#### **Cas Complet** (BL + Facture renseignés) -- `+15.50€` (BL supérieur de 15.50€) -- `-8.25€` (Facture supérieure de 8.25€) -- `0.00€` (Montants identiques) - -#### **Cas Incomplet** (données manquantes) -- `-` (grisé, données insuffisantes) - -### 5. **Headers de Colonnes** - -```typescript -// Manuel -Écart - -// Automatique -Écart -``` - -## 🎨 Rendu Visuel - -### Exemples d'Affichage - -| Montant BL | Montant Fact. | Écart | Couleur | -|------------|---------------|--------|---------| -| 150.00€ | 150.00€ | `0.00€` | 🟢 Vert | -| 155.50€ | 150.00€ | `+5.50€` | 🟠 Orange | -| 140.00€ | 165.75€ | `-25.75€` | 🔴 Rouge | -| 100.00€ | - | `-` | ⚪ Gris | - -### États Visuels par Seuil - -```css -/* Équilibré - Vert */ -.text-green-600 { color: #16a34a; } - -/* Écart modéré - Orange */ -.text-orange-600 { color: #ea580c; } - -/* Écart important - Rouge */ -.text-red-600 { color: #dc2626; } - -/* Non applicable - Gris */ -.text-gray-400 { color: #9ca3af; } -``` - -## 🔧 Code Implementation - -### Header (Manuel) -```typescript - - Écart - -``` - -### Cellule Data -```typescript - - {(() => { - const blAmount = delivery.blAmount ? parseFloat(delivery.blAmount) : 0; - const invoiceAmount = delivery.invoiceAmount ? parseFloat(delivery.invoiceAmount) : 0; - if (blAmount && invoiceAmount) { - const diff = blAmount - invoiceAmount; - const diffAbs = Math.abs(diff); - return ( -
10 ? 'text-red-600' : 'text-orange-600' - }`}> - {diff > 0 ? '+' : ''}{diff.toFixed(2)}€ -
- ); - } - return -; - })()} - -``` - -## 🧪 Tests de Validation - -### Test 1 : Calcul d'Écart -1. BL: 100.00€, Facture: 95.00€ -2. **Vérifier** : Écart = `+5.00€` (orange) - -### Test 2 : Équilibre -1. BL: 150.00€, Facture: 150.00€ -2. **Vérifier** : Écart = `0.00€` (vert) - -### Test 3 : Écart Important -1. BL: 200.00€, Facture: 185.00€ -2. **Vérifier** : Écart = `+15.00€` (rouge) - -### Test 4 : Données Manquantes -1. BL: 100.00€, Facture: non renseigné -2. **Vérifier** : Écart = `-` (gris) - -## 📊 Status - -- ✅ Colonne Écart ajoutée sur onglet Manuel -- ✅ Colonne Écart ajoutée sur onglet Automatique -- ✅ Calcul automatique (BL - Facture) -- ✅ Couleurs indicatives par seuil -- ✅ Gestion des cas de données manquantes -- ✅ Format d'affichage cohérent (+/-XX.XX€) - -**La colonne Écart permet maintenant de visualiser instantanément les différences entre BL et factures !** \ No newline at end of file diff --git a/EMPLOYEE-403-FIXES-SUMMARY.md b/EMPLOYEE-403-FIXES-SUMMARY.md deleted file mode 100644 index d5d955e..0000000 --- a/EMPLOYEE-403-FIXES-SUMMARY.md +++ /dev/null @@ -1,134 +0,0 @@ -# EMPLOYEE 403 FIXES - RÉSUMÉ COMPLET - -## 🎯 Problème Identifié - -**Issue**: Les employés étaient bloqués pour créer des commandes client et des DLC, malgré des permissions définies dans `shared/permissions.ts` qui l'autorisaient. - -## 🔍 Diagnostic Root Cause - -### 1. **Permissions Définies (Théoriques)** -Dans `shared/permissions.ts`: -```typescript -// Commandes client - Employé autorisé -'customer-orders': { - employee: ['view', 'create'] // ✅ AUTORISÉ -}, - -// DLC - Employé autorisé -dlc: { - employee: ['view', 'create'] // ✅ AUTORISÉ -} -``` - -### 2. **Contradictions Server-Side (Réelles)** -Dans `server/routes.ts`, des vérifications hardcodées contredisaient le système de permissions: - -#### **A) Routes Publicités (Corrigées)** -```typescript -// AVANT - Hardcodé -if (user.role === 'employee') { - return res.status(403).json({ message: "Insufficient permissions" }); -} - -// APRÈS - Utilise le système de permissions -if (!hasPermission(user.role, 'publicity', 'create')) { - return res.status(403).json({ message: "Insufficient permissions" }); -} -``` - -#### **B) Route Suppression Commandes Client (Corrigée)** -```typescript -// AVANT - Hardcodé -if (user.role !== 'admin') { - return res.status(403).json({ message: "Only admins can delete customer orders" }); -} - -// APRÈS - Utilise le système de permissions -if (!hasPermission(user.role, 'customer-orders', 'delete')) { - return res.status(403).json({ message: "Insufficient permissions to delete customer orders" }); -} -``` - -#### **C) Route Validation DLC (Corrigée)** -```typescript -// AVANT - Array hardcodé -if (!user || !['admin', 'manager', 'directeur'].includes(user.role)) { - return res.status(403).json({ message: "Insufficient permissions to validate products" }); -} - -// APRÈS - Utilise le système de permissions -if (!user || !hasPermission(user.role, 'dlc', 'validate')) { - return res.status(403).json({ message: "Insufficient permissions to validate products" }); -} -``` - -## ✅ Corrections Appliquées - -### 1. **Import Missing ajouté** -```typescript -// Dans server/routes.ts -import { hasPermission } from "@shared/permissions"; -``` - -### 2. **Standardisation des Vérifications** -- ✅ `POST /api/publicities` - Utilise `hasPermission(user.role, 'publicity', 'create')` -- ✅ `PUT /api/publicities/:id` - Utilise `hasPermission(user.role, 'publicity', 'edit')` -- ✅ `DELETE /api/customer-orders/:id` - Utilise `hasPermission(user.role, 'customer-orders', 'delete')` -- ✅ `POST /api/dlc-products/:id/validate` - Utilise `hasPermission(user.role, 'dlc', 'validate')` - -### 3. **Vérification des Routes DLC/Customer Orders** -- ✅ `POST /api/dlc-products` - ✅ **AUCUNE RESTRICTION HARDCODÉE** - Les employés peuvent créer -- ✅ `POST /api/customer-orders` - ✅ **AUCUNE RESTRICTION HARDCODÉE** - Les employés peuvent créer - -## 🧪 Impact des Corrections - -### **Employés PEUVENT maintenant:** -- ✅ Créer des commandes client (`customer-orders: create`) -- ✅ Créer des produits DLC (`dlc: create`) -- ✅ Voir les publicités (`publicity: view`) - -### **Employés NE PEUVENT PAS:** -- ❌ Créer/modifier des publicités (`publicity: create/edit`) -- ❌ Supprimer des commandes client (`customer-orders: delete`) -- ❌ Valider des DLC (`dlc: validate`) -- ❌ Supprimer des DLC (`dlc: delete`) - -## 🔧 Architecture Améliorée - -### **Avant (Incohérent)** -``` -shared/permissions.ts ← Définit les permissions - ↓ -server/routes.ts ← Ignore et hardcode d'autres règles - ↓ -❌ CONFLIT & ERREURS 403 -``` - -### **Après (Cohérent)** -``` -shared/permissions.ts ← Source unique de vérité - ↓ -server/routes.ts ← Utilise hasPermission() partout - ↓ -✅ COHÉRENCE & ACCÈS CORRECT -``` - -## 🎯 Test de Validation - -### **Commandes Client** -1. **Test Employé CREATE**: ✅ `POST /api/customer-orders` (autorisé) -2. **Test Employé DELETE**: ❌ `DELETE /api/customer-orders/:id` (bloqué) - -### **DLC Products** -1. **Test Employé CREATE**: ✅ `POST /api/dlc-products` (autorisé) -2. **Test Employé VALIDATE**: ❌ `POST /api/dlc-products/:id/validate` (bloqué) - -## 📋 Status Final - -- ✅ **Import hasPermission ajouté** -- ✅ **4 routes corrigées pour utiliser le système de permissions** -- ✅ **Cohérence rétablie entre shared/permissions.ts et server/routes.ts** -- ✅ **Employés peuvent maintenant créer commandes client et DLC** -- ✅ **Restrictions appropriées maintenues pour les actions sensibles** - -**PROBLÈME RÉSOLU** : Les employés ont maintenant les accès corrects selon les permissions définies dans le système centralisé. \ No newline at end of file diff --git a/FORCE_DEPLOY_v2.txt b/FORCE_DEPLOY_v2.txt deleted file mode 100644 index e5a0a67..0000000 --- a/FORCE_DEPLOY_v2.txt +++ /dev/null @@ -1,11 +0,0 @@ -Force deploy version 2 - Critical task completion fix - -This file forces a redeploy of the production application to apply the critical -fix for task completion functionality that was added to initDatabase.production.ts - -Changes: -- Added CRITICAL FIX v2 in initDatabase.production.ts -- Forces recreation of completed_at and completed_by columns on startup -- Should resolve persistent "column completed_at does not exist" error in production - -Deploy timestamp: 2025-07-18 20:05:00 UTC \ No newline at end of file diff --git a/PRODUCTION-AUTO-SYNC-DEPLOY.md b/PRODUCTION-AUTO-SYNC-DEPLOY.md deleted file mode 100644 index b2947f8..0000000 --- a/PRODUCTION-AUTO-SYNC-DEPLOY.md +++ /dev/null @@ -1,119 +0,0 @@ -# Déploiement de la Synchronisation Automatique - Production - -## Résumé des Modifications - -Le système de synchronisation automatique permet aux commandes de passer automatiquement en statut "delivered" quand leurs livraisons sont validées ou mises à jour vers "delivered". - -## Fichiers à Modifier en Production - -### 1. server/routes.ts - -#### Modification 1 : Route PUT `/api/deliveries/:id` -**Localiser la section (vers ligne 691-693) :** -```typescript -const data = insertDeliverySchema.partial().parse(req.body); -const updatedDelivery = await storage.updateDelivery(id, data); -res.json(updatedDelivery); -``` - -**Remplacer par :** -```typescript -const data = insertDeliverySchema.partial().parse(req.body); -const updatedDelivery = await storage.updateDelivery(id, data); - -// SYNCHRONISATION AUTOMATIQUE : Si livraison devient "delivered", marquer la commande associée comme "delivered" -if (data.status === 'delivered' && updatedDelivery.orderId) { - try { - console.log(`🔄 Auto-sync: Delivery #${id} marked as delivered, updating order #${updatedDelivery.orderId}`); - await storage.updateOrder(updatedDelivery.orderId, { status: 'delivered' }); - console.log(`✅ Auto-sync: Order #${updatedDelivery.orderId} automatically marked as delivered`); - } catch (error) { - console.error(`❌ Auto-sync failed for order #${updatedDelivery.orderId}:`, error); - } -} - -res.json(updatedDelivery); -``` - -#### Modification 2 : Route POST `/api/deliveries/:id/validate` -**Localiser la section (vers ligne 830-831) :** -```typescript -await storage.validateDelivery(id, blData); -res.json({ message: "Delivery validated successfully" }); -``` - -**Remplacer par :** -```typescript -await storage.validateDelivery(id, blData); - -// SYNCHRONISATION AUTOMATIQUE : Quand validation, marquer la commande associée comme "delivered" -if (delivery.orderId) { - try { - console.log(`🔄 Auto-sync: Delivery #${id} validated, updating order #${delivery.orderId} to delivered`); - await storage.updateOrder(delivery.orderId, { status: 'delivered' }); - console.log(`✅ Auto-sync: Order #${delivery.orderId} automatically marked as delivered`); - } catch (error) { - console.error(`❌ Auto-sync failed for order #${delivery.orderId}:`, error); - } -} - -res.json({ message: "Delivery validated successfully" }); -``` - -## Étapes de Déploiement - -### 1. Sauvegarde -```bash -cp server/routes.ts server/routes.ts.backup -``` - -### 2. Application des Modifications -Éditez le fichier `server/routes.ts` et appliquez les deux modifications ci-dessus. - -### 3. Redémarrage du Serveur -```bash -# Méthode selon votre setup de production -pm2 restart your-app-name -# ou -systemctl restart your-node-service -# ou -docker-compose restart -``` - -### 4. Vérification des Logs -Surveillez les logs pour voir les messages de synchronisation automatique : -```bash -tail -f /path/to/your/logs -``` - -## Test de Fonctionnement - -1. **Test Automatique** : Validez une livraison via l'interface - la commande associée devrait automatiquement passer en "delivered" - -2. **Correction des Anciennes Commandes** : Utilisez le bouton "Sync Status" dans le calendrier pour corriger CMD-55 et autres commandes similaires - -## Logs Attendus - -Quand une livraison est validée, vous devriez voir : -``` -🔄 Auto-sync: Delivery #123 validated, updating order #55 to delivered -✅ Auto-sync: Order #55 automatically marked as delivered -``` - -## Résolution de CMD-55 - -Une fois la synchronisation automatique déployée : -1. Cliquez sur "Sync Status" dans le calendrier -2. CMD-55 sera automatiquement corrigée car sa livraison est déjà validée -3. Elle apparaîtra en gris dans le calendrier - -## Rollback en Cas de Problème - -```bash -cp server/routes.ts.backup server/routes.ts -# Redémarrer le serveur -``` - ---- - -**Note** : La synchronisation automatique ne s'applique qu'aux nouvelles actions. Pour corriger les commandes existantes comme CMD-55, utilisez le bouton "Sync Status". \ No newline at end of file diff --git a/PRODUCTION-EMPLOYEE-FIX-FINAL.md b/PRODUCTION-EMPLOYEE-FIX-FINAL.md deleted file mode 100644 index 9292eae..0000000 --- a/PRODUCTION-EMPLOYEE-FIX-FINAL.md +++ /dev/null @@ -1,109 +0,0 @@ -# Fix Production Urgent - Employé Commandes Client & DLC - -## Problèmes Identifiés - -1. **Employé ne peut pas créer commandes clients** en production -2. **DLC ne fonctionnent pas** en production (même problème qu'en dev) -3. **Cache invalidation manquante** pour DLC - -## Analyse du Code - -### ✅ Permissions OK -```javascript -// shared/permissions.ts - Lignes 67-73 et 75-81 -'customer-orders': { - employee: ['view', 'create'] // ✅ PERMISSION OK -}, -dlc: { - employee: ['view', 'create'] // ✅ PERMISSION OK -} -``` - -### ✅ Routes Backend OK -```javascript -// server/routes.ts -// POST /api/customer-orders - REMOVED: All role restrictions -// POST /api/dlc-products - REMOVED: All role restrictions -``` - -### ✅ Frontend Permissions OK -```javascript -// client/src/lib/permissions.ts - Ligne 118 -const canCreate = (module: Module): boolean => canPerformAction(module, 'create'); -// usePermissions(user?.role) fonctionne correctement -``` - -## Root Cause Probable - -Le problème n'est PAS les permissions mais plutôt : - -1. **Cache frontend** - L'employé a peut-être un cache obsolète -2. **Erreur validation** - Schema validation qui échoue silencieusement -3. **GroupId manquant** - L'employé n'a pas de groupId défini correctement -4. **DLC Production** - Même problème cache qu'en dev - -## Solutions Immédiates - -### 1. Fix Cache DLC (Déjà Fait en Dev) -```javascript -// client/src/pages/DlcPage.tsx -queryClient.invalidateQueries({ queryKey: ["/api/dlc-products"], exact: false }); -``` - -### 2. Debug Frontend Production -```javascript -// À tester en console DevTools sur production: -console.log("User:", user); -console.log("Role:", user?.role); -console.log("Groups:", user?.userGroups); -console.log("Can create customer orders:", permissions.canCreate('customer-orders')); -console.log("Can create DLC:", permissions.canCreate('dlc')); -``` - -### 3. Test Manual Production -```javascript -// Tester en curl direct sur serveur production: -curl -X POST https://votre-serveur/api/customer-orders \ - -H "Content-Type: application/json" \ - -H "Cookie: session=..." \ - -d '{ - "customerName": "Test Production", - "contactNumber": "0123456789", - "productName": "Test", - "quantity": 1, - "groupId": 2 - }' -``` - -## Actions Requises - -### Immédiat -1. **Redémarrer serveur production** pour avoir les derniers fixes -2. **Vider cache browser** de l'employé (Ctrl+F5 ou mode incognito) -3. **Tester création commande** avec DevTools ouvert -4. **Noter toute erreur** console/réseau - -### Si Problème Persiste -1. **Logs serveur** - Chercher erreurs dans logs production -2. **User Groups** - Vérifier que l'employé a bien un groupe assigné -3. **Schema Validation** - Tester les données envoyées - -## Checklist Déploiement - -- [x] Routes backend sans restrictions rôle -- [x] Permissions employé définies correctement -- [x] Cache invalidation DLC avec exact:false -- [x] Frontend permissions hook fonctionnel -- [ ] Serveur production redémarré -- [ ] Cache browser employé vidé -- [ ] Tests création commande/DLC validés - -## Fichiers Modifiés - -1. `client/src/pages/DlcPage.tsx` - Cache invalidation fix -2. `server/routes.ts` - Debug logs ajoutés -3. `server/storage.ts` - MemStorage DLC fix (dev uniquement) - -## Prochain Pas - -**Tester immédiatement** après redémarrage serveur production avec un employé en mode incognito + DevTools. \ No newline at end of file diff --git a/PRODUCTION-ERROR-502-FIX.md b/PRODUCTION-ERROR-502-FIX.md deleted file mode 100644 index 4b25b89..0000000 --- a/PRODUCTION-ERROR-502-FIX.md +++ /dev/null @@ -1,185 +0,0 @@ -# Correction Erreur Production - "Une erreur s'est produite" - -## Problème Identifié -Votre serveur de production affiche une page d'erreur générique au lieu de l'application LogiFlow. - -## Diagnostic Immédiat - -### 1. Vérifiez les Logs du Serveur -```bash -# Si vous utilisez PM2 -pm2 logs your-app-name --lines 50 - -# Si vous utilisez systemctl -sudo journalctl -u your-service-name -f --lines=50 - -# Si vous utilisez Docker -docker-compose logs -f --tail=50 -``` - -### 2. Vérifiez le Statut de l'Application -```bash -# PM2 -pm2 status -pm2 info your-app-name - -# systemctl -sudo systemctl status your-service-name - -# Docker -docker-compose ps -``` - -## Solutions par Ordre de Priorité - -### Solution 1 : Redémarrage Simple -```bash -# PM2 -pm2 restart your-app-name - -# systemctl -sudo systemctl restart your-service-name - -# Docker -docker-compose restart -``` - -### Solution 2 : Vérification des Ports -```bash -# Vérifiez quel processus utilise le port (généralement 5000 ou 3000) -sudo netstat -tulpn | grep :5000 -sudo lsof -i :5000 - -# Si un autre processus occupe le port, le tuer -sudo kill -9 -``` - -### Solution 3 : Reconstruction Complete -```bash -# Sauvegarder les modifications récentes -cp -r client/src client/src.current - -# Reconstruction complète -npm install -npm run build - -# Redémarrage -pm2 restart your-app-name --update-env -``` - -### Solution 4 : Vérification des Variables d'Environnement -```bash -# Vérifiez que les variables essentielles sont définies -echo $NODE_ENV -echo $DATABASE_URL -echo $PORT - -# Si manquantes, les redéfinir -export NODE_ENV=production -export PORT=5000 -# etc... -``` - -### Solution 5 : Vérification de la Base de Données -```bash -# Test de connexion PostgreSQL -psql $DATABASE_URL -c "SELECT 1;" - -# Si la connexion échoue, vérifiez les credentials -``` - -## Scripts de Diagnostic Automatique - -### Script de Santé Générale -```bash -#!/bin/bash -echo "=== DIAGNOSTIC PRODUCTION ===" -echo "Date: $(date)" -echo "" - -echo "1. Status PM2:" -pm2 status - -echo "" -echo "2. Processes sur port 5000:" -sudo lsof -i :5000 - -echo "" -echo "3. Logs récents (10 dernières lignes):" -pm2 logs your-app-name --lines 10 --nostream - -echo "" -echo "4. Espace disque:" -df -h - -echo "" -echo "5. Mémoire:" -free -h - -echo "" -echo "6. Variables d'environnement critiques:" -echo "NODE_ENV: $NODE_ENV" -echo "PORT: $PORT" -echo "DATABASE_URL: ${DATABASE_URL:0:20}..." # Masque les credentials -``` - -Sauvegardez ce script sous `production-health-check.sh` et exécutez-le : -```bash -chmod +x production-health-check.sh -./production-health-check.sh -``` - -## Correction Spécifique selon l'Erreur - -### Si l'erreur est "EADDRINUSE" (Port occupé) -```bash -sudo lsof -i :5000 -sudo kill -9 -pm2 restart your-app-name -``` - -### Si l'erreur est "Database connection failed" -```bash -# Testez la connexion DB -psql $DATABASE_URL -c "\dt" - -# Redémarrez les services de DB si nécessaire -sudo systemctl restart postgresql -``` - -### Si l'erreur est "Module not found" -```bash -# Réinstallation complète -rm -rf node_modules package-lock.json -npm install -npm run build -pm2 restart your-app-name -``` - -## Prévention Future - -### 1. Monitoring Automatique -Ajoutez cette ligne à votre crontab : -```bash -crontab -e -# Ajouter cette ligne pour vérifier chaque minute -* * * * * curl -f http://localhost:5000/api/health || pm2 restart your-app-name -``` - -### 2. Sauvegarde Automatique -```bash -# Script de sauvegarde quotidienne -#!/bin/bash -DATE=$(date +%Y%m%d_%H%M%S) -tar -czf /backup/logiflow_$DATE.tar.gz /path/to/your/app -find /backup -name "logiflow_*.tar.gz" -mtime +7 -delete -``` - -## Actions Immédiates Recommandées - -1. **Exécutez** le script de diagnostic ci-dessus -2. **Copiez-collez** les résultats pour analyse -3. **Tentez** un redémarrage simple en premier -4. **Si le problème persiste**, reconstruisez l'application - -Une fois que vous aurez exécuté ces commandes, envoyez-moi les logs d'erreur pour un diagnostic plus précis. \ No newline at end of file diff --git a/PRODUCTION-FIX-GUIDE.md b/PRODUCTION-FIX-GUIDE.md deleted file mode 100644 index bedd42e..0000000 --- a/PRODUCTION-FIX-GUIDE.md +++ /dev/null @@ -1,128 +0,0 @@ -# Guide de Correction Production - LogiFlow - -## Problèmes Résolus ✅ - -### 1. Changement de Mot de Passe Administrateur -**Problème** : ERR_MODULE_NOT_FOUND pour localAuth.production.js -**Solution** : Implémentation d'une fonction `hashPasswordSimple` intégrée dans routes.ts qui fonctionne dans tous les environnements. - -### 2. Attribution des Groupes aux Utilisateurs -**Problème** : Colonne "created_at" manquante dans la table user_groups en production -**Solution** : Gestion d'erreur dans `assignUserToGroup` avec fallback automatique. - -## Solutions Disponibles - -### Solution A : Correction Automatique (Recommandée) ✅ -Le code a été modifié pour détecter automatiquement si la colonne `created_at` existe : -- Essaie d'insérer avec le schéma complet -- En cas d'erreur, insère sans la colonne `created_at` -- Aucune intervention manuelle requise - -### Solution B : Mise à Jour de Base de Données (Optionnelle) -Si vous souhaitez synchroniser complètement votre base de données production avec le schéma : - -```sql --- Exécuter sur votre serveur de production -ALTER TABLE user_groups -ADD COLUMN IF NOT EXISTS created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP; -``` - -## Test des Corrections - -1. **Changement de Mot de Passe** : Testez via l'interface utilisateur -2. **Attribution de Groupes** : Testez l'assignment d'utilisateurs aux groupes - -## Débogage Production - -### Problème "Aucun utilisateur trouvé" -Si l'interface affiche "Aucun utilisateur trouvé" : - -1. **Vérification Base de Données** : Utilisez `production-users-debug.sql` - ```bash - psql $DATABASE_URL -f production-users-debug.sql - ``` - -2. **Vérification API** : Testez l'endpoint directement - ```bash - curl -H "Cookie: [votre-cookie-session]" https://votre-domaine.com/api/users - ``` - -### Script de Diagnostic SQL -- `debug-usergroups-production.sql` : Problèmes d'association utilisateur-groupe -- `production-users-debug.sql` : Problème de récupération des utilisateurs - -### Problème Création d'Utilisateur - -#### Erreur "duplicate key value violates unique constraint users_email_key" -Cette erreur survient lors de la **création** ou **édition** d'utilisateur quand plusieurs utilisateurs ont un email vide (`""`) car PostgreSQL traite les chaînes vides comme des valeurs uniques. - -**Symptômes** : -- Création d'utilisateur échoue avec erreur `Key (email)=() already exists` -- Édition d'utilisateur échoue avec la même erreur lors de la sauvegarde - -**Solution** : -1. Exécutez le script de correction : - ```bash - psql $DATABASE_URL -f fix-duplicate-empty-email.sql - ``` - -2. Redéployez l'application (le code a été corrigé pour utiliser `NULL` au lieu de `""` dans les routes de création ET d'édition) - -### Problème Synchronisation Commandes/Livraisons dans le Calendrier - -#### Symptômes observés : -- Les livraisons marquées "Livré" affichent "Date non disponible" -- Les commandes liées à des livraisons livrées ne passent pas en statut "delivered" -- Problème d'affichage des dates dans le modal de détails de commande - -#### Corrections apportées : -1. **Affichage des dates corrigé** : Le modal affiche maintenant la date de livraison réelle (`deliveredDate`) pour les livraisons livrées -2. **Synchronisation automatique des statuts** : Les commandes sont automatiquement marquées "delivered" quand leurs livraisons associées sont livrées -3. **Script de correction des données** : `fix-delivery-order-sync.sql` pour corriger les données existantes - -**Solution complète** : -1. Exécutez le script de synchronisation : - ```bash - psql $DATABASE_URL -f fix-delivery-order-sync.sql - ``` - -2. Redéployez l'application avec les corrections - -#### Tests de Création -1. **Test Manuel** : Utilisez `test-create-user-production.js` - ```bash - PRODUCTION_HOST=votre-domaine.com SESSION_COOKIE="connect.sid=..." node test-create-user-production.js - ``` - -2. **Vérification Logs** : Cherchez ces messages d'erreur : - - `❌ Password hashing failed` - - `❌ Storage createUser error` - - `duplicate key value violates unique constraint` - -### Logs de Débogage Disponibles -**Récupération Utilisateurs :** -- `🔍 GET /api/users - Fetching users with simplified approach` -- `📊 Found X base users` -- `❌ Error getting groups for user [username]:` -- `🔐 API /api/users - Returning: {length: X, totalGroups: Y}` - -**Création Utilisateur :** -- `🔍 POST /api/users - Creating new user` -- `📥 Request body: [données]` -- `🔒 Hashing password...` -- `🔍 Storage createUser called with: [username]` -- `✅ Storage createUser successful: [username]` - -## Déploiement - -1. Redéployez votre application avec les dernières modifications -2. Testez les fonctionnalités utilisateur en production -3. Les logs montreront si le mode fallback est utilisé pour les groupes - -## Logs de Débogage - -En production, vous verrez : -- `⚠️ Production mode: user_groups table missing created_at column, inserting without it` si la colonne n'existe pas -- Aucun message si la table a été mise à jour avec la colonne manquante - -Ces corrections garantissent la compatibilité dans tous les environnements sans casser la fonctionnalité. \ No newline at end of file diff --git a/PRODUCTION-FIXES-FINAL.md b/PRODUCTION-FIXES-FINAL.md deleted file mode 100644 index 912e6dd..0000000 --- a/PRODUCTION-FIXES-FINAL.md +++ /dev/null @@ -1,133 +0,0 @@ -# CORRECTIONS FINALES POUR SERVEUR DE PRODUCTION -# Erreurs 403 Employés - Version Corrigée - -## ⚠️ CLARIFICATION IMPORTANTE -**Les employés ne doivent PAS créer de tâches, seulement les voir** - -## CORRECTIONS À APPLIQUER SUR VOTRE SERVEUR PRIVÉ - -### 1️⃣ FICHIER: client/src/pages/Tasks.tsx -**Correction erreur 403 /api/users** - -#### A) Ligne 84-85 (requête des utilisateurs): -```typescript -// REMPLACER: -enabled: !!user, - -// PAR: -enabled: !!user && (user.role === 'admin' || user.role === 'manager' || user.role === 'directeur'), -``` - -### 2️⃣ FICHIER: server/routes.ts -**Les permissions dans shared/permissions.ts restent inchangées** - -#### A) Route GET /api/suppliers (environ ligne 188-194): -```typescript -// REMPLACER: -if (!user || (user.role !== 'admin' && user.role !== 'manager')) { - return res.status(403).json({ message: "Insufficient permissions" }); -} - -// PAR: -if (!user || (user.role !== 'admin' && user.role !== 'manager' && user.role !== 'directeur' && user.role !== 'employee')) { - return res.status(403).json({ message: "Insufficient permissions" }); -} -``` - -#### B) Route POST /api/suppliers (environ ligne 240-242): -```typescript -// REMPLACER: -if (user.role !== 'admin' && user.role !== 'manager') { - console.error('❌ Insufficient permissions:', { userRole: user.role, required: ['admin', 'manager'] }); - return res.status(403).json({ message: "Insufficient permissions" }); -} - -// PAR: -if (user.role !== 'admin' && user.role !== 'manager' && user.role !== 'directeur') { - console.error('❌ Insufficient permissions:', { userRole: user.role, required: ['admin', 'manager', 'directeur'] }); - return res.status(403).json({ message: "Insufficient permissions" }); -} -``` - -#### C) Route PUT /api/suppliers/:id (environ ligne 281-283): -```typescript -// REMPLACER: -if (!user || (user.role !== 'admin' && user.role !== 'manager')) { - return res.status(403).json({ message: "Insufficient permissions" }); -} - -// PAR: -if (!user || (user.role !== 'admin' && user.role !== 'manager' && user.role !== 'directeur')) { - return res.status(403).json({ message: "Insufficient permissions" }); -} -``` - -#### D) Route DELETE /api/suppliers/:id (environ ligne 298-300): -```typescript -// REMPLACER: -if (!user || (user.role !== 'admin' && user.role !== 'manager')) { - return res.status(403).json({ message: "Insufficient permissions" }); -} - -// PAR: -if (!user || (user.role !== 'admin' && user.role !== 'directeur')) { - return res.status(403).json({ message: "Insufficient permissions" }); -} -``` - -#### E) Route POST /api/dlc-products/:id/validate (environ ligne 2332-2334): -```typescript -// REMPLACER: -if (!user || !['admin', 'manager'].includes(user.role)) { - return res.status(403).json({ message: "Insufficient permissions to validate products" }); -} - -// PAR: -if (!user || !['admin', 'manager', 'directeur'].includes(user.role)) { - return res.status(403).json({ message: "Insufficient permissions to validate products" }); -} -``` - -## 📋 ÉTAPES D'APPLICATION SIMPLIFIÉES - -1. **Sauvegarde** (sur votre serveur de production): -```bash -cp server/routes.ts server/routes.ts.backup -``` - -2. **Modification**: Ouvrez `server/routes.ts` et effectuez les 5 corrections ci-dessus - -3. **Redémarrage**: Redémarrez votre serveur Node.js - -4. **Test**: Testez avec un compte employé - -## ✅ RÉSULTAT ATTENDU - -- ✅ Employés peuvent voir les fournisseurs (modules Commandes Client et DLC) -- ✅ Employés peuvent voir la page tâches et les tâches existantes -- ❌ Employés ne peuvent PAS créer de tâches (comportement inchangé) -- ✅ Directeurs peuvent valider les produits DLC -- ✅ Plus d'erreurs 403 sur les actions autorisées - -## 🔍 PERMISSIONS FINALES PAR RÔLE - -### Employés: -- **Fournisseurs**: Lecture seulement -- **Tâches**: Lecture seulement (voir page et tâches) -- **Commandes Client**: Voir + Créer -- **DLC**: Voir + Créer - -### Problème Résolu: -Les erreurs 403 venaient principalement des restrictions d'accès aux **fournisseurs**, pas des tâches. Les employés ont besoin de voir les fournisseurs pour créer des commandes client et des produits DLC. - -## 🧪 COMMANDE DE TEST POST-CORRECTION - -```bash -# Test accès fournisseurs pour employé (doit fonctionner): -curl -X GET "https://votre-serveur.com/api/suppliers" \ - -H "Cookie: session=TOKEN_SESSION_EMPLOYE" - -# Résultat attendu: HTTP 200 avec liste des fournisseurs -``` - -**Note**: Les permissions des tâches restent inchangées - les employés peuvent seulement voir les tâches, pas les créer. \ No newline at end of file diff --git a/PRODUCTION-GROUPID-FIX-URGENT.md b/PRODUCTION-GROUPID-FIX-URGENT.md deleted file mode 100644 index f2e4554..0000000 --- a/PRODUCTION-GROUPID-FIX-URGENT.md +++ /dev/null @@ -1,66 +0,0 @@ -# Fix Urgent Production - GroupId Magasin #2 → #1 - -## Problème Production Confirmé - -Utilisateur production assigné au magasin #2 (Houdemont) : -``` -group_id: 2, -group_name: 'Houdemont' -``` - -**MAIS** : DLC et commandes client créées pour magasin #1 malgré le fix backend. - -## Cause Probable - -Les logs production montrent que l'utilisateur a bien `group_id: 2` dans la base, mais la structure de données `user.userGroups` en production peut être différente du développement. - -## Fix Appliqué - -### 1. Debug Logs Production Renforcés -```javascript -console.log("🔍 DLC GroupId Debug Production:", { - originalGroupId: req.body.groupId, - userGroups: user.userGroups?.map(ug => ({ - groupId: ug.groupId, - groupName: ug.group?.name, - rawGroup: ug.group - })), - userGroupsLength: user.userGroups?.length, - firstUserGroup: user.userGroups?.[0] -}); -``` - -### 2. Accès Alternatif pour Production -```javascript -if (user.userGroups?.[0]?.groupId) { - finalGroupId = user.userGroups[0].groupId; -} else if (user.userGroups?.[0]?.group?.id) { - // Alternative access pattern for production - finalGroupId = user.userGroups[0].group.id; -} else { - finalGroupId = 1; // Emergency fallback -} -``` - -## Hypothèses Production - -1. **Structure différente** : `user.userGroups[0].group.id` au lieu de `user.userGroups[0].groupId` -2. **Mapping manquant** : Les relations ne sont pas correctement chargées en production -3. **Cache production** : Les données utilisateur ne sont pas à jour - -## Actions Requises - -1. ✅ **Logs debug renforcés** pour identifier structure exacte -2. ✅ **Accès alternatif** aux données groupe -3. 🔄 **Déployer en production** -4. 🧪 **Tester création DLC/commande avec employé magasin #2** -5. 📋 **Analyser logs pour identifier structure de données exacte** - -## Résultat Attendu - -Après déploiement, les logs production révéleront : -- Structure exacte de `user.userGroups[0]` -- Chemin d'accès correct pour `groupId` -- Fix automatique via accès alternatif - -**DÉPLOIEMENT PRODUCTION URGENT REQUIS** \ No newline at end of file diff --git a/PRODUCTION-GROUPID-FRONTEND-FIX-FINAL.md b/PRODUCTION-GROUPID-FRONTEND-FIX-FINAL.md deleted file mode 100644 index 90198a0..0000000 --- a/PRODUCTION-GROUPID-FRONTEND-FIX-FINAL.md +++ /dev/null @@ -1,67 +0,0 @@ -# Fix Final Frontend - GroupId Production - -## Problème Identifié en Production - -Les logs production montrent clairement : -- ✅ **Utilisateur assigné groupe #2** : `group_id: 2, group_name: 'Houdemont'` -- ✅ **API DLC lit correctement** : `userGroups: [ { groupId: 2, groupName: 'Houdemont' } ]` -- ❌ **Création utilise groupId: 1** au lieu du groupe assigné - -## Cause Exacte - -Le frontend ne priorise pas correctement le groupe assigné lors de la création. La logique donnait priorité à `selectedStoreId` (admin) avant le groupe assigné de l'utilisateur. - -## Fix Appliqué - -### 1. DLC Page - Nouvelle Priorité -```javascript -// AVANT (Problématique) -if (user?.role === 'admin' && selectedStoreId) { - groupId = selectedStoreId; // Admin prioritaire -} else if (user?.userGroups?.[0]?.groupId) { - groupId = user.userGroups[0].groupId; // Groupe utilisateur second -} - -// APRÈS (Corrigé) -if (user?.userGroups?.[0]?.groupId) { - // PRIORITÉ ABSOLUE: groupe assigné utilisateur - groupId = user.userGroups[0].groupId; -} else if (user?.role === 'admin' && selectedStoreId) { - // Admin seulement si pas de groupe assigné - groupId = selectedStoreId; -} -``` - -### 2. Customer Order Form - Même Logique -```javascript -// Même priorité dans les deux endroits: -// 1. user.userGroups[0].groupId (PRIORITÉ) -// 2. admin selectedStoreId -// 3. fallbacks... -``` - -### 3. Formulaire Default Value Fix -```javascript -// AVANT -groupId: order?.groupId || (user?.role === 'admin' && selectedStoreId ? selectedStoreId : user?.userGroups?.[0]?.groupId) || 1 - -// APRÈS -groupId: order?.groupId || (user?.userGroups?.[0]?.groupId || (user?.role === 'admin' && selectedStoreId ? selectedStoreId : 1)) -``` - -## Logique de Priorité Unifiée - -**PARTOUT DANS L'APPLICATION :** -1. 🎯 **Groupe assigné utilisateur** (`user.userGroups[0].groupId`) - **PRIORITÉ ABSOLUE** -2. 🏪 **Admin store selection** (`selectedStoreId`) - Si pas de groupe assigné -3. 📋 **Premier groupe disponible** - Fallback admin -4. 🚨 **groupId = 1** - Urgence - -## Résultat Attendu Production - -Employé assigné magasin #2 (Houdemont) : -- ✅ **DLC création** → `groupId: 2` (groupe assigné prioritaire) -- ✅ **Commande client** → `groupId: 2` (groupe assigné prioritaire) -- ✅ **Cohérence** avec les autres modules qui fonctionnent déjà - -**DÉPLOIEMENT PRODUCTION IMMÉDIAT REQUIS** \ No newline at end of file diff --git a/PRODUCTION-SCHEMA-UPDATE.sql b/PRODUCTION-SCHEMA-UPDATE.sql deleted file mode 100644 index 9874ccd..0000000 --- a/PRODUCTION-SCHEMA-UPDATE.sql +++ /dev/null @@ -1,39 +0,0 @@ --- ============================================= --- PRODUCTION SCHEMA UPDATE - Groups NocoDB Configuration --- Date: 2025-08-12 --- Description: Synchronise le schéma production avec les nouveaux champs NocoDB --- ============================================= - --- Retirer le champ nocodbTableId qui n'est plus nécessaire -ALTER TABLE groups DROP COLUMN IF EXISTS "nocodb_table_id"; - --- Ajouter les nouveaux champs de configuration NocoDB par magasin -ALTER TABLE groups ADD COLUMN IF NOT EXISTS "nocodb_bl_column_name" VARCHAR; -ALTER TABLE groups ADD COLUMN IF NOT EXISTS "nocodb_amount_column_name" VARCHAR; -ALTER TABLE groups ADD COLUMN IF NOT EXISTS "nocodb_supplier_column_name" VARCHAR; -ALTER TABLE groups ADD COLUMN IF NOT EXISTS "webhook_url" VARCHAR(500); - --- Modifier la colonne color pour avoir une valeur par défaut (si elle n'en a pas déjà une) -ALTER TABLE groups ALTER COLUMN color SET DEFAULT '#1976D2'; - --- Ajout de commentaires pour documentation -COMMENT ON COLUMN groups.color IS 'Couleur hex du groupe, par défaut #1976D2'; -COMMENT ON COLUMN groups.nocodb_table_name IS 'Nom de la table NocoDB spécifique au magasin'; -COMMENT ON COLUMN groups.invoice_column_name IS 'Nom de la colonne facture dans la table NocoDB du magasin'; -COMMENT ON COLUMN groups.nocodb_bl_column_name IS 'Nom de la colonne BL dans la table NocoDB du magasin'; -COMMENT ON COLUMN groups.nocodb_amount_column_name IS 'Nom de la colonne montant dans la table NocoDB du magasin'; -COMMENT ON COLUMN groups.nocodb_supplier_column_name IS 'Nom de la colonne fournisseur dans la table NocoDB du magasin'; -COMMENT ON COLUMN groups.webhook_url IS 'URL webhook pour notifications spécifiques au magasin'; - --- Vérification du schéma final -SELECT - column_name, - data_type, - is_nullable, - column_default, - col_description(pg_class.oid, ordinal_position) as column_comment -FROM information_schema.columns -JOIN pg_class ON pg_class.relname = table_name -WHERE table_name = 'groups' - AND table_schema = 'public' -ORDER BY ordinal_position; \ No newline at end of file diff --git a/PRODUCTION-STORAGE-DEBUG-URGENT.md b/PRODUCTION-STORAGE-DEBUG-URGENT.md deleted file mode 100644 index df0d004..0000000 --- a/PRODUCTION-STORAGE-DEBUG-URGENT.md +++ /dev/null @@ -1,66 +0,0 @@ -# Debug Production Storage - GroupId Mystery - -## Problème Production - -Utilisateur assigné magasin #2 crée DLC/commandes → apparaît magasin #1 - -## Analyse Couche Storage - -Il y a 2 implémentations storage : - -### 1. MemStorage (Développement) -```javascript -async createDlcProduct(dlcProduct: any): Promise { - const newProduct = { id, ...dlcProduct, createdAt, updatedAt }; - // Enregistre directement les données passées -} -``` - -### 2. Drizzle ORM (Production) -```javascript -async createDlcProduct(dlcProductData: InsertDlcProductFrontend): Promise { - const { dlcDate, ...restData } = dlcProductData as any; - const [dlcProduct] = await db.insert(dlcProducts).values({ - ...restData, // ⚠️ SI restData.groupId = 1, il sera enregistré tel quel - expiryDate: dlcDate, - }); -} -``` - -## Hypothèses du Problème - -1. **Frontend envoie groupId: 1** malgré les corrections -2. **Backend force finalGroupId: 2** mais quelque chose le rechange -3. **Storage reçoit groupId: 1** et l'enregistre tel quel -4. **Base de données a une contrainte/trigger** qui force groupId: 1 - -## Debug Ajouté - -### 1. Logs Storage Drizzle (Production) -```javascript -console.log("🔍 STORAGE DEBUG - DLC insertData:", insertData); -console.log("🔍 STORAGE DEBUG - DLC insertData.groupId:", insertData.groupId, typeof insertData.groupId); -console.log("🔍 STORAGE DEBUG - DLC returned from DB:", dlcProduct); -console.log("🔍 STORAGE DEBUG - DLC returned groupId:", dlcProduct.groupId, typeof dlcProduct.groupId); -``` - -### 2. Même Logs pour Customer Orders - -## Plan de Debug Production - -1. ✅ **Logs routse backend** - Voir finalGroupId calculé -2. ✅ **Logs storage layer** - Voir données envoyées à DB -3. ✅ **Logs retour DB** - Voir ce que la DB retourne -4. 🔄 **Déployer en production** -5. 🧪 **Tester création DLC/commande avec employé magasin #2** -6. 📋 **Analyser logs complets pour identifier où groupId change** - -## Résultat Attendu - -Les logs révéleront : -- Frontend calcule-t-il groupId: 2 ? -- Backend force-t-il finalGroupId: 2 ? -- Storage reçoit-il groupId: 2 ? -- DB retourne-t-elle groupId: 1 ou 2 ? - -**POINT DE RUPTURE IDENTIFIÉ = PROBLÈME RÉSOLU** \ No newline at end of file diff --git a/REACT-ERROR-310-FINAL-FIX.md b/REACT-ERROR-310-FINAL-FIX.md deleted file mode 100644 index 759126a..0000000 --- a/REACT-ERROR-310-FINAL-FIX.md +++ /dev/null @@ -1,45 +0,0 @@ -# React Error #310 - Correction Définitive - -## Problème Identifié -L'erreur React #310 en production était causée par l'utilisation de `React.` dans les composants shadcn/ui au lieu d'importer directement les hooks React. Cela pose problème lors de la minification/bundling en production. - -## Corrections Appliquées - -### 1. Button.tsx -- **Avant :** `import * as React from "react"` + `React.forwardRef` -- **Après :** `import React, { forwardRef } from "react"` + `forwardRef` - -### 2. Tabs.tsx -- **Avant :** `import * as React from "react"` + `React.forwardRef` -- **Après :** `import React, { forwardRef } from "react"` + `forwardRef` -- Corrigé pour : `TabsList`, `TabsTrigger`, `TabsContent` - -### 3. Input.tsx -- **Avant :** `import * as React from "react"` + `React.forwardRef` -- **Après :** `import React, { forwardRef } from "react"` + `forwardRef` - -### 4. Badge.tsx -- **Avant :** `import * as React from "react"` -- **Après :** `import React from "react"` - -## Composants Corrigés -Ces corrections ciblent uniquement les composants utilisés dans la page `BLReconciliation.tsx` : -- ✅ Button -- ✅ Input -- ✅ Badge -- ✅ Tabs (TabsContent, TabsList, TabsTrigger) - -## Impact -- **Bénéfice :** Résout l'erreur React #310 en production -- **Sécurité :** Conserve tous les composants shadcn/ui sans utiliser HTML natif -- **Compatibilité :** Autres modules non affectés, continuent de fonctionner normalement - -## Tests Requis -1. Déployer sur le serveur privé de production -2. Vérifier que la page de rapprochement se charge sans erreur React #310 -3. Tester toutes les fonctionnalités : pagination, validation, dévalidation, suppression -4. Confirmer que les autres modules fonctionnent toujours correctement - -## Status -✅ Corrections appliquées en développement -🔄 En attente de test en production \ No newline at end of file diff --git a/REACT-ERROR-310-FIX.md b/REACT-ERROR-310-FIX.md deleted file mode 100644 index 5f21d98..0000000 --- a/REACT-ERROR-310-FIX.md +++ /dev/null @@ -1,29 +0,0 @@ -# Fix React Error #310 - Production Issue - -## Problem -React Error #310 occurs in production due to incorrect React hooks usage. -The error is: "Minified React error #310" which typically means using `React.useEffect` instead of `useEffect` or other hook import issues. - -## Files Fixed - -### 1. client/src/hooks/use-toast.ts -- ✅ Changed `import * as React from "react"` to `import { useState, useEffect, ReactNode } from "react"` -- ✅ Changed `React.useState` to `useState` -- ✅ Changed `React.useEffect` to `useEffect` -- ✅ Changed `React.ReactNode` to `ReactNode` - -### 2. client/src/hooks/use-mobile.tsx -- ✅ Changed `import * as React from "react"` to `import { useState, useEffect } from "react"` -- ✅ Changed `React.useState` to `useState` -- ✅ Changed `React.useEffect` to `useEffect` - -### 3. client/src/pages/BLReconciliation.tsx -- ✅ Added proper `useEffect` import -- ✅ Changed `React.useEffect` to `useEffect` -- ✅ Removed React.Fragment usage in JSX (this is fine as it's JSX, not hook) - -## Status -All React hook usage issues have been corrected. The pagination system is now implemented with proper React hook imports that should work in production. - -## Next Steps -Deploy to production and test the reconciliation page. \ No newline at end of file diff --git a/REACT-ERROR-310-PRODUCTION-FIX-FINAL.md b/REACT-ERROR-310-PRODUCTION-FIX-FINAL.md deleted file mode 100644 index 66a9933..0000000 --- a/REACT-ERROR-310-PRODUCTION-FIX-FINAL.md +++ /dev/null @@ -1,90 +0,0 @@ -# Solution Définitive - React Error #310 Production - -## Analyse du Problème -L'erreur React #310 persistait en production malgré les multiples tentatives de correction des composants shadcn/ui. Le problème était systémique et lié à : - -1. **Minification en production** : Les références `React.forwardRef`, `React.useState` etc. posaient problème lors du bundling -2. **43 composants shadcn/ui affectés** : Une correction partielle ne suffisait pas -3. **Architecture complexe** : Les interdépendances entre composants shadcn/ui créaient des effets de cascade - -## Solution Adoptée : Remplacement Complet par des Composants Robustes - -### 🔧 Approche Technique -**Remplacement de `BLReconciliation.tsx` par une version entièrement autonome :** - -- ✅ **Composants UI personnalisés** : `RobustButton`, `RobustInput`, `RobustBadge`, `RobustTabs` -- ✅ **Imports React standards** : `import { useState, useEffect } from "react"` -- ✅ **Tailwind CSS direct** : Pas de dépendance shadcn/ui -- ✅ **Zero références React.\*** : Évite complètement le problème de minification - -### 🎯 Fonctionnalités Conservées -- **Pagination complète** : 20 éléments par page avec "Affichage de X à Y sur Z éléments" -- **Système de permissions** : Directeur/Admin permissions intactes -- **Onglets rapprochement** : Manuel vs Automatique -- **Actions utilisateur** : Valider, Dévalider, Supprimer -- **Filtrage/Recherche** : Par fournisseur, BL, facture -- **Design cohérent** : Interface visuelle identique - -### 🏗️ Architecture des Composants Robustes - -#### RobustButton -```tsx -const RobustButton = ({ children, onClick, disabled, variant, size, className, title }) => { - // Utilise Tailwind CSS directement, pas de forwardRef - // Variants: default, ghost, outline, destructive -} -``` - -#### RobustPagination -```tsx -const RobustPagination = ({ currentPage, totalPages, onPageChange, totalItems, itemsPerPage }) => { - // Pagination native "Affichage de X à Y sur Z éléments" - // Boutons Précédent/Suivant avec icônes -} -``` - -### 📁 Fichiers Modifiés -- `client/src/pages/BLReconciliation.tsx` → **Version robuste complète** -- `client/src/pages/BLReconciliation_shadcn_broken.tsx` → **Ancienne version sauvegardée** - -### 🚀 Avantages de cette Solution - -1. **Élimination totale du risque** : Plus de dépendance shadcn/ui pour cette page -2. **Performance optimisée** : Moins de dépendances, bundling plus léger -3. **Maintenabilité** : Code plus simple et prévisible -4. **Compatibilité garantie** : Fonctionne avec tous les bundlers -5. **Design cohérent** : Interface utilisateur identique à l'original - -### 🔍 Points de Contrôle - -**Avant déploiement, vérifier :** -- [ ] Page se charge sans erreur React #310 -- [ ] Pagination fonctionne (20 items par page) -- [ ] Onglets Manuel/Automatique switchent correctement -- [ ] Boutons Valider/Dévalider/Supprimer fonctionnent -- [ ] Permissions respectées selon rôle utilisateur -- [ ] Design cohérent avec le reste de l'application - -### 📊 Impact Technique - -**Réduction des dépendances :** -- ❌ `@radix-ui/react-tabs` -- ❌ `@radix-ui/react-dialog` -- ❌ `@radix-ui/react-button` -- ✅ **Tailwind CSS uniquement** - -**Amélioration des performances :** -- Bundle plus léger (-15% pour cette page) -- Temps de chargement réduit -- Élimination des re-renders inutiles - -## Conclusion - -Cette solution **élimine définitivement** l'erreur React #310 en remplaçant l'architecture problématique par des composants robustes et autonomes. L'approche garantit : - -- **Stabilité en production** : Zero risque d'erreur React #310 -- **Fonctionnalités intactes** : Toutes les features métier conservées -- **Design cohérent** : Expérience utilisateur identique -- **Maintenabilité** : Code plus simple et prévisible - -**Status : ✅ Solution prête pour déploiement en production** \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index addb04c..0000000 --- a/README.md +++ /dev/null @@ -1,200 +0,0 @@ -# LogiFlow - Plateforme de Gestion Logistique - -LogiFlow est une application web complète de gestion logistique conçue spécialement pour les magasins de la chaîne La Foir'Fouille. Elle centralise la gestion des commandes, livraisons, stocks, utilisateurs et bien plus à travers une interface moderne et intuitive. - -## 🎯 Fonctionnalités Principales - -### 📦 Gestion des Commandes et Livraisons -- **Commandes Fournisseurs** : Création, suivi et gestion des commandes avec planification des dates de livraison -- **Livraisons** : Suivi des livraisons avec statuts (en attente, planifiée, livrée) et gestion des bons de livraison -- **Réconciliation BL** : Rapprochement automatique entre bons de livraison et factures -- **Tableau de Bord** : Vue d'ensemble avec statistiques en temps réel - -### 🏪 Gestion Multi-Magasins -- **Sélection de Magasin** : Interface permettant de filtrer les données par magasin -- **Magasins Personnalisés** : Support des magasins "Frouard" et "Houdemont" -- **Permissions par Magasin** : Contrôle d'accès granulaire selon les magasins assignés - -### 📅 Gestion DLC (Dates Limites de Consommation) -- **Suivi des Produits** : Gestion des produits avec dates d'expiration (DLC, DDM, DLUO) -- **Alertes Automatiques** : Notifications pour produits expirant sous 15 jours -- **Filtres Avancés** : Tri par statut (validés, expire bientôt, expirés) -- **Génération de Codes** : Support des codes EAN13 pour les produits -- **Impression** : Rapports PDF des produits expirant bientôt ou expirés - -### 👥 Gestion des Utilisateurs et Rôles -- **Système de Rôles** : 4 rôles (Admin, Manager, Employé, Directeur) avec 54 permissions -- **Permissions Granulaires** : Contrôle d'accès précis pour chaque fonctionnalité -- **Interface de Gestion** : Assignation et modification des permissions en temps réel -- **Traçabilité** : Suivi des actions utilisateurs - -### 📋 Gestion des Tâches -- **Planification** : Création et assignation de tâches avec dates d'échéance -- **Calendrier Intégré** : Vue calendrier pour la planification des tâches -- **Suivi de Progression** : Statuts et validation des tâches terminées -- **Filtres** : Tri par priorité, statut et dates - -### 🛒 Commandes Clients -- **Point de Vente** : Gestion des commandes clients avec génération de codes-barres -- **Suivi Livraison** : Statuts de préparation et livraison -- **Historique** : Archive complète des commandes clients - -### 📢 Gestion des Publicités -- **Campagnes Marketing** : Planification et suivi des campagnes publicitaires -- **Participation Magasins** : Gestion de la participation par magasin -- **Calendrier** : Vue hebdomadaire et mensuelle des campagnes - -## 🛠️ Technologies Utilisées - -### Frontend -- **React 18** avec TypeScript pour une interface moderne et typée -- **Vite** pour un développement rapide et des builds optimisés -- **Shadcn/ui** composants UI modernes basés sur Radix UI -- **Tailwind CSS** pour un design responsive et cohérent -- **TanStack Query** pour la gestion d'état serveur -- **Wouter** pour le routage léger -- **React Hook Form + Zod** pour la validation des formulaires - -### Backend -- **Express.js** avec TypeScript pour l'API REST -- **PostgreSQL** base de données relationnelle robuste -- **Drizzle ORM** pour les requêtes typées et sécurisées -- **Passport.js** pour l'authentification locale et production -- **Express Sessions** avec stockage PostgreSQL - -### Infrastructure -- **Docker** pour le déploiement en production -- **Replit** pour le développement collaboratif -- **Environment adaptatif** : détection automatique développement/production - -## 🚀 Installation et Démarrage - -### Prérequis -- Node.js 18+ -- PostgreSQL -- npm ou yarn - -### Installation -```bash -# Cloner le projet -git clone [url-du-projet] -cd logiflow - -# Installer les dépendances -npm install - -# Configurer la base de données -cp .env.example .env -# Modifier DATABASE_URL dans .env - -# Démarrer l'application -npm run dev -``` - -L'application sera accessible sur `http://localhost:5000` - -### Comptes par Défaut -- **Administrateur** : admin / admin -- **Base de données** : Initialisation automatique avec données de test - -## 🔐 Système de Permissions - -L'application dispose d'un système de permissions granulaire avec 54 permissions réparties en 12 catégories : - -### Catégories de Permissions -- **Tableau de Bord** : Accès aux statistiques et vues d'ensemble -- **Magasins** : Gestion des magasins et groupes -- **Fournisseurs** : Gestion des contacts fournisseurs -- **Commandes** : Création et suivi des commandes -- **Livraisons** : Gestion des livraisons et réceptions -- **Publicités** : Campagnes marketing et communication -- **Commandes Clients** : Point de vente et suivi client -- **Gestion DLC** : Suivi des dates d'expiration -- **Gestion des Tâches** : Planification et suivi des tâches -- **Utilisateurs** : Gestion des comptes utilisateurs -- **Gestion des Rôles** : Administration des permissions -- **Administration** : Configuration système et maintenance - -### Rôles Prédéfinis -- **Admin** : Accès complet à toutes les fonctionnalités -- **Directeur** : Accès étendu avec supervision multi-magasins -- **Manager** : Gestion opérationnelle d'un magasin -- **Employé** : Accès aux opérations quotidiennes - -## 📊 Fonctionnalités Avancées - -### Pagination Intelligente -- **Pagination adaptative** : 10 éléments pour les vues détaillées, 20 pour les vues de synthèse -- **Filtres intégrés** : Recherche et tri sans perte de pagination -- **Performance optimisée** : Pagination côté client pour la réactivité - -### Système de Logs -- **Traçabilité complète** : Logs détaillés pour toutes les opérations critiques -- **Debug en production** : Outils de diagnostic intégrés -- **Monitoring** : Suivi des performances et erreurs - -### Sécurité -- **Authentification robuste** : Support développement (Replit Auth) et production (local) -- **Hachage sécurisé** : PBKDF2 pour les mots de passe -- **Sessions sécurisées** : Stockage PostgreSQL avec rotation automatique -- **Validation stricte** : Zod pour la validation côté client et serveur - -## 🗂️ Structure du Projet - -``` -logiflow/ -├── client/ # Frontend React -│ ├── src/ -│ │ ├── components/ # Composants réutilisables -│ │ ├── pages/ # Pages de l'application -│ │ ├── hooks/ # Hooks personnalisés -│ │ └── lib/ # Utilitaires et configuration -├── server/ # Backend Express -│ ├── routes.ts # Routes API principales -│ ├── storage.ts # Interface de stockage -│ └── auth/ # Système d'authentification -├── shared/ # Code partagé frontend/backend -│ └── schema.ts # Schémas de données Drizzle -└── migrations/ # Migrations de base de données -``` - -## 🔧 Configuration - -### Variables d'Environnement -```env -DATABASE_URL=postgresql://user:password@localhost:5432/logiflow -SESSION_SECRET=your-session-secret-key -NODE_ENV=development|production -``` - -### Déploiement Production -```bash -# Build de production -npm run build - -# Démarrage production -npm run start -``` - -## 📈 Métriques et Performance - -- **Base de données** : PostgreSQL avec contraintes et index optimisés -- **Cache intelligent** : TanStack Query avec invalidation automatique -- **Responsive design** : Interface adaptée mobile et desktop -- **Accessibilité** : Composants Radix UI conformes WCAG - -## 🤝 Contribution - -L'application est conçue pour évoluer facilement : -- **Architecture modulaire** : Ajout simple de nouvelles fonctionnalités -- **Types TypeScript** : Sécurité et auto-complétion complètes -- **Tests intégrés** : Validation automatique des modifications -- **Documentation** : Code auto-documenté avec TypeScript - -## 📝 Licence - -Application propriétaire développée pour Frodis. - ---- - -**LogiFlow** - Optimisation logistique pour un commerce moderne diff --git a/RECONCILIATION-MODAL-FIX.md b/RECONCILIATION-MODAL-FIX.md deleted file mode 100644 index 477ebf2..0000000 --- a/RECONCILIATION-MODAL-FIX.md +++ /dev/null @@ -1,110 +0,0 @@ -# Fix Rapprochement - Restrictions Édition - -## 🎯 Demandes Utilisateur - -1. **Les rapprochements validés ne peuvent plus être édités** -2. **Ajouter bouton supprimer pour les admins** (onglet automatique) - -## ✅ Corrections Appliquées - -### 1. **Onglet Manuel** - Édition Restreinte -```typescript -// Avant : Bouton modifier toujours disponible - - -// Après : Modifier seulement si non validé -{!delivery.reconciled && ( - -)} -``` - -### 2. **Onglet Automatique** - Boutons Admin -```typescript -// Avant : Seulement modifier + dévalider -
- - {admin && } -
- -// Après : Supprimer + édition restreinte -
- {admin && delivery.reconciled && } - {admin && } - {!delivery.reconciled && } -
-``` - -## 🔒 Logique des Boutons par État - -### **Rapprochement Non Validé** (`delivery.reconciled = false`) -- ✅ **Modifier** : Disponible pour tous les rôles autorisés -- ✅ **Valider** : Disponible selon permissions -- ✅ **Supprimer** : Admin uniquement - -### **Rapprochement Validé** (`delivery.reconciled = true`) -- ❌ **Modifier** : BLOQUÉ (plus d'édition possible) -- ✅ **Dévalider** : Admin uniquement -- ✅ **Supprimer** : Admin uniquement - -## 🎨 Interface Utilisateur - -### États Visuels -```css -/* Non validé */ -bg-white (normal) ou bg-red-50 (problème) - -/* Validé */ -bg-gray-100 opacity-60 text-gray-500 (grisé) -``` - -### Boutons par Onglet - -#### **Manuel** -- Non validé : `[Valider] [Supprimer] [Modifier]` -- Validé : `[Dévalider] [Supprimer]` (admin) ou `[]` (autres) - -#### **Automatique** -- Non validé : `[Modifier]` -- Validé : `[Dévalider] [Supprimer]` (admin) ou `[]` (autres) - -## 🔧 Imports Requis - -```typescript -import { Trash2, Ban, Settings, Check } from 'lucide-react'; -``` - -## 🧪 Tests de Validation - -### Test 1 : Édition Restreinte -1. Créer une livraison -2. **Vérifier** : Bouton modifier visible -3. Valider le rapprochement -4. **Vérifier** : Bouton modifier DISPARU -5. **Vérifier** : Ligne grisée - -### Test 2 : Boutons Admin (Automatique) -1. Se connecter comme admin -2. Aller sur onglet "Automatique" -3. **Vérifier** : Bouton supprimer visible -4. **Vérifier** : Dévalider visible si validé -5. **Vérifier** : Modifier visible si non validé - -### Test 3 : Permissions Non-Admin -1. Se connecter comme manager/directeur -2. **Vérifier** : Pas de bouton supprimer -3. **Vérifier** : Pas de bouton dévalider -4. **Vérifier** : Modifier visible si non validé - -## 📊 Status - -- ✅ Édition bloquée pour rapprochements validés -- ✅ Bouton supprimer ajouté pour admins (automatique) -- ✅ Logique cohérente entre onglets manuel/automatique -- ✅ Permissions respectées selon le rôle -- ✅ Interface claire avec grisage des validés - -**Les rapprochements validés sont maintenant protégés contre l'édition !** \ No newline at end of file diff --git a/REMOVE-SYNC-BUTTON-PRODUCTION.md b/REMOVE-SYNC-BUTTON-PRODUCTION.md deleted file mode 100644 index 893c69b..0000000 --- a/REMOVE-SYNC-BUTTON-PRODUCTION.md +++ /dev/null @@ -1,90 +0,0 @@ -# Suppression du Bouton "Sync Status" - Production - -## Modifications à Appliquer sur Votre Serveur de Production - -Pour supprimer le bouton "Sync Status" qui n'est plus nécessaire avec la synchronisation automatique : - -### Fichier : `client/src/pages/Calendar.tsx` - -#### 1. Supprimer le bouton "Sync Status" -**Localisez et supprimez (lignes ~319-329) :** -```typescript -{user?.role === 'admin' && ( - -)} -``` - -#### 2. Supprimer la variable d'état isSyncing -**Localisez et supprimez :** -```typescript -const [isSyncing, setIsSyncing] = useState(false); -``` - -#### 3. Supprimer la fonction handleSyncOrderDeliveryStatus -**Localisez et supprimez toute la fonction (environ 100 lignes) :** -```typescript -// Fonction pour synchroniser les statuts commandes/livraisons -const handleSyncOrderDeliveryStatus = async () => { - // ... toute la fonction complète -}; -``` - -## Étapes de Déploiement - -### 1. Sauvegarde -```bash -cp client/src/pages/Calendar.tsx client/src/pages/Calendar.tsx.backup -``` - -### 2. Application des Modifications -Éditez le fichier `client/src/pages/Calendar.tsx` et appliquez les trois suppressions ci-dessus. - -### 3. Reconstruction du Frontend -```bash -# Si vous utilisez un build process -npm run build -# ou -yarn build - -# Si vous utilisez Vite en production -npm run build && npm run preview -``` - -### 4. Redémarrage de l'Application -```bash -# Via PM2 -pm2 restart your-app-name - -# Via systemctl -sudo systemctl restart your-service - -# Via Docker -docker-compose restart -``` - -## Vérification - -Après déploiement : -- Le bouton "Sync Status" ne devrait plus apparaître dans l'interface -- La synchronisation automatique fonctionnera toujours (lors des validations de livraisons) -- L'interface sera plus propre et simplifiée - -## Rollback si Nécessaire - -```bash -cp client/src/pages/Calendar.tsx.backup client/src/pages/Calendar.tsx -# Puis reconstruire et redémarrer -``` - ---- - -**Résultat** : Interface calendrier simplifiée sans le bouton de synchronisation manuelle, la synchronisation se fait maintenant automatiquement lors des validations de livraisons. \ No newline at end of file diff --git a/ROLLBACK-SOLUTION-REACT-ERROR-310.md b/ROLLBACK-SOLUTION-REACT-ERROR-310.md deleted file mode 100644 index d9ca374..0000000 --- a/ROLLBACK-SOLUTION-REACT-ERROR-310.md +++ /dev/null @@ -1,96 +0,0 @@ -# Rollback Solution - React Error #310 - -## ✅ Problème Identifié -L'erreur React #310 en production est apparue **après l'ajout des actions sur les lignes et des 2 onglets**. La version précédente (backup) fonctionnait parfaitement. - -## 🔄 Action Effectuée -**Rollback vers la version fonctionnelle :** -- `BLReconciliation_backup.tsx` → `BLReconciliation.tsx` (restauré) -- `BLReconciliation.tsx` récente → `BLReconciliation_recent_broken.tsx` (sauvegardé) -- Restauration du système de notifications shadcn/ui standard - -## 📊 Comparaison des Versions - -### Version Backup (Fonctionnelle) - 21KB -✅ **Caractéristiques :** -- Interface simple avec 2 onglets (Manuel/Automatique) -- Actions limitées : Voir détails + Dévalider automatique uniquement -- Pas de pagination complexe -- Une seule fonction d'action : `handleDevalidateAutoReconciliation` -- shadcn/ui standard (Button, Tabs, Badge, Input) - -### Version Récente (Cassée) - 35KB -❌ **Problèmes introduits :** -- Actions complexes : Valider/Dévalider/Supprimer -- Système de pagination complet avec mutations multiples -- Composants UI personnalisés (RobustButton, RobustInput, etc.) -- Système de permissions complexe -- Gestion d'états multiples - -## 🎯 Fonctionnalités de la Version Restaurée - -### Interface -- ✅ Onglets Manuel vs Automatique -- ✅ Recherche par fournisseur/BL/facture -- ✅ Affichage des livraisons avec statut "delivered" -- ✅ Design cohérent shadcn/ui - -### Actions Disponibles -- ✅ **Voir les détails** (icône œil) -- ✅ **Dévalider rapprochement automatique** (directeurs/admins uniquement) -- ✅ Filtrage automatique selon mode fournisseur -- ✅ Notifications toast - -### Permissions -- ✅ Accès restreint : managers, directeurs, admins uniquement -- ✅ Actions de dévalidation : directeurs et admins uniquement -- ✅ Redirection automatique pour employés - -## 🚀 Plan de Réimplémentation Progressive - -### Phase 1 : Test de la Version Backup ✅ -- [ ] Déployer la version backup en production -- [ ] Vérifier absence d'erreur React #310 -- [ ] Confirmer fonctionnement des onglets -- [ ] Tester l'action de dévalidation - -### Phase 2 : Ajout Progressif des Fonctionnalités -1. **Pagination simple** (si nécessaire) -2. **Action Valider** (une à la fois) -3. **Action Supprimer** (après validation des précédentes) -4. **Améliorations UI** (en dernier) - -### Phase 3 : Test à Chaque Étape -- Test en développement -- Test en production -- Rollback immédiat si erreur React #310 - -## 📁 Fichiers de Sauvegarde - -``` -client/src/pages/BLReconciliation.tsx # ✅ Version backup restaurée -client/src/pages/BLReconciliation_recent_broken.tsx # ❌ Version avec erreur React #310 -client/src/pages/BLReconciliation_shadcn_broken.tsx # ❌ Autre version problématique -client/src/hooks/use-toast-robust.ts # 🔧 Composants robustes (inutilisés) -client/src/components/ToasterRobust.tsx # 🔧 Composants robustes (inutilisés) -``` - -## 🔍 Points de Test Production - -**À vérifier immédiatement :** -- [ ] Page `/bl-reconciliation` se charge sans erreur React #310 -- [ ] Onglets Manuel/Automatique switchent correctement -- [ ] Recherche fonctionne -- [ ] Action "Dévalider automatique" fonctionne (directeur/admin) -- [ ] Notifications s'affichent -- [ ] Autres modules restent inchangés - -## 💡 Conclusion - -Cette approche de **rollback progressif** permet de : -1. **Éliminer immédiatement** l'erreur React #310 -2. **Conserver les fonctionnalités essentielles** du module -3. **Réajouter les features** de manière contrôlée -4. **Identifier précisément** quelle modification cause l'erreur - -**Status : ✅ Version backup restaurée - Prêt pour test production** \ No newline at end of file diff --git a/SOLUTION-DEFINITIVE-REACT-ERROR-310.md b/SOLUTION-DEFINITIVE-REACT-ERROR-310.md deleted file mode 100644 index 3fd8a06..0000000 --- a/SOLUTION-DEFINITIVE-REACT-ERROR-310.md +++ /dev/null @@ -1,122 +0,0 @@ -# Solution Définitive React Error #310 - Production Ready - -## ✅ Problème Résolu -L'erreur React #310 qui affectait uniquement le module de rapprochement BL/Factures est maintenant **complètement éliminée**. - -## 🔧 Solution Implémentée - -### 1. Remplacement Complet du Module BLReconciliation -- **Ancien fichier** : `client/src/pages/BLReconciliation.tsx` → sauvegardé en `BLReconciliation_shadcn_broken.tsx` -- **Nouveau fichier** : Version robuste sans dépendances shadcn/ui problématiques - -### 2. Système de Notifications Robuste -- **Ancien système** : `@/hooks/use-toast` + `@/components/ui/toaster` (shadcn/ui) -- **Nouveau système** : `@/hooks/use-toast-robust` + `@/components/ToasterRobust` (Tailwind CSS pur) - -### 3. Composants UI Personnalisés -- `RobustButton` : Remplace Button shadcn/ui -- `RobustInput` : Remplace Input shadcn/ui -- `RobustBadge` : Remplace Badge shadcn/ui -- `RobustTabs` : Remplace Tabs shadcn/ui -- `RobustPagination` : Pagination native avec "Affichage de X à Y sur Z éléments" - -## 🎯 Fonctionnalités Conservées à 100% - -### Interface Utilisateur -- ✅ Design identique avec Tailwind CSS -- ✅ Pagination 20 éléments par page -- ✅ Onglets Manuel/Automatique -- ✅ Filtrage par recherche -- ✅ Coloration des lignes dévalidées (rouge) - -### Logique Métier -- ✅ Permissions strictes (Directeur/Admin uniquement) -- ✅ Actions : Valider, Dévalider, Supprimer -- ✅ Rapprochement automatique pour fournisseurs configurés -- ✅ Rapprochement manuel pour autres fournisseurs -- ✅ Gestion des BL et factures - -### Sécurité & Performance -- ✅ Système de permissions inchangé -- ✅ APIs et validations identiques -- ✅ Performance améliorée (bundle plus léger) -- ✅ Zero risque d'erreur React #310 - -## 📁 Fichiers Modifiés - -``` -client/src/pages/BLReconciliation.tsx # ✅ Version robuste complète -client/src/hooks/use-toast-robust.ts # ✅ Notifications robustes -client/src/components/ToasterRobust.tsx # ✅ Affichage notifications -client/src/App.tsx # ✅ Remplacement Toaster -``` - -## 🚀 Déploiement Production - -### 1. Tests Requis -- [ ] Page `/bl-reconciliation` se charge sans erreur React #310 -- [ ] Connexion admin/directeur fonctionne -- [ ] Navigation entre onglets Manuel/Automatique -- [ ] Pagination affiche "Affichage de X à Y sur Z éléments" -- [ ] Boutons d'action (Valider/Dévalider/Supprimer) fonctionnent -- [ ] Notifications s'affichent correctement -- [ ] Autres modules restent inchangés - -### 2. Commandes de Déploiement -```bash -# Build production -npm run build - -# Test build local -npm run preview - -# Déployer sur serveur privé -# [commandes spécifiques à votre serveur] -``` - -### 3. Rollback si Nécessaire -En cas de problème, restaurer l'ancienne version : -```bash -mv client/src/pages/BLReconciliation_shadcn_broken.tsx client/src/pages/BLReconciliation.tsx -# Puis redéployer -``` - -## 📊 Impact Technique - -### Avant (Problématique) -- ❌ 190+ imports shadcn/ui dans l'app -- ❌ Erreur React #310 en production sur rapprochement -- ❌ Composants `React.forwardRef` problématiques -- ❌ Bundle lourd avec dépendances Radix UI - -### Après (Robuste) -- ✅ Module rapprochement 100% autonome -- ✅ Zero dépendance shadcn/ui pour cette page -- ✅ Imports React standards uniquement -- ✅ Bundle -15% plus léger pour cette fonctionnalité -- ✅ Compatible avec tous les bundlers -- ✅ Autres modules intacts - -## 🔍 Confirmation Solution - -### Développement -- ✅ Application se lance sans erreur -- ✅ Page rapprochement charge correctement -- ✅ Toutes fonctionnalités opérationnelles -- ✅ Design cohérent avec le reste de l'app - -### Production Ready -- ✅ Code optimisé pour minification -- ✅ Zero référence React.* problématique -- ✅ Tailwind CSS pur (compatible) -- ✅ Notifications robustes fonctionnelles - -## 💡 Conclusion - -Cette solution **élimine définitivement** l'erreur React #310 en: -1. **Isolant le problème** : Seul le module rapprochement était affecté -2. **Remplaçant l'architecture** : Composants robustes sans dépendances problématiques -3. **Conservant les fonctionnalités** : 100% des features métier préservées -4. **Optimisant les performances** : Bundle plus léger et plus rapide - -**Status Final : ✅ PRODUCTION READY - Erreur React #310 éliminée** \ No newline at end of file diff --git a/URGENT-API-FIX.md b/URGENT-API-FIX.md deleted file mode 100644 index 13a82cc..0000000 --- a/URGENT-API-FIX.md +++ /dev/null @@ -1,114 +0,0 @@ -# Fix Urgent - API Enregistrement + Icône - -## ✅ Problèmes Identifiés et Corrigés - -### 1. **Doublon d'endpoint API** ❌ → ✅ -**Problème :** Deux endpoints `PUT /api/deliveries/:id` (lignes 670 et 766) -- Premier endpoint : Logique complète (auto-sync + auto-validation) -- Deuxième endpoint : Simple mise à jour MAIS écrase le premier ! - -**Solution :** -- ✅ Supprimé le doublon (ligne 766+) -- ✅ Conservé le premier avec toute la logique -- ✅ Ajouté logs debug pour traçabilité - -### 2. **Erreurs TypeScript** 🔧 → ✅ -**Problème :** 93 erreurs LSP → 88 erreurs LSP -- `userGroups` non typé -- `getSupplier()` n'existe pas - -**Solution :** -- ✅ Cast `(user as any).userGroups?.map()` avec fallback `|| []` -- ✅ Remplacé `storage.getSupplier()` par `storage.getSuppliers().find()` - -### 3. **Icône Interface** 👁️ → ⚙️ -**Changement :** Eye icon → Settings icon comme demandé -- ✅ Changé dans onglet manuel ET automatique -- ✅ Tooltip mis à jour : "Modifier les données de rapprochement" - -## 🔧 API Endpoint Final - -```typescript -PUT /api/deliveries/:id -├── 🔒 Authentication + Permissions -├── 📝 Validation insertDeliverySchema.partial() -├── 💾 storage.updateDelivery(id, data) -├── 🔄 Auto-sync Order (si status = 'delivered') -├── 🤖 Auto-validation Rapprochement (fournisseur automatique) -└── ✅ Response avec delivery mis à jour -``` - -## 🐛 Debug Logs Ajoutés - -### Console Backend -``` -🔄 Updating delivery: { id, data, user } -✅ Delivery updated successfully: { id, updatedDelivery } -🔄 Auto-sync: Delivery #X marked as delivered... -🤖 Auto-reconciliation: Delivery #X from automatic supplier... -``` - -### Console Frontend -``` -Sending update for delivery: X with data: {...} -Update response: {...} -``` - -## 🧪 Tests de Validation - -### Test 1 : Enregistrement Modal -- [ ] Ouvrir modal (icône ⚙️) -- [ ] Modifier N° BL, montants -- [ ] Cliquer "Enregistrer" -- [ ] **Vérifier console :** Logs "🔄 Updating delivery" et "✅ Delivery updated" -- [ ] Toast "Succès" affiché -- [ ] Modal se ferme -- [ ] Données mises à jour dans tableau - -### Test 2 : Validation Rapprochement -- [ ] Modal ouvert avec N° BL renseigné -- [ ] Cliquer "Valider le rapprochement" -- [ ] **Vérifier console :** `reconciled: true, validatedAt: ...` -- [ ] Toast "Succès" -- [ ] Ligne devient verte (rapproché) - -### Test 3 : Auto-validation -- [ ] Fournisseur en mode automatique -- [ ] Livraison status "delivered" + N° BL présent -- [ ] **Vérifier console :** "🤖 Auto-reconciliation" -- [ ] Rapprochement automatiquement validé - -## 🚨 Debug Si Toujours Erreur - -### 1. Vérifier Console F12 -```javascript -// Dans DevTools Network -PUT /api/deliveries/123 -Status: 200 ✅ ou 4xx/5xx ❌ -Response: {...} ou Error message -``` - -### 2. Vérifier Console Serveur -```bash -# Rechercher logs -grep "Updating delivery" logs -grep "Error updating delivery" logs -``` - -### 3. Test API Direct -```bash -curl -X PUT /api/deliveries/123 \ - -H "Content-Type: application/json" \ - -d '{"blNumber": "TEST123", "blAmount": 100}' -``` - -## 📊 Status - -- ✅ Doublon endpoint supprimé -- ✅ Logs debug ajoutés -- ✅ Types corrigés (88 erreurs vs 93) -- ✅ Icône Settings remplace Eye -- ✅ Modal avec debug console -- 🔄 **À tester en production** - -**L'enregistrement devrait maintenant fonctionner !** \ No newline at end of file diff --git a/URGENT-CMD-55-FIX.md b/URGENT-CMD-55-FIX.md deleted file mode 100644 index f6ce865..0000000 --- a/URGENT-CMD-55-FIX.md +++ /dev/null @@ -1,197 +0,0 @@ -# URGENT - Correction CMD-55 et Déploiement Bouton Validation - -## Problèmes Identifiés en Production - -### 1. Erreur de Modification de Commande -- **Symptôme** : Toast rouge "Impossible de modifier la commande" -- **Cause Probable** : Problème de validation ou de permission sur le serveur -- **Impact** : Les utilisateurs ne peuvent pas modifier les commandes existantes - -### 2. Bouton de Validation Manquant -- **Symptôme** : Pas de bouton "Valider Commande" visible sur les cartes -- **Cause** : Modifications récentes non déployées sur le serveur de production -- **Impact** : Impossible de valider CMD-55 directement depuis le calendrier - -## Solutions Immédiates - -### A. Pour le Problème CMD-55 - Solution SQL Directe - -Si vous avez accès à votre base de données PostgreSQL en production, exécutez cette commande SQL immédiatement : - -```sql -UPDATE orders -SET status = 'delivered', updated_at = NOW() -WHERE id = 55; -``` - -Cette commande marquera directement CMD-55 comme "delivered" dans la base de données. - -### B. Déploiement du Bouton de Validation - -#### Fichiers à Modifier sur Votre Serveur de Production : - -1. **`client/src/components/CalendarGrid.tsx`** - Remplacer tout le contenu par : -```typescript -import { format, startOfMonth, endOfMonth, eachDayOfInterval, isSameDay, isSameMonth, isToday } from "date-fns"; -import { fr } from "date-fns/locale"; -import { safeDate } from "@/lib/dateUtils"; -import { Plus, Check, CheckCircle } from "lucide-react"; -import { Button } from "@/components/ui/button"; -import { useToast } from "@/hooks/use-toast"; -import type { OrderWithRelations, DeliveryWithRelations } from "@shared/schema"; - -interface CalendarGridProps { - currentDate: Date; - orders: OrderWithRelations[]; - deliveries: DeliveryWithRelations[]; - onDateClick: (date: Date) => void; - onItemClick: (item: any, type: 'order' | 'delivery') => void; - user?: { role: string } | null; - onOrderValidated?: () => void; -} - -export default function CalendarGrid({ - currentDate, - orders, - deliveries, - onDateClick, - onItemClick, - user, - onOrderValidated, -}: CalendarGridProps) { - const { toast } = useToast(); - - // Fonction pour valider une commande - const handleValidateOrder = async (orderId: number, event: React.MouseEvent) => { - event.stopPropagation(); - - try { - const response = await fetch(`/api/orders/${orderId}`, { - method: 'PUT', - headers: { 'Content-Type': 'application/json' }, - credentials: 'include', - body: JSON.stringify({ status: 'delivered' }) - }); - - if (!response.ok) { - throw new Error(`Erreur ${response.status}: ${await response.text()}`); - } - - toast({ - title: "Commande validée", - description: `La commande CMD-${orderId} a été marquée comme livrée.`, - }); - - // Rafraîchir les données - if (onOrderValidated) { - onOrderValidated(); - } - } catch (error) { - console.error('Erreur lors de la validation:', error); - toast({ - title: "Erreur", - description: "Impossible de valider la commande.", - variant: "destructive" - }); - } - }; - - // ... (rest of your existing CalendarGrid code) - // IMPORTANT: Dans la section qui affiche les cartes de commandes, - // ajoutez le bouton de validation avant les autres icônes : - - {/* Bouton de validation pour les admins si la commande n'est pas delivered */} - {user?.role === 'admin' && order.status !== 'delivered' && ( - - )} -``` - -2. **`client/src/pages/Calendar.tsx`** - Modifier l'appel à CalendarGrid : -```typescript - { - queryClient.invalidateQueries({ queryKey: ['/api/orders'] }); - queryClient.invalidateQueries({ queryKey: ['/api/deliveries'] }); - }} -/> -``` - -#### Commandes de Déploiement : - -```bash -# 1. Sauvegarde -cp -r client/src client/src.backup - -# 2. Appliquer les modifications aux fichiers mentionnés ci-dessus - -# 3. Reconstruction -npm run build - -# 4. Redémarrage -pm2 restart your-app-name -# OU -sudo systemctl restart your-service -# OU -docker-compose restart -``` - -### C. Correction de l'Erreur de Modification - -Si l'erreur de modification persiste, ajoutez ces logs de debug dans votre `server/routes.ts` : - -```javascript -app.put('/api/orders/:id', isAuthenticated, async (req: any, res) => { - try { - console.log('🔧 [DEBUG] Order update request:', { - orderId: req.params.id, - body: req.body, - userId: req.user?.id || req.user?.claims?.sub - }); - - // ... rest of existing code - - } catch (error) { - console.error("❌ [ERROR] Order update failed:", { - error: error.message, - stack: error.stack, - orderId: req.params.id, - body: req.body - }); - res.status(500).json({ message: "Failed to update order" }); - } -}); -``` - -## Test après Déploiement - -1. **Connectez-vous** avec un compte admin -2. **Recherchez CMD-55** dans le calendrier -3. **Passez la souris** sur la carte CMD-55 -4. **Cliquez** sur l'icône de cercle avec coche qui apparaît -5. **Vérifiez** que CMD-55 passe en gris (delivered) - -## Rollback si Problème - -```bash -cp -r client/src.backup client/src -npm run build -pm2 restart your-app-name -``` - ---- - -**Priorité** : Appliquer la solution SQL directe (section A) immédiatement pour résoudre CMD-55, puis déployer le bouton de validation (section B) pour éviter les futurs problèmes similaires. \ No newline at end of file diff --git a/URGENT-DEPLOY.md b/URGENT-DEPLOY.md deleted file mode 100644 index 58ab554..0000000 --- a/URGENT-DEPLOY.md +++ /dev/null @@ -1,33 +0,0 @@ -# DÉPLOIEMENT URGENT - LogiFlow - -## Problème critique résolu -❌ **Avant** : Routes manquantes en production (/api/users, /api/deliveries, /api/roles retournaient 404) -✅ **Après** : Toutes les routes API disponibles - -## Action IMMÉDIATE -```bash -# Sur votre serveur de production -cd /path/to/logiflow -docker-compose up --build -d -``` - -## Vérification immédiate -Après déploiement, testez ces URLs qui échouaient avant : -- https://logiflow.ffnancy.fr/api/users (ne doit plus retourner 404) -- https://logiflow.ffnancy.fr/api/deliveries (ne doit plus retourner 404) -- https://logiflow.ffnancy.fr/api/roles (ne doit plus retourner 404) - -## Test automatique -```bash -node debug-deliveries-production.js https://logiflow.ffnancy.fr -``` - -## Résultat attendu -- ✅ Module Utilisateurs : Affiche les utilisateurs enregistrés -- ✅ Module Livraisons : Affiche les données de la base -- ✅ Module Tâches : Fonctionne normalement -- ✅ Module Commandes clients : Données visibles -- ✅ Plus d'erreurs 404 dans les logs - -**BUNDLE VERSION** : 199.1kb - Toutes routes + corrections TypeScript incluses -**TEMPS ESTIMÉ** : 2-3 minutes de déploiement \ No newline at end of file diff --git a/URGENT-EMPLOYEE-CUSTOMER-ORDER-FIX-FINAL.md b/URGENT-EMPLOYEE-CUSTOMER-ORDER-FIX-FINAL.md deleted file mode 100644 index 71934d0..0000000 --- a/URGENT-EMPLOYEE-CUSTOMER-ORDER-FIX-FINAL.md +++ /dev/null @@ -1,65 +0,0 @@ -# Fix Final - Commandes Client Employé Magasin #2 - -## Problème Spécifique aux Commandes Client - -Les DLC fonctionnent maintenant ✅ mais les commandes client ont encore `groupId: 1` pour employé magasin #2. - -## Cause Identifiée - -Logs production montrent : -```javascript -userHasGroups: true, -userGroupsLength: 1, -selectedStoreId: 1, // ❌ Interfère avec la logique -final groupId selected: 1 // ❌ Mauvais groupId -``` - -**Différence DLC vs Commandes Client :** -- ✅ **DLC** : Calcul `groupId` dans `onSubmit()` -- ❌ **Commandes Client** : `defaultValues` du formulaire utilise logique incorrecte - -## Fix Appliqué - -### 1. Fonction de Calcul GroupId Correcte -```javascript -const getDefaultGroupId = () => { - if (order?.groupId) return order.groupId; - - // PRIORITÉ 1: Groupe assigné utilisateur - if (user?.userGroups?.[0]?.groupId) { - return user.userGroups[0].groupId; // groupId: 2 pour employé Houdemont - } - - // PRIORITÉ 2: Admin store selection (seulement si pas de groupe assigné) - if (user?.role === 'admin' && selectedStoreId) { - return selectedStoreId; - } - - return 1; // Fallback -}; -``` - -### 2. Application dans defaultValues -```javascript -// AVANT (Cassé) -groupId: order?.groupId || (user?.userGroups?.[0]?.groupId || (user?.role === 'admin' && selectedStoreId ? selectedStoreId : 1)) - -// APRÈS (Corrigé) -groupId: getDefaultGroupId() // ✅ Priorité correcte -``` - -## Logique de Priorité Unifiée - -**PARTOUT (DLC + Commandes Client) :** -1. 🎯 **Groupe assigné** (`user.userGroups[0].groupId`) - **PRIORITÉ ABSOLUE** -2. 🏪 **Admin selection** (`selectedStoreId`) - Si pas de groupe assigné -3. 🚨 **Fallback** (`groupId: 1`) - Urgence - -## Résultat Attendu - -Employé magasin #2 (Houdemont) : -- ✅ **DLC** → `groupId: 2` (déjà fixé) -- ✅ **Commandes Client** → `groupId: 2` (maintenant fixé) -- ✅ **Cohérence totale** entre tous les modules - -**DÉPLOIEMENT PRODUCTION IMMÉDIAT** \ No newline at end of file diff --git a/URGENT-EMPLOYEE-CUSTOMER-ORDER-FIX.md b/URGENT-EMPLOYEE-CUSTOMER-ORDER-FIX.md deleted file mode 100644 index b21793b..0000000 --- a/URGENT-EMPLOYEE-CUSTOMER-ORDER-FIX.md +++ /dev/null @@ -1,94 +0,0 @@ -# Fix Urgent - Employé ne peut pas créer de commandes client en production - -## Problème Identifié -L'utilisateur avec rôle employé n'arrive pas à créer des commandes client en production alors que ça fonctionne avec admin. - -## Solutions Appliquées - -### 1. Suppression Totale des Restrictions Backend -**Fichier:** `server/routes.ts` ligne 1977 -```javascript -// REMOVED: All role restrictions - tous les rôles peuvent créer des commandes client -console.log("Creating customer order - no role restrictions:", { userId, userRole: user.role, groupId: backendData.groupId }); -``` -✅ **CONFIRMÉ** - Aucune restriction de rôle dans le POST `/api/customer-orders` - -### 2. Permissions Système Confirmées -**Fichier:** `shared/permissions.ts` ligne 72 -```javascript -'customer-orders': { - admin: ['view', 'create', 'edit', 'delete'], - directeur: ['view', 'create', 'edit', 'delete'], - manager: ['view', 'create', 'edit'], - employee: ['view', 'create'] // ✅ EMPLOYÉ A BIEN LES DROITS -}, -``` - -### 3. Robustesse Frontend GroupId -**Fichier:** `client/src/components/CustomerOrderForm.tsx` - -**AVANT (Problématique):** -```javascript -groupId: order?.groupId || (user?.role === 'admin' && selectedStoreId ? selectedStoreId : user?.userGroups?.[0]?.groupId) || undefined -``` - -**APRÈS (Corrigé avec fallbacks robustes):** -```javascript -groupId: order?.groupId || (user?.role === 'admin' && selectedStoreId ? selectedStoreId : user?.userGroups?.[0]?.groupId) || 1 - -// + Logique de fallback renforcée: -if (!groupId) { - if (user?.role === 'admin' && selectedStoreId) { - groupId = selectedStoreId; - } else if (user?.userGroups?.[0]?.groupId) { - groupId = user.userGroups[0].groupId; - } else if (user?.role === 'admin' && groups.length > 0) { - groupId = groups[0].id; - } else if (groups.length > 0) { - // EMERGENCY FALLBACK: Force assignment - groupId = groups[0].id; - } else { - // LAST RESORT: Hard-coded fallback - groupId = 1; - } -} -``` - -### 4. Debug Logs Ajoutés -```javascript -console.log("🔍 Customer Order GroupId Debug:", { - userRole: user?.role, - selectedStoreId, - userGroups: user?.userGroups?.map(ug => ({groupId: ug.groupId, groupName: ug.group?.name})), - initialGroupId: groupId, - availableGroups: groups.map(g => ({id: g.id, name: g.name})) -}); -``` - -### 5. Validation Schema Robuste -**Schema Frontend utilise déjà `z.coerce.number()` pour conversion automatique:** -```javascript -supplierId: z.coerce.number().int().positive(), -deposit: z.coerce.number().min(0), -``` - -## Test de Validation -✅ Création commande client avec admin fonctionne -✅ API route sans restriction de rôle -✅ Permissions employé confirmées dans permissions.ts -✅ GroupId forcé avec fallbacks multiples - -## Déploiement Production -1. ✅ Logique groupId renforcée -2. ✅ Debug logs pour traçabilité -3. ✅ Fallbacks d'urgence -4. 🔄 **REDÉMARRER SERVEUR PRODUCTION** -5. 🧪 **TESTER AVEC EMPLOYÉ RÉEL** - -## Fallbacks d'Urgence Appliqués -- Si pas de groupId → utilise groupe utilisateur -- Si pas de groupe utilisateur → utilise premier groupe disponible -- Si pas de groupes → force groupId = 1 -- Logs détaillés pour debug production - -**RÉSULTAT ATTENDU:** Employé peut maintenant créer des commandes client sans restriction. \ No newline at end of file diff --git a/URGENT-PERMISSIONS-FIX.md b/URGENT-PERMISSIONS-FIX.md deleted file mode 100644 index 928b335..0000000 --- a/URGENT-PERMISSIONS-FIX.md +++ /dev/null @@ -1,130 +0,0 @@ -# Fix Urgent - Permissions Directeurs - -## 🎯 Problème Identifié -**Les directeurs voient TOUS les magasins** au lieu de seulement leur magasin assigné. - -## 🔍 Analyse du Problème - -### Logique Incorrecte Actuelle -```typescript -// ❌ INCORRECT -if (user.role === 'admin') { - // Voir tous les magasins -} else { - // Tous les autres rôles voient leurs magasins assignés -} -``` - -### Rôles et Accès Attendus -- **Admin** : Tous les magasins ✅ -- **Directeur** : Seulement son magasin assigné ❌→✅ -- **Manager** : Seulement son magasin assigné ✅ -- **Employee** : Seulement son magasin assigné ✅ - -## ✅ Corrections Appliquées - -### 1. **Endpoint Groups** (`/api/groups`) -```typescript -// Avant -if (user.role === 'admin') { - const groups = await storage.getGroups(); // Tous -} else { - const userGroups = user.userGroups.map(ug => ug.group); // Assignés -} - -// Après -if (user.role === 'admin') { - const groups = await storage.getGroups(); // Tous -} else { - // Directeur, Manager, Employee → seulement magasins assignés - const userGroups = (user as any).userGroups?.map((ug: any) => ug.group) || []; -} -``` - -### 2. **Endpoint Orders** (`/api/orders`) -```typescript -// Avant -if (user.role === 'admin') { - orders = await storage.getOrders(groupIds); // Tous ou filtré -} else { - const groupIds = user.userGroups.map(ug => ug.groupId); // Assignés -} - -// Après -if (user.role === 'admin') { - orders = await storage.getOrders(groupIds); // Tous ou filtré -} else { - // Directeur, Manager, Employee → seulement groupes assignés - const groupIds = (user as any).userGroups?.map((ug: any) => ug.groupId) || []; -} -``` - -### 3. **Endpoint Deliveries** (`/api/deliveries`) -```typescript -// Déjà corrigé précédemment avec commentaire explicite -if (user.role === 'admin') { - // Admin peut voir tous les magasins -} else { - // For non-admin users (managers, employees, directeurs), only show their assigned stores - const groupIds = (user as any).userGroups?.map((ug: any) => ug.groupId) || []; -} -``` - -### 4. **Contrôles d'Accès** (tous endpoints) -```typescript -// Ajout de fallbacks robustes -const userGroupIds = (user as any).userGroups?.map((ug: any) => ug.groupId) || []; -``` - -## 🔒 Logique de Sécurité Corrigée - -### Accès aux Données -``` -Admin → Tous les magasins (peut sélectionner un magasin spécifique) -├── Groups: Tous -├── Orders: Tous -├── Deliveries: Tous -└── Permissions: Toutes actions - -Directeur → SEULEMENT son magasin assigné -├── Groups: Magasin assigné uniquement -├── Orders: Magasin assigné uniquement -├── Deliveries: Magasin assigné uniquement -└── Permissions: Actions limitées selon le rôle - -Manager/Employee → SEULEMENT leur magasin assigné -├── Groups: Magasin assigné uniquement -├── Orders: Magasin assigné uniquement -├── Deliveries: Magasin assigné uniquement -└── Permissions: Actions limitées selon le rôle -``` - -## 🧪 Tests de Validation - -### Test Directeur -1. Se connecter avec compte directeur -2. **Vérifier :** Seulement SON magasin visible -3. **Vérifier :** Pas d'accès aux autres magasins -4. **Tenter :** Accéder à une commande d'un autre magasin → 403 Forbidden - -### Test Admin -1. Se connecter avec compte admin -2. **Vérifier :** Tous les magasins visibles -3. **Vérifier :** Sélecteur de magasin fonctionne -4. **Vérifier :** Peut basculer entre magasins - -### Test Manager/Employee -1. Se connecter avec ces rôles -2. **Vérifier :** Seulement leur magasin assigné -3. **Vérifier :** Cohérent avec directeur - -## 📊 Status - -- ✅ Endpoint Groups corrigé -- ✅ Endpoint Orders corrigé -- ✅ Endpoint Deliveries déjà corrigé -- ✅ Contrôles d'accès renforcés avec fallbacks -- ✅ Commentaires explicites ajoutés -- 🔄 **À tester en production** - -**Les directeurs ne verront maintenant que leur magasin assigné !** \ No newline at end of file diff --git a/URGENT-PRODUCTION-FIX.md b/URGENT-PRODUCTION-FIX.md deleted file mode 100644 index 2eceda2..0000000 --- a/URGENT-PRODUCTION-FIX.md +++ /dev/null @@ -1,44 +0,0 @@ -# CORRECTION URGENTE PRODUCTION - "Button is not defined" - -## Problème Identifié -L'erreur `ReferenceError: Button is not defined` est causée par un import manquant dans CalendarGrid.tsx. - -## Correction Appliquée -Ajout de l'import manquant dans `client/src/components/CalendarGrid.tsx` : - -```typescript -// AVANT (ligne 4) -import { Plus, Check } from "lucide-react"; - -// APRÈS (lignes 4-5) -import { Plus, Check } from "lucide-react"; -import { Button } from "@/components/ui/button"; -``` - -## Pour Appliquer en Production - -### 1. Copier le Fichier Corrigé -Copiez le contenu corrigé de `client/src/components/CalendarGrid.tsx` sur votre serveur. - -### 2. Reconstruction et Redémarrage -```bash -# Sur votre serveur de production -npm run build -pm2 restart your-app-name -``` - -### 3. Vérification -- L'application devrait redémarrer sans erreur -- Le calendrier devrait s'afficher correctement -- Le bouton + pour créer une nouvelle entrée devrait fonctionner - -## Cause de l'Erreur -Quand j'ai nettoyé le code de debug, j'ai supprimé l'import `Button` mais le composant était encore utilisé pour le bouton "+" de création rapide dans le calendrier. - -## Test Rapide -Une fois corrigé, testez : -1. Accès au calendrier ✓ -2. Clic sur le bouton + ✓ -3. Clic sur une commande → modal avec bouton "Valider Commande" ✓ - -Cette correction résout l'erreur de production immédiatement. \ No newline at end of file diff --git a/URGENT-SYNC-GUIDE.md b/URGENT-SYNC-GUIDE.md deleted file mode 100644 index bc586c7..0000000 --- a/URGENT-SYNC-GUIDE.md +++ /dev/null @@ -1,38 +0,0 @@ -# GUIDE URGENT : Synchronisation Commandes/Livraisons - -## Problème -La commande #CMD-55 et d'autres commandes liées à des livraisons "livrées" n'apparaissent pas grisées dans le calendrier car elles gardent le statut "planned" au lieu de "delivered". - -## Solution Immédiate (Production) - -### Option 1: Script SQL Direct ✅ RECOMMANDÉ -```bash -# Connectez-vous à votre base PostgreSQL et exécutez : -psql $DATABASE_URL -f fix-delivery-order-sync-immediate.sql -``` - -### Option 2: Via Interface Web (après déploiement) -1. Déployez le nouveau code sur votre serveur -2. Connectez-vous comme admin sur https://logiflow-logiflow-1.c-2.us-east-2.aws.neon.tech -3. Allez dans le calendrier -4. Cliquez sur le bouton "Sync Status" (à côté de "Nouveau") - -## Ce que fait le script - -1. **Diagnostic** : Affiche toutes les commandes avec des livraisons livrées mais statut incorrect -2. **Correction automatique** : Met à jour le statut des commandes vers "delivered" -3. **Dates de livraison** : Corrige les delivered_date manquantes -4. **Vérification finale** : Affiche les résultats et la commande CMD-55 spécifiquement - -## Résultat attendu -Après exécution du script : -- ✅ La commande #CMD-55 aura le statut "delivered" -- ✅ Elle apparaîtra grisée (bg-delivered) dans le calendrier -- ✅ Les dates de livraison seront affichées correctement -- ✅ Toutes les commandes similaires seront corrigées - -## Test -Après avoir exécuté le script, actualisez votre calendrier sur https://logiflow-logiflow-1.c-2.us-east-2.aws.neon.tech et vérifiez que la commande CMD-55 apparaît maintenant grisée. - -## Note Technique -Le bouton "Sync Status" dans l'interface n'est pas encore déployé sur votre serveur de production. Le script SQL est la solution immédiate. \ No newline at end of file diff --git a/VALIDATE-ORDER-BUTTON-FEATURE.md b/VALIDATE-ORDER-BUTTON-FEATURE.md deleted file mode 100644 index a6bc5b8..0000000 --- a/VALIDATE-ORDER-BUTTON-FEATURE.md +++ /dev/null @@ -1,54 +0,0 @@ -# Fonctionnalité Bouton "Valider Commande" - Calendrier - -## Nouvelle Fonctionnalité - -J'ai ajouté un bouton de validation directement sur les cartes des commandes dans le calendrier, avec les caractéristiques suivantes : - -### Fonctionnement - -- **Visibilité** : Le bouton n'est visible que pour les utilisateurs avec le rôle `admin` -- **Apparition** : Le bouton apparaît uniquement au survol de la carte de commande (effet hover) -- **Cible** : Seules les commandes qui ne sont pas encore en statut `delivered` affichent le bouton -- **Action** : Un clic sur le bouton marque immédiatement la commande comme `delivered` - -### Interface Utilisateur - -- **Icône** : CheckCircle (cercle avec coche) -- **Position** : À droite de la carte, avant les autres indicateurs de statut -- **Style** : Bouton fantôme semi-transparent qui devient visible au survol -- **Feedback** : Toast de confirmation quand la validation réussit - -### Avantages - -1. **Accès Direct** : Plus besoin d'ouvrir le modal de détail pour valider une commande -2. **Interface Propre** : Le bouton n'encombre pas l'interface car il n'apparaît qu'au survol -3. **Sécurité** : Réservé aux administrateurs uniquement -4. **Efficacité** : Validation en un clic avec feedback immédiat - -### Utilisation - -1. **Connexion Admin** : Connectez-vous avec un compte administrateur -2. **Survol** : Passez la souris sur une commande non-delivered (orange ou bleue) -3. **Validation** : Cliquez sur l'icône de cercle avec coche qui apparaît -4. **Confirmation** : La commande passe en gris (delivered) avec un toast de confirmation - -### Déploiement en Production - -Les modifications ont été apportées aux fichiers : -- `client/src/components/CalendarGrid.tsx` : Ajout du bouton et logique de validation -- `client/src/pages/Calendar.tsx` : Passage des props user et callback de rafraîchissement - -Pour déployer en production : -1. Appliquer les modifications aux fichiers mentionnés -2. Reconstruire le frontend (`npm run build`) -3. Redémarrer l'application - -### Résolution du Problème CMD-55 - -Avec cette fonctionnalité, vous pouvez maintenant : -1. Trouver CMD-55 dans le calendrier -2. Passer la souris dessus (si elle n'est pas déjà delivered) -3. Cliquer sur le bouton de validation -4. CMD-55 passera automatiquement en gris (delivered) - -Cette solution est plus simple et directe que la synchronisation manuelle précédente. \ No newline at end of file diff --git a/VALIDATION-ERROR-FIX.md b/VALIDATION-ERROR-FIX.md deleted file mode 100644 index b8f12f7..0000000 --- a/VALIDATION-ERROR-FIX.md +++ /dev/null @@ -1,61 +0,0 @@ -# Fix Validation Errors - Commandes Client Production - -## Problème Identifié - -**Erreurs de validation dans le formulaire de commande client :** -1. `"Expected number, received string"` pour le champ **Fournisseur** (`supplierId`) -2. `"Expected number, received string"` pour le champ **Acompte** (`deposit`) - -## Cause du Problème - -Le formulaire frontend envoie des valeurs string, mais le schema Zod attend des numbers : - -```javascript -// AVANT (Problématique) -supplierId: z.number().int().positive().optional().default(1) -deposit: z.number().optional().default(0) - -// APRÈS (Corrigé) -supplierId: z.coerce.number().int().positive().optional().default(1) -deposit: z.coerce.number().optional().default(0) -``` - -## Solution Appliquée - -**Fichier modifié :** `shared/schema.ts` - -✅ Ajouté `z.coerce.number()` pour forcer la conversion automatique string → number -✅ Appliqué aussi pour `quantity` et `groupId` par précaution -✅ Corrigé `customerEmail` pour accepter chaîne vide avec `.or(z.literal(""))` - -## Schema Corrigé - -```javascript -export const insertCustomerOrderFrontendSchema = z.object({ - customerName: z.string().min(1, "Customer name is required"), - contactNumber: z.string().min(1, "Contact number is required"), - productName: z.string().min(1, "Product name is required"), - productDescription: z.string().optional(), - quantity: z.coerce.number().int().positive().default(1), // ✅ CORRIGÉ - groupId: z.coerce.number().int().positive(), // ✅ CORRIGÉ - isPickup: z.boolean().default(false), - notes: z.string().optional(), - orderTaker: z.string().optional(), - gencode: z.string().optional().default(""), - supplierId: z.coerce.number().int().positive().optional().default(1), // ✅ CORRIGÉ - deposit: z.coerce.number().optional().default(0), // ✅ CORRIGÉ - isPromotionalPrice: z.boolean().default(false), - customerEmail: z.string().email().optional().or(z.literal("")), // ✅ CORRIGÉ - productReference: z.string().optional(), -}); -``` - -## Test - -Après cette correction, les employés devraient pouvoir créer des commandes client sans erreur de validation en production. - -## Déploiement - -1. ✅ Schema corrigé dans `shared/schema.ts` -2. 🔄 **Redémarrer le serveur production** -3. 🧪 **Tester création commande client avec employé** \ No newline at end of file diff --git a/apply-production-fixes.js b/apply-production-fixes.js deleted file mode 100644 index 64a86b9..0000000 --- a/apply-production-fixes.js +++ /dev/null @@ -1,146 +0,0 @@ -#!/usr/bin/env node - -/** - * Script pour appliquer les corrections 403 employés sur votre serveur de production privé - * Ce script documente les changements à effectuer manuellement sur votre serveur - */ - -console.log('🔧 === CORRECTIONS À APPLIQUER SUR VOTRE SERVEUR DE PRODUCTION ===\n'); - -console.log('📝 FICHIERS À MODIFIER SUR VOTRE SERVEUR PRIVÉ:'); -console.log('================================================\n'); - -console.log('1️⃣ FICHIER: shared/permissions.ts'); -console.log('-----------------------------------'); -console.log('LIGNE À MODIFIER (environ ligne 84-91):'); -console.log(''); -console.log('// REMPLACER:'); -console.log('tasks: {'); -console.log(' admin: [\'view\', \'create\', \'edit\', \'delete\', \'validate\'],'); -console.log(' directeur: [\'view\', \'create\', \'edit\', \'delete\', \'validate\'],'); -console.log(' manager: [\'view\', \'validate\'],'); -console.log(' employee: [\'view\'] // ← PROBLÈME ICI'); -console.log('}'); -console.log(''); -console.log('// PAR:'); -console.log('tasks: {'); -console.log(' admin: [\'view\', \'create\', \'edit\', \'delete\', \'validate\'],'); -console.log(' directeur: [\'view\', \'create\', \'edit\', \'delete\', \'validate\'],'); -console.log(' manager: [\'view\', \'validate\'],'); -console.log(' employee: [\'view\'] // ← PERMISSIONS INCHANGÉES - VOIR SEULEMENT'); -console.log('}'); -console.log('\n'); - -console.log('2️⃣ FICHIER: server/routes.ts'); -console.log('-----------------------------'); -console.log('CORRECTIONS MULTIPLES À EFFECTUER:\n'); - -console.log('A) Route GET /api/suppliers (environ ligne 188-194):'); -console.log('// REMPLACER:'); -console.log('if (!user || (user.role !== \'admin\' && user.role !== \'manager\')) {'); -console.log(' return res.status(403).json({ message: "Insufficient permissions" });'); -console.log('}'); -console.log(''); -console.log('// PAR:'); -console.log('if (!user || (user.role !== \'admin\' && user.role !== \'manager\' && user.role !== \'directeur\' && user.role !== \'employee\')) {'); -console.log(' return res.status(403).json({ message: "Insufficient permissions" });'); -console.log('}'); -console.log('\n'); - -console.log('B) Route POST /api/suppliers (environ ligne 240-242):'); -console.log('// REMPLACER:'); -console.log('if (user.role !== \'admin\' && user.role !== \'manager\') {'); -console.log(' console.error(\'❌ Insufficient permissions:\', { userRole: user.role, required: [\'admin\', \'manager\'] });'); -console.log(' return res.status(403).json({ message: "Insufficient permissions" });'); -console.log('}'); -console.log(''); -console.log('// PAR:'); -console.log('if (user.role !== \'admin\' && user.role !== \'manager\' && user.role !== \'directeur\') {'); -console.log(' console.error(\'❌ Insufficient permissions:\', { userRole: user.role, required: [\'admin\', \'manager\', \'directeur\'] });'); -console.log(' return res.status(403).json({ message: "Insufficient permissions" });'); -console.log('}'); -console.log('\n'); - -console.log('C) Route PUT /api/suppliers/:id (environ ligne 281-283):'); -console.log('// REMPLACER:'); -console.log('if (!user || (user.role !== \'admin\' && user.role !== \'manager\')) {'); -console.log(' return res.status(403).json({ message: "Insufficient permissions" });'); -console.log('}'); -console.log(''); -console.log('// PAR:'); -console.log('if (!user || (user.role !== \'admin\' && user.role !== \'manager\' && user.role !== \'directeur\')) {'); -console.log(' return res.status(403).json({ message: "Insufficient permissions" });'); -console.log('}'); -console.log('\n'); - -console.log('D) Route DELETE /api/suppliers/:id (environ ligne 298-300):'); -console.log('// REMPLACER:'); -console.log('if (!user || (user.role !== \'admin\' && user.role !== \'manager\')) {'); -console.log(' return res.status(403).json({ message: "Insufficient permissions" });'); -console.log('}'); -console.log(''); -console.log('// PAR:'); -console.log('if (!user || (user.role !== \'admin\' && user.role !== \'directeur\')) {'); -console.log(' return res.status(403).json({ message: "Insufficient permissions" });'); -console.log('}'); -console.log('\n'); - -console.log('E) Route POST /api/dlc-products/:id/validate (environ ligne 2332-2334):'); -console.log('// REMPLACER:'); -console.log('if (!user || ![\'admin\', \'manager\'].includes(user.role)) {'); -console.log(' return res.status(403).json({ message: "Insufficient permissions to validate products" });'); -console.log('}'); -console.log(''); -console.log('// PAR:'); -console.log('if (!user || ![\'admin\', \'manager\', \'directeur\'].includes(user.role)) {'); -console.log(' return res.status(403).json({ message: "Insufficient permissions to validate products" });'); -console.log('}'); -console.log('\n'); - -console.log('📋 ÉTAPES D\'APPLICATION:'); -console.log('========================'); -console.log('1. Connectez-vous à votre serveur de production'); -console.log('2. Sauvegardez les fichiers originaux:'); -console.log(' cp shared/permissions.ts shared/permissions.ts.backup'); -console.log(' cp server/routes.ts server/routes.ts.backup'); -console.log('3. Ouvrez shared/permissions.ts et effectuez la correction 1️⃣'); -console.log('4. Ouvrez server/routes.ts et effectuez les corrections 2️⃣A à 2️⃣E'); -console.log('5. Redémarrez votre serveur Node.js'); -console.log('6. Testez avec un compte employé'); -console.log('\n'); - -console.log('🧪 COMMANDES DE TEST POST-CORRECTION:'); -console.log('===================================='); -console.log('# Test rapide des fournisseurs pour employé:'); -console.log('curl -X GET "https://votre-serveur.com/api/suppliers" \\'); -console.log(' -H "Cookie: session=TOKEN_SESSION_EMPLOYE"'); -console.log(''); -console.log('# Test création tâche pour employé:'); -console.log('curl -X POST "https://votre-serveur.com/api/tasks" \\'); -console.log(' -H "Content-Type: application/json" \\'); -console.log(' -H "Cookie: session=TOKEN_SESSION_EMPLOYE" \\'); -console.log(' -d \'{"title":"Test","description":"Test employé","priority":"medium","status":"pending","groupId":1}\''); -console.log('\n'); - -console.log('✅ RÉSULTAT ATTENDU APRÈS CORRECTIONS:'); -console.log('======================================'); -console.log('- Employés peuvent accéder aux fournisseurs (modules Commandes Client et DLC)'); -console.log('- Employés peuvent créer des tâches dans leurs magasins assignés'); -console.log('- Directeurs peuvent valider les produits DLC'); -console.log('- Plus d\'erreurs 403 pour les actions autorisées'); -console.log('\n'); - -console.log('⚠️ REMARQUES IMPORTANTES:'); -console.log('=========================='); -console.log('- Ces corrections doivent être appliquées sur votre serveur de production'); -console.log('- Testez d\'abord sur un environnement de staging si possible'); -console.log('- Gardez les sauvegardes des fichiers originaux'); -console.log('- Redémarrez le serveur après les modifications'); -console.log('- Surveillez les logs après les changements'); -console.log('\n'); - -console.log('🎯 Ces corrections résolvent spécifiquement:'); -console.log('- Erreurs 403 sur /api/suppliers pour employés'); -console.log('- Erreurs 403 sur /api/tasks POST pour employés'); -console.log('- Erreurs 403 sur /api/dlc-products/:id/validate pour directeurs'); -console.log('- Permissions incohérentes entre frontend et backend'); \ No newline at end of file diff --git a/attached_assets/.gitkeep b/attached_assets/.gitkeep deleted file mode 100644 index 0e87a0a..0000000 --- a/attached_assets/.gitkeep +++ /dev/null @@ -1 +0,0 @@ -# Assets placeholder diff --git a/attached_assets/Pasted--Database-initialization-NODE-ENV-production-isProduction-true-h-1754928114027_1754928114027.txt b/attached_assets/Pasted--Database-initialization-NODE-ENV-production-isProduction-true-h-1754928114027_1754928114027.txt deleted file mode 100644 index 704b43d..0000000 --- a/attached_assets/Pasted--Database-initialization-NODE-ENV-production-isProduction-true-h-1754928114027_1754928114027.txt +++ /dev/null @@ -1,175 +0,0 @@ - - -🔗 Database initialization: { - - NODE_ENV: 'production', - - isProduction: true, - - hasDbUrl: true, - - dbHost: 'logiflow-db' - -} - -🐳 PRODUCTION: Using standard PostgreSQL - -✅ PostgreSQL connection test successful - -🐳 PRODUCTION: Using PostgreSQL storage - -🐳 PRODUCTION: Local auth configured with PostgreSQL sessions - -🐳 PRODUCTION: Starting LogiFlow application - -🐳 Environment: { NODE_ENV: 'production', DATABASE_URL: 'Present', PORT: '3000' } - -🐳 Serving static files from: /app/dist/public - -🐳 PRODUCTION: LogiFlow serving on port 3000 - -✅ Production admin user found: { id: 'admin_local', username: 'admin', passwordFormat: 'present' } - -🔐 Production password comparison { suppliedLength: 5, storedFormat: '21ff482668...' } - -✅ Password matched with hash.salt format - -✅ Admin password works with current system - -Server error: { - - status: 500, - - message: 'column user_groups.created_at does not exist', - - error: error: column user_groups.created_at does not exist - - at /app/node_modules/pg-pool/index.js:45:11 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - - at async file:///app/node_modules/drizzle-orm/node-postgres/session.js:83:22 - - at async DatabaseStorage.getUserWithGroups (file:///app/dist/index.js:1364:28) - - at async file:///app/dist/index.js:3051:20 { - - length: 120, - - severity: 'ERROR', - - code: '42703', - - detail: undefined, - - hint: undefined, - - position: '59', - - internalPosition: undefined, - - internalQuery: undefined, - - where: undefined, - - schema: undefined, - - table: undefined, - - column: undefined, - - dataType: undefined, - - constraint: undefined, - - file: 'parse_relation.c', - - line: '3665', - - routine: 'errorMissingColumn' - - } - -} - -error: column user_groups.created_at does not exist - - at /app/node_modules/pg-pool/index.js:45:11 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - - at async file:///app/node_modules/drizzle-orm/node-postgres/session.js:83:22 - - at async DatabaseStorage.getUserWithGroups (file:///app/dist/index.js:1364:28) - - at async file:///app/dist/index.js:3051:20 - -HEAD /api/health 200 in 3ms - -Server error: { - - status: 500, - - message: 'column user_groups.created_at does not exist', - - error: error: column user_groups.created_at does not exist - - at /app/node_modules/pg-pool/index.js:45:11 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - - at async file:///app/node_modules/drizzle-orm/node-postgres/session.js:83:22 - - at async DatabaseStorage.getUserWithGroups (file:///app/dist/index.js:1364:28) - - at async file:///app/dist/index.js:3051:20 { - - length: 120, - - severity: 'ERROR', - - code: '42703', - - detail: undefined, - - hint: undefined, - - position: '59', - - internalPosition: undefined, - - internalQuery: undefined, - - where: undefined, - - schema: undefined, - - table: undefined, - - column: undefined, - - dataType: undefined, - - constraint: undefined, - - file: 'parse_relation.c', - - line: '3665', - - routine: 'errorMissingColumn' - - } - -} - -error: column user_groups.created_at does not exist - - at /app/node_modules/pg-pool/index.js:45:11 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - - at async file:///app/node_modules/drizzle-orm/node-postgres/session.js:83:22 - - at async DatabaseStorage.getUserWithGroups (file:///app/dist/index.js:1364:28) - - at async file:///app/dist/index.js:3051:20 \ No newline at end of file diff --git a/attached_assets/Pasted--Database-initialization-NODE-ENV-production-isProduction-true-hasDb-1754936753635_1754936753635.txt b/attached_assets/Pasted--Database-initialization-NODE-ENV-production-isProduction-true-hasDb-1754936753635_1754936753635.txt deleted file mode 100644 index 91109d6..0000000 --- a/attached_assets/Pasted--Database-initialization-NODE-ENV-production-isProduction-true-hasDb-1754936753635_1754936753635.txt +++ /dev/null @@ -1,182 +0,0 @@ - -🔗 Database initialization: { - - NODE_ENV: 'production', - - isProduction: true, - - hasDbUrl: true, - - dbHost: 'logiflow-db' - -} - -🐳 PRODUCTION: Using standard PostgreSQL - -✅ PostgreSQL connection test successful - -🐳 PRODUCTION: Using PostgreSQL storage - -🐳 PRODUCTION: Local auth configured with PostgreSQL sessions - -🐳 PRODUCTION: Starting LogiFlow application - -🐳 Environment: { NODE_ENV: 'production', DATABASE_URL: 'Present', PORT: '3000' } - -🔍 Using development storage and authentication - -🔧 Using memory session store for development - -Warning: connect.session() MemoryStore is not - -designed for a production environment, as it will leak - -memory, and will not scale past a single process. - -🐳 Serving static files from: /app/dist/public - -🐳 PRODUCTION: LogiFlow serving on port 3000 - -✅ Production admin user found: { id: 'admin_local', username: 'admin', passwordFormat: 'present' } - -🔐 Production password comparison { suppliedLength: 5, storedFormat: '63d2ce518b...' } - -✅ Password matched with hash.salt format - -✅ Admin password works with current system - -HEAD /api/health 200 in 5ms - -Error updating user: error: duplicate key value violates unique constraint "users_email_key" - - at /app/node_modules/pg-pool/index.js:45:11 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - - at async file:///app/node_modules/drizzle-orm/node-postgres/session.js:83:22 - - at async DatabaseStorage.updateUser (file:///app/dist/index.js:1085:24) - - at async file:///app/dist/index.js:4051:27 { - - length: 210, - - severity: 'ERROR', - - code: '23505', - - detail: 'Key (email)=(admin@logiflow.com) already exists.', - - hint: undefined, - - position: undefined, - - internalPosition: undefined, - - internalQuery: undefined, - - where: undefined, - - schema: 'public', - - table: 'users', - - column: undefined, - - dataType: undefined, - - constraint: 'users_email_key', - - file: 'nbtinsert.c', - - line: '664', - - routine: '_bt_check_unique' - -} - -PUT /api/users/_1754936203292 500 in 96ms - -HEAD /api/health 200 in 1ms - -HEAD /api/health 200 in 0ms - -HEAD /api/health 200 in 1ms - -HEAD /api/health 200 in 1ms - -HEAD /api/health 200 in 1ms - -HEAD /api/health 200 in 16ms - -HEAD /api/health 200 in 1ms - -HEAD /api/health 200 in 4ms - -HEAD /api/health 200 in 1ms - -HEAD /api/health 200 in 1ms - -HEAD /api/health 200 in 1ms - -HEAD /api/health 200 in 1ms - -HEAD /api/health 200 in 1ms - -HEAD /api/health 200 in 1ms - -HEAD /api/health 200 in 1ms - -HEAD /api/health 200 in 3ms - -Error updating user: error: duplicate key value violates unique constraint "users_email_key" - - at /app/node_modules/pg-pool/index.js:45:11 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - - at async file:///app/node_modules/drizzle-orm/node-postgres/session.js:83:22 - - at async DatabaseStorage.updateUser (file:///app/dist/index.js:1085:24) - - at async file:///app/dist/index.js:4051:27 { - - length: 210, - - severity: 'ERROR', - - code: '23505', - - detail: 'Key (email)=(admin@logiflow.com) already exists.', - - hint: undefined, - - position: undefined, - - internalPosition: undefined, - - internalQuery: undefined, - - where: undefined, - - schema: 'public', - - table: 'users', - - column: undefined, - - dataType: undefined, - - constraint: 'users_email_key', - - file: 'nbtinsert.c', - - line: '664', - - routine: '_bt_check_unique' - -} - -PUT /api/users/_1754936203292 500 in 44ms - -HEAD /api/health 200 in 1ms \ No newline at end of file diff --git a/attached_assets/Pasted--Processed-0-groups-for-user-admin-local-Found-0-group-assignments-for-user-admin-local--1754986712301_1754986712302.txt b/attached_assets/Pasted--Processed-0-groups-for-user-admin-local-Found-0-group-assignments-for-user-admin-local--1754986712301_1754986712302.txt deleted file mode 100644 index e9188bb..0000000 --- a/attached_assets/Pasted--Processed-0-groups-for-user-admin-local-Found-0-group-assignments-for-user-admin-local--1754986712301_1754986712302.txt +++ /dev/null @@ -1,199 +0,0 @@ -✅ Processed 0 groups for user admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -Orders API called with: { - - startDate: undefined, - - endDate: undefined, - - storeId: undefined, - - userRole: 'admin' - -} - -Admin filtering with groupIds: undefined - -Fetching all orders - -GET /api/publicities 304 in 143ms - -GET /api/user 304 in 37ms - -Deliveries returned: 80 items - -Customer orders returned from storage: 32 items - -GET /api/deliveries 200 in 182ms - -Orders returned: 46 items - -GET /api/customer-orders 200 in 177ms - -GET /api/tasks 200 in 162ms - -GET /api/orders 200 in 191ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -GET /api/dlc-products/stats 200 in 180ms - -🔍 Querying user_groups for user: admin_local - -GET /api/user 304 in 7ms - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getPublicities called with: { year: 2025, groupIds: undefined } - -📢 Raw publicities found: 29 - -🏪 Participations found: 26 - -✅ Final publicities with participations: 29 - -📄 Sample publicity: { - - - -, - - pubNumber: '2526', - - participations: [ { groupId: 2, groupName: 'Houdemont' } ] - -} - -GET /api/publicities 200 in 47ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -GET /api/groups 200 in 8ms - -HEAD /api/health 200 in 1ms - -HEAD /api/health 200 in 0ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -GET /api/user 304 in 33ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 ===== DÉBUT SCAN SCHÉMA BASE DE DONNÉES ===== - -⏰ Timestamp: 2025-08-12T08:18:10.753Z - -❌ ERREUR lors du scan du schéma: TypeError: Cannot read properties of undefined (reading 'query') - - at file:///app/dist/index.js:4455:45 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - -GET /api/debug/log-schema 500 in 16ms - -HEAD /api/health 200 in 0ms \ No newline at end of file diff --git a/attached_assets/Pasted--Querying-user-groups-for-user-admin-local-Found-0-group-assignments-for-user-adm-1754944991616_1754944991617.txt b/attached_assets/Pasted--Querying-user-groups-for-user-admin-local-Found-0-group-assignments-for-user-adm-1754944991616_1754944991617.txt deleted file mode 100644 index ee9493f..0000000 --- a/attached_assets/Pasted--Querying-user-groups-for-user-admin-local-Found-0-group-assignments-for-user-adm-1754944991616_1754944991617.txt +++ /dev/null @@ -1,201 +0,0 @@ - - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -Deliveries API called with: { - - startDate: undefined, - - endDate: undefined, - - storeId: undefined, - - withBL: undefined, - - userRole: 'admin' - -} - -Admin filtering deliveries with groupIds: undefined - -Fetching all deliveries - -Deliveries returned: 80 items - -GET /api/deliveries 304 in 28ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -📄 SPA: Serving index.html for /[object%20Object] - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -📄 SPA: Serving index.html for /[object%20Object] - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -📄 SPA: Serving index.html for /[object%20Object] - -🔍 getUserWithGroups called for user: admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -Orders API called with: { - - startDate: '2025-08-01', - - endDate: '2025-08-31', - - storeId: '1', - - userRole: 'admin' - -} - -Admin filtering with groupIds: [ 1 ] - -Fetching orders by date range: 2025-08-01 to 2025-08-31 - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -Orders returned: 9 items - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -Deliveries API called with: { - - startDate: '2025-08-01', - - endDate: '2025-08-31', - - storeId: '1', - - withBL: undefined, - - userRole: 'admin' - -} - -Admin filtering deliveries with groupIds: [ 1 ] - -Fetching deliveries by date range: 2025-08-01 to 2025-08-31 - -GET /api/orders 304 in 23ms - -Deliveries returned: 20 items - -GET /api/deliveries 304 in 31ms - -HEAD /api/health 200 in 0ms \ No newline at end of file diff --git a/attached_assets/Pasted--User-related-Environment-related-Registries-Logs-Notifications-Settings-New--1754928661164_1754928661164.txt b/attached_assets/Pasted--User-related-Environment-related-Registries-Logs-Notifications-Settings-New--1754928661164_1754928661164.txt deleted file mode 100644 index e4f01bb..0000000 --- a/attached_assets/Pasted--User-related-Environment-related-Registries-Logs-Notifications-Settings-New--1754928661164_1754928661164.txt +++ /dev/null @@ -1,156 +0,0 @@ - - -User-related - - -Environment-related - -Registries - -Logs - -Notifications - -Settings - -New version available 2.27.9 -DismissSee what's new -Community Edition -2.27.6 LTS -Containers>logiflow-logiflow-1>Logs -Container logs - - -admin -Log viewer settings -Auto-refresh logs -Wrap lines -Display timestamps -Fetch -All logs -Search -Filter... -Lines -100 -Actions - - - - -🔗 Database initialization: { - - NODE_ENV: 'production', - - isProduction: true, - - hasDbUrl: true, - - dbHost: 'logiflow-db' - -} - -🐳 PRODUCTION: Using standard PostgreSQL - -✅ PostgreSQL connection test successful - -🐳 PRODUCTION: Using PostgreSQL storage - -🐳 PRODUCTION: Local auth configured with PostgreSQL sessions - -🐳 PRODUCTION: Starting LogiFlow application - -🐳 Environment: { NODE_ENV: 'production', DATABASE_URL: 'Present', PORT: '3000' } - -🐳 Serving static files from: /app/dist/public - -🐳 PRODUCTION: LogiFlow serving on port 3000 - -✅ Production admin user found: { id: 'admin_local', username: 'admin', passwordFormat: 'present' } - -🔐 Production password comparison { suppliedLength: 5, storedFormat: '21ff482668...' } - -✅ Password matched with hash.salt format - -✅ Admin password works with current system - -HEAD /api/health 200 in 8ms - -📄 SPA: Serving index.html for /users - -GET /api/user 304 in 7ms - -GET /api/user 304 in 7ms - -GET /api/user 304 in 6ms - -GET /api/user 304 in 9ms - -GET /api/groups 304 in 15ms - -GET /api/users 404 in 37ms - -GET /api/roles 404 in 52ms - -GET /api/users 404 in 8ms - -GET /api/roles 404 in 6ms - -GET /api/user 401 in 2ms - -GET /api/user 401 in 2ms - -GET /api/default-credentials-check 200 in 2ms - -GET /api/user 304 in 8ms - -GET /api/deliveries 404 in 7ms - -GET /api/deliveries 404 in 5ms - -GET /api/deliveries 404 in 8ms - -🔐 Production password comparison { suppliedLength: 8, storedFormat: 'c81960e064...' } - -❌ No password format matched - -POST /api/login 400 in 5ms - -GET /api/deliveries 404 in 14ms - -🔐 Production password comparison { suppliedLength: 8, storedFormat: 'c81960e064...' } - -❌ No password format matched - -POST /api/login 400 in 4ms - -🔐 Production password comparison { suppliedLength: 8, storedFormat: 'c81960e064...' } - -❌ No password format matched - -POST /api/login 400 in 5ms - -🔐 Production password comparison { suppliedLength: 8, storedFormat: 'c81960e064...' } - -❌ No password format matched - -POST /api/login 400 in 6ms - -🔐 Production password comparison { suppliedLength: 8, storedFormat: 'c81960e064...' } - -❌ No password format matched - -POST /api/login 400 in 4ms - -🔐 Production password comparison { suppliedLength: 8, storedFormat: 'c81960e064...' } - -❌ No password format matched - -POST /api/login 400 in 4ms - -🔐 Production password comparison { suppliedLength: 8, storedFormat: 'c81960e064...' } - -❌ No password format matched - -POST /api/login 400 in 4ms - -HEAD /api/health 200 in 1ms \ No newline at end of file diff --git a/attached_assets/Pasted--User-related-Environment-related-Registries-Logs-Notifications-Settings-New--1754937215668_1754937215668.txt b/attached_assets/Pasted--User-related-Environment-related-Registries-Logs-Notifications-Settings-New--1754937215668_1754937215668.txt deleted file mode 100644 index 788693b..0000000 --- a/attached_assets/Pasted--User-related-Environment-related-Registries-Logs-Notifications-Settings-New--1754937215668_1754937215668.txt +++ /dev/null @@ -1,206 +0,0 @@ - - -User-related - - -Environment-related - -Registries - -Logs - -Notifications - -Settings - -New version available 2.27.9 -DismissSee what's new -Community Edition -2.27.6 LTS -Containers>logiflow-logiflow-1>Logs -Container logs - - -admin -Log viewer settings -Auto-refresh logs -Wrap lines -Display timestamps -Fetch -All logs -Search -Filter... -Lines -100 -Actions - - - - -🔗 Database initialization: { - - NODE_ENV: 'production', - - isProduction: true, - - hasDbUrl: true, - - dbHost: 'logiflow-db' - -} - -🐳 PRODUCTION: Using standard PostgreSQL - -✅ PostgreSQL connection test successful - -🐳 PRODUCTION: Using PostgreSQL storage - -🐳 PRODUCTION: Local auth configured with PostgreSQL sessions - -🐳 PRODUCTION: Starting LogiFlow application - -🐳 Environment: { NODE_ENV: 'production', DATABASE_URL: 'Present', PORT: '3000' } - -🔍 Using development storage and authentication - -🔧 Using memory session store for development - -🐳 Serving static files from: /app/dist/public - -Warning: connect.session() MemoryStore is not - -designed for a production environment, as it will leak - -memory, and will not scale past a single process. - -🐳 PRODUCTION: LogiFlow serving on port 3000 - -✅ Production admin user found: { id: 'admin_local', username: 'admin', passwordFormat: 'present' } - -🔐 Production password comparison { suppliedLength: 5, storedFormat: '63d2ce518b...' } - -✅ Password matched with hash.salt format - -✅ Admin password works with current system - -HEAD /api/health 200 in 5ms - -📄 SPA: Serving index.html for /users - -GET /api/user 304 in 8ms - -GET /api/user 304 in 5ms - -GET /api/user 304 in 6ms - -GET /api/user 304 in 6ms - -GET /api/groups 304 in 16ms - -GET /api/roles 304 in 33ms - -🔍 getUsersWithRolesAndGroups called - -📊 Base users found: 7 - -🔍 Processing user: admin - -🔍 Processing user: ff292 - -🔍 Processing user: Rudolph - -🔍 Processing user: ff579 - -🔍 Processing user: ff579m - -🔍 Processing user: Nicolas - -🔍 Processing user: AnneLaure - -📊 getUserWithRoles(_1754936203292): { userRoleDataLength: 0 } - -📊 getUserWithRoles(admin_local): { userRoleDataLength: 1 } - -📊 User ff292 groups: 0 - -📊 User admin groups: 0 - -📊 getUserWithRoles(_1753340243216): { userRoleDataLength: 0 } - -📊 getUserWithRoles(directionfrouard_1753264272043): { userRoleDataLength: 0 } - -📊 getUserWithRoles(_1753266881822): { userRoleDataLength: 0 } - -📊 getUserWithRoles(_1753266816257): { userRoleDataLength: 0 } - -📊 User Rudolph groups: 1 - -📊 getUserWithRoles(_1753266851515): { userRoleDataLength: 0 } - -📊 User AnneLaure groups: 1 - -📊 User ff579 groups: 1 - -📊 User Nicolas groups: 1 - -📊 User ff579m groups: 1 - -🔍 Final users with roles and groups: 7 - -🔐 API /api/users - Returning: { isArray: true, length: 7 } - -GET /api/users 304 in 126ms - -PUT /api/users/_1754936203292 200 in 15ms - -🔍 getUsersWithRolesAndGroups called - -📊 Base users found: 7 - -🔍 Processing user: admin - -🔍 Processing user: ff292 - -🔍 Processing user: Rudolph - -🔍 Processing user: ff579 - -🔍 Processing user: ff579m - -🔍 Processing user: Nicolas - -🔍 Processing user: AnneLaure - -📊 getUserWithRoles(admin_local): { userRoleDataLength: 1 } - -📊 getUserWithRoles(_1754936203292): { userRoleDataLength: 0 } - -📊 getUserWithRoles(_1753266851515): { userRoleDataLength: 0 } - -📊 getUserWithRoles(_1753266881822): { userRoleDataLength: 0 } - -📊 getUserWithRoles(directionfrouard_1753264272043): { userRoleDataLength: 0 } - -📊 getUserWithRoles(_1753266816257): { userRoleDataLength: 0 } - -📊 User admin groups: 0 - -📊 User ff292 groups: 0 - -📊 getUserWithRoles(_1753340243216): { userRoleDataLength: 0 } - -📊 User Rudolph groups: 1 - -📊 User Nicolas groups: 1 - -📊 User ff579m groups: 1 - -📊 User ff579 groups: 1 - -📊 User AnneLaure groups: 1 - -🔍 Final users with roles and groups: 7 - -🔐 API /api/users - Returning: { isArray: true, length: 7 } - -GET /api/users 200 in 40ms \ No newline at end of file diff --git a/attached_assets/Pasted--User-system-groups-0-User-AnneLaure-groups-1-Final-users-with-roles-and-groups-7--1754935637981_1754935637981.txt b/attached_assets/Pasted--User-system-groups-0-User-AnneLaure-groups-1-Final-users-with-roles-and-groups-7--1754935637981_1754935637981.txt deleted file mode 100644 index b7d10c7..0000000 --- a/attached_assets/Pasted--User-system-groups-0-User-AnneLaure-groups-1-Final-users-with-roles-and-groups-7--1754935637981_1754935637981.txt +++ /dev/null @@ -1,133 +0,0 @@ -📊 User system groups: 0 - -📊 User AnneLaure groups: 1 - -🔍 Final users with roles and groups: 7 - -🔐 API /api/users - Returning: { isArray: true, length: 7 } - -GET /api/users 200 in 80ms - -Error deleting user: error: update or delete on table "users" violates foreign key constraint "database_backups_created_by_fkey" on table "database_backups" - - at /app/node_modules/pg/lib/client.js:545:17 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - - at async file:///app/dist/index.js:1109:11 - - at async NodePgSession.transaction (file:///app/node_modules/drizzle-orm/node-postgres/session.js:142:22) - - at async DatabaseStorage.deleteUser (file:///app/dist/index.js:1090:9) - - at async file:///app/dist/index.js:4095:7 { - - length: 327, - - severity: 'ERROR', - - code: '23503', - - detail: 'Key (id)=(system) is still referenced from table "database_backups".', - - hint: undefined, - - position: undefined, - - internalPosition: undefined, - - internalQuery: undefined, - - where: undefined, - - schema: 'public', - - table: 'database_backups', - - column: undefined, - - dataType: undefined, - - constraint: 'database_backups_created_by_fkey', - - file: 'ri_triggers.c', - - line: '2609', - - routine: 'ri_ReportViolation' - -} - -DELETE /api/users/system 500 in 28ms - -HEAD /api/health 200 in 1ms - -Error creating user: ZodError: [ - - { - - "validation": "email", - - "code": "invalid_string", - - "message": "Invalid email", - - "path": [ - - "email" - - ] - - } - -] - - at get error [as error] (file:///app/node_modules/zod/v3/types.js:39:31) - - at ZodObject.parse (file:///app/node_modules/zod/v3/types.js:114:22) - - at file:///app/dist/index.js:3988:41 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) { - - issues: [ - - { - - validation: 'email', - - code: 'invalid_string', - - message: 'Invalid email', - - path: [Array] - - } - - ], - - addIssue: [Function (anonymous)], - - addIssues: [Function (anonymous)], - - errors: [ - - { - - validation: 'email', - - code: 'invalid_string', - - message: 'Invalid email', - - path: [Array] - - } - - ] - -} - -POST /api/users 400 in 26ms - -HEAD /api/health 200 in 1ms \ No newline at end of file diff --git a/attached_assets/Pasted--getUserWithGroups-called-for-user-admin-local-Querying-user-groups-for-user-adm-1754945126235_1754945126235.txt b/attached_assets/Pasted--getUserWithGroups-called-for-user-admin-local-Querying-user-groups-for-user-adm-1754945126235_1754945126235.txt deleted file mode 100644 index f4c4e12..0000000 --- a/attached_assets/Pasted--getUserWithGroups-called-for-user-admin-local-Querying-user-groups-for-user-adm-1754945126235_1754945126235.txt +++ /dev/null @@ -1,202 +0,0 @@ - - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -Deliveries API called with: { - - startDate: undefined, - - endDate: undefined, - - storeId: undefined, - - withBL: undefined, - - userRole: 'admin' - -} - -Admin filtering deliveries with groupIds: undefined - -Fetching all deliveries - -Deliveries returned: 80 items - -GET /api/deliveries 304 in 44ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -📄 SPA: Serving index.html for /[object%20Object] - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -📄 SPA: Serving index.html for /[object%20Object] - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -📄 SPA: Serving index.html for /[object%20Object] - -🔍 getUserWithGroups called for user: admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -Orders API called with: { - - startDate: '2025-08-01', - - endDate: '2025-08-31', - - storeId: '1', - - userRole: 'admin' - -} - -Admin filtering with groupIds: [ 1 ] - -Fetching orders by date range: 2025-08-01 to 2025-08-31 - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -Deliveries API called with: { - - startDate: '2025-08-01', - - endDate: '2025-08-31', - - storeId: '1', - - withBL: undefined, - - userRole: 'admin' - -} - -Admin filtering deliveries with groupIds: [ 1 ] - -Fetching deliveries by date range: 2025-08-01 to 2025-08-31 - -Orders returned: 9 items - -GET /api/orders 304 in 23ms - -Deliveries returned: 20 items - -GET /api/deliveries 304 in 36ms - diff --git a/attached_assets/Pasted--getUserWithGroups-called-for-user-admin-local-Querying-user-groups-for-user-adm-1755002698355_1755002698355.txt b/attached_assets/Pasted--getUserWithGroups-called-for-user-admin-local-Querying-user-groups-for-user-adm-1755002698355_1755002698355.txt deleted file mode 100644 index 773a876..0000000 --- a/attached_assets/Pasted--getUserWithGroups-called-for-user-admin-local-Querying-user-groups-for-user-adm-1755002698355_1755002698355.txt +++ /dev/null @@ -1,199 +0,0 @@ - - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -📄 SPA: Serving index.html for /bl-reconciliation - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -GET /api/user 304 in 7ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -GET /api/user 304 in 8ms - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -GET /api/suppliers 304 in 31ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -GET /api/user 304 in 5ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -GET /api/user 304 in 9ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -Deliveries API called with: { - - startDate: undefined, - - endDate: undefined, - - storeId: '1', - - withBL: undefined, - - userRole: 'admin' - -} - -Admin filtering deliveries with groupIds: [ 1 ] - -Fetching all deliveries - -Deliveries returned: 44 items - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -GET /api/deliveries 304 in 67ms - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -GET /api/groups 304 in 26ms - -HEAD /api/health 200 in 0ms \ No newline at end of file diff --git a/attached_assets/Pasted--group-created-at-2025-07-22-11-09-08-977622-group-updated-at-2025-07-28-1-1754942841066_1754942841066.txt b/attached_assets/Pasted--group-created-at-2025-07-22-11-09-08-977622-group-updated-at-2025-07-28-1-1754942841066_1754942841066.txt deleted file mode 100644 index 56daa6f..0000000 --- a/attached_assets/Pasted--group-created-at-2025-07-22-11-09-08-977622-group-updated-at-2025-07-28-1-1754942841066_1754942841066.txt +++ /dev/null @@ -1,201 +0,0 @@ - - - group_created_at: '2025-07-22 11:09:08.977622', - - group_updated_at: '2025-07-28 18:25:49.452346' - - } - -] - -✅ Processed 1 groups for user _1753266816257 - -🔐 API /api/users - Returning: { isArray: true, length: 7, totalGroups: 6 } - -GET /api/users 304 in 81ms - -HEAD /api/health 200 in 1ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 POST /api/users - Creating new user - -📥 Request body: { - - "email": "", - - "firstName": "", - - "lastName": "", - - "username": "ff292m", - - "password": "ff292m", - - "role": "manager", - - "id": "_1754942821925" - -} - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 Parsing user data... - -✅ User data parsed successfully - -🔒 Hashing password... - -✅ Password hashed successfully - -🔍 Generated user ID: _1754942821925 - -🔍 Creating user in database... - -🔍 Storage createUser called with: ff292m - -❌ Storage createUser error: error: duplicate key value violates unique constraint "users_email_key" - - at /app/node_modules/pg-pool/index.js:45:11 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - - at async file:///app/node_modules/drizzle-orm/node-postgres/session.js:83:22 - - at async DatabaseStorage.createUser (file:///app/dist/index.js:989:26) - - at async file:///app/dist/index.js:3993:23 { - - length: 192, - - severity: 'ERROR', - - code: '23505', - - detail: 'Key (email)=() already exists.', - - hint: undefined, - - position: undefined, - - internalPosition: undefined, - - internalQuery: undefined, - - where: undefined, - - schema: 'public', - - table: 'users', - - column: undefined, - - dataType: undefined, - - constraint: 'users_email_key', - - file: 'nbtinsert.c', - - line: '664', - - routine: '_bt_check_unique' - -} - -❌ Storage error code: 23505 - -❌ Storage error constraint: users_email_key - -❌ Error creating user: error: duplicate key value violates unique constraint "users_email_key" - - at /app/node_modules/pg-pool/index.js:45:11 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - - at async file:///app/node_modules/drizzle-orm/node-postgres/session.js:83:22 - - at async DatabaseStorage.createUser (file:///app/dist/index.js:989:26) - - at async file:///app/dist/index.js:3993:23 { - - length: 192, - - severity: 'ERROR', - - code: '23505', - - detail: 'Key (email)=() already exists.', - - hint: undefined, - - position: undefined, - - internalPosition: undefined, - - internalQuery: undefined, - - where: undefined, - - schema: 'public', - - table: 'users', - - column: undefined, - - dataType: undefined, - - constraint: 'users_email_key', - - file: 'nbtinsert.c', - - line: '664', - - routine: '_bt_check_unique' - -} - -❌ Error type: DatabaseError - -❌ Error code: 23505 - -❌ Error constraint: users_email_key - -❌ Error stack: error: duplicate key value violates unique constraint "users_email_key" - - at /app/node_modules/pg-pool/index.js:45:11 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - - at async file:///app/node_modules/drizzle-orm/node-postgres/session.js:83:22 - - at async DatabaseStorage.createUser (file:///app/dist/index.js:989:26) - - at async file:///app/dist/index.js:3993:23 - -POST /api/users 409 in 109ms \ No newline at end of file diff --git a/attached_assets/Pasted--nocodb-table-id-my7zunxprumahmm-nocodb-table-name-CommandeH-invoice-column-n-1755008314981_1755008314981.txt b/attached_assets/Pasted--nocodb-table-id-my7zunxprumahmm-nocodb-table-name-CommandeH-invoice-column-n-1755008314981_1755008314981.txt deleted file mode 100644 index b51e61a..0000000 --- a/attached_assets/Pasted--nocodb-table-id-my7zunxprumahmm-nocodb-table-name-CommandeH-invoice-column-n-1755008314981_1755008314981.txt +++ /dev/null @@ -1,204 +0,0 @@ - nocodb_table_id: 'my7zunxprumahmm', - - nocodb_table_name: 'CommandeH', - - invoice_column_name: 'RefFacture', - - group_created_at: '2025-07-22 11:09:08.977622', - - group_updated_at: '2025-08-12 09:39:32.989' - - } - -] - -✅ Processed 1 groups for user _1753266816257 - -🔍 getUserWithGroups called for user: _1753266816257 - -🔍 Querying user_groups for user: _1753266816257 - -🔍 Querying user_groups for user: _1753266816257 - -🔍 Found 1 group assignments for user _1753266816257 - -🔍 Raw query result: [ - - { - - user_id: '_1753266816257', - - group_id: 2, - - group_id_ref: 2, - - group_name: 'Houdemont', - - group_color: '#455A64', - - nocodb_config_id: 1, - - nocodb_table_id: 'my7zunxprumahmm', - - nocodb_table_name: 'CommandeH', - - invoice_column_name: 'RefFacture', - - group_created_at: '2025-07-22 11:09:08.977622', - - group_updated_at: '2025-08-12 09:39:32.989' - - } - -] - -✅ Processed 1 groups for user _1753266816257 - -🔍 getUserWithGroups called for user: _1753266816257 - -🔍 Found 1 group assignments for user _1753266816257 - -🔍 Raw query result: [ - - { - - user_id: '_1753266816257', - - group_id: 2, - - group_id_ref: 2, - - group_name: 'Houdemont', - - group_color: '#455A64', - - nocodb_config_id: 1, - - nocodb_table_id: 'my7zunxprumahmm', - - nocodb_table_name: 'CommandeH', - - invoice_column_name: 'RefFacture', - - group_created_at: '2025-07-22 11:09:08.977622', - - group_updated_at: '2025-08-12 09:39:32.989' - - } - -] - -✅ Processed 1 groups for user _1753266816257 - -🔍 getUserWithGroups called for user: _1753266816257 - -🔍 Querying user_groups for user: _1753266816257 - -🔍 Found 1 group assignments for user _1753266816257 - -🔍 Raw query result: [ - - { - - user_id: '_1753266816257', - - group_id: 2, - - group_id_ref: 2, - - group_name: 'Houdemont', - - group_color: '#455A64', - - nocodb_config_id: 1, - - nocodb_table_id: 'my7zunxprumahmm', - - nocodb_table_name: 'CommandeH', - - invoice_column_name: 'RefFacture', - - group_created_at: '2025-07-22 11:09:08.977622', - - group_updated_at: '2025-08-12 09:39:32.989' - - } - -] - -✅ Processed 1 groups for user _1753266816257 - -🔍 Querying user_groups for user: _1753266816257 - -🔍 Found 1 group assignments for user _1753266816257 - -🔍 Raw query result: [ - - { - - user_id: '_1753266816257', - - group_id: 2, - - group_id_ref: 2, - - group_name: 'Houdemont', - - group_color: '#455A64', - - nocodb_config_id: 1, - - nocodb_table_id: 'my7zunxprumahmm', - - nocodb_table_name: 'CommandeH', - - invoice_column_name: 'RefFacture', - - group_created_at: '2025-07-22 11:09:08.977622', - - group_updated_at: '2025-08-12 09:39:32.989' - - } - -] - -✅ Processed 1 groups for user _1753266816257 - -🔍 DLC Products API called with: { - - userId: '_1753266816257', - - userRole: 'employee', - - userGroups: [ { groupId: 2, groupName: 'Houdemont' } ], - - groupIds: [ 2 ], - - filters: {}, - - queryStoreId: undefined - -} - -GET /api/dlc-products/stats 304 in 18ms - -📋 DLC Products returned: 133 items - -📋 Sample DLC products groupIds: [ - - { id: 178, name: 'Nesta grenier strawberry aloe vera', groupId: 2 }, - - { id: 48, name: 'Gressins sésame', groupId: 2 }, - - { id: 154, name: 'M&m’s crispy 240g', groupId: 2 } - -] - -GET /api/dlc-products 304 in 26ms - -HEAD /api/health 200 in 1ms - - - - - \ No newline at end of file diff --git a/attached_assets/Pasted--nocodb-table-name-CommandeH-invoice-column-name-RefFacture-group-created-a-1755011493131_1755011493131.txt b/attached_assets/Pasted--nocodb-table-name-CommandeH-invoice-column-name-RefFacture-group-created-a-1755011493131_1755011493131.txt deleted file mode 100644 index 3c17536..0000000 --- a/attached_assets/Pasted--nocodb-table-name-CommandeH-invoice-column-name-RefFacture-group-created-a-1755011493131_1755011493131.txt +++ /dev/null @@ -1,204 +0,0 @@ - nocodb_table_name: 'CommandeH', - - invoice_column_name: 'RefFacture', - - group_created_at: '2025-07-22 11:09:08.977622', - - group_updated_at: '2025-08-12 09:39:32.989' - - } - -] - -✅ Processed 1 groups for user _1753266816257 - -🔍 getUserWithGroups called for user: _1753266816257 - -🔍 Querying user_groups for user: _1753266816257 - -🔍 Found 1 group assignments for user _1753266816257 - -🔍 Raw query result: [ - - { - - user_id: '_1753266816257', - - group_id: 2, - - group_id_ref: 2, - - group_name: 'Houdemont', - - group_color: '#455A64', - - nocodb_config_id: 1, - - nocodb_table_id: 'my7zunxprumahmm', - - nocodb_table_name: 'CommandeH', - - invoice_column_name: 'RefFacture', - - group_created_at: '2025-07-22 11:09:08.977622', - - group_updated_at: '2025-08-12 09:39:32.989' - - } - -] - -✅ Processed 1 groups for user _1753266816257 - -🔍 DLC Products API called with: { - - userId: '_1753266816257', - - userRole: 'employee', - - userGroups: [ { groupId: 2, groupName: 'Houdemont' } ], - - groupIds: [ 2 ], - - filters: {}, - - queryStoreId: undefined - -} - -📋 DLC Products returned: 133 items - -📋 Sample DLC products groupIds: [ - - { id: 178, name: 'Nesta grenier strawberry aloe vera', groupId: 2 }, - - { id: 48, name: 'Gressins sésame', groupId: 2 }, - - { id: 154, name: 'M&m’s crispy 240g', groupId: 2 } - -] - -🔍 getUserWithGroups called for user: _1753266816257 - -GET /api/dlc-products 304 in 34ms - -🔍 Querying user_groups for user: _1753266816257 - -🔍 Found 1 group assignments for user _1753266816257 - -🔍 Raw query result: [ - - { - - user_id: '_1753266816257', - - group_id: 2, - - group_id_ref: 2, - - group_name: 'Houdemont', - - group_color: '#455A64', - - nocodb_config_id: 1, - - nocodb_table_id: 'my7zunxprumahmm', - - nocodb_table_name: 'CommandeH', - - invoice_column_name: 'RefFacture', - - group_created_at: '2025-07-22 11:09:08.977622', - - group_updated_at: '2025-08-12 09:39:32.989' - - } - -] - -✅ Processed 1 groups for user _1753266816257 - -🔍 getUserWithGroups called for user: _1753266816257 - -🔍 Querying user_groups for user: _1753266816257 - -🔍 Found 1 group assignments for user _1753266816257 - -🔍 Raw query result: [ - - { - - user_id: '_1753266816257', - - group_id: 2, - - group_id_ref: 2, - - group_name: 'Houdemont', - - group_color: '#455A64', - - nocodb_config_id: 1, - - nocodb_table_id: 'my7zunxprumahmm', - - nocodb_table_name: 'CommandeH', - - invoice_column_name: 'RefFacture', - - group_created_at: '2025-07-22 11:09:08.977622', - - group_updated_at: '2025-08-12 09:39:32.989' - - } - -] - -✅ Processed 1 groups for user _1753266816257 - -🔍 getUserWithGroups called for user: _1753266816257 - -🔍 Querying user_groups for user: _1753266816257 - -🔍 Found 1 group assignments for user _1753266816257 - -🔍 Raw query result: [ - - { - - user_id: '_1753266816257', - - group_id: 2, - - group_id_ref: 2, - - group_name: 'Houdemont', - - group_color: '#455A64', - - nocodb_config_id: 1, - - nocodb_table_id: 'my7zunxprumahmm', - - nocodb_table_name: 'CommandeH', - - invoice_column_name: 'RefFacture', - - group_created_at: '2025-07-22 11:09:08.977622', - - group_updated_at: '2025-08-12 09:39:32.989' - - } - -] - -✅ Processed 1 groups for user _1753266816257 - -GET /api/dlc-products/stats 304 in 45ms - -HEAD /api/health 200 in 1ms - - - - - \ No newline at end of file diff --git a/attached_assets/Pasted--status-500-message-connect-ECONNREFUSED-172-20-0-10-443-error-ErrorEvent--1754925087618_1754925087618.txt b/attached_assets/Pasted--status-500-message-connect-ECONNREFUSED-172-20-0-10-443-error-ErrorEvent--1754925087618_1754925087618.txt deleted file mode 100644 index 975f022..0000000 --- a/attached_assets/Pasted--status-500-message-connect-ECONNREFUSED-172-20-0-10-443-error-ErrorEvent--1754925087618_1754925087618.txt +++ /dev/null @@ -1,199 +0,0 @@ - status: 500, - - message: 'connect ECONNREFUSED 172.20.0.10:443', - - error: ErrorEvent { - - [Symbol(kTarget)]: WebSocket { - - _events: [Object: null prototype], - - _eventsCount: 4, - - _maxListeners: undefined, - - _binaryType: 'arraybuffer', - - _closeCode: 1006, - - _closeFrameReceived: false, - - _closeFrameSent: false, - - _closeMessage: , - - _closeTimer: null, - - _errorEmitted: true, - - _extensions: {}, - - _paused: false, - - _protocol: '', - - _readyState: 3, - - _receiver: null, - - _sender: null, - - _socket: null, - - _bufferedAmount: 0, - - _isServer: false, - - _redirects: 0, - - _autoPong: true, - - _url: 'wss://logiflow-db/v2', - - _req: null, - - [Symbol(shapeMode)]: false, - - [Symbol(kCapture)]: false - - }, - - [Symbol(kType)]: 'error', - - [Symbol(kError)]: Error: connect ECONNREFUSED 172.20.0.10:443 - - at TCPConnectWrap.afterConnect [as oncomplete] (node:net:1611:16) { - - errno: -111, - - code: 'ECONNREFUSED', - - syscall: 'connect', - - address: '172.20.0.10', - - port: 443 - - }, - - [Symbol(kMessage)]: 'connect ECONNREFUSED 172.20.0.10:443' - - } - -} - -POST /api/login 500 in 9ms - -Error: connect ECONNREFUSED 172.20.0.10:443 - - at file:///app/node_modules/@neondatabase/serverless/index.mjs:1345:74 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - - at async NeonPreparedQuery.execute (file:///app/node_modules/drizzle-orm/neon-serverless/session.js:76:20) - - at async DatabaseStorage.getUserByUsername (file:///app/dist/index.js:893:20) - - at async Strategy._verify (file:///app/dist/index.js:2461:24) - -Server error: { - - status: 500, - - message: 'connect ECONNREFUSED 172.20.0.10:443', - - error: ErrorEvent { - - [Symbol(kTarget)]: WebSocket { - - _events: [Object: null prototype], - - _eventsCount: 4, - - _maxListeners: undefined, - - _binaryType: 'arraybuffer', - - _closeCode: 1006, - - _closeFrameReceived: false, - - _closeFrameSent: false, - - _closeMessage: , - - _closeTimer: null, - - _errorEmitted: true, - - _extensions: {}, - - _paused: false, - - _protocol: '', - - _readyState: 3, - - _receiver: null, - - _sender: null, - - _socket: null, - - _bufferedAmount: 0, - - _isServer: false, - - _redirects: 0, - - _autoPong: true, - - _url: 'wss://logiflow-db/v2', - - _req: null, - - [Symbol(shapeMode)]: false, - - [Symbol(kCapture)]: false - - }, - - [Symbol(kType)]: 'error', - - [Symbol(kError)]: Error: connect ECONNREFUSED 172.20.0.10:443 - - at TCPConnectWrap.afterConnect [as oncomplete] (node:net:1611:16) { - - errno: -111, - - code: 'ECONNREFUSED', - - syscall: 'connect', - - address: '172.20.0.10', - - port: 443 - - }, - - [Symbol(kMessage)]: 'connect ECONNREFUSED 172.20.0.10:443' - - } - -} - -POST /api/login 500 in 23ms - -Error: connect ECONNREFUSED 172.20.0.10:443 - - at file:///app/node_modules/@neondatabase/serverless/index.mjs:1345:74 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - - at async NeonPreparedQuery.execute (file:///app/node_modules/drizzle-orm/neon-serverless/session.js:76:20) - - at async DatabaseStorage.getUserByUsername (file:///app/dist/index.js:893:20) - - at async Strategy._verify (file:///app/dist/index.js:2461:24) - -HEAD /api/health 200 in 1ms \ No newline at end of file diff --git a/attached_assets/Pasted-Actions-Querying-user-groups-for-user-admin-local-Found-0-group-assignme-1754945532656_1754945532656.txt b/attached_assets/Pasted-Actions-Querying-user-groups-for-user-admin-local-Found-0-group-assignme-1754945532656_1754945532656.txt deleted file mode 100644 index 4de1176..0000000 --- a/attached_assets/Pasted-Actions-Querying-user-groups-for-user-admin-local-Found-0-group-assignme-1754945532656_1754945532656.txt +++ /dev/null @@ -1,205 +0,0 @@ -Actions - - - - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -Orders API called with: { - - startDate: '2025-08-01', - - endDate: '2025-08-31', - - storeId: '1', - - userRole: 'admin' - -} - -Admin filtering with groupIds: [ 1 ] - -Fetching orders by date range: 2025-08-01 to 2025-08-31 - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -Deliveries API called with: { - - startDate: '2025-08-01', - - endDate: '2025-08-31', - - storeId: '1', - - withBL: undefined, - - userRole: 'admin' - -} - -Admin filtering deliveries with groupIds: [ 1 ] - -Fetching deliveries by date range: 2025-08-01 to 2025-08-31 - -Orders returned: 9 items - -Deliveries returned: 20 items - -GET /api/orders 304 in 32ms - -GET /api/deliveries 304 in 30ms - -🔍 Querying user_groups for user: admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -GET /api/user 304 in 45ms - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -Orders API called with: { - - startDate: '2025-08-01', - - endDate: '2025-08-31', - - storeId: '1', - - userRole: 'admin' - -} - -Admin filtering with groupIds: [ 1 ] - -Fetching orders by date range: 2025-08-01 to 2025-08-31 - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -Deliveries API called with: { - - startDate: '2025-08-01', - - endDate: '2025-08-31', - - storeId: '1', - - withBL: undefined, - - userRole: 'admin' - -} - -Admin filtering deliveries with groupIds: [ 1 ] - -Fetching deliveries by date range: 2025-08-01 to 2025-08-31 - -Orders returned: 9 items - -Deliveries returned: 20 items - -GET /api/orders 304 in 23ms - -GET /api/deliveries 304 in 22ms - diff --git a/attached_assets/Pasted-Administration-User-related-Environment-related-Registries-Logs-Notifications-Se-1754927673709_1754927673710.txt b/attached_assets/Pasted-Administration-User-related-Environment-related-Registries-Logs-Notifications-Se-1754927673709_1754927673710.txt deleted file mode 100644 index 4acd120..0000000 --- a/attached_assets/Pasted-Administration-User-related-Environment-related-Registries-Logs-Notifications-Se-1754927673709_1754927673710.txt +++ /dev/null @@ -1,158 +0,0 @@ -Administration - -User-related - - -Environment-related - -Registries - -Logs - -Notifications - -Settings - -New version available 2.27.9 -DismissSee what's new -Community Edition -2.27.6 LTS -Containers>logiflow-logiflow-1>Logs -Container logs - - -admin -Log viewer settings -Auto-refresh logs -Wrap lines -Display timestamps -Fetch -All logs -Search -Filter... -Lines -100 -Actions - - - - -🔗 Database initialization: { - - NODE_ENV: 'production', - - isProduction: true, - - hasDbUrl: true, - - dbHost: 'logiflow-db' - -} - -🐳 PRODUCTION: Using standard PostgreSQL - -✅ PostgreSQL connection test successful - -🐳 PRODUCTION: Using PostgreSQL storage - -🐳 PRODUCTION: Local auth configured with PostgreSQL sessions - -🐳 PRODUCTION: Starting LogiFlow application - -🐳 Environment: { NODE_ENV: 'production', DATABASE_URL: 'Present', PORT: '3000' } - -🐳 Serving static files from: /app/dist/public - -🐳 PRODUCTION: LogiFlow serving on port 3000 - -✅ Production admin user found: { id: 'admin_local', username: 'admin', passwordFormat: 'present' } - -🔐 Production password comparison { suppliedLength: 5, storedFormat: '21ff482668...' } - -✅ Password matched with hash.salt format - -✅ Admin password works with current system - -HEAD /api/health 200 in 5ms - -GET /api/user 401 in 24ms - -🔐 Production password comparison { suppliedLength: 9, storedFormat: '21ff482668...' } - -❌ No password format matched - -POST /api/login 400 in 60ms - -🔐 Production password comparison { suppliedLength: 5, storedFormat: '21ff482668...' } - -✅ Password matched with hash.salt format - -POST /api/login 200 in 69ms - -Server error: { - - status: 500, - - message: 'column user_groups.created_at does not exist', - - error: error: column user_groups.created_at does not exist - - at /app/node_modules/pg-pool/index.js:45:11 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - - at async file:///app/node_modules/drizzle-orm/node-postgres/session.js:83:22 - - at async DatabaseStorage.getUserWithGroups (file:///app/dist/index.js:1364:28) - - at async file:///app/dist/index.js:3046:20 { - - length: 120, - - severity: 'ERROR', - - code: '42703', - - detail: undefined, - - hint: undefined, - - position: '59', - - internalPosition: undefined, - - internalQuery: undefined, - - where: undefined, - - schema: undefined, - - table: undefined, - - column: undefined, - - dataType: undefined, - - constraint: undefined, - - file: 'parse_relation.c', - - line: '3665', - - routine: 'errorMissingColumn' - - } - -} - -error: column user_groups.created_at does not exist - - at /app/node_modules/pg-pool/index.js:45:11 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - - at async file:///app/node_modules/drizzle-orm/node-postgres/session.js:83:22 - - at async DatabaseStorage.getUserWithGroups (file:///app/dist/index.js:1364:28) - - at async file:///app/dist/index.js:3046:20 \ No newline at end of file diff --git a/attached_assets/Pasted-Administration-User-related-Environment-related-Registries-Logs-Notifications-Se-1754944003568_1754944003569.txt b/attached_assets/Pasted-Administration-User-related-Environment-related-Registries-Logs-Notifications-Se-1754944003568_1754944003569.txt deleted file mode 100644 index 6d26975..0000000 --- a/attached_assets/Pasted-Administration-User-related-Environment-related-Registries-Logs-Notifications-Se-1754944003568_1754944003569.txt +++ /dev/null @@ -1,238 +0,0 @@ -Administration - -User-related - - -Environment-related - -Registries - -Logs - -Notifications - -Settings - -New version available 2.27.9 -DismissSee what's new -Community Edition -2.27.6 LTS -Containers>logiflow-logiflow-1>Logs -Container logs - - -admin -Log viewer settings -Auto-refresh logs -Wrap lines -Display timestamps -Fetch -All logs -Search -Filter... -Lines -100 -Actions - - - - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -Customer orders - Admin filtering by store: { storeId: '1', groupIds: [ 1 ] } - -Customer orders returned from storage: 9 items - -GET /api/customer-orders 304 in 12ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -GET /api/user 304 in 6ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -GET /api/user 304 in 4ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -GET /api/user 304 in 8ms - -🔍 Querying user_groups for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -Orders API called with: { - - startDate: '2025-08-01', - - endDate: '2025-08-31', - - storeId: undefined, - - userRole: 'admin' - -} - -Admin filtering with groupIds: undefined - -Fetching orders by date range: 2025-08-01 to 2025-08-31 - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -Orders returned: 15 items - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -Deliveries API called with: { - - startDate: '2025-08-01', - - endDate: '2025-08-31', - - storeId: undefined, - - withBL: undefined, - - userRole: 'admin' - -} - -Admin filtering deliveries with groupIds: undefined - -Fetching deliveries by date range: 2025-08-01 to 2025-08-31 - -GET /api/orders 304 in 27ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -GET /api/stats/monthly 304 in 33ms - -GET /api/user 304 in 9ms - -Deliveries returned: 40 items - -GET /api/deliveries 304 in 36ms \ No newline at end of file diff --git a/attached_assets/Pasted-Error-ERR-MODULE-NOT-FOUND-Cannot-find-package-vite-imported-from-app-dist-index-js-at--1754924794519_1754924794519.txt b/attached_assets/Pasted-Error-ERR-MODULE-NOT-FOUND-Cannot-find-package-vite-imported-from-app-dist-index-js-at--1754924794519_1754924794519.txt deleted file mode 100644 index d33c8ac..0000000 --- a/attached_assets/Pasted-Error-ERR-MODULE-NOT-FOUND-Cannot-find-package-vite-imported-from-app-dist-index-js-at--1754924794519_1754924794519.txt +++ /dev/null @@ -1,188 +0,0 @@ -Error [ERR_MODULE_NOT_FOUND]: Cannot find package 'vite' imported from /app/dist/index.js - - at packageResolve (node:internal/modules/esm/resolve:873:9) - - at moduleResolve (node:internal/modules/esm/resolve:946:18) - - at defaultResolve (node:internal/modules/esm/resolve:1188:11) - - at ModuleLoader.defaultResolve (node:internal/modules/esm/loader:642:12) - - at #cachedDefaultResolve (node:internal/modules/esm/loader:591:25) - - at ModuleLoader.resolve (node:internal/modules/esm/loader:574:38) - - at ModuleLoader.getModuleJobForImport (node:internal/modules/esm/loader:236:38) - - at ModuleJob._link (node:internal/modules/esm/module_job:130:49) { - - code: 'ERR_MODULE_NOT_FOUND' - -} - -Node.js v20.19.4 - -node:internal/modules/esm/resolve:873 - - throw new ERR_MODULE_NOT_FOUND(packageName, fileURLToPath(base), null); - - - -^ - -Error [ERR_MODULE_NOT_FOUND]: Cannot find package 'vite' imported from /app/dist/index.js - - at packageResolve (node:internal/modules/esm/resolve:873:9) - - at moduleResolve (node:internal/modules/esm/resolve:946:18) - - at defaultResolve (node:internal/modules/esm/resolve:1188:11) - - at ModuleLoader.defaultResolve (node:internal/modules/esm/loader:642:12) - - at #cachedDefaultResolve (node:internal/modules/esm/loader:591:25) - - at ModuleLoader.resolve (node:internal/modules/esm/loader:574:38) - - at ModuleLoader.getModuleJobForImport (node:internal/modules/esm/loader:236:38) - - at ModuleJob._link (node:internal/modules/esm/module_job:130:49) { - - code: 'ERR_MODULE_NOT_FOUND' - -} - -Node.js v20.19.4 - -node:internal/modules/esm/resolve:873 - - throw new ERR_MODULE_NOT_FOUND(packageName, fileURLToPath(base), null); - - - -^ - -Error [ERR_MODULE_NOT_FOUND]: Cannot find package 'vite' imported from /app/dist/index.js - - at packageResolve (node:internal/modules/esm/resolve:873:9) - - at moduleResolve (node:internal/modules/esm/resolve:946:18) - - at defaultResolve (node:internal/modules/esm/resolve:1188:11) - - at ModuleLoader.defaultResolve (node:internal/modules/esm/loader:642:12) - - at #cachedDefaultResolve (node:internal/modules/esm/loader:591:25) - - at ModuleLoader.resolve (node:internal/modules/esm/loader:574:38) - - at ModuleLoader.getModuleJobForImport (node:internal/modules/esm/loader:236:38) - - at ModuleJob._link (node:internal/modules/esm/module_job:130:49) { - - code: 'ERR_MODULE_NOT_FOUND' - -} - -Node.js v20.19.4 - -node:internal/modules/esm/resolve:873 - - throw new ERR_MODULE_NOT_FOUND(packageName, fileURLToPath(base), null); - - - -^ - -Error [ERR_MODULE_NOT_FOUND]: Cannot find package 'vite' imported from /app/dist/index.js - - at packageResolve (node:internal/modules/esm/resolve:873:9) - - at moduleResolve (node:internal/modules/esm/resolve:946:18) - - at defaultResolve (node:internal/modules/esm/resolve:1188:11) - - at ModuleLoader.defaultResolve (node:internal/modules/esm/loader:642:12) - - at #cachedDefaultResolve (node:internal/modules/esm/loader:591:25) - - at ModuleLoader.resolve (node:internal/modules/esm/loader:574:38) - - at ModuleLoader.getModuleJobForImport (node:internal/modules/esm/loader:236:38) - - at ModuleJob._link (node:internal/modules/esm/module_job:130:49) { - - code: 'ERR_MODULE_NOT_FOUND' - -} - -Node.js v20.19.4 - -node:internal/modules/esm/resolve:873 - - throw new ERR_MODULE_NOT_FOUND(packageName, fileURLToPath(base), null); - - - -^ - -Error [ERR_MODULE_NOT_FOUND]: Cannot find package 'vite' imported from /app/dist/index.js - - at packageResolve (node:internal/modules/esm/resolve:873:9) - - at moduleResolve (node:internal/modules/esm/resolve:946:18) - - at defaultResolve (node:internal/modules/esm/resolve:1188:11) - - at ModuleLoader.defaultResolve (node:internal/modules/esm/loader:642:12) - - at #cachedDefaultResolve (node:internal/modules/esm/loader:591:25) - - at ModuleLoader.resolve (node:internal/modules/esm/loader:574:38) - - at ModuleLoader.getModuleJobForImport (node:internal/modules/esm/loader:236:38) - - at ModuleJob._link (node:internal/modules/esm/module_job:130:49) { - - code: 'ERR_MODULE_NOT_FOUND' - -} - -Node.js v20.19.4 - -node:internal/modules/esm/resolve:873 - - throw new ERR_MODULE_NOT_FOUND(packageName, fileURLToPath(base), null); - - - -^ - -Error [ERR_MODULE_NOT_FOUND]: Cannot find package 'vite' imported from /app/dist/index.js - - at packageResolve (node:internal/modules/esm/resolve:873:9) - - at moduleResolve (node:internal/modules/esm/resolve:946:18) - - at defaultResolve (node:internal/modules/esm/resolve:1188:11) - - at ModuleLoader.defaultResolve (node:internal/modules/esm/loader:642:12) - - at #cachedDefaultResolve (node:internal/modules/esm/loader:591:25) - - at ModuleLoader.resolve (node:internal/modules/esm/loader:574:38) - - at ModuleLoader.getModuleJobForImport (node:internal/modules/esm/loader:236:38) - - at ModuleJob._link (node:internal/modules/esm/module_job:130:49) { - - code: 'ERR_MODULE_NOT_FOUND' - -} - -Node.js v20.19.4 - - - - - \ No newline at end of file diff --git a/attached_assets/Pasted-GET-api-deliveries-500-in-24ms-GET-api-orders-500-in-27ms-getUserWithGroups-called-for-us-1754994000361_1754994000361.txt b/attached_assets/Pasted-GET-api-deliveries-500-in-24ms-GET-api-orders-500-in-27ms-getUserWithGroups-called-for-us-1754994000361_1754994000361.txt deleted file mode 100644 index bebe89c..0000000 --- a/attached_assets/Pasted-GET-api-deliveries-500-in-24ms-GET-api-orders-500-in-27ms-getUserWithGroups-called-for-us-1754994000361_1754994000361.txt +++ /dev/null @@ -1,200 +0,0 @@ -GET /api/deliveries 500 in 24ms - -GET /api/orders 500 in 27ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -Orders API called with: { - - startDate: '2025-08-01', - - endDate: '2025-08-31', - - storeId: undefined, - - userRole: 'admin' - -} - -Admin filtering with groupIds: undefined - -Fetching orders by date range: 2025-08-01 to 2025-08-31 - -Error fetching orders: error: column orders_supplier.email does not exist - - at /app/node_modules/pg-pool/index.js:45:11 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - - at async file:///app/node_modules/drizzle-orm/node-postgres/session.js:83:22 - - at async DatabaseStorage.getOrdersByDateRange (file:///app/dist/index.js:1127:16) - - at async file:///app/dist/index.js:3633:21 { - - length: 120, - - severity: 'ERROR', - - code: '42703', - - detail: undefined, - - hint: undefined, - - position: '555', - - internalPosition: undefined, - - internalQuery: undefined, - - where: undefined, - - schema: undefined, - - table: undefined, - - column: undefined, - - dataType: undefined, - - constraint: undefined, - - file: 'parse_relation.c', - - line: '3665', - - routine: 'errorMissingColumn' - -} - -GET /api/orders 500 in 13ms - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -Deliveries API called with: { - - startDate: '2025-08-01', - - endDate: '2025-08-31', - - storeId: undefined, - - withBL: undefined, - - userRole: 'admin' - -} - -Admin filtering deliveries with groupIds: undefined - -Fetching deliveries by date range: 2025-08-01 to 2025-08-31 - -Error fetching deliveries: error: column deliveries_supplier.email does not exist - - at /app/node_modules/pg-pool/index.js:45:11 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - - at async file:///app/node_modules/drizzle-orm/node-postgres/session.js:83:22 - - at async DatabaseStorage.getDeliveriesByDateRange (file:///app/dist/index.js:1186:25) - - at async file:///app/dist/index.js:3848:25 { - - length: 124, - - severity: 'ERROR', - - code: '42703', - - detail: undefined, - - hint: undefined, - - position: '856', - - internalPosition: undefined, - - internalQuery: undefined, - - where: undefined, - - schema: undefined, - - table: undefined, - - column: undefined, - - dataType: undefined, - - constraint: undefined, - - file: 'parse_relation.c', - - line: '3665', - - routine: 'errorMissingColumn' - -} - -GET /api/deliveries 500 in 42ms - -HEAD /api/health 200 in 1ms - diff --git a/attached_assets/Pasted-GET-api-users-200-in-33ms-Error-deleting-user-error-update-or-delete-on-table-users-violates-1754935124372_1754935124372.txt b/attached_assets/Pasted-GET-api-users-200-in-33ms-Error-deleting-user-error-update-or-delete-on-table-users-violates-1754935124372_1754935124372.txt deleted file mode 100644 index 48b8c49..0000000 --- a/attached_assets/Pasted-GET-api-users-200-in-33ms-Error-deleting-user-error-update-or-delete-on-table-users-violates-1754935124372_1754935124372.txt +++ /dev/null @@ -1,108 +0,0 @@ -GET /api/users 200 in 33ms - -Error deleting user: error: update or delete on table "users" violates foreign key constraint "user_roles_assigned_by_fkey" on table "user_roles" - - at /app/node_modules/pg/lib/client.js:545:17 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - - at async file:///app/dist/index.js:1108:11 - - at async NodePgSession.transaction (file:///app/node_modules/drizzle-orm/node-postgres/session.js:142:22) - - at async DatabaseStorage.deleteUser (file:///app/dist/index.js:1090:9) - - at async file:///app/dist/index.js:4094:7 { - - length: 299, - - severity: 'ERROR', - - code: '23503', - - detail: 'Key (id)=(system) is still referenced from table "user_roles".', - - hint: undefined, - - position: undefined, - - internalPosition: undefined, - - internalQuery: undefined, - - where: undefined, - - schema: 'public', - - table: 'user_roles', - - column: undefined, - - dataType: undefined, - - constraint: 'user_roles_assigned_by_fkey', - - file: 'ri_triggers.c', - - line: '2609', - - routine: 'ri_ReportViolation' - -} - -DELETE /api/users/system 500 in 29ms - -HEAD /api/health 200 in 1ms - -Error deleting user: error: update or delete on table "users" violates foreign key constraint "user_roles_assigned_by_fkey" on table "user_roles" - - at /app/node_modules/pg/lib/client.js:545:17 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - - at async file:///app/dist/index.js:1108:11 - - at async NodePgSession.transaction (file:///app/node_modules/drizzle-orm/node-postgres/session.js:142:22) - - at async DatabaseStorage.deleteUser (file:///app/dist/index.js:1090:9) - - at async file:///app/dist/index.js:4094:7 { - - length: 299, - - severity: 'ERROR', - - code: '23503', - - detail: 'Key (id)=(system) is still referenced from table "user_roles".', - - hint: undefined, - - position: undefined, - - internalPosition: undefined, - - internalQuery: undefined, - - where: undefined, - - schema: 'public', - - table: 'user_roles', - - column: undefined, - - dataType: undefined, - - constraint: 'user_roles_assigned_by_fkey', - - file: 'ri_triggers.c', - - line: '2609', - - routine: 'ri_ReportViolation' - -} - -DELETE /api/users/system 500 in 19ms - diff --git a/attached_assets/Pasted-HEAD-api-health-200-in-1ms-Error-updating-user-Error-ERR-MODULE-NOT-FOUND-Cannot-find-module-1754941254642_1754941254643.txt b/attached_assets/Pasted-HEAD-api-health-200-in-1ms-Error-updating-user-Error-ERR-MODULE-NOT-FOUND-Cannot-find-module-1754941254642_1754941254643.txt deleted file mode 100644 index 5d9d1d3..0000000 --- a/attached_assets/Pasted-HEAD-api-health-200-in-1ms-Error-updating-user-Error-ERR-MODULE-NOT-FOUND-Cannot-find-module-1754941254642_1754941254643.txt +++ /dev/null @@ -1,140 +0,0 @@ -HEAD /api/health 200 in 1ms - -Error updating user: Error [ERR_MODULE_NOT_FOUND]: Cannot find module '/app/dist/localAuth.production.js' imported from /app/dist/index.js - - at finalizeResolution (node:internal/modules/esm/resolve:283:11) - - at moduleResolve (node:internal/modules/esm/resolve:952:10) - - at defaultResolve (node:internal/modules/esm/resolve:1188:11) - - at ModuleLoader.defaultResolve (node:internal/modules/esm/loader:642:12) - - at #cachedDefaultResolve (node:internal/modules/esm/loader:591:25) - - at ModuleLoader.resolve (node:internal/modules/esm/loader:574:38) - - at ModuleLoader.getModuleJobForImport (node:internal/modules/esm/loader:236:38) - - at ModuleLoader.import (node:internal/modules/esm/loader:539:34) - - at defaultImportModuleDynamicallyForModule (node:internal/modules/esm/utils:221:31) - - at importModuleDynamicallyCallback (node:internal/modules/esm/utils:260:12) { - - code: 'ERR_MODULE_NOT_FOUND', - - url: 'file:///app/dist/localAuth.production.js' - -} - -PUT /api/users/admin_local 500 in 14ms - -HEAD /api/health 200 in 1ms - -Error assigning user to group: error: column "created_at" of relation "user_groups" does not exist - - at /app/node_modules/pg-pool/index.js:45:11 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - - at async file:///app/node_modules/drizzle-orm/node-postgres/session.js:83:22 - - at async DatabaseStorage.assignUserToGroup (file:///app/dist/index.js:1225:32) - - at async file:///app/dist/index.js:3842:25 { - - length: 134, - - severity: 'ERROR', - - code: '42703', - - detail: undefined, - - hint: undefined, - - position: '51', - - internalPosition: undefined, - - internalQuery: undefined, - - where: undefined, - - schema: undefined, - - table: undefined, - - column: undefined, - - dataType: undefined, - - constraint: undefined, - - file: 'parse_target.c', - - line: '1075', - - routine: 'checkInsertTargets' - -} - -POST /api/users/admin_local/groups 500 in 55ms - -Error assigning user to group: error: column "created_at" of relation "user_groups" does not exist - - at /app/node_modules/pg-pool/index.js:45:11 - - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - - at async file:///app/node_modules/drizzle-orm/node-postgres/session.js:83:22 - - at async DatabaseStorage.assignUserToGroup (file:///app/dist/index.js:1225:32) - - at async file:///app/dist/index.js:3842:25 { - - length: 134, - - severity: 'ERROR', - - code: '42703', - - detail: undefined, - - hint: undefined, - - position: '51', - - internalPosition: undefined, - - internalQuery: undefined, - - where: undefined, - - schema: undefined, - - table: undefined, - - column: undefined, - - dataType: undefined, - - constraint: undefined, - - file: 'parse_target.c', - - line: '1075', - - routine: 'checkInsertTargets' - -} - -POST /api/users/admin_local/groups 500 in 27ms - -HEAD /api/health 200 in 2ms - - - - - \ No newline at end of file diff --git a/attached_assets/Pasted-ctions-Found-1-group-assignments-for-user-1753266816257-Raw-query-result-1755008518319_1755008518319.txt b/attached_assets/Pasted-ctions-Found-1-group-assignments-for-user-1753266816257-Raw-query-result-1755008518319_1755008518319.txt deleted file mode 100644 index 9a83c0e..0000000 --- a/attached_assets/Pasted-ctions-Found-1-group-assignments-for-user-1753266816257-Raw-query-result-1755008518319_1755008518319.txt +++ /dev/null @@ -1,207 +0,0 @@ -ctions - - - - -🔍 Found 1 group assignments for user _1753266816257 - -🔍 Raw query result: [ - - { - - user_id: '_1753266816257', - - group_id: 2, - - group_id_ref: 2, - - group_name: 'Houdemont', - - group_color: '#455A64', - - nocodb_config_id: 1, - - nocodb_table_id: 'my7zunxprumahmm', - - nocodb_table_name: 'CommandeH', - - invoice_column_name: 'RefFacture', - - group_created_at: '2025-07-22 11:09:08.977622', - - group_updated_at: '2025-08-12 09:39:32.989' - - } - -] - -✅ Processed 1 groups for user _1753266816257 - -GET /api/groups 304 in 88ms - -GET /api/suppliers 304 in 95ms - -🔍 Querying user_groups for user: _1753266816257 - -🔍 Found 1 group assignments for user _1753266816257 - -🔍 Raw query result: [ - - { - - user_id: '_1753266816257', - - group_id: 2, - - group_id_ref: 2, - - group_name: 'Houdemont', - - group_color: '#455A64', - - nocodb_config_id: 1, - - nocodb_table_id: 'my7zunxprumahmm', - - nocodb_table_name: 'CommandeH', - - invoice_column_name: 'RefFacture', - - group_created_at: '2025-07-22 11:09:08.977622', - - group_updated_at: '2025-08-12 09:39:32.989' - - } - -] - -✅ Processed 1 groups for user _1753266816257 - -🔍 getUserWithGroups called for user: _1753266816257 - -🔍 Querying user_groups for user: _1753266816257 - -🔍 Found 1 group assignments for user _1753266816257 - -🔍 Raw query result: [ - - { - - user_id: '_1753266816257', - - group_id: 2, - - group_id_ref: 2, - - group_name: 'Houdemont', - - group_color: '#455A64', - - nocodb_config_id: 1, - - nocodb_table_id: 'my7zunxprumahmm', - - nocodb_table_name: 'CommandeH', - - invoice_column_name: 'RefFacture', - - group_created_at: '2025-07-22 11:09:08.977622', - - group_updated_at: '2025-08-12 09:39:32.989' - - } - -] - -✅ Processed 1 groups for user _1753266816257 - -🔍 getUserWithGroups called for user: _1753266816257 - -🔍 Querying user_groups for user: _1753266816257 - -🔍 Found 1 group assignments for user _1753266816257 - -🔍 Raw query result: [ - - { - - user_id: '_1753266816257', - - group_id: 2, - - group_id_ref: 2, - - group_name: 'Houdemont', - - group_color: '#455A64', - - nocodb_config_id: 1, - - nocodb_table_id: 'my7zunxprumahmm', - - nocodb_table_name: 'CommandeH', - - invoice_column_name: 'RefFacture', - - group_created_at: '2025-07-22 11:09:08.977622', - - group_updated_at: '2025-08-12 09:39:32.989' - - } - -] - -✅ Processed 1 groups for user _1753266816257 - -Customer orders - User assigned stores: { groupIds: [ 2 ] } - -Customer orders returned from storage: 23 items - -GET /api/customer-orders 304 in 130ms - -HEAD /api/health 200 in 1ms - -🔍 getUserWithGroups called for user: _1753266816257 - -🔍 Querying user_groups for user: _1753266816257 - -🔍 Found 1 group assignments for user _1753266816257 - -🔍 Raw query result: [ - - { - - user_id: '_1753266816257', - - group_id: 2, - - group_id_ref: 2, - - group_name: 'Houdemont', - - group_color: '#455A64', - - nocodb_config_id: 1, - - nocodb_table_id: 'my7zunxprumahmm', - - nocodb_table_name: 'CommandeH', - - invoice_column_name: 'RefFacture', - - group_created_at: '2025-07-22 11:09:08.977622', - - group_updated_at: '2025-08-12 09:39:32.989' - - } - -] - -✅ Processed 1 groups for user _1753266816257 - -GET /api/user 304 in 7ms - -HEAD /api/health 200 in 1ms - - - \ No newline at end of file diff --git a/attached_assets/Pasted-ions-Found-0-group-assignments-for-user-admin-local-Raw-query-result--1754944471521_1754944471521.txt b/attached_assets/Pasted-ions-Found-0-group-assignments-for-user-admin-local-Raw-query-result--1754944471521_1754944471521.txt deleted file mode 100644 index 33308f5..0000000 --- a/attached_assets/Pasted-ions-Found-0-group-assignments-for-user-admin-local-Raw-query-result--1754944471521_1754944471521.txt +++ /dev/null @@ -1,208 +0,0 @@ -ions - - - - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -Deliveries API called with: { - - startDate: '2025-08-01', - - endDate: '2025-08-31', - - storeId: undefined, - - withBL: undefined, - - userRole: 'admin' - -} - -Admin filtering deliveries with groupIds: undefined - -Fetching deliveries by date range: 2025-08-01 to 2025-08-31 - -🔍 getUserWithGroups called for user: admin_local - -GET /api/user 304 in 67ms - -GET /api/stats/monthly 304 in 57ms - -Deliveries returned: 40 items - -GET /api/deliveries 304 in 64ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -GET /api/user 304 in 5ms - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -Orders API called with: { - - startDate: '2025-08-01', - - endDate: '2025-08-31', - - storeId: undefined, - - userRole: 'admin' - -} - -Admin filtering with groupIds: undefined - -Fetching orders by date range: 2025-08-01 to 2025-08-31 - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -GET /api/user 304 in 13ms - -Orders returned: 15 items - -GET /api/orders 304 in 111ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -GET /api/user 304 in 7ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -GET /api/groups 304 in 10ms - -HEAD /api/health 200 in 1ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -📄 SPA: Serving index.html for /[object%20Object] - - - - \ No newline at end of file diff --git a/attached_assets/Pasted-ions-Raw-query-result-Processed-0-groups-for-user-admin-local-ge-1754944623748_1754944623748.txt b/attached_assets/Pasted-ions-Raw-query-result-Processed-0-groups-for-user-admin-local-ge-1754944623748_1754944623748.txt deleted file mode 100644 index 4b86903..0000000 --- a/attached_assets/Pasted-ions-Raw-query-result-Processed-0-groups-for-user-admin-local-ge-1754944623748_1754944623748.txt +++ /dev/null @@ -1,208 +0,0 @@ -ions - - - - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -Deliveries API called with: { - - startDate: '2025-08-01', - - endDate: '2025-08-31', - - storeId: '1', - - withBL: undefined, - - userRole: 'admin' - -} - -Admin filtering deliveries with groupIds: [ 1 ] - -Fetching deliveries by date range: 2025-08-01 to 2025-08-31 - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -Orders API called with: { - - startDate: '2025-08-01', - - endDate: '2025-08-31', - - storeId: '1', - - userRole: 'admin' - -} - -Admin filtering with groupIds: [ 1 ] - -Fetching orders by date range: 2025-08-01 to 2025-08-31 - -Deliveries returned: 20 items - -Orders returned: 9 items - -GET /api/orders 304 in 28ms - -GET /api/deliveries 304 in 30ms - -HEAD /api/health 200 in 1ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -📄 SPA: Serving index.html for /[object%20Object] - -HEAD /api/health 200 in 2ms - -HEAD /api/health 200 in 1ms - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -📄 SPA: Serving index.html for /[object%20Object] - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -📄 SPA: Serving index.html for /[object%20Object] - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -📄 SPA: Serving index.html for /[object%20Object] - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -🔍 getUserWithGroups called for user: admin_local - -🔍 Querying user_groups for user: admin_local - -🔍 Found 0 group assignments for user admin_local - -🔍 Raw query result: [] - -✅ Processed 0 groups for user admin_local - -📄 SPA: Serving index.html for /[object%20Object] - - - - \ No newline at end of file diff --git a/attached_assets/image_1752766025066.png b/attached_assets/image_1752766025066.png deleted file mode 100644 index e5c249c..0000000 Binary files a/attached_assets/image_1752766025066.png and /dev/null differ diff --git a/attached_assets/image_1752766464149.png b/attached_assets/image_1752766464149.png deleted file mode 100644 index d2690e0..0000000 Binary files a/attached_assets/image_1752766464149.png and /dev/null differ diff --git a/attached_assets/image_1752766480419.png b/attached_assets/image_1752766480419.png deleted file mode 100644 index c15f31d..0000000 Binary files a/attached_assets/image_1752766480419.png and /dev/null differ diff --git a/attached_assets/image_1752766490182.png b/attached_assets/image_1752766490182.png deleted file mode 100644 index 4cbe479..0000000 Binary files a/attached_assets/image_1752766490182.png and /dev/null differ diff --git a/attached_assets/image_1752766821507.png b/attached_assets/image_1752766821507.png deleted file mode 100644 index 48d5dfe..0000000 Binary files a/attached_assets/image_1752766821507.png and /dev/null differ diff --git a/attached_assets/image_1752766833825.png b/attached_assets/image_1752766833825.png deleted file mode 100644 index abf2f18..0000000 Binary files a/attached_assets/image_1752766833825.png and /dev/null differ diff --git a/attached_assets/image_1752766848888.png b/attached_assets/image_1752766848888.png deleted file mode 100644 index b1e727d..0000000 Binary files a/attached_assets/image_1752766848888.png and /dev/null differ diff --git a/attached_assets/image_1752767258504.png b/attached_assets/image_1752767258504.png deleted file mode 100644 index fece8c2..0000000 Binary files a/attached_assets/image_1752767258504.png and /dev/null differ diff --git a/attached_assets/image_1752767418007.png b/attached_assets/image_1752767418007.png deleted file mode 100644 index 781e9be..0000000 Binary files a/attached_assets/image_1752767418007.png and /dev/null differ diff --git a/attached_assets/image_1752767430055.png b/attached_assets/image_1752767430055.png deleted file mode 100644 index 83cdd91..0000000 Binary files a/attached_assets/image_1752767430055.png and /dev/null differ diff --git a/attached_assets/image_1752767446461.png b/attached_assets/image_1752767446461.png deleted file mode 100644 index 821c04f..0000000 Binary files a/attached_assets/image_1752767446461.png and /dev/null differ diff --git a/attached_assets/image_1752767661266.png b/attached_assets/image_1752767661266.png deleted file mode 100644 index b6b7c43..0000000 Binary files a/attached_assets/image_1752767661266.png and /dev/null differ diff --git a/attached_assets/image_1752767684109.png b/attached_assets/image_1752767684109.png deleted file mode 100644 index fd311e1..0000000 Binary files a/attached_assets/image_1752767684109.png and /dev/null differ diff --git a/attached_assets/image_1752767691981.png b/attached_assets/image_1752767691981.png deleted file mode 100644 index 911c620..0000000 Binary files a/attached_assets/image_1752767691981.png and /dev/null differ diff --git a/attached_assets/image_1752769392661.png b/attached_assets/image_1752769392661.png deleted file mode 100644 index 6f62c2d..0000000 Binary files a/attached_assets/image_1752769392661.png and /dev/null differ diff --git a/attached_assets/image_1752769407218.png b/attached_assets/image_1752769407218.png deleted file mode 100644 index a1c967a..0000000 Binary files a/attached_assets/image_1752769407218.png and /dev/null differ diff --git a/attached_assets/image_1752769420047.png b/attached_assets/image_1752769420047.png deleted file mode 100644 index facdb4d..0000000 Binary files a/attached_assets/image_1752769420047.png and /dev/null differ diff --git a/attached_assets/image_1752771225174.png b/attached_assets/image_1752771225174.png deleted file mode 100644 index c0cd829..0000000 Binary files a/attached_assets/image_1752771225174.png and /dev/null differ diff --git a/attached_assets/image_1752771765779.png b/attached_assets/image_1752771765779.png deleted file mode 100644 index 0390d27..0000000 Binary files a/attached_assets/image_1752771765779.png and /dev/null differ diff --git a/attached_assets/image_1752772428531.png b/attached_assets/image_1752772428531.png deleted file mode 100644 index 4d449ba..0000000 Binary files a/attached_assets/image_1752772428531.png and /dev/null differ diff --git a/attached_assets/image_1752772440846.png b/attached_assets/image_1752772440846.png deleted file mode 100644 index a4430e5..0000000 Binary files a/attached_assets/image_1752772440846.png and /dev/null differ diff --git a/attached_assets/image_1752772451841.png b/attached_assets/image_1752772451841.png deleted file mode 100644 index 10358c7..0000000 Binary files a/attached_assets/image_1752772451841.png and /dev/null differ diff --git a/attached_assets/image_1752773320143.png b/attached_assets/image_1752773320143.png deleted file mode 100644 index 5e0bc0f..0000000 Binary files a/attached_assets/image_1752773320143.png and /dev/null differ diff --git a/attached_assets/image_1752773478420.png b/attached_assets/image_1752773478420.png deleted file mode 100644 index a4f48c7..0000000 Binary files a/attached_assets/image_1752773478420.png and /dev/null differ diff --git a/attached_assets/image_1752773953453.png b/attached_assets/image_1752773953453.png deleted file mode 100644 index b07d6cc..0000000 Binary files a/attached_assets/image_1752773953453.png and /dev/null differ diff --git a/attached_assets/image_1752773965091.png b/attached_assets/image_1752773965091.png deleted file mode 100644 index adb24b7..0000000 Binary files a/attached_assets/image_1752773965091.png and /dev/null differ diff --git a/attached_assets/image_1752775532174.png b/attached_assets/image_1752775532174.png deleted file mode 100644 index d0b8a5c..0000000 Binary files a/attached_assets/image_1752775532174.png and /dev/null differ diff --git a/attached_assets/image_1752775546486.png b/attached_assets/image_1752775546486.png deleted file mode 100644 index 1fbf7e0..0000000 Binary files a/attached_assets/image_1752775546486.png and /dev/null differ diff --git a/attached_assets/image_1752777402539.png b/attached_assets/image_1752777402539.png deleted file mode 100644 index 021ee01..0000000 Binary files a/attached_assets/image_1752777402539.png and /dev/null differ diff --git a/attached_assets/image_1752777417410.png b/attached_assets/image_1752777417410.png deleted file mode 100644 index f5644b1..0000000 Binary files a/attached_assets/image_1752777417410.png and /dev/null differ diff --git a/attached_assets/image_1752777432020.png b/attached_assets/image_1752777432020.png deleted file mode 100644 index f5bafdc..0000000 Binary files a/attached_assets/image_1752777432020.png and /dev/null differ diff --git a/attached_assets/image_1752777446031.png b/attached_assets/image_1752777446031.png deleted file mode 100644 index 75c94ee..0000000 Binary files a/attached_assets/image_1752777446031.png and /dev/null differ diff --git a/attached_assets/image_1752778476256.png b/attached_assets/image_1752778476256.png deleted file mode 100644 index ba952f7..0000000 Binary files a/attached_assets/image_1752778476256.png and /dev/null differ diff --git a/attached_assets/image_1752779250152.png b/attached_assets/image_1752779250152.png deleted file mode 100644 index 1a80859..0000000 Binary files a/attached_assets/image_1752779250152.png and /dev/null differ diff --git a/attached_assets/image_1752779262237.png b/attached_assets/image_1752779262237.png deleted file mode 100644 index 47935d5..0000000 Binary files a/attached_assets/image_1752779262237.png and /dev/null differ diff --git a/attached_assets/image_1752779795804.png b/attached_assets/image_1752779795804.png deleted file mode 100644 index 100357e..0000000 Binary files a/attached_assets/image_1752779795804.png and /dev/null differ diff --git a/attached_assets/image_1752780860294.png b/attached_assets/image_1752780860294.png deleted file mode 100644 index 61c8963..0000000 Binary files a/attached_assets/image_1752780860294.png and /dev/null differ diff --git a/attached_assets/image_1752780878637.png b/attached_assets/image_1752780878637.png deleted file mode 100644 index 66648d3..0000000 Binary files a/attached_assets/image_1752780878637.png and /dev/null differ diff --git a/attached_assets/image_1752781874554.png b/attached_assets/image_1752781874554.png deleted file mode 100644 index 7c5b243..0000000 Binary files a/attached_assets/image_1752781874554.png and /dev/null differ diff --git a/attached_assets/image_1752782368901.png b/attached_assets/image_1752782368901.png deleted file mode 100644 index c18a700..0000000 Binary files a/attached_assets/image_1752782368901.png and /dev/null differ diff --git a/attached_assets/image_1752782746736.png b/attached_assets/image_1752782746736.png deleted file mode 100644 index 0cea7c0..0000000 Binary files a/attached_assets/image_1752782746736.png and /dev/null differ diff --git a/attached_assets/image_1752783126000.png b/attached_assets/image_1752783126000.png deleted file mode 100644 index 96ba1c3..0000000 Binary files a/attached_assets/image_1752783126000.png and /dev/null differ diff --git a/attached_assets/image_1752783301204.png b/attached_assets/image_1752783301204.png deleted file mode 100644 index 37e709e..0000000 Binary files a/attached_assets/image_1752783301204.png and /dev/null differ diff --git a/attached_assets/image_1752783309160.png b/attached_assets/image_1752783309160.png deleted file mode 100644 index a55ad8e..0000000 Binary files a/attached_assets/image_1752783309160.png and /dev/null differ diff --git a/attached_assets/image_1752783652014.png b/attached_assets/image_1752783652014.png deleted file mode 100644 index c12dd7d..0000000 Binary files a/attached_assets/image_1752783652014.png and /dev/null differ diff --git a/attached_assets/image_1752783882954.png b/attached_assets/image_1752783882954.png deleted file mode 100644 index b9aae37..0000000 Binary files a/attached_assets/image_1752783882954.png and /dev/null differ diff --git a/attached_assets/image_1752784161800.png b/attached_assets/image_1752784161800.png deleted file mode 100644 index c682fc3..0000000 Binary files a/attached_assets/image_1752784161800.png and /dev/null differ diff --git a/attached_assets/image_1752784500876.png b/attached_assets/image_1752784500876.png deleted file mode 100644 index e49703a..0000000 Binary files a/attached_assets/image_1752784500876.png and /dev/null differ diff --git a/attached_assets/image_1752784653474.png b/attached_assets/image_1752784653474.png deleted file mode 100644 index b1d8131..0000000 Binary files a/attached_assets/image_1752784653474.png and /dev/null differ diff --git a/attached_assets/image_1752784708889.png b/attached_assets/image_1752784708889.png deleted file mode 100644 index 143ad45..0000000 Binary files a/attached_assets/image_1752784708889.png and /dev/null differ diff --git a/attached_assets/image_1752784915937.png b/attached_assets/image_1752784915937.png deleted file mode 100644 index 5e64afe..0000000 Binary files a/attached_assets/image_1752784915937.png and /dev/null differ diff --git a/attached_assets/image_1752785793545.png b/attached_assets/image_1752785793545.png deleted file mode 100644 index 1f93e05..0000000 Binary files a/attached_assets/image_1752785793545.png and /dev/null differ diff --git a/attached_assets/image_1752786081511.png b/attached_assets/image_1752786081511.png deleted file mode 100644 index a696c14..0000000 Binary files a/attached_assets/image_1752786081511.png and /dev/null differ diff --git a/attached_assets/image_1752786293718.png b/attached_assets/image_1752786293718.png deleted file mode 100644 index 8331daa..0000000 Binary files a/attached_assets/image_1752786293718.png and /dev/null differ diff --git a/attached_assets/image_1752786513943.png b/attached_assets/image_1752786513943.png deleted file mode 100644 index efcb8c2..0000000 Binary files a/attached_assets/image_1752786513943.png and /dev/null differ diff --git a/attached_assets/image_1752787356602.png b/attached_assets/image_1752787356602.png deleted file mode 100644 index 83ec428..0000000 Binary files a/attached_assets/image_1752787356602.png and /dev/null differ diff --git a/attached_assets/image_1752787679865.png b/attached_assets/image_1752787679865.png deleted file mode 100644 index 362b1cb..0000000 Binary files a/attached_assets/image_1752787679865.png and /dev/null differ diff --git a/attached_assets/image_1752787989742.png b/attached_assets/image_1752787989742.png deleted file mode 100644 index 3c9d56c..0000000 Binary files a/attached_assets/image_1752787989742.png and /dev/null differ diff --git a/attached_assets/image_1752788964597.png b/attached_assets/image_1752788964597.png deleted file mode 100644 index da49db3..0000000 Binary files a/attached_assets/image_1752788964597.png and /dev/null differ diff --git a/attached_assets/image_1752849165698.png b/attached_assets/image_1752849165698.png deleted file mode 100644 index d06108f..0000000 Binary files a/attached_assets/image_1752849165698.png and /dev/null differ diff --git a/attached_assets/image_1752849370460.png b/attached_assets/image_1752849370460.png deleted file mode 100644 index 48eede2..0000000 Binary files a/attached_assets/image_1752849370460.png and /dev/null differ diff --git a/attached_assets/image_1752849820341.png b/attached_assets/image_1752849820341.png deleted file mode 100644 index e78049e..0000000 Binary files a/attached_assets/image_1752849820341.png and /dev/null differ diff --git a/attached_assets/image_1752850101293.png b/attached_assets/image_1752850101293.png deleted file mode 100644 index 3ce313e..0000000 Binary files a/attached_assets/image_1752850101293.png and /dev/null differ diff --git a/attached_assets/image_1752850706979.png b/attached_assets/image_1752850706979.png deleted file mode 100644 index d9c92ad..0000000 Binary files a/attached_assets/image_1752850706979.png and /dev/null differ diff --git a/attached_assets/image_1752851073078.png b/attached_assets/image_1752851073078.png deleted file mode 100644 index 94a500a..0000000 Binary files a/attached_assets/image_1752851073078.png and /dev/null differ diff --git a/attached_assets/image_1752851081124.png b/attached_assets/image_1752851081124.png deleted file mode 100644 index 296f123..0000000 Binary files a/attached_assets/image_1752851081124.png and /dev/null differ diff --git a/attached_assets/image_1752851354808.png b/attached_assets/image_1752851354808.png deleted file mode 100644 index 0bf1d5a..0000000 Binary files a/attached_assets/image_1752851354808.png and /dev/null differ diff --git a/attached_assets/image_1752851424685.png b/attached_assets/image_1752851424685.png deleted file mode 100644 index 282dfac..0000000 Binary files a/attached_assets/image_1752851424685.png and /dev/null differ diff --git a/attached_assets/image_1752852210421.png b/attached_assets/image_1752852210421.png deleted file mode 100644 index 158f473..0000000 Binary files a/attached_assets/image_1752852210421.png and /dev/null differ diff --git a/attached_assets/image_1752853991222.png b/attached_assets/image_1752853991222.png deleted file mode 100644 index d6a7546..0000000 Binary files a/attached_assets/image_1752853991222.png and /dev/null differ diff --git a/attached_assets/image_1752854253640.png b/attached_assets/image_1752854253640.png deleted file mode 100644 index 4755aec..0000000 Binary files a/attached_assets/image_1752854253640.png and /dev/null differ diff --git a/attached_assets/image_1752854720451.png b/attached_assets/image_1752854720451.png deleted file mode 100644 index cbe7508..0000000 Binary files a/attached_assets/image_1752854720451.png and /dev/null differ diff --git a/attached_assets/image_1752856138351.png b/attached_assets/image_1752856138351.png deleted file mode 100644 index 9d40622..0000000 Binary files a/attached_assets/image_1752856138351.png and /dev/null differ diff --git a/attached_assets/image_1752856242407.png b/attached_assets/image_1752856242407.png deleted file mode 100644 index 1874f94..0000000 Binary files a/attached_assets/image_1752856242407.png and /dev/null differ diff --git a/attached_assets/image_1752856283569.png b/attached_assets/image_1752856283569.png deleted file mode 100644 index cf9efa5..0000000 Binary files a/attached_assets/image_1752856283569.png and /dev/null differ diff --git a/attached_assets/image_1752861618160.png b/attached_assets/image_1752861618160.png deleted file mode 100644 index 5bd8789..0000000 Binary files a/attached_assets/image_1752861618160.png and /dev/null differ diff --git a/attached_assets/image_1752861678028.png b/attached_assets/image_1752861678028.png deleted file mode 100644 index 80acd3f..0000000 Binary files a/attached_assets/image_1752861678028.png and /dev/null differ diff --git a/attached_assets/image_1752862717543.png b/attached_assets/image_1752862717543.png deleted file mode 100644 index d5b248b..0000000 Binary files a/attached_assets/image_1752862717543.png and /dev/null differ diff --git a/attached_assets/image_1752863404767.png b/attached_assets/image_1752863404767.png deleted file mode 100644 index 9d9448f..0000000 Binary files a/attached_assets/image_1752863404767.png and /dev/null differ diff --git a/attached_assets/image_1752866013504.png b/attached_assets/image_1752866013504.png deleted file mode 100644 index d80c051..0000000 Binary files a/attached_assets/image_1752866013504.png and /dev/null differ diff --git a/attached_assets/image_1752866368662.png b/attached_assets/image_1752866368662.png deleted file mode 100644 index 47808b4..0000000 Binary files a/attached_assets/image_1752866368662.png and /dev/null differ diff --git a/attached_assets/image_1752866433245.png b/attached_assets/image_1752866433245.png deleted file mode 100644 index 917bad4..0000000 Binary files a/attached_assets/image_1752866433245.png and /dev/null differ diff --git a/attached_assets/image_1752867231289.png b/attached_assets/image_1752867231289.png deleted file mode 100644 index 1c1da9e..0000000 Binary files a/attached_assets/image_1752867231289.png and /dev/null differ diff --git a/attached_assets/image_1752868755962.png b/attached_assets/image_1752868755962.png deleted file mode 100644 index 5de54b4..0000000 Binary files a/attached_assets/image_1752868755962.png and /dev/null differ diff --git a/attached_assets/image_1752870195952.png b/attached_assets/image_1752870195952.png deleted file mode 100644 index ccb74b9..0000000 Binary files a/attached_assets/image_1752870195952.png and /dev/null differ diff --git a/attached_assets/image_1752870206570.png b/attached_assets/image_1752870206570.png deleted file mode 100644 index 86d826e..0000000 Binary files a/attached_assets/image_1752870206570.png and /dev/null differ diff --git a/attached_assets/image_1752870216070.png b/attached_assets/image_1752870216070.png deleted file mode 100644 index dd6cbe0..0000000 Binary files a/attached_assets/image_1752870216070.png and /dev/null differ diff --git a/attached_assets/image_1752870872668.png b/attached_assets/image_1752870872668.png deleted file mode 100644 index ef6a19e..0000000 Binary files a/attached_assets/image_1752870872668.png and /dev/null differ diff --git a/attached_assets/image_1752870982195.png b/attached_assets/image_1752870982195.png deleted file mode 100644 index 8769327..0000000 Binary files a/attached_assets/image_1752870982195.png and /dev/null differ diff --git a/attached_assets/image_1752871195279.png b/attached_assets/image_1752871195279.png deleted file mode 100644 index 3a1791a..0000000 Binary files a/attached_assets/image_1752871195279.png and /dev/null differ diff --git a/attached_assets/image_1752871686017.png b/attached_assets/image_1752871686017.png deleted file mode 100644 index cc077e0..0000000 Binary files a/attached_assets/image_1752871686017.png and /dev/null differ diff --git a/attached_assets/image_1752871797411.png b/attached_assets/image_1752871797411.png deleted file mode 100644 index 71386fe..0000000 Binary files a/attached_assets/image_1752871797411.png and /dev/null differ diff --git a/attached_assets/image_1752871856908.png b/attached_assets/image_1752871856908.png deleted file mode 100644 index 71386fe..0000000 Binary files a/attached_assets/image_1752871856908.png and /dev/null differ diff --git a/attached_assets/image_1752872286785.png b/attached_assets/image_1752872286785.png deleted file mode 100644 index cece444..0000000 Binary files a/attached_assets/image_1752872286785.png and /dev/null differ diff --git a/attached_assets/image_1752872330874.png b/attached_assets/image_1752872330874.png deleted file mode 100644 index 728c335..0000000 Binary files a/attached_assets/image_1752872330874.png and /dev/null differ diff --git a/attached_assets/image_1752872369259.png b/attached_assets/image_1752872369259.png deleted file mode 100644 index 576534f..0000000 Binary files a/attached_assets/image_1752872369259.png and /dev/null differ diff --git a/attached_assets/image_1752872587413.png b/attached_assets/image_1752872587413.png deleted file mode 100644 index f40eced..0000000 Binary files a/attached_assets/image_1752872587413.png and /dev/null differ diff --git a/attached_assets/image_1752873198754.png b/attached_assets/image_1752873198754.png deleted file mode 100644 index db68555..0000000 Binary files a/attached_assets/image_1752873198754.png and /dev/null differ diff --git a/attached_assets/image_1752873380134.png b/attached_assets/image_1752873380134.png deleted file mode 100644 index 2677229..0000000 Binary files a/attached_assets/image_1752873380134.png and /dev/null differ diff --git a/attached_assets/image_1754927312405.png b/attached_assets/image_1754927312405.png deleted file mode 100644 index 4204181..0000000 Binary files a/attached_assets/image_1754927312405.png and /dev/null differ diff --git a/attached_assets/image_1754927463961.png b/attached_assets/image_1754927463961.png deleted file mode 100644 index f9df289..0000000 Binary files a/attached_assets/image_1754927463961.png and /dev/null differ diff --git a/attached_assets/image_1754928367370.png b/attached_assets/image_1754928367370.png deleted file mode 100644 index 06b2022..0000000 Binary files a/attached_assets/image_1754928367370.png and /dev/null differ diff --git a/attached_assets/image_1754928646763.png b/attached_assets/image_1754928646763.png deleted file mode 100644 index 32c3453..0000000 Binary files a/attached_assets/image_1754928646763.png and /dev/null differ diff --git a/attached_assets/image_1754929849430.png b/attached_assets/image_1754929849430.png deleted file mode 100644 index 98ea59f..0000000 Binary files a/attached_assets/image_1754929849430.png and /dev/null differ diff --git a/attached_assets/image_1754934559795.png b/attached_assets/image_1754934559795.png deleted file mode 100644 index fc3ce2d..0000000 Binary files a/attached_assets/image_1754934559795.png and /dev/null differ diff --git a/attached_assets/image_1754935107751.png b/attached_assets/image_1754935107751.png deleted file mode 100644 index d5884af..0000000 Binary files a/attached_assets/image_1754935107751.png and /dev/null differ diff --git a/attached_assets/image_1754935627291.png b/attached_assets/image_1754935627291.png deleted file mode 100644 index d659ead..0000000 Binary files a/attached_assets/image_1754935627291.png and /dev/null differ diff --git a/attached_assets/image_1754935721553.png b/attached_assets/image_1754935721553.png deleted file mode 100644 index 5ac9528..0000000 Binary files a/attached_assets/image_1754935721553.png and /dev/null differ diff --git a/attached_assets/image_1754935736068.png b/attached_assets/image_1754935736068.png deleted file mode 100644 index 5ac9528..0000000 Binary files a/attached_assets/image_1754935736068.png and /dev/null differ diff --git a/attached_assets/image_1754936742486.png b/attached_assets/image_1754936742486.png deleted file mode 100644 index bf3e341..0000000 Binary files a/attached_assets/image_1754936742486.png and /dev/null differ diff --git a/attached_assets/image_1754936873392.png b/attached_assets/image_1754936873392.png deleted file mode 100644 index 99b026c..0000000 Binary files a/attached_assets/image_1754936873392.png and /dev/null differ diff --git a/attached_assets/image_1754937206418.png b/attached_assets/image_1754937206418.png deleted file mode 100644 index 7be6cfa..0000000 Binary files a/attached_assets/image_1754937206418.png and /dev/null differ diff --git a/attached_assets/image_1754937586408.png b/attached_assets/image_1754937586408.png deleted file mode 100644 index cdd91fb..0000000 Binary files a/attached_assets/image_1754937586408.png and /dev/null differ diff --git a/attached_assets/image_1754940238213.png b/attached_assets/image_1754940238213.png deleted file mode 100644 index 21d25ff..0000000 Binary files a/attached_assets/image_1754940238213.png and /dev/null differ diff --git a/attached_assets/image_1754940275041.png b/attached_assets/image_1754940275041.png deleted file mode 100644 index 3cfcb2d..0000000 Binary files a/attached_assets/image_1754940275041.png and /dev/null differ diff --git a/attached_assets/image_1754940633122.png b/attached_assets/image_1754940633122.png deleted file mode 100644 index 363436d..0000000 Binary files a/attached_assets/image_1754940633122.png and /dev/null differ diff --git a/attached_assets/image_1754941049134.png b/attached_assets/image_1754941049134.png deleted file mode 100644 index a910360..0000000 Binary files a/attached_assets/image_1754941049134.png and /dev/null differ diff --git a/attached_assets/image_1754941198941.png b/attached_assets/image_1754941198941.png deleted file mode 100644 index b70751a..0000000 Binary files a/attached_assets/image_1754941198941.png and /dev/null differ diff --git a/attached_assets/image_1754941240030.png b/attached_assets/image_1754941240030.png deleted file mode 100644 index 526a840..0000000 Binary files a/attached_assets/image_1754941240030.png and /dev/null differ diff --git a/attached_assets/image_1754941438794.png b/attached_assets/image_1754941438794.png deleted file mode 100644 index 5253589..0000000 Binary files a/attached_assets/image_1754941438794.png and /dev/null differ diff --git a/attached_assets/image_1754941674961.png b/attached_assets/image_1754941674961.png deleted file mode 100644 index e9523ad..0000000 Binary files a/attached_assets/image_1754941674961.png and /dev/null differ diff --git a/attached_assets/image_1754941873531.png b/attached_assets/image_1754941873531.png deleted file mode 100644 index e2a601c..0000000 Binary files a/attached_assets/image_1754941873531.png and /dev/null differ diff --git a/attached_assets/image_1754942095938.png b/attached_assets/image_1754942095938.png deleted file mode 100644 index de0814d..0000000 Binary files a/attached_assets/image_1754942095938.png and /dev/null differ diff --git a/attached_assets/image_1754942324848.png b/attached_assets/image_1754942324848.png deleted file mode 100644 index dba6ab9..0000000 Binary files a/attached_assets/image_1754942324848.png and /dev/null differ diff --git a/attached_assets/image_1754942591562.png b/attached_assets/image_1754942591562.png deleted file mode 100644 index 47ec2df..0000000 Binary files a/attached_assets/image_1754942591562.png and /dev/null differ diff --git a/attached_assets/image_1754942828642.png b/attached_assets/image_1754942828642.png deleted file mode 100644 index ac8d34b..0000000 Binary files a/attached_assets/image_1754942828642.png and /dev/null differ diff --git a/attached_assets/image_1754943064930.png b/attached_assets/image_1754943064930.png deleted file mode 100644 index 965c97b..0000000 Binary files a/attached_assets/image_1754943064930.png and /dev/null differ diff --git a/attached_assets/image_1754943664463.png b/attached_assets/image_1754943664463.png deleted file mode 100644 index 061fc24..0000000 Binary files a/attached_assets/image_1754943664463.png and /dev/null differ diff --git a/attached_assets/image_1754944126059.png b/attached_assets/image_1754944126059.png deleted file mode 100644 index 93f82e9..0000000 Binary files a/attached_assets/image_1754944126059.png and /dev/null differ diff --git a/attached_assets/image_1754944243764.png b/attached_assets/image_1754944243764.png deleted file mode 100644 index 529ce87..0000000 Binary files a/attached_assets/image_1754944243764.png and /dev/null differ diff --git a/attached_assets/image_1754944449064.png b/attached_assets/image_1754944449064.png deleted file mode 100644 index 559f93c..0000000 Binary files a/attached_assets/image_1754944449064.png and /dev/null differ diff --git a/attached_assets/image_1754944537680.png b/attached_assets/image_1754944537680.png deleted file mode 100644 index 50a2944..0000000 Binary files a/attached_assets/image_1754944537680.png and /dev/null differ diff --git a/attached_assets/image_1754944580886.png b/attached_assets/image_1754944580886.png deleted file mode 100644 index 50a2944..0000000 Binary files a/attached_assets/image_1754944580886.png and /dev/null differ diff --git a/attached_assets/image_1754944615419.png b/attached_assets/image_1754944615419.png deleted file mode 100644 index c04450c..0000000 Binary files a/attached_assets/image_1754944615419.png and /dev/null differ diff --git a/attached_assets/image_1754944779506.png b/attached_assets/image_1754944779506.png deleted file mode 100644 index 87d3502..0000000 Binary files a/attached_assets/image_1754944779506.png and /dev/null differ diff --git a/attached_assets/image_1754944953948.png b/attached_assets/image_1754944953948.png deleted file mode 100644 index 5c55046..0000000 Binary files a/attached_assets/image_1754944953948.png and /dev/null differ diff --git a/attached_assets/image_1754945642796.png b/attached_assets/image_1754945642796.png deleted file mode 100644 index 0b46e81..0000000 Binary files a/attached_assets/image_1754945642796.png and /dev/null differ diff --git a/attached_assets/image_1754946213927.png b/attached_assets/image_1754946213927.png deleted file mode 100644 index 5e38dbb..0000000 Binary files a/attached_assets/image_1754946213927.png and /dev/null differ diff --git a/attached_assets/image_1754946503284.png b/attached_assets/image_1754946503284.png deleted file mode 100644 index 1a66a98..0000000 Binary files a/attached_assets/image_1754946503284.png and /dev/null differ diff --git a/attached_assets/image_1754946758521.png b/attached_assets/image_1754946758521.png deleted file mode 100644 index 40f4c15..0000000 Binary files a/attached_assets/image_1754946758521.png and /dev/null differ diff --git a/attached_assets/image_1754946916384.png b/attached_assets/image_1754946916384.png deleted file mode 100644 index 4f601d8..0000000 Binary files a/attached_assets/image_1754946916384.png and /dev/null differ diff --git a/attached_assets/image_1754947079230.png b/attached_assets/image_1754947079230.png deleted file mode 100644 index 3765717..0000000 Binary files a/attached_assets/image_1754947079230.png and /dev/null differ diff --git a/attached_assets/image_1754947130971.png b/attached_assets/image_1754947130971.png deleted file mode 100644 index 3765717..0000000 Binary files a/attached_assets/image_1754947130971.png and /dev/null differ diff --git a/attached_assets/image_1754947197975.png b/attached_assets/image_1754947197975.png deleted file mode 100644 index 3765717..0000000 Binary files a/attached_assets/image_1754947197975.png and /dev/null differ diff --git a/attached_assets/image_1754947430630.png b/attached_assets/image_1754947430630.png deleted file mode 100644 index 4774539..0000000 Binary files a/attached_assets/image_1754947430630.png and /dev/null differ diff --git a/attached_assets/image_1754947823130.png b/attached_assets/image_1754947823130.png deleted file mode 100644 index 11db6a4..0000000 Binary files a/attached_assets/image_1754947823130.png and /dev/null differ diff --git a/attached_assets/image_1754948003757.png b/attached_assets/image_1754948003757.png deleted file mode 100644 index a1a5287..0000000 Binary files a/attached_assets/image_1754948003757.png and /dev/null differ diff --git a/attached_assets/image_1755015147302.png b/attached_assets/image_1755015147302.png deleted file mode 100644 index 6760a9d..0000000 Binary files a/attached_assets/image_1755015147302.png and /dev/null differ diff --git a/attached_assets/{04C31A6E-E082-4C70-BCCD-A3021D2DE73B}_1755005296646.png b/attached_assets/{04C31A6E-E082-4C70-BCCD-A3021D2DE73B}_1755005296646.png deleted file mode 100644 index 3c7acdf..0000000 Binary files a/attached_assets/{04C31A6E-E082-4C70-BCCD-A3021D2DE73B}_1755005296646.png and /dev/null differ diff --git a/attached_assets/{0978F662-7351-4203-B569-6E97C74BDA98}_1754987491374.png b/attached_assets/{0978F662-7351-4203-B569-6E97C74BDA98}_1754987491374.png deleted file mode 100644 index 205e84c..0000000 Binary files a/attached_assets/{0978F662-7351-4203-B569-6E97C74BDA98}_1754987491374.png and /dev/null differ diff --git a/attached_assets/{0BF0A44D-52E5-4F5B-91DC-6A324D45044E}_1755006376031.png b/attached_assets/{0BF0A44D-52E5-4F5B-91DC-6A324D45044E}_1755006376031.png deleted file mode 100644 index 9812220..0000000 Binary files a/attached_assets/{0BF0A44D-52E5-4F5B-91DC-6A324D45044E}_1755006376031.png and /dev/null differ diff --git a/attached_assets/{15611991-6334-4433-8D89-777AA7BB04F6}_1755013005997.png b/attached_assets/{15611991-6334-4433-8D89-777AA7BB04F6}_1755013005997.png deleted file mode 100644 index b78bf9f..0000000 Binary files a/attached_assets/{15611991-6334-4433-8D89-777AA7BB04F6}_1755013005997.png and /dev/null differ diff --git a/attached_assets/{15FA3613-084B-4C65-9137-D8D3FF33CD34}_1755006743271.png b/attached_assets/{15FA3613-084B-4C65-9137-D8D3FF33CD34}_1755006743271.png deleted file mode 100644 index f84c90a..0000000 Binary files a/attached_assets/{15FA3613-084B-4C65-9137-D8D3FF33CD34}_1755006743271.png and /dev/null differ diff --git a/attached_assets/{192C59D5-006D-462C-8642-17012D06A969}_1755008500055.png b/attached_assets/{192C59D5-006D-462C-8642-17012D06A969}_1755008500055.png deleted file mode 100644 index 95b620e..0000000 Binary files a/attached_assets/{192C59D5-006D-462C-8642-17012D06A969}_1755008500055.png and /dev/null differ diff --git a/attached_assets/{196C82CB-1B5E-465C-8E2E-2085A6374715}_1754994443183.png b/attached_assets/{196C82CB-1B5E-465C-8E2E-2085A6374715}_1754994443183.png deleted file mode 100644 index 51e8462..0000000 Binary files a/attached_assets/{196C82CB-1B5E-465C-8E2E-2085A6374715}_1754994443183.png and /dev/null differ diff --git a/attached_assets/{29BD8749-1C84-4FD4-A3F3-A8546D5534B7}_1755005668941.png b/attached_assets/{29BD8749-1C84-4FD4-A3F3-A8546D5534B7}_1755005668941.png deleted file mode 100644 index 532f2bd..0000000 Binary files a/attached_assets/{29BD8749-1C84-4FD4-A3F3-A8546D5534B7}_1755005668941.png and /dev/null differ diff --git a/attached_assets/{394F47D1-C025-41C6-B09E-E00D24D11D3F}_1755012123378.png b/attached_assets/{394F47D1-C025-41C6-B09E-E00D24D11D3F}_1755012123378.png deleted file mode 100644 index 14821f7..0000000 Binary files a/attached_assets/{394F47D1-C025-41C6-B09E-E00D24D11D3F}_1755012123378.png and /dev/null differ diff --git a/attached_assets/{3BC0ADAC-F56E-4D6F-B047-AF545AA1CB04}_1754925273921.png b/attached_assets/{3BC0ADAC-F56E-4D6F-B047-AF545AA1CB04}_1754925273921.png deleted file mode 100644 index 5aeffa6..0000000 Binary files a/attached_assets/{3BC0ADAC-F56E-4D6F-B047-AF545AA1CB04}_1754925273921.png and /dev/null differ diff --git a/attached_assets/{41342A2B-B6D0-4AAF-8D84-B01E40DFEFC5}_1755010460434.png b/attached_assets/{41342A2B-B6D0-4AAF-8D84-B01E40DFEFC5}_1755010460434.png deleted file mode 100644 index 96e2b85..0000000 Binary files a/attached_assets/{41342A2B-B6D0-4AAF-8D84-B01E40DFEFC5}_1755010460434.png and /dev/null differ diff --git a/attached_assets/{41E896A3-9301-4C3E-AB6A-195D11ECE3F0}_1755006693645.png b/attached_assets/{41E896A3-9301-4C3E-AB6A-195D11ECE3F0}_1755006693645.png deleted file mode 100644 index 30ba41b..0000000 Binary files a/attached_assets/{41E896A3-9301-4C3E-AB6A-195D11ECE3F0}_1755006693645.png and /dev/null differ diff --git a/attached_assets/{47A315E2-C868-4AFE-9075-979FD56A1D12}_1754995609289.png b/attached_assets/{47A315E2-C868-4AFE-9075-979FD56A1D12}_1754995609289.png deleted file mode 100644 index 428c36b..0000000 Binary files a/attached_assets/{47A315E2-C868-4AFE-9075-979FD56A1D12}_1754995609289.png and /dev/null differ diff --git a/attached_assets/{4EF913A6-C82F-45EB-AFDC-7791EC5CF5D5}_1755007779494.png b/attached_assets/{4EF913A6-C82F-45EB-AFDC-7791EC5CF5D5}_1755007779494.png deleted file mode 100644 index 5ec8c53..0000000 Binary files a/attached_assets/{4EF913A6-C82F-45EB-AFDC-7791EC5CF5D5}_1755007779494.png and /dev/null differ diff --git a/attached_assets/{4FFC2F69-0BF9-46C2-9AEB-7F4B97E326F0}_1755005966227.png b/attached_assets/{4FFC2F69-0BF9-46C2-9AEB-7F4B97E326F0}_1755005966227.png deleted file mode 100644 index ac84fa0..0000000 Binary files a/attached_assets/{4FFC2F69-0BF9-46C2-9AEB-7F4B97E326F0}_1755005966227.png and /dev/null differ diff --git a/attached_assets/{6B8A9306-D258-4800-A65A-86DC1D0A236C}_1754924926047.png b/attached_assets/{6B8A9306-D258-4800-A65A-86DC1D0A236C}_1754924926047.png deleted file mode 100644 index ed0066a..0000000 Binary files a/attached_assets/{6B8A9306-D258-4800-A65A-86DC1D0A236C}_1754924926047.png and /dev/null differ diff --git a/attached_assets/{6BF8C496-8BDD-4DCD-AD06-5E60F90EBCE9}_1754996898430.png b/attached_assets/{6BF8C496-8BDD-4DCD-AD06-5E60F90EBCE9}_1754996898430.png deleted file mode 100644 index 79c4b2f..0000000 Binary files a/attached_assets/{6BF8C496-8BDD-4DCD-AD06-5E60F90EBCE9}_1754996898430.png and /dev/null differ diff --git a/attached_assets/{6DA6AB2E-F626-4C12-B816-7F4EC8BA4D4A}_1755011550725.png b/attached_assets/{6DA6AB2E-F626-4C12-B816-7F4EC8BA4D4A}_1755011550725.png deleted file mode 100644 index f9cb48a..0000000 Binary files a/attached_assets/{6DA6AB2E-F626-4C12-B816-7F4EC8BA4D4A}_1755011550725.png and /dev/null differ diff --git a/attached_assets/{70D1374F-538C-4724-9532-8C6E54E4FBCE}_1754998054097.png b/attached_assets/{70D1374F-538C-4724-9532-8C6E54E4FBCE}_1754998054097.png deleted file mode 100644 index ef259a3..0000000 Binary files a/attached_assets/{70D1374F-538C-4724-9532-8C6E54E4FBCE}_1754998054097.png and /dev/null differ diff --git a/attached_assets/{770C1358-C0B0-4F25-9E82-6BB1092546C6}_1755002679357.png b/attached_assets/{770C1358-C0B0-4F25-9E82-6BB1092546C6}_1755002679357.png deleted file mode 100644 index 4a0a3a3..0000000 Binary files a/attached_assets/{770C1358-C0B0-4F25-9E82-6BB1092546C6}_1755002679357.png and /dev/null differ diff --git a/attached_assets/{78C105AD-BD53-4D7E-BF93-C1EF197A0988}_1754995961515.png b/attached_assets/{78C105AD-BD53-4D7E-BF93-C1EF197A0988}_1754995961515.png deleted file mode 100644 index 52f8721..0000000 Binary files a/attached_assets/{78C105AD-BD53-4D7E-BF93-C1EF197A0988}_1754995961515.png and /dev/null differ diff --git a/attached_assets/{78D671ED-C43E-41B0-838C-F9066C944DE4}_1755012433773.png b/attached_assets/{78D671ED-C43E-41B0-838C-F9066C944DE4}_1755012433773.png deleted file mode 100644 index ee394d5..0000000 Binary files a/attached_assets/{78D671ED-C43E-41B0-838C-F9066C944DE4}_1755012433773.png and /dev/null differ diff --git a/attached_assets/{8C7798C2-E7A7-4548-AEF4-43D9576796B3}_1754988741867.png b/attached_assets/{8C7798C2-E7A7-4548-AEF4-43D9576796B3}_1754988741867.png deleted file mode 100644 index 1d99880..0000000 Binary files a/attached_assets/{8C7798C2-E7A7-4548-AEF4-43D9576796B3}_1754988741867.png and /dev/null differ diff --git a/attached_assets/{8C93A7A2-1A60-4CA5-BFDF-EAA969D8C50E}_1755006306671.png b/attached_assets/{8C93A7A2-1A60-4CA5-BFDF-EAA969D8C50E}_1755006306671.png deleted file mode 100644 index 3fa95f2..0000000 Binary files a/attached_assets/{8C93A7A2-1A60-4CA5-BFDF-EAA969D8C50E}_1755006306671.png and /dev/null differ diff --git a/attached_assets/{9356B5AA-6F49-4981-BF70-054DC239AAA0}_1754996399645.png b/attached_assets/{9356B5AA-6F49-4981-BF70-054DC239AAA0}_1754996399645.png deleted file mode 100644 index 127a0f0..0000000 Binary files a/attached_assets/{9356B5AA-6F49-4981-BF70-054DC239AAA0}_1754996399645.png and /dev/null differ diff --git a/attached_assets/{A8ADEA18-2833-4D19-854B-2F8A035B13D5}_1754923509505.png b/attached_assets/{A8ADEA18-2833-4D19-854B-2F8A035B13D5}_1754923509505.png deleted file mode 100644 index 14a4c05..0000000 Binary files a/attached_assets/{A8ADEA18-2833-4D19-854B-2F8A035B13D5}_1754923509505.png and /dev/null differ diff --git a/attached_assets/{AC351FEE-BC19-401B-8F42-FBCC89BBAEDB}_1755013256979.png b/attached_assets/{AC351FEE-BC19-401B-8F42-FBCC89BBAEDB}_1755013256979.png deleted file mode 100644 index 121528f..0000000 Binary files a/attached_assets/{AC351FEE-BC19-401B-8F42-FBCC89BBAEDB}_1755013256979.png and /dev/null differ diff --git a/attached_assets/{B140BADE-D8C9-4DA2-92B3-E3E4AE043049}_1755007441143.png b/attached_assets/{B140BADE-D8C9-4DA2-92B3-E3E4AE043049}_1755007441143.png deleted file mode 100644 index 9eb1de0..0000000 Binary files a/attached_assets/{B140BADE-D8C9-4DA2-92B3-E3E4AE043049}_1755007441143.png and /dev/null differ diff --git a/attached_assets/{C0EB3F72-6919-46C0-A54C-84D869D92459}_1755005798705.png b/attached_assets/{C0EB3F72-6919-46C0-A54C-84D869D92459}_1755005798705.png deleted file mode 100644 index fa5fcf1..0000000 Binary files a/attached_assets/{C0EB3F72-6919-46C0-A54C-84D869D92459}_1755005798705.png and /dev/null differ diff --git a/attached_assets/{CE12C1A0-A0CB-49B6-A208-5377CA2E9FE3}_1754986220953.png b/attached_assets/{CE12C1A0-A0CB-49B6-A208-5377CA2E9FE3}_1754986220953.png deleted file mode 100644 index 7cac13a..0000000 Binary files a/attached_assets/{CE12C1A0-A0CB-49B6-A208-5377CA2E9FE3}_1754986220953.png and /dev/null differ diff --git a/attached_assets/{DFCCD614-BF99-4F78-845B-737CFC16AF4D}_1755006833150.png b/attached_assets/{DFCCD614-BF99-4F78-845B-737CFC16AF4D}_1755006833150.png deleted file mode 100644 index 24ca636..0000000 Binary files a/attached_assets/{DFCCD614-BF99-4F78-845B-737CFC16AF4D}_1755006833150.png and /dev/null differ diff --git a/attached_assets/{E6E79F46-7D13-4B31-859C-5957C0D12A79}_1754998968767.png b/attached_assets/{E6E79F46-7D13-4B31-859C-5957C0D12A79}_1754998968767.png deleted file mode 100644 index f190dc6..0000000 Binary files a/attached_assets/{E6E79F46-7D13-4B31-859C-5957C0D12A79}_1754998968767.png and /dev/null differ diff --git a/attached_assets/{E90CACDC-1E90-4AAF-8458-22BC13DF5B30}_1754998300995.png b/attached_assets/{E90CACDC-1E90-4AAF-8458-22BC13DF5B30}_1754998300995.png deleted file mode 100644 index 1f5140f..0000000 Binary files a/attached_assets/{E90CACDC-1E90-4AAF-8458-22BC13DF5B30}_1754998300995.png and /dev/null differ diff --git a/attached_assets/{EBE743A0-E190-4BE7-84A1-DEBE974124BA}_1754998681214.png b/attached_assets/{EBE743A0-E190-4BE7-84A1-DEBE974124BA}_1754998681214.png deleted file mode 100644 index 6c38f7b..0000000 Binary files a/attached_assets/{EBE743A0-E190-4BE7-84A1-DEBE974124BA}_1754998681214.png and /dev/null differ diff --git a/attached_assets/{F3D194AF-8FB6-4D0B-8963-F3959CF3A5F3}_1755010018200.png b/attached_assets/{F3D194AF-8FB6-4D0B-8963-F3959CF3A5F3}_1755010018200.png deleted file mode 100644 index d9a380c..0000000 Binary files a/attached_assets/{F3D194AF-8FB6-4D0B-8963-F3959CF3A5F3}_1755010018200.png and /dev/null differ diff --git a/attached_assets/{F54D13AD-6172-448A-8400-791459169E36}_1755007044787.png b/attached_assets/{F54D13AD-6172-448A-8400-791459169E36}_1755007044787.png deleted file mode 100644 index 238fc0f..0000000 Binary files a/attached_assets/{F54D13AD-6172-448A-8400-791459169E36}_1755007044787.png and /dev/null differ diff --git a/attached_assets/{F8DF25B7-AAB8-4266-9F4E-3717C4CA43C3}_1754989295935.png b/attached_assets/{F8DF25B7-AAB8-4266-9F4E-3717C4CA43C3}_1754989295935.png deleted file mode 100644 index 45928ca..0000000 Binary files a/attached_assets/{F8DF25B7-AAB8-4266-9F4E-3717C4CA43C3}_1754989295935.png and /dev/null differ diff --git a/attached_assets/{FB7EC083-1E79-4A38-8599-3300B363A960}_1755008238157.png b/attached_assets/{FB7EC083-1E79-4A38-8599-3300B363A960}_1755008238157.png deleted file mode 100644 index f383fd2..0000000 Binary files a/attached_assets/{FB7EC083-1E79-4A38-8599-3300B363A960}_1755008238157.png and /dev/null differ diff --git a/client/src/pages/BLReconciliation_backup.tsx b/client/src/pages/BLReconciliation_backup.tsx deleted file mode 100644 index cad52f9..0000000 --- a/client/src/pages/BLReconciliation_backup.tsx +++ /dev/null @@ -1,462 +0,0 @@ -import React, { useState } from "react"; -import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query"; -import { safeFormat } from "@/lib/dateUtils"; -import { Button } from "@/components/ui/button"; -import { Input } from "@/components/ui/input"; -import { Badge } from "@/components/ui/badge"; -import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; -import { useToast } from "@/hooks/use-toast"; -import { apiRequest } from "@/lib/queryClient"; -import { useStore } from "@/components/Layout"; -import { useAuthUnified } from "@/hooks/useAuthUnified"; -import { Search, Edit, FileText, Settings, Eye, AlertTriangle, X } from "lucide-react"; - -export default function BLReconciliation() { - const { user } = useAuthUnified(); - const { selectedStoreId } = useStore(); - const { toast } = useToast(); - const queryClient = useQueryClient(); - - // Redirection pour les employés - if (user?.role === 'employee') { - return ( -
-
-
-
- -
-
-

- Accès restreint
- Seuls les managers et administrateurs peuvent accéder au module de rapprochement BL/Factures. -

-
-
-
-
- ); - } - - const [activeTab, setActiveTab] = useState("manual"); - const [searchTerm, setSearchTerm] = useState(""); - - // Récupérer les fournisseurs pour la logique automatique - const { data: suppliers = [] } = useQuery({ - queryKey: ['/api/suppliers'], - }); - - // Récupérer les livraisons validées avec BL - const { data: deliveriesWithBL = [], isLoading } = useQuery({ - queryKey: ['/api/deliveries/bl', selectedStoreId], - queryFn: async () => { - const params = new URLSearchParams({}); - if (selectedStoreId && user?.role === 'admin') { - params.append('storeId', selectedStoreId.toString()); - } - - const response = await fetch(`/api/deliveries?${params.toString()}`, { - credentials: 'include' - }); - - if (!response.ok) { - throw new Error('Failed to fetch deliveries'); - } - - const deliveries = await response.json(); - const filtered = Array.isArray(deliveries) ? deliveries.filter((d: any) => d.status === 'delivered') : []; - - return filtered.sort((a: any, b: any) => new Date(b.deliveredDate || b.updatedAt).getTime() - new Date(a.deliveredDate || a.updatedAt).getTime()); - }, - }); - - // Séparer les livraisons selon le mode de rapprochement du fournisseur - const manualReconciliationDeliveries = deliveriesWithBL.filter((delivery: any) => { - const supplier = suppliers.find((s: any) => s.id === delivery.supplierId); - return !supplier?.automaticReconciliation; - }); - - const automaticReconciliationDeliveries = deliveriesWithBL.filter((delivery: any) => { - const supplier = suppliers.find((s: any) => s.id === delivery.supplierId); - return supplier?.automaticReconciliation; - }); - - // Fonction pour dévalider un rapprochement automatique (directeurs et admins uniquement) - const handleDevalidateAutoReconciliation = async (deliveryId: number) => { - if (user?.role !== 'directeur' && user?.role !== 'admin') { - toast({ - title: "Accès refusé", - description: "Seuls les directeurs et administrateurs peuvent dévalider les rapprochements automatiques", - variant: "destructive", - }); - return; - } - - try { - await apiRequest(`/api/deliveries/${deliveryId}`, "PUT", { - reconciled: false, - validatedAt: null - }); - - toast({ - title: "Succès", - description: "Rapprochement automatique dévalidé avec succès", - }); - - queryClient.invalidateQueries({ queryKey: ['/api/deliveries/bl'] }); - } catch (error) { - toast({ - title: "Erreur", - description: "Impossible de dévalider le rapprochement", - variant: "destructive", - }); - } - }; - - // Filtrage des livraisons par recherche - const filterDeliveries = (deliveries: any[]) => { - return deliveries.filter((delivery: any) => { - const searchLower = searchTerm.toLowerCase(); - return ( - delivery.supplier?.name?.toLowerCase().includes(searchLower) || - delivery.blNumber?.toLowerCase().includes(searchLower) || - delivery.invoiceReference?.toLowerCase().includes(searchLower) - ); - }); - }; - - const filteredManualDeliveries = filterDeliveries(manualReconciliationDeliveries); - const filteredAutomaticDeliveries = filterDeliveries(automaticReconciliationDeliveries); - - const canModify = user?.role === 'directeur' || user?.role === 'admin'; - - return ( -
- {/* Header avec onglets */} -
-
-
-

- - Rapprochement BL/Factures -

-

- Gestion des rapprochements manuels et automatiques -

-
-
- - {manualReconciliationDeliveries.length} rapprochements manuels - - - {automaticReconciliationDeliveries.length} rapprochements automatiques - -
-
- - {/* Onglets */} - - - - - Rapprochement Manuel - - {manualReconciliationDeliveries.length} - - - - - Rapprochement Automatique - - {automaticReconciliationDeliveries.length} - - - - -
- - {/* Filtre de recherche */} -
-
- - setSearchTerm(e.target.value)} - className="pl-10 border border-gray-300 shadow-sm" - /> -
-
- - {/* Contenu des onglets */} - - - {filteredManualDeliveries.length === 0 ? ( -
- -

- Aucun rapprochement manuel trouvé -

-

- Les livraisons de fournisseurs en mode manuel apparaîtront ici. -

-
- ) : ( -
-
- - - - - - - - - - - - - - - {filteredManualDeliveries.map((delivery: any) => ( - - - - - - - - - - - ))} - -
- Fournisseur - - N° BL - - Date Livr. - - Montant BL - - Ref. Facture - - Montant Fact. - - Magasin - - Actions -
-
- {delivery.supplier?.name} -
- 		-
- {delivery.blNumber || ( - Non renseigné - )} -
- 		-
- {safeFormat(delivery.scheduledDate, 'dd/MM/yy')} -
- 		-
- {delivery.blAmount ? - `${parseFloat(delivery.blAmount).toFixed(2)}€` : - Non renseigné - } -
- 		-
- {delivery.invoiceReference || ( - Non renseigné - )} -
- 		-
- {delivery.invoiceAmount ? - `${parseFloat(delivery.invoiceAmount).toFixed(2)}€` : - Non renseigné - } -
- 		-
- {delivery.group?.name} -
- 		-
- -
-
-
-
- )} - - - - {/* Message d'information */} -
-
- -
-

Mode rapprochement automatique

-

- Les livraisons de fournisseurs en mode automatique sont validées automatiquement lorsqu'elles ont le statut "delivered" et un numéro de BL. - {canModify ? ( - " Vous pouvez dévalider ces rapprochements si nécessaire." - ) : ( - " Seuls les directeurs et administrateurs peuvent modifier ces rapprochements." - )} -

-
-
-
- - {filteredAutomaticDeliveries.length === 0 ? ( -
- -

- Aucun rapprochement automatique trouvé -

-

- Les livraisons de fournisseurs en mode automatique apparaîtront ici. -

-
- ) : ( -
-
- - - - - - - - - - - - - - - - {filteredAutomaticDeliveries.map((delivery: any) => ( - - - - - - - - - - - - ))} - -
- Fournisseur - AUTO - - N° BL - - Date Livr. - - Date Valid. - - Montant BL - - Ref. Facture - - Montant Fact. - - Magasin - - Actions -
-
-
- {delivery.supplier?.name} -
- -
- 		-
- {delivery.blNumber || '-'} -
- 		-
- {safeFormat(delivery.scheduledDate, 'dd/MM/yy')} -
- 		-
- {delivery.reconciled && delivery.updatedAt ? - safeFormat(delivery.updatedAt, 'dd/MM/yy') : - '-' - } -
- 		-
- {delivery.blAmount ? - `${parseFloat(delivery.blAmount).toFixed(2)}€` : - '-' - } -
- 		-
- {delivery.invoiceReference || '-'} -
- 		-
- {delivery.invoiceAmount ? - `${parseFloat(delivery.invoiceAmount).toFixed(2)}€` : - '-' - } -
- 		-
- {delivery.group?.name} -
- 		-
- {canModify ? ( - <> - - - - ) : ( - - )} -
-
-
-
- )} - - -
- ); -} \ No newline at end of file diff --git a/client/src/pages/BLReconciliation_broken.tsx b/client/src/pages/BLReconciliation_broken.tsx deleted file mode 100644 index c6bba9e..0000000 --- a/client/src/pages/BLReconciliation_broken.tsx +++ /dev/null @@ -1,778 +0,0 @@ -import React, { useState, useEffect } from "react"; -import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query"; -import { safeFormat } from "@/lib/dateUtils"; -import { Button } from "@/components/ui/button"; -import { Input } from "@/components/ui/input"; -import { Badge } from "@/components/ui/badge"; -import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; -import { useToast } from "@/hooks/use-toast"; -import { apiRequest } from "@/lib/queryClient"; -import { useStore } from "@/components/Layout"; -import { useAuthUnified } from "@/hooks/useAuthUnified"; -import { usePermissions } from "@shared/permissions"; -import { Search, Edit, FileText, Settings, Eye, AlertTriangle, X, Check, Trash2, Ban, ChevronLeft, ChevronRight } from "lucide-react"; -import type { Supplier } from "@shared/schema"; - -export default function BLReconciliation() { - const { user } = useAuthUnified(); - const { selectedStoreId } = useStore(); - const { toast } = useToast(); - const queryClient = useQueryClient(); - const permissions = usePermissions(user?.role); - - // Vérification des permissions d'accès au module - if (!permissions.canView('reconciliation')) { - return ( -
-
-
-
- -
-
-

- Accès restreint
- Seuls les directeurs et administrateurs peuvent accéder au module de rapprochement BL/Factures. -

-
-
-
-
- ); - } - - const [activeTab, setActiveTab] = useState("manual"); - const [searchTerm, setSearchTerm] = useState(""); - const [currentPage, setCurrentPage] = useState(1); - const itemsPerPage = 20; - - // Récupérer les fournisseurs pour la logique automatique - const { data: suppliers = [], isLoading: suppliersLoading } = useQuery({ - queryKey: ['/api/suppliers'], - }); - - // Récupérer les livraisons validées avec BL - const { data: deliveriesWithBL = [], isLoading } = useQuery({ - queryKey: ['/api/deliveries/bl', selectedStoreId], - queryFn: async () => { - const params = new URLSearchParams({}); - if (selectedStoreId && user?.role === 'admin') { - params.append('storeId', selectedStoreId.toString()); - } - - const response = await fetch(`/api/deliveries?${params.toString()}`, { - credentials: 'include' - }); - - if (!response.ok) { - throw new Error('Failed to fetch deliveries'); - } - - const deliveries = await response.json(); - const filtered = Array.isArray(deliveries) ? deliveries.filter((d: any) => d.status === 'delivered') : []; - - return filtered.sort((a: any, b: any) => new Date(b.deliveredDate || b.updatedAt).getTime() - new Date(a.deliveredDate || a.updatedAt).getTime()); - }, - }); - - // Séparer les livraisons selon le mode de rapprochement du fournisseur - const manualReconciliationDeliveries = deliveriesWithBL.filter((delivery: any) => { - const supplier = suppliers.find((s: any) => s.id === delivery.supplierId); - return !supplier?.automaticReconciliation; - }); - - const automaticReconciliationDeliveries = deliveriesWithBL.filter((delivery: any) => { - const supplier = suppliers.find((s: any) => s.id === delivery.supplierId); - return supplier?.automaticReconciliation; - }); - - // Mutation pour valider un rapprochement manuel - const validateManualMutation = useMutation({ - mutationFn: async (deliveryId: number) => { - return await apiRequest(`/api/deliveries/${deliveryId}`, "PUT", { - reconciled: true, - validatedAt: new Date().toISOString() - }); - }, - onSuccess: () => { - toast({ - title: "Succès", - description: "Rapprochement validé avec succès", - }); - queryClient.invalidateQueries({ queryKey: ['/api/deliveries/bl'] }); - }, - onError: () => { - toast({ - title: "Erreur", - description: "Impossible de valider le rapprochement", - variant: "destructive", - }); - } - }); - - // Mutation pour dévalider un rapprochement (admins uniquement) - const devalidateMutation = useMutation({ - mutationFn: async (deliveryId: number) => { - return await apiRequest(`/api/deliveries/${deliveryId}`, "PUT", { - reconciled: false, - validatedAt: null - }); - }, - onSuccess: () => { - toast({ - title: "Succès", - description: "Rapprochement dévalidé avec succès", - }); - queryClient.invalidateQueries({ queryKey: ['/api/deliveries/bl'] }); - }, - onError: () => { - toast({ - title: "Erreur", - description: "Impossible de dévalider le rapprochement", - variant: "destructive", - }); - } - }); - - // Mutation pour supprimer une ligne (admins uniquement) - const deleteMutation = useMutation({ - mutationFn: async (deliveryId: number) => { - return await apiRequest(`/api/deliveries/${deliveryId}`, "DELETE"); - }, - onSuccess: () => { - toast({ - title: "Succès", - description: "Ligne supprimée avec succès", - }); - queryClient.invalidateQueries({ queryKey: ['/api/deliveries/bl'] }); - }, - onError: () => { - toast({ - title: "Erreur", - description: "Impossible de supprimer la ligne", - variant: "destructive", - }); - } - }); - - // Fonctions de gestion des actions - const handleValidateManual = (deliveryId: number) => { - if (!permissions.canValidate('reconciliation')) { - toast({ - title: "Accès refusé", - description: "Vous n'avez pas les permissions pour valider les rapprochements", - variant: "destructive", - }); - return; - } - validateManualMutation.mutate(deliveryId); - }; - - const handleDevalidate = (deliveryId: number) => { - if (!permissions.canEdit('reconciliation')) { - toast({ - title: "Accès refusé", - description: "Seuls les administrateurs peuvent dévalider les rapprochements", - variant: "destructive", - }); - return; - } - if (confirm("Êtes-vous sûr de vouloir dévalider ce rapprochement ?")) { - devalidateMutation.mutate(deliveryId); - } - }; - - const handleDelete = (deliveryId: number) => { - if (!permissions.canDelete('reconciliation')) { - toast({ - title: "Accès refusé", - description: "Seuls les administrateurs peuvent supprimer les lignes", - variant: "destructive", - }); - return; - } - if (confirm("Êtes-vous sûr de vouloir supprimer cette ligne ? Cette action est irréversible.")) { - deleteMutation.mutate(deliveryId); - } - }; - - // Filtrage des livraisons par recherche - const filterDeliveries = (deliveries: any[]) => { - return deliveries.filter((delivery: any) => { - const searchLower = searchTerm.toLowerCase(); - return ( - delivery.supplier?.name?.toLowerCase().includes(searchLower) || - delivery.blNumber?.toLowerCase().includes(searchLower) || - delivery.invoiceReference?.toLowerCase().includes(searchLower) - ); - }); - }; - - const filteredManualDeliveries = filterDeliveries(manualReconciliationDeliveries); - const filteredAutomaticDeliveries = filterDeliveries(automaticReconciliationDeliveries); - - // Pagination - const getCurrentPageData = (data: any[]) => { - const startIndex = (currentPage - 1) * itemsPerPage; - const endIndex = startIndex + itemsPerPage; - return data.slice(startIndex, endIndex); - }; - - const getTotalPages = (data: any[]) => { - return Math.ceil(data.length / itemsPerPage); - }; - - const currentManualData = getCurrentPageData(filteredManualDeliveries); - const currentAutomaticData = getCurrentPageData(filteredAutomaticDeliveries); - - const totalManualPages = getTotalPages(filteredManualDeliveries); - const totalAutomaticPages = getTotalPages(filteredAutomaticDeliveries); - - // Reset page when changing tabs or searching - useEffect(() => { - setCurrentPage(1); - }, [activeTab, searchTerm]); - - // Vérifier si une ligne est dévalidée (pour la coloration) - const isDevalidated = (delivery: any) => { - return delivery.reconciled === false && delivery.validatedAt === null; - }; - - // Composant de pagination - const PaginationControls = ({ currentPage, totalPages, onPageChange, totalItems, itemsPerPage }: { - currentPage: number; - totalPages: number; - onPageChange: (page: number) => void; - totalItems: number; - itemsPerPage: number; - }) => { - if (totalPages <= 1) return null; - - const startItem = (currentPage - 1) * itemsPerPage + 1; - const endItem = Math.min(currentPage * itemsPerPage, totalItems); - - return ( -
-
- - Affichage de {startItem} à {endItem} sur {totalItems} éléments - -
-
- - -
- {Array.from({ length: totalPages }, (_, i) => i + 1) - .filter(page => { - // Afficher la première page, la dernière page, et les pages autour de la page actuelle - return page === 1 || - page === totalPages || - (page >= currentPage - 2 && page <= currentPage + 2); - }) - .map((page, index, array) => { - // Ajouter des points de suspension si nécessaire - const prevPage = array[index - 1]; - const showEllipsis = prevPage && page > prevPage + 1; - - return ( - - {showEllipsis && ( - ... - )} - - - ); - })} -
- - -
-
- ); - }; - - if (isLoading || suppliersLoading) { - return ( -
-
-
-
-
-
- ); - } - - return ( -
- {/* Header avec onglets */} -
-
-
-

- - Rapprochement BL/Factures -

-

- Gestion des rapprochements manuels et automatiques -

-
-
- - {manualReconciliationDeliveries.length} rapprochements manuels - - - {automaticReconciliationDeliveries.length} rapprochements automatiques - -
-
- - {/* Onglets */} - - - - - Rapprochement Manuel - - {manualReconciliationDeliveries.length} - - - - - Rapprochement Automatique - - {automaticReconciliationDeliveries.length} - - - - -
- - {/* Filtre de recherche */} -
-
- - setSearchTerm(e.target.value)} - className="pl-10 border border-gray-300 shadow-sm" - /> -
-
- - {/* Contenu des onglets */} - - - {filteredManualDeliveries.length === 0 ? ( -
- -

- Aucun rapprochement manuel trouvé -

-

- Les livraisons de fournisseurs en mode manuel apparaîtront ici. -

-
- ) : ( -
- {/* Pagination du haut */} - - -
- - - - - - - - - - - - - - - {currentManualData.map((delivery: any) => ( - - - - - - - - - - - ))} - -
- Fournisseur - - N° BL - - Date Livr. - - Montant BL - - Ref. Facture - - Montant Fact. - - Statut - - Actions -
-
- {delivery.supplier?.name} -
- 		-
- {delivery.blNumber || ( - Non renseigné - )} -
- 		-
- {safeFormat(delivery.scheduledDate, 'dd/MM/yy')} -
- 		-
- {delivery.blAmount ? - `${parseFloat(delivery.blAmount).toFixed(2)}€` : - Non renseigné - } -
- 		-
- {delivery.invoiceReference || ( - Non renseigné - )} -
- 		-
- {delivery.invoiceAmount ? - `${parseFloat(delivery.invoiceAmount).toFixed(2)}€` : - Non renseigné - } -
- 		- {delivery.reconciled ? ( - - Validé - - ) : isDevalidated(delivery) ? ( - - Dévalidé - - ) : ( - - En attente - - )} - -
- {permissions.canEdit('reconciliation') && ( - - )} - - {!delivery.reconciled && permissions.canValidate('reconciliation') && ( - - )} - - {delivery.reconciled && permissions.canEdit('reconciliation') && user?.role === 'admin' && ( - - )} - - {permissions.canDelete('reconciliation') && ( - - )} -
-
-
- - {/* Pagination du bas */} - -
- )} - - - - {/* Message d'information */} -
-
- -
-

Mode rapprochement automatique

-

- Les livraisons de fournisseurs en mode automatique sont validées automatiquement lorsqu'elles ont le statut "delivered" et un numéro de BL. - {permissions.canEdit('reconciliation') ? ( - " Vous pouvez dévalider ces rapprochements si nécessaire." - ) : ( - " Seuls les directeurs et administrateurs peuvent modifier ces rapprochements." - )} -

-
-
-
- - {filteredAutomaticDeliveries.length === 0 ? ( -
- -

- Aucun rapprochement automatique trouvé -

-

- Les livraisons de fournisseurs en mode automatique apparaîtront ici. -

-
- ) : ( -
- {/* Pagination du haut */} - - -
- - - - - - - - - - - - - - - {currentAutomaticData.map((delivery: any) => ( - - - - - - - - - - - ))} - -
- Fournisseur - AUTO - - N° BL - - Date Livr. - - Date Valid. - - Montant BL - - Ref. Facture - - Statut - - Actions -
-
-
- {delivery.supplier?.name} -
-
-
-
-
- {delivery.blNumber || '-'} -
- 		-
- {safeFormat(delivery.scheduledDate, 'dd/MM/yy')} -
- 		-
- {delivery.reconciled && delivery.validatedAt ? - safeFormat(delivery.validatedAt, 'dd/MM/yy') : - '-' - } -
- 		-
- {delivery.blAmount ? - `${parseFloat(delivery.blAmount).toFixed(2)}€` : - '-' - } -
- 		-
- {delivery.invoiceReference || '-'} -
- 		- {isDevalidated(delivery) ? ( - - Dévalidé - - ) : ( - - Auto-validé - - )} - -
- {isDevalidated(delivery) && permissions.canEdit('reconciliation') && ( - <> - - - - )} - - {!isDevalidated(delivery) && permissions.canEdit('reconciliation') && ( - - )} - - {permissions.canDelete('reconciliation') && ( - - )} -
-
-
- - {/* Pagination du bas */} - -
- )} - - -
- ); -} \ No newline at end of file diff --git a/client/src/pages/BLReconciliation_recent_broken.tsx b/client/src/pages/BLReconciliation_recent_broken.tsx deleted file mode 100644 index c2cba4e..0000000 --- a/client/src/pages/BLReconciliation_recent_broken.tsx +++ /dev/null @@ -1,840 +0,0 @@ -import { useState, useEffect } from "react"; -import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query"; -import { safeFormat } from "@/lib/dateUtils"; -import { useToast } from "@/hooks/use-toast-robust"; -import { apiRequest } from "@/lib/queryClient"; -import { useStore } from "@/components/Layout"; -import { useAuthUnified } from "@/hooks/useAuthUnified"; -import { usePermissions } from "@shared/permissions"; -import { Search, Edit, FileText, Settings, Eye, AlertTriangle, X, Check, Trash2, Ban, ChevronLeft, ChevronRight } from "lucide-react"; -import type { Supplier } from "@shared/schema"; - -// Composants UI robustes sans dépendances shadcn/ui problématiques -const RobustButton = ({ children, onClick, disabled = false, variant = "default", size = "default", className = "", title = "" }: { - children: React.ReactNode, - onClick?: () => void, - disabled?: boolean, - variant?: "default" | "ghost" | "outline" | "destructive", - size?: "default" | "sm" | "lg", - className?: string, - title?: string -}) => { - const variantStyles = { - default: "bg-blue-600 text-white hover:bg-blue-700 border-blue-600", - ghost: "text-gray-600 hover:text-gray-900 hover:bg-gray-100 border-transparent", - outline: "border-gray-300 bg-white text-gray-700 hover:bg-gray-50", - destructive: "bg-red-600 text-white hover:bg-red-700 border-red-600" - }; - - const sizeStyles = { - default: "px-4 py-2 text-sm", - sm: "px-3 py-1.5 text-xs", - lg: "px-6 py-3 text-base" - }; - - return ( - - ); -}; - -const RobustInput = ({ placeholder, value, onChange, className = "" }: { - placeholder?: string, - value: string, - onChange: (e: React.ChangeEvent) => void, - className?: string -}) => { - return ( - - ); -}; - -const RobustBadge = ({ children, variant = "default", className = "" }: { - children: React.ReactNode, - variant?: "default" | "secondary" | "destructive" | "outline", - className?: string -}) => { - const variantStyles = { - default: "bg-blue-100 text-blue-800 border-blue-200", - secondary: "bg-gray-100 text-gray-800 border-gray-200", - destructive: "bg-red-100 text-red-800 border-red-200", - outline: "bg-white text-gray-700 border-gray-300" - }; - - return ( - - {children} - - ); -}; - -const RobustTabs = ({ value, onValueChange, children }: { - value: string, - onValueChange: (value: string) => void, - children: React.ReactNode -}) => { - return ( -
onValueChange}> - {children} -
- ); -}; - -const RobustTabsList = ({ children }: { children: React.ReactNode }) => { - return ( -
- {children} -
- ); -}; - -const RobustTabsTrigger = ({ value, children, isActive, onClick }: { - value: string, - children: React.ReactNode, - isActive: boolean, - onClick: () => void -}) => { - return ( - - ); -}; - -export default function BLReconciliation() { - const { user } = useAuthUnified(); - const { selectedStoreId } = useStore(); - const { toast } = useToast(); - const queryClient = useQueryClient(); - const permissions = usePermissions(user?.role); - - // Vérification des permissions d'accès au module - if (!permissions.canView('reconciliation')) { - return ( -
-
-
-
- -
-
-

- Accès restreint
- Seuls les directeurs et administrateurs peuvent accéder au module de rapprochement BL/Factures. -

-
-
-
-
- ); - } - - const [activeTab, setActiveTab] = useState("manual"); - const [searchTerm, setSearchTerm] = useState(""); - const [currentPage, setCurrentPage] = useState(1); - const itemsPerPage = 20; - - // Récupérer les fournisseurs pour la logique automatique - const { data: suppliers = [], isLoading: suppliersLoading } = useQuery({ - queryKey: ['/api/suppliers'], - }); - - // Récupérer les livraisons validées avec BL - const { data: deliveriesWithBL = [], isLoading } = useQuery({ - queryKey: ['/api/deliveries/bl', selectedStoreId], - queryFn: async () => { - const params = new URLSearchParams({}); - if (selectedStoreId && user?.role === 'admin') { - params.append('storeId', selectedStoreId.toString()); - } - - const response = await fetch(`/api/deliveries?${params.toString()}`, { - credentials: 'include' - }); - - if (!response.ok) { - throw new Error('Failed to fetch deliveries'); - } - - const deliveries = await response.json(); - const filtered = Array.isArray(deliveries) ? deliveries.filter((d: any) => d.status === 'delivered') : []; - - return filtered.sort((a: any, b: any) => new Date(b.deliveredDate || b.updatedAt).getTime() - new Date(a.deliveredDate || a.updatedAt).getTime()); - }, - }); - - // Séparer les livraisons selon le mode de rapprochement du fournisseur - const manualReconciliationDeliveries = deliveriesWithBL.filter((delivery: any) => { - const supplier = suppliers.find((s: any) => s.id === delivery.supplierId); - return !supplier?.automaticReconciliation; - }); - - const automaticReconciliationDeliveries = deliveriesWithBL.filter((delivery: any) => { - const supplier = suppliers.find((s: any) => s.id === delivery.supplierId); - return supplier?.automaticReconciliation; - }); - - // Mutations pour les actions - const validateManualMutation = useMutation({ - mutationFn: async (deliveryId: number) => { - return await apiRequest(`/api/deliveries/${deliveryId}`, "PUT", { - reconciled: true, - validatedAt: new Date().toISOString() - }); - }, - onSuccess: () => { - toast({ - title: "Succès", - description: "Rapprochement validé avec succès", - }); - queryClient.invalidateQueries({ queryKey: ['/api/deliveries/bl'] }); - }, - onError: () => { - toast({ - title: "Erreur", - description: "Impossible de valider le rapprochement", - variant: "destructive", - }); - } - }); - - const devalidateMutation = useMutation({ - mutationFn: async (deliveryId: number) => { - return await apiRequest(`/api/deliveries/${deliveryId}`, "PUT", { - reconciled: false, - validatedAt: null - }); - }, - onSuccess: () => { - toast({ - title: "Succès", - description: "Rapprochement dévalidé avec succès", - }); - queryClient.invalidateQueries({ queryKey: ['/api/deliveries/bl'] }); - }, - onError: () => { - toast({ - title: "Erreur", - description: "Impossible de dévalider le rapprochement", - variant: "destructive", - }); - } - }); - - const deleteMutation = useMutation({ - mutationFn: async (deliveryId: number) => { - return await apiRequest(`/api/deliveries/${deliveryId}`, "DELETE"); - }, - onSuccess: () => { - toast({ - title: "Succès", - description: "Ligne supprimée avec succès", - }); - queryClient.invalidateQueries({ queryKey: ['/api/deliveries/bl'] }); - }, - onError: () => { - toast({ - title: "Erreur", - description: "Impossible de supprimer la ligne", - variant: "destructive", - }); - } - }); - - // Fonctions de gestion des actions - const handleValidateManual = (deliveryId: number) => { - if (!permissions.canValidate('reconciliation')) { - toast({ - title: "Accès refusé", - description: "Vous n'avez pas les permissions pour valider les rapprochements", - variant: "destructive", - }); - return; - } - validateManualMutation.mutate(deliveryId); - }; - - const handleDevalidate = (deliveryId: number) => { - if (!permissions.canEdit('reconciliation')) { - toast({ - title: "Accès refusé", - description: "Seuls les administrateurs peuvent dévalider les rapprochements", - variant: "destructive", - }); - return; - } - if (confirm("Êtes-vous sûr de vouloir dévalider ce rapprochement ?")) { - devalidateMutation.mutate(deliveryId); - } - }; - - const handleDelete = (deliveryId: number) => { - if (!permissions.canDelete('reconciliation')) { - toast({ - title: "Accès refusé", - description: "Seuls les administrateurs peuvent supprimer les lignes", - variant: "destructive", - }); - return; - } - if (confirm("Êtes-vous sûr de vouloir supprimer cette ligne ? Cette action est irréversible.")) { - deleteMutation.mutate(deliveryId); - } - }; - - // Filtrage des livraisons par recherche - const filterDeliveries = (deliveries: any[]) => { - return deliveries.filter((delivery: any) => { - const searchLower = searchTerm.toLowerCase(); - return ( - delivery.supplier?.name?.toLowerCase().includes(searchLower) || - delivery.blNumber?.toLowerCase().includes(searchLower) || - delivery.invoiceReference?.toLowerCase().includes(searchLower) - ); - }); - }; - - const filteredManualDeliveries = filterDeliveries(manualReconciliationDeliveries); - const filteredAutomaticDeliveries = filterDeliveries(automaticReconciliationDeliveries); - - // Pagination - const getCurrentPageData = (data: any[]) => { - const startIndex = (currentPage - 1) * itemsPerPage; - const endIndex = startIndex + itemsPerPage; - return data.slice(startIndex, endIndex); - }; - - const getTotalPages = (data: any[]) => { - return Math.ceil(data.length / itemsPerPage); - }; - - const currentManualData = getCurrentPageData(filteredManualDeliveries); - const currentAutomaticData = getCurrentPageData(filteredAutomaticDeliveries); - - const totalManualPages = getTotalPages(filteredManualDeliveries); - const totalAutomaticPages = getTotalPages(filteredAutomaticDeliveries); - - // Reset page when changing tabs or searching - useEffect(() => { - setCurrentPage(1); - }, [activeTab, searchTerm]); - - // Vérifier si une ligne est dévalidée (pour la coloration) - const isDevalidated = (delivery: any) => { - return delivery.reconciled === false && delivery.validatedAt === null; - }; - - // Composant de pagination robuste - const RobustPagination = ({ currentPage, totalPages, onPageChange, totalItems, itemsPerPage }: { - currentPage: number; - totalPages: number; - onPageChange: (page: number) => void; - totalItems: number; - itemsPerPage: number; - }) => { - if (totalPages <= 1) return null; - - const startItem = (currentPage - 1) * itemsPerPage + 1; - const endItem = Math.min(currentPage * itemsPerPage, totalItems); - - return ( -
-
- - Affichage de {startItem} à {endItem} sur {totalItems} éléments - -
-
- onPageChange(currentPage - 1)} - disabled={currentPage === 1} - className="flex items-center space-x-1" - > - - Précédent - - - - Page {currentPage} sur {totalPages} - - - onPageChange(currentPage + 1)} - disabled={currentPage === totalPages} - className="flex items-center space-x-1" - > - Suivant - - -
-
- ); - }; - - if (isLoading || suppliersLoading) { - return ( -
-
-
-
-
-
- ); - } - - return ( -
- {/* Header avec onglets */} -
-
-
-

- - Rapprochement BL/Factures -

-

- Gestion des rapprochements manuels et automatiques -

-
-
- - {manualReconciliationDeliveries.length} rapprochements manuels - - - {automaticReconciliationDeliveries.length} rapprochements automatiques - -
-
- - {/* Onglets robustes */} -
- -
-
- - {/* Filtre de recherche */} -
-
- - setSearchTerm(e.target.value)} - className="pl-10" - /> -
-
- - {/* Contenu des onglets */} - {activeTab === "manual" && ( -
- {filteredManualDeliveries.length === 0 ? ( -
- -

- Aucun rapprochement manuel trouvé -

-

- Les livraisons de fournisseurs en mode manuel apparaîtront ici. -

-
- ) : ( -
- {/* Pagination du haut */} - - -
- - - - - - - - - - - - - - - {currentManualData.map((delivery: any) => ( - - - - - - - - - - - ))} - -
FournisseurN° BLDate Livr.Montant BLRef. FactureMontant Fact.StatutActions
-
- {delivery.supplier?.name} -
- 		-
- {delivery.blNumber || ( - Non renseigné - )} -
- 		-
- {safeFormat(delivery.scheduledDate, 'dd/MM/yy')} -
- 		-
- {delivery.blAmount ? - `${parseFloat(delivery.blAmount).toFixed(2)}€` : - Non renseigné - } -
- 		-
- {delivery.invoiceReference || ( - Non renseigné - )} -
- 		-
- {delivery.invoiceAmount ? - `${parseFloat(delivery.invoiceAmount).toFixed(2)}€` : - Non renseigné - } -
- 		- {delivery.reconciled ? ( - - Validé - - ) : isDevalidated(delivery) ? ( - - Dévalidé - - ) : ( - - En attente - - )} - -
- {permissions.canEdit('reconciliation') && ( - - - - )} - - {!delivery.reconciled && permissions.canValidate('reconciliation') && ( - handleValidateManual(delivery.id)} - disabled={validateManualMutation.isPending} - className="text-green-600 hover:text-green-700 p-1" - title="Valider" - > - - - )} - - {delivery.reconciled && permissions.canEdit('reconciliation') && user?.role === 'admin' && ( - handleDevalidate(delivery.id)} - disabled={devalidateMutation.isPending} - className="text-orange-600 hover:text-orange-700 p-1" - title="Dévalider" - > - - - )} - - {permissions.canDelete('reconciliation') && ( - handleDelete(delivery.id)} - disabled={deleteMutation.isPending} - className="text-red-600 hover:text-red-700 p-1" - title="Supprimer" - > - - - )} -
-
-
- - {/* Pagination du bas */} - -
- )} -
- )} - - {activeTab === "automatic" && ( -
- {/* Message d'information */} -
-
- -
-

Mode rapprochement automatique

-

- Les livraisons de fournisseurs en mode automatique sont validées automatiquement lorsqu'elles ont le statut "delivered" et un numéro de BL. - {permissions.canEdit('reconciliation') ? ( - " Vous pouvez dévalider ces rapprochements si nécessaire." - ) : ( - " Seuls les directeurs et administrateurs peuvent modifier ces rapprochements." - )} -

-
-
-
- - {filteredAutomaticDeliveries.length === 0 ? ( -
- -

- Aucun rapprochement automatique trouvé -

-

- Les livraisons de fournisseurs en mode automatique apparaîtront ici. -

-
- ) : ( -
- {/* Pagination du haut */} - - -
- - - - - - - - - - - - - - - {currentAutomaticData.map((delivery: any) => ( - - - - - - - - - - - ))} - -
- Fournisseur - AUTO - N° BLDate Livr.Date Valid.Montant BLRef. FactureStatutActions
-
-
- {delivery.supplier?.name} -
-
-
-
-
- {delivery.blNumber || '-'} -
- 		-
- {safeFormat(delivery.scheduledDate, 'dd/MM/yy')} -
- 		-
- {delivery.reconciled && delivery.validatedAt ? - safeFormat(delivery.validatedAt, 'dd/MM/yy') : - '-' - } -
- 		-
- {delivery.blAmount ? - `${parseFloat(delivery.blAmount).toFixed(2)}€` : - '-' - } -
- 		-
- {delivery.invoiceReference || '-'} -
- 		- {isDevalidated(delivery) ? ( - - Dévalidé - - ) : ( - - Auto-validé - - )} - -
- {isDevalidated(delivery) && permissions.canEdit('reconciliation') && ( - <> - - - - handleValidateManual(delivery.id)} - disabled={validateManualMutation.isPending} - className="text-green-600 hover:text-green-700 p-1" - title="Valider" - > - - - - )} - - {!isDevalidated(delivery) && permissions.canEdit('reconciliation') && ( - handleDevalidate(delivery.id)} - disabled={devalidateMutation.isPending} - className="text-orange-600 hover:text-orange-700 p-1" - title="Dévalider" - > - - - )} - - {permissions.canDelete('reconciliation') && ( - handleDelete(delivery.id)} - disabled={deleteMutation.isPending} - className="text-red-600 hover:text-red-700 p-1" - title="Supprimer" - > - - - )} -
-
-
- - {/* Pagination du bas */} - -
- )} -
- )} -
- ); -} \ No newline at end of file diff --git a/client/src/pages/BLReconciliation_shadcn_broken.tsx b/client/src/pages/BLReconciliation_shadcn_broken.tsx deleted file mode 100644 index 1ded5e2..0000000 --- a/client/src/pages/BLReconciliation_shadcn_broken.tsx +++ /dev/null @@ -1,751 +0,0 @@ -import { useState, useEffect } from "react"; -import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query"; -import { safeFormat } from "@/lib/dateUtils"; -import { Button } from "@/components/ui/button"; -import { Input } from "@/components/ui/input"; -import { Badge } from "@/components/ui/badge"; -import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; -import { useToast } from "@/hooks/use-toast"; -import { apiRequest } from "@/lib/queryClient"; -import { useStore } from "@/components/Layout"; -import { useAuthUnified } from "@/hooks/useAuthUnified"; -import { usePermissions } from "@shared/permissions"; -import { Search, Edit, FileText, Settings, Eye, AlertTriangle, X, Check, Trash2, Ban, ChevronLeft, ChevronRight } from "lucide-react"; -import type { Supplier } from "@shared/schema"; - -export default function BLReconciliation() { - const { user } = useAuthUnified(); - const { selectedStoreId } = useStore(); - const { toast } = useToast(); - const queryClient = useQueryClient(); - const permissions = usePermissions(user?.role); - - // Vérification des permissions d'accès au module - if (!permissions.canView('reconciliation')) { - return ( -
-
-
-
- -
-
-

- Accès restreint
- Seuls les directeurs et administrateurs peuvent accéder au module de rapprochement BL/Factures. -

-
-
-
-
- ); - } - - const [activeTab, setActiveTab] = useState("manual"); - const [searchTerm, setSearchTerm] = useState(""); - const [currentPage, setCurrentPage] = useState(1); - const itemsPerPage = 20; - - // Récupérer les fournisseurs pour la logique automatique - const { data: suppliers = [], isLoading: suppliersLoading } = useQuery({ - queryKey: ['/api/suppliers'], - }); - - // Récupérer les livraisons validées avec BL - const { data: deliveriesWithBL = [], isLoading } = useQuery({ - queryKey: ['/api/deliveries/bl', selectedStoreId], - queryFn: async () => { - const params = new URLSearchParams({}); - if (selectedStoreId && user?.role === 'admin') { - params.append('storeId', selectedStoreId.toString()); - } - - const response = await fetch(`/api/deliveries?${params.toString()}`, { - credentials: 'include' - }); - - if (!response.ok) { - throw new Error('Failed to fetch deliveries'); - } - - const deliveries = await response.json(); - const filtered = Array.isArray(deliveries) ? deliveries.filter((d: any) => d.status === 'delivered') : []; - - return filtered.sort((a: any, b: any) => new Date(b.deliveredDate || b.updatedAt).getTime() - new Date(a.deliveredDate || a.updatedAt).getTime()); - }, - }); - - // Séparer les livraisons selon le mode de rapprochement du fournisseur - const manualReconciliationDeliveries = deliveriesWithBL.filter((delivery: any) => { - const supplier = suppliers.find((s: any) => s.id === delivery.supplierId); - return !supplier?.automaticReconciliation; - }); - - const automaticReconciliationDeliveries = deliveriesWithBL.filter((delivery: any) => { - const supplier = suppliers.find((s: any) => s.id === delivery.supplierId); - return supplier?.automaticReconciliation; - }); - - // Mutation pour valider un rapprochement manuel - const validateManualMutation = useMutation({ - mutationFn: async (deliveryId: number) => { - return await apiRequest(`/api/deliveries/${deliveryId}`, "PUT", { - reconciled: true, - validatedAt: new Date().toISOString() - }); - }, - onSuccess: () => { - toast({ - title: "Succès", - description: "Rapprochement validé avec succès", - }); - queryClient.invalidateQueries({ queryKey: ['/api/deliveries/bl'] }); - }, - onError: () => { - toast({ - title: "Erreur", - description: "Impossible de valider le rapprochement", - variant: "destructive", - }); - } - }); - - // Mutation pour dévalider un rapprochement (admins uniquement) - const devalidateMutation = useMutation({ - mutationFn: async (deliveryId: number) => { - return await apiRequest(`/api/deliveries/${deliveryId}`, "PUT", { - reconciled: false, - validatedAt: null - }); - }, - onSuccess: () => { - toast({ - title: "Succès", - description: "Rapprochement dévalidé avec succès", - }); - queryClient.invalidateQueries({ queryKey: ['/api/deliveries/bl'] }); - }, - onError: () => { - toast({ - title: "Erreur", - description: "Impossible de dévalider le rapprochement", - variant: "destructive", - }); - } - }); - - // Mutation pour supprimer une ligne (admins uniquement) - const deleteMutation = useMutation({ - mutationFn: async (deliveryId: number) => { - return await apiRequest(`/api/deliveries/${deliveryId}`, "DELETE"); - }, - onSuccess: () => { - toast({ - title: "Succès", - description: "Ligne supprimée avec succès", - }); - queryClient.invalidateQueries({ queryKey: ['/api/deliveries/bl'] }); - }, - onError: () => { - toast({ - title: "Erreur", - description: "Impossible de supprimer la ligne", - variant: "destructive", - }); - } - }); - - // Fonctions de gestion des actions - const handleValidateManual = (deliveryId: number) => { - if (!permissions.canValidate('reconciliation')) { - toast({ - title: "Accès refusé", - description: "Vous n'avez pas les permissions pour valider les rapprochements", - variant: "destructive", - }); - return; - } - validateManualMutation.mutate(deliveryId); - }; - - const handleDevalidate = (deliveryId: number) => { - if (!permissions.canEdit('reconciliation')) { - toast({ - title: "Accès refusé", - description: "Seuls les administrateurs peuvent dévalider les rapprochements", - variant: "destructive", - }); - return; - } - if (confirm("Êtes-vous sûr de vouloir dévalider ce rapprochement ?")) { - devalidateMutation.mutate(deliveryId); - } - }; - - const handleDelete = (deliveryId: number) => { - if (!permissions.canDelete('reconciliation')) { - toast({ - title: "Accès refusé", - description: "Seuls les administrateurs peuvent supprimer les lignes", - variant: "destructive", - }); - return; - } - if (confirm("Êtes-vous sûr de vouloir supprimer cette ligne ? Cette action est irréversible.")) { - deleteMutation.mutate(deliveryId); - } - }; - - // Filtrage des livraisons par recherche - const filterDeliveries = (deliveries: any[]) => { - return deliveries.filter((delivery: any) => { - const searchLower = searchTerm.toLowerCase(); - return ( - delivery.supplier?.name?.toLowerCase().includes(searchLower) || - delivery.blNumber?.toLowerCase().includes(searchLower) || - delivery.invoiceReference?.toLowerCase().includes(searchLower) - ); - }); - }; - - const filteredManualDeliveries = filterDeliveries(manualReconciliationDeliveries); - const filteredAutomaticDeliveries = filterDeliveries(automaticReconciliationDeliveries); - - // Pagination - const getCurrentPageData = (data: any[]) => { - const startIndex = (currentPage - 1) * itemsPerPage; - const endIndex = startIndex + itemsPerPage; - return data.slice(startIndex, endIndex); - }; - - const getTotalPages = (data: any[]) => { - return Math.ceil(data.length / itemsPerPage); - }; - - const currentManualData = getCurrentPageData(filteredManualDeliveries); - const currentAutomaticData = getCurrentPageData(filteredAutomaticDeliveries); - - const totalManualPages = getTotalPages(filteredManualDeliveries); - const totalAutomaticPages = getTotalPages(filteredAutomaticDeliveries); - - // Reset page when changing tabs or searching - useEffect(() => { - setCurrentPage(1); - }, [activeTab, searchTerm]); - - // Vérifier si une ligne est dévalidée (pour la coloration) - const isDevalidated = (delivery: any) => { - return delivery.reconciled === false && delivery.validatedAt === null; - }; - - // Composant de pagination simplifiée - const SimplePagination = ({ currentPage, totalPages, onPageChange, totalItems, itemsPerPage }: { - currentPage: number; - totalPages: number; - onPageChange: (page: number) => void; - totalItems: number; - itemsPerPage: number; - }) => { - if (totalPages <= 1) return null; - - const startItem = (currentPage - 1) * itemsPerPage + 1; - const endItem = Math.min(currentPage * itemsPerPage, totalItems); - - return ( -
-
- - Affichage de {startItem} à {endItem} sur {totalItems} éléments - -
-
- - - - Page {currentPage} sur {totalPages} - - - -
-
- ); - }; - - if (isLoading || suppliersLoading) { - return ( -
-
-
-
-
-
- ); - } - - return ( -
- {/* Header avec onglets */} -
-
-
-

- - Rapprochement BL/Factures -

-

- Gestion des rapprochements manuels et automatiques -

-
-
- - {manualReconciliationDeliveries.length} rapprochements manuels - - - {automaticReconciliationDeliveries.length} rapprochements automatiques - -
-
- - {/* Onglets */} - - - - - Rapprochement Manuel - - {manualReconciliationDeliveries.length} - - - - - Rapprochement Automatique - - {automaticReconciliationDeliveries.length} - - - - -
- - {/* Filtre de recherche */} -
-
- - setSearchTerm(e.target.value)} - className="pl-10 border border-gray-300 shadow-sm" - /> -
-
- - {/* Contenu des onglets */} - - - {filteredManualDeliveries.length === 0 ? ( -
- -

- Aucun rapprochement manuel trouvé -

-

- Les livraisons de fournisseurs en mode manuel apparaîtront ici. -

-
- ) : ( -
- {/* Pagination du haut */} - - -
- - - - - - - - - - - - - - - {currentManualData.map((delivery: any) => ( - - - - - - - - - - - ))} - -
- Fournisseur - - N° BL - - Date Livr. - - Montant BL - - Ref. Facture - - Montant Fact. - - Statut - - Actions -
-
- {delivery.supplier?.name} -
- 		-
- {delivery.blNumber || ( - Non renseigné - )} -
- 		-
- {safeFormat(delivery.scheduledDate, 'dd/MM/yy')} -
- 		-
- {delivery.blAmount ? - `${parseFloat(delivery.blAmount).toFixed(2)}€` : - Non renseigné - } -
- 		-
- {delivery.invoiceReference || ( - Non renseigné - )} -
- 		-
- {delivery.invoiceAmount ? - `${parseFloat(delivery.invoiceAmount).toFixed(2)}€` : - Non renseigné - } -
- 		- {delivery.reconciled ? ( - - Validé - - ) : isDevalidated(delivery) ? ( - - Dévalidé - - ) : ( - - En attente - - )} - -
- {permissions.canEdit('reconciliation') && ( - - )} - - {!delivery.reconciled && permissions.canValidate('reconciliation') && ( - - )} - - {delivery.reconciled && permissions.canEdit('reconciliation') && user?.role === 'admin' && ( - - )} - - {permissions.canDelete('reconciliation') && ( - - )} -
-
-
- - {/* Pagination du bas */} - -
- )} - - - - {/* Message d'information */} -
-
- -
-

Mode rapprochement automatique

-

- Les livraisons de fournisseurs en mode automatique sont validées automatiquement lorsqu'elles ont le statut "delivered" et un numéro de BL. - {permissions.canEdit('reconciliation') ? ( - " Vous pouvez dévalider ces rapprochements si nécessaire." - ) : ( - " Seuls les directeurs et administrateurs peuvent modifier ces rapprochements." - )} -

-
-
-
- - {filteredAutomaticDeliveries.length === 0 ? ( -
- -

- Aucun rapprochement automatique trouvé -

-

- Les livraisons de fournisseurs en mode automatique apparaîtront ici. -

-
- ) : ( -
- {/* Pagination du haut */} - - -
- - - - - - - - - - - - - - - {currentAutomaticData.map((delivery: any) => ( - - - - - - - - - - - ))} - -
- Fournisseur - AUTO - - N° BL - - Date Livr. - - Date Valid. - - Montant BL - - Ref. Facture - - Statut - - Actions -
-
-
- {delivery.supplier?.name} -
-
-
-
-
- {delivery.blNumber || '-'} -
- 		-
- {safeFormat(delivery.scheduledDate, 'dd/MM/yy')} -
- 		-
- {delivery.reconciled && delivery.validatedAt ? - safeFormat(delivery.validatedAt, 'dd/MM/yy') : - '-' - } -
- 		-
- {delivery.blAmount ? - `${parseFloat(delivery.blAmount).toFixed(2)}€` : - '-' - } -
- 		-
- {delivery.invoiceReference || '-'} -
- 		- {isDevalidated(delivery) ? ( - - Dévalidé - - ) : ( - - Auto-validé - - )} - -
- {isDevalidated(delivery) && permissions.canEdit('reconciliation') && ( - <> - - - - )} - - {!isDevalidated(delivery) && permissions.canEdit('reconciliation') && ( - - )} - - {permissions.canDelete('reconciliation') && ( - - )} -
-
-
- - {/* Pagination du bas */} - -
- )} - - -
- ); -} \ No newline at end of file diff --git a/client/src/pages/Groups.tsx.backup.1752674092 b/client/src/pages/Groups.tsx.backup.1752674092 deleted file mode 100644 index ec0d0d1..0000000 --- a/client/src/pages/Groups.tsx.backup.1752674092 +++ /dev/null @@ -1,631 +0,0 @@ -import { useState } from "react"; -import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query"; -import { Button } from "@/components/ui/button"; -import { Input } from "@/components/ui/input"; -import { Label } from "@/components/ui/label"; -import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog"; -import { useAuthUnified } from "@/hooks/useAuthUnified"; -import { useToast } from "@/hooks/use-toast"; -import { apiRequest } from "@/lib/queryClient"; -import { isUnauthorizedError } from "@/lib/authUtils"; -import { - Plus, - Search, - Users, - Edit, - Trash2, - Package, - Truck, - Palette -} from "lucide-react"; -import type { Group, NocodbConfig } from "@shared/schema"; - -const colorOptions = [ - { value: '#1976D2', label: 'Bleu' }, - { value: '#388E3C', label: 'Vert' }, - { value: '#FF6F00', label: 'Orange' }, - { value: '#D32F2F', label: 'Rouge' }, - { value: '#7B1FA2', label: 'Violet' }, - { value: '#F57C00', label: 'Ambre' }, - { value: '#5D4037', label: 'Marron' }, - { value: '#455A64', label: 'Bleu gris' }, - { value: '#E91E63', label: 'Rose' }, - { value: '#00796B', label: 'Sarcelle' }, -]; - -export default function Groups() { - const { user } = useAuthUnified(); - const { toast } = useToast(); - const queryClient = useQueryClient(); - - const [searchTerm, setSearchTerm] = useState(""); - const [showCreateModal, setShowCreateModal] = useState(false); - const [showEditModal, setShowEditModal] = useState(false); - const [selectedGroup, setSelectedGroup] = useState(null); - const [formData, setFormData] = useState({ - name: "", - color: "#1976D2", - nocodbConfigId: "", - nocodbTableId: "", - nocodbTableName: "", - invoiceColumnName: "Ref Facture", - }); - - const { data: groups = [], isLoading } = useQuery({ - queryKey: ['/api/groups'], - }); - - const { data: rawNocodbConfigs = [] } = useQuery({ - queryKey: ['/api/nocodb-config'], - }); - - // Protection contre les erreurs TypeError - const nocodbConfigs = Array.isArray(rawNocodbConfigs) ? rawNocodbConfigs : []; - - console.log('🔍 Groups NocoDB Debug:', { - rawNocodbConfigs, - nocodbConfigs, - isArray: Array.isArray(rawNocodbConfigs) - }); - - const { data: orders = [] } = useQuery({ - queryKey: ['/api/orders'], - }); - - const { data: deliveries = [] } = useQuery({ - queryKey: ['/api/deliveries'], - }); - - const createMutation = useMutation({ - mutationFn: async (data: any) => { - await apiRequest("/api/groups", { - method: "POST", - body: data, - }); - }, - onSuccess: () => { - toast({ - title: "Succès", - description: "Groupe créé avec succès", - }); - queryClient.invalidateQueries({ queryKey: ['/api/groups'] }); - setShowCreateModal(false); - setFormData({ - name: "", - color: "#1976D2", - nocodbConfigId: "", - nocodbTableId: "", - nocodbTableName: "", - invoiceColumnName: "Ref Facture", - }); - }, - 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 créer le groupe", - variant: "destructive", - }); - }, - }); - - const updateMutation = useMutation({ - mutationFn: async (data: any) => { - await apiRequest(`/api/groups/${selectedGroup?.id}`, { - method: "PUT", - body: data, - }); - }, - onSuccess: () => { - toast({ - title: "Succès", - description: "Groupe modifié avec succès", - }); - queryClient.invalidateQueries({ queryKey: ['/api/groups'] }); - setShowEditModal(false); - setSelectedGroup(null); - setFormData({ - name: "", - color: "#1976D2", - nocodbConfigId: "", - nocodbTableId: "", - nocodbTableName: "", - invoiceColumnName: "Ref Facture", - }); - }, - 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 modifier le groupe", - variant: "destructive", - }); - }, - }); - - const deleteMutation = useMutation({ - mutationFn: async (id: number) => { - await apiRequest("DELETE", `/api/groups/${id}`); - }, - onSuccess: () => { - toast({ - title: "Succès", - description: "Groupe supprimé avec succès", - }); - queryClient.invalidateQueries({ queryKey: ['/api/groups'] }); - }, - 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 le groupe", - variant: "destructive", - }); - }, - }); - - const filteredGroups = Array.isArray(groups) ? groups.filter(group => - group.name.toLowerCase().includes(searchTerm.toLowerCase()) - ) : []; - - console.log('🏪 Groups Debug:', { - groups: Array.isArray(groups) ? groups.length : 'NOT_ARRAY', - orders: Array.isArray(orders) ? orders.length : 'NOT_ARRAY', - deliveries: Array.isArray(deliveries) ? deliveries.length : 'NOT_ARRAY', - groupsData: groups?.slice(0, 2), - ordersData: orders?.slice(0, 2), - deliveriesData: deliveries?.slice(0, 2) - }); - - const getGroupStats = (groupId: number) => { - const groupOrders = Array.isArray(orders) ? orders.filter(order => { - const match = order.groupId === groupId; - if (match) console.log(`🎯 Order ${order.id} matches group ${groupId}`, order); - return match; - }) : []; - - const groupDeliveries = Array.isArray(deliveries) ? deliveries.filter(delivery => { - const match = delivery.groupId === groupId; - if (match) console.log(`🎯 Delivery ${delivery.id} matches group ${groupId}`, delivery); - return match; - }) : []; - - console.log(`🏪 Group ${groupId} stats:`, { - groupOrders: groupOrders.length, - groupDeliveries: groupDeliveries.length, - delivered: groupDeliveries.filter(d => d.status === 'delivered').length, - ordersSample: groupOrders.slice(0, 2), - deliveriesSample: groupDeliveries.slice(0, 2), - allOrdersCount: orders?.length, - allDeliveriesCount: deliveries?.length - }); - - return { - orders: groupOrders.length, - deliveries: groupDeliveries.length, - delivered: groupDeliveries.filter(d => d.status === 'delivered').length, - }; - }; - - const handleCreate = () => { - setFormData({ - name: "", - color: "#1976D2", - nocodbConfigId: "", - nocodbTableId: "", - nocodbTableName: "", - invoiceColumnName: "Ref Facture", - }); - setShowCreateModal(true); - }; - - const handleEdit = (group: Group) => { - setSelectedGroup(group); - setFormData({ - name: group.name, - color: group.color, - nocodbConfigId: group.nocodbConfigId?.toString() || "", - nocodbTableId: group.nocodbTableId || "", - nocodbTableName: group.nocodbTableName || "", - invoiceColumnName: group.invoiceColumnName || "Ref Facture", - }); - setShowEditModal(true); - }; - - const handleDelete = (group: Group) => { - const stats = getGroupStats(group.id); - - if (stats.orders > 0 || stats.deliveries > 0) { - toast({ - title: "Suppression impossible", - description: "Ce groupe a des commandes ou livraisons associées", - variant: "destructive", - }); - return; - } - - if (window.confirm(`Êtes-vous sûr de vouloir supprimer le groupe "${group.name}" ?`)) { - deleteMutation.mutate(group.id); - } - }; - - const handleSubmit = (e: React.FormEvent) => { - e.preventDefault(); - - if (!formData.name.trim()) { - toast({ - title: "Erreur", - description: "Le nom du groupe est requis", - variant: "destructive", - }); - return; - } - - // Prepare data with proper type conversion - const submitData = { - ...formData, - nocodbConfigId: formData.nocodbConfigId ? parseInt(formData.nocodbConfigId) : null, - }; - - if (selectedGroup) { - updateMutation.mutate(submitData); - } else { - createMutation.mutate(submitData); - } - }; - - const handleChange = (field: string, value: string) => { - setFormData(prev => ({ ...prev, [field]: value })); - }; - - const canManage = user?.role === 'admin' || user?.role === 'manager'; - - return ( -
- {/* Header */} -
-
-
-

- - Gestion des Groupes/Magasins -

-

- {filteredGroups.length} groupe{filteredGroups.length !== 1 ? 's' : ''} -

-
- {canManage && ( - - )} -
-
- - {/* Search */} -
-
- - setSearchTerm(e.target.value)} - className="pl-10 border border-gray-300 shadow-sm" - /> -
-
- - {/* Groups List */} -
- {isLoading ? ( -
-
-
- ) : filteredGroups.length === 0 ? ( -
- -

- {searchTerm ? "Aucun groupe trouvé" : "Aucun groupe"} -

-

- {searchTerm - ? "Aucun groupe ne correspond à votre recherche." - : "Vous n'avez pas encore de groupes. Créez votre premier groupe pour commencer."} -

- {!searchTerm && canManage && ( - - )} -
- ) : ( -
-
- {filteredGroups.map((group) => { - const stats = getGroupStats(group.id); - return ( -
-
-
-
- -
-
-

{group.name}

-

#{group.id}

-
-
- {canManage && ( -
- - -
- )} -
- -
- -
-
- {group.color} -
-
- -
-
-
-
- - {stats.orders} -
-

Commandes

-
-
-
- - {stats.deliveries} -
-

Livraisons

-
-
- {stats.deliveries > 0 && ( -
-

- {stats.delivered} livrées ({Math.round((stats.delivered / stats.deliveries) * 100)}%) -

-
- )} -
-
- ); - })} -
-
- )} -
- - {/* Create/Edit Modal */} - { - setShowCreateModal(false); - setShowEditModal(false); - setSelectedGroup(null); - setFormData({ - name: "", - color: "#1976D2", - nocodbConfigId: "", - nocodbTableId: "", - nocodbTableName: "", - invoiceColumnName: "Ref Facture", - }); - }}> - - - - {selectedGroup ? 'Modifier' : 'Nouveau'} Groupe - -

- {selectedGroup ? 'Modifier les informations du groupe' : 'Créer un nouveau groupe/magasin'} -

- - -
-
- - handleChange('name', e.target.value)} - placeholder="Nom du groupe/magasin" - required - /> -
- -
- -
-
-
- handleChange('color', e.target.value)} - className="w-20 h-8" - /> - {formData.color} -
-
- {colorOptions.map(option => ( -
-
-
- - {/* Section Configuration NocoDB */} -
-
-
-

Configuration NocoDB (Optionnel)

-
-

- Configurez la vérification automatique des références de facture dans une table NocoDB. -

- -
- - -
- - {formData.nocodbConfigId && ( - <> -
- - handleChange('nocodbTableId', e.target.value)} - placeholder="m_xxxxxxxxxxxx (ID de la table NocoDB)" - /> -
- -
- - handleChange('nocodbTableName', e.target.value)} - placeholder="Nom de la table (pour affichage)" - /> -
- -
- - handleChange('invoiceColumnName', e.target.value)} - placeholder="Ref Facture" - /> -
- - )} -
- -
- - -
- - -
-
- ); -} diff --git a/client/src/pages/NocoDBConfig.tsx.backup.1752674092 b/client/src/pages/NocoDBConfig.tsx.backup.1752674092 deleted file mode 100644 index 9582034..0000000 --- a/client/src/pages/NocoDBConfig.tsx.backup.1752674092 +++ /dev/null @@ -1,661 +0,0 @@ -import { useState } from "react"; -import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query"; -import { apiRequest } from "@/lib/queryClient"; -import { useAuthUnified } from "@/hooks/useAuthUnified"; -import { useToast } from "@/hooks/use-toast"; -import { Button } from "@/components/ui/button"; -import { Input } from "@/components/ui/input"; -import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"; -import { Badge } from "@/components/ui/badge"; -import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog"; -import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form"; -import { Textarea } from "@/components/ui/textarea"; -import { Switch } from "@/components/ui/switch"; -import { useForm } from "react-hook-form"; -import { zodResolver } from "@hookform/resolvers/zod"; -import { z } from "zod"; -import { - Database, - Plus, - Edit, - Trash2, - Settings, - Eye, - EyeOff, - CheckCircle, - XCircle, - AlertTriangle, - Link, -} from "lucide-react"; -import type { NocodbConfig } from "@shared/schema"; - -// Form schemas -const nocodbConfigFormSchema = z.object({ - name: z.string().min(1, "Le nom est obligatoire"), - baseUrl: z.string().url("L'URL doit être valide").min(1, "L'URL de base est obligatoire"), - apiToken: z.string().min(1, "Le token API est obligatoire"), - projectId: z.string().min(1, "L'ID du projet est obligatoire"), - description: z.string().optional(), - isActive: z.boolean().default(true), -}); - -type NocodbConfigForm = z.infer; - -export default function NocoDBConfig() { - const { user } = useAuthUnified(); - const { toast } = useToast(); - const queryClient = useQueryClient(); - - const [showCreateModal, setShowCreateModal] = useState(false); - const [showEditModal, setShowEditModal] = useState(false); - const [showDeleteModal, setShowDeleteModal] = useState(false); - const [selectedConfig, setSelectedConfig] = useState(null); - const [showTokens, setShowTokens] = useState<{ [key: number]: boolean }>({}); - - // Queries avec protection complète - const { data: rawConfigs, isLoading, error } = useQuery({ - queryKey: ['/api/nocodb-config'], - enabled: user?.role === 'admin', - }); - - // Protection triple couche pour éviter les erreurs TypeError - const configs = rawConfigs || []; - const safeConfigs = Array.isArray(configs) ? configs : []; - - // Log pour debug production - console.log('🔍 NocoDBConfig Debug:', { - rawConfigs, - configs, - isArray: Array.isArray(configs), - safeConfigs, - length: safeConfigs.length, - error, - userRole: user?.role - }); - - // Mutations - const createConfigMutation = useMutation({ - mutationFn: (data: NocodbConfigForm) => - apiRequest('/api/nocodb-config', 'POST', data), - onSuccess: () => { - queryClient.invalidateQueries({ queryKey: ['/api/nocodb-config'] }); - setShowCreateModal(false); - toast({ - title: "Configuration créée", - description: "La configuration NocoDB a été créée avec succès.", - }); - }, - onError: (error: any) => { - toast({ - title: "Erreur", - description: error.message || "Erreur lors de la création de la configuration.", - variant: "destructive", - }); - }, - }); - - const updateConfigMutation = useMutation({ - mutationFn: ({ id, data }: { id: number; data: Partial }) => - apiRequest(`/api/nocodb-config/${id}`, 'PUT', data), - onSuccess: () => { - queryClient.invalidateQueries({ queryKey: ['/api/nocodb-config'] }); - setShowEditModal(false); - setSelectedConfig(null); - toast({ - title: "Configuration mise à jour", - description: "La configuration NocoDB a été mise à jour avec succès.", - }); - }, - onError: (error: any) => { - toast({ - title: "Erreur", - description: error.message || "Erreur lors de la mise à jour de la configuration.", - variant: "destructive", - }); - }, - }); - - const deleteConfigMutation = useMutation({ - mutationFn: (id: number) => - apiRequest(`/api/nocodb-config/${id}`, 'DELETE'), - onSuccess: () => { - queryClient.invalidateQueries({ queryKey: ['/api/nocodb-config'] }); - setShowDeleteModal(false); - setSelectedConfig(null); - toast({ - title: "Configuration supprimée", - description: "La configuration NocoDB a été supprimée avec succès.", - }); - }, - onError: (error: any) => { - toast({ - title: "Erreur", - description: error.message || "Erreur lors de la suppression de la configuration.", - variant: "destructive", - }); - }, - }); - - // Forms - const createForm = useForm({ - resolver: zodResolver(nocodbConfigFormSchema), - defaultValues: { - name: "", - baseUrl: "", - apiToken: "", - projectId: "", - description: "", - isActive: true, - }, - }); - - const editForm = useForm({ - resolver: zodResolver(nocodbConfigFormSchema), - }); - - // Handle create config - const handleCreateConfig = (data: NocodbConfigForm) => { - createConfigMutation.mutate(data); - }; - - // Handle edit config - const handleEditConfig = (data: NocodbConfigForm) => { - if (!selectedConfig) return; - updateConfigMutation.mutate({ id: selectedConfig.id, data }); - }; - - // Handle delete config - const handleDeleteConfig = () => { - if (!selectedConfig) return; - deleteConfigMutation.mutate(selectedConfig.id); - }; - - // Open edit modal - const openEditModal = (config: NocodbConfig) => { - setSelectedConfig(config); - editForm.reset({ - name: config.name, - baseUrl: config.baseUrl, - apiToken: config.apiToken, - projectId: config.projectId, - description: config.description || "", - isActive: config.isActive, - }); - setShowEditModal(true); - }; - - // Open delete modal - const openDeleteModal = (config: NocodbConfig) => { - setSelectedConfig(config); - setShowDeleteModal(true); - }; - - // Toggle token visibility - const toggleTokenVisibility = (configId: number) => { - setShowTokens(prev => ({ - ...prev, - [configId]: !prev[configId] - })); - }; - - // Format token for display - const formatToken = (token: string, isVisible: boolean) => { - if (isVisible) return token; - return '•'.repeat(Math.min(token.length, 20)); - }; - - if (user?.role !== 'admin') { - return ( -
- - - -

Accès restreint

-

- Seuls les administrateurs peuvent gérer les configurations NocoDB. -

- - -
- ); - } - - if (isLoading) { - return ( -
-
-
-
-
- ); - } - - return ( -
- {/* Header */} -
-
-

- - Configuration NocoDB -

-

- Gérez les connexions aux bases de données NocoDB externes pour récupérer des informations. -

-
- -
- - {/* Configurations List */} -
- {safeConfigs.length === 0 ? ( - - - -

Aucune configuration

-

- Commencez par créer votre première configuration NocoDB. -

- - - - ) : ( - safeConfigs.map((config: NocodbConfig) => ( - - -
-
-
- -
-
-
- {config.name} - - {config.isActive ? ( - <> Actif - ) : ( - <> Inactif - )} - -
- {config.description && ( - - {config.description} - - )} -
-
-
- - -
-
- - -
-
- -
- - - {config.baseUrl} - -
-
-
- -
- - {config.projectId} - -
-
-
- -
- - {formatToken(config.apiToken, showTokens[config.id])} - - -
-
-
- - - )) - )} -
- - {/* Create Modal */} - - - - Nouvelle Configuration NocoDB - -
- Créer une nouvelle configuration pour se connecter à une base de données NocoDB externe -
-
- - ( - - Nom de la configuration - - - - - - )} - /> - - ( - - URL de base - - - - - - )} - /> - - ( - - Personal API Token - - - - - - )} - /> - - ( - - ID du projet - - - - - - )} - /> - - ( - - Description (optionnel) - -