Merge pull request #368 from R0m1k3/1.1

1.1

attached_assets/Pasted-ns-CALLING-storage-getPublicities-filterYear-2025-groupIds-undefined-1757343240882_1757343240882.txt

@@ -0,0 +1,205 @@
+ns
+ 
+ 
+ 
+      
+}
+
+📋 CALLING storage.getPublicities: { filterYear: 2025, groupIds: undefined }
+
+📋 PUBLICITES FETCHED: 29 résultats pour année 2025
+
+🔍 PREMIERS RESULTATS: [
+
+  '1. N°2501 - Blanc',
+
+  '2. N°2502 - Moins de 1€ 2€ 3€ 4€ 5€',
+
+  '3. N°2503 - Imbattables'
+
+]
+
+🔍 [PRODUCTION] Raw messages from DB: 2 items: [
+
+  {
+
+    id: 16,
+
+    title: 'Mise à jour Prix',
+
+    content: 'Merci de mettre vos prix a jour tous les matins, certain magasin ne le font pas.',
+
+    type: 'success',
+
+    storeId: null,
+
+    createdBy: 'admin',
+
+    createdAt: 2025-08-18T10:45:08.585Z
+
+  },
+
+  {
+
+    id: 8,
+
+    title: 'Bon de Livraison',
+
+    content: 'Lorsque vous rentrez un numéro de bon de livraison, faite le a l identique, même les majuscules. Pour My candy Shop, prendre le numéro de commande.',
+
+    type: 'info',
+
+    storeId: null,
+
+    createdBy: 'admin_local',
+
+    createdAt: 2025-08-07T11:04:38.123Z
+
+  }
+
+]
+
+🔍 [PRODUCTION] Looking for user with username: admin
+
+🔍 [PRODUCTION] Looking for user with username: admin_local
+
+🔍 [PRODUCTION] User search result: Found
+
+📋 PUBLICITIES RETURNED: { count: 29 }
+
+GET /api/publicities 304 in 77ms
+
+🔍 [PRODUCTION] User search result: Not found
+
+❌ [PRODUCTION] User not found with username: admin_local
+
+🎯 [PRODUCTION] Found announcements: 2
+
+GET /api/announcements 304 in 83ms
+
+GET /api/user 304 in 3ms
+
+Deliveries API called with: {
+
+  startDate: undefined,
+
+  endDate: undefined,
+
+  storeId: '1',
+
+  withBL: undefined,
+
+  userRole: 'admin'
+
+}
+
+🔍 Admin deliveries filtering by store: { storeId: '1', groupIds: [ 1 ], role: 'admin' }
+
+Fetching all deliveries
+
+📢 [SERVER] Fetching announcements for user: admin_local environment: production
+
+Orders API called with: {
+
+  startDate: undefined,
+
+  endDate: undefined,
+
+  storeId: '1',
+
+  userRole: 'admin'
+
+}
+
+🔍 Admin orders filtering by store: { storeId: '1', groupIds: [ 1 ], role: 'admin' }
+
+Fetching all orders
+
+Customer Orders API called with: { groupIds: [ 1 ], userRole: 'admin' }
+
+Customer Orders returned: 11 items
+
+📢 [SERVER] User found: { username: 'admin', role: 'admin' }
+
+🎯 [PRODUCTION] Using PostgreSQL DASHBOARD_MESSAGES table
+
+GET /api/customer-orders 304 in 113ms
+
+🔗 PRODUCTION: getDeliveries() récupéré 82 livraisons avec relations
+
+Deliveries returned: 82 items
+
+GET /api/deliveries 304 in 151ms
+
+GET /api/groups 304 in 139ms
+
+🔗 PRODUCTION: getOrders() récupéré 64 commandes avec relations
+
+Orders returned: 64 items
+
+🔍 [PRODUCTION] Raw messages from DB: 2 items: [
+
+  {
+
+    id: 16,
+
+    title: 'Mise à jour Prix',
+
+    content: 'Merci de mettre vos prix a jour tous les matins, certain magasin ne le font pas.',
+
+    type: 'success',
+
+    storeId: null,
+
+    createdBy: 'admin',
+
+    createdAt: 2025-08-18T10:45:08.585Z
+
+  },
+
+  {
+
+    id: 8,
+
+    title: 'Bon de Livraison',
+
+    content: 'Lorsque vous rentrez un numéro de bon de livraison, faite le a l identique, même les majuscules. Pour My candy Shop, prendre le numéro de commande.',
+
+    type: 'info',
+
+    storeId: null,
+
+    createdBy: 'admin_local',
+
+    createdAt: 2025-08-07T11:04:38.123Z
+
+  }
+
+]
+
+🔍 [PRODUCTION] Looking for user with username: admin
+
+🔍 [PRODUCTION] Looking for user with username: admin_local
+
+GET /api/orders 304 in 198ms
+
+🔍 [PRODUCTION] User search result: Found
+
+🔍 [PRODUCTION] User search result: Not found
+
+🎯 [PRODUCTION] Found announcements: 2
+
+❌ [PRODUCTION] User not found with username: admin_local
+
+GET /api/announcements 304 in 196ms
+
+GET /api/user 304 in 10ms
+
+GET /api/suppliers 304 in 7ms
+
+🔍 Avoirs API called with: { groupIds: undefined, userRole: 'admin' }
+
+📋 Avoirs returned: 1 items
+
+GET /api/avoirs 304 in 11ms
+

client/src/pages/Avoirs.tsx

@@ -24,8 +24,8 @@ interface Avoir {
   id: number;
   supplierId: number;
   groupId: number;
-  invoiceReference: string;
-  amount: number;
+  invoiceReference?: string;
+  amount?: number;
   comment?: string;
   commercialProcessed: boolean;
   status: 'En attente de demande' | 'Demandé' | 'Reçu';
@@ -161,7 +161,7 @@ export default function Avoirs() {
 
   // Filter avoirs based on search term
   const filteredAvoirs = avoirs.filter(avoir =>
-    avoir.invoiceReference.toLowerCase().includes(searchTerm.toLowerCase()) ||
+    avoir.invoiceReference?.toLowerCase().includes(searchTerm.toLowerCase()) ||
     avoir.supplier.name.toLowerCase().includes(searchTerm.toLowerCase()) ||
     avoir.comment?.toLowerCase().includes(searchTerm.toLowerCase()) ||
     (avoir.creator.firstName && avoir.creator.lastName 
@@ -450,7 +450,7 @@ export default function Avoirs() {
                 <div className="flex items-center justify-between">
                   <CardTitle className="text-lg flex items-center">
                     {getStatusIcon(avoir.status)}
-                    <span className="ml-2">#{avoir.invoiceReference}</span>
+                    <span className="ml-2">#{avoir.invoiceReference || 'Sans référence'}</span>
                   </CardTitle>
                   <Badge variant={getStatusVariant(avoir.status)}>
                     {avoir.status}
@@ -475,7 +475,7 @@ export default function Avoirs() {
                   
                   <div className="flex justify-between items-center">
                     <span className="text-sm text-muted-foreground">Montant:</span>
-                    <span className="font-bold text-lg">{avoir.amount.toFixed(2)} €</span>
+                    <span className="font-bold text-lg">{avoir.amount ? avoir.amount.toFixed(2) + ' €' : 'Non spécifié'}</span>
                   </div>
                   
                   {avoir.comment && (