Merge pull request #285 from R0m1k3/1.1

1.1

server/routes.ts

@@ -339,15 +339,15 @@ export async function registerRoutes(app: Express): Promise<Server> {
 
       console.log('Orders API called with:', { startDate, endDate, storeId, userRole: user.role });
 
-      if (user.role === 'admin') {
+      if (user.role === 'admin' || user.role === 'directeur') {
         let groupIds: number[] | undefined;
         
-        // If admin selected a specific store, filter by it
+        // If admin/directeur selected a specific store, filter by it
         if (storeId) {
           groupIds = [parseInt(storeId as string)];
-          console.log('🔍 Admin orders filtering by store:', { storeId, groupIds });
+          console.log('🔍 Admin/Directeur orders filtering by store:', { storeId, groupIds, role: user.role });
         } else {
-          console.log('🔍 Admin orders - showing all stores');
+          console.log('🔍 Admin/Directeur orders - showing all stores', { role: user.role });
         }
         
         // Only filter by date if both startDate and endDate are provided
@@ -359,7 +359,7 @@ export async function registerRoutes(app: Express): Promise<Server> {
           orders = await storage.getOrders(groupIds);
         }
       } else {
-        // For all non-admin roles (manager, employee, directeur), filter by their assigned groups
+        // For manager and employee roles, filter by their assigned groups
         const userGroupIds = (user as any).userGroups?.map((ug: any) => ug.groupId) || [];
         let groupIds: number[] | undefined;
         
@@ -384,14 +384,32 @@ export async function registerRoutes(app: Express): Promise<Server> {
             return res.json([]);
           }
         } else {
-          // IMPORTANT FIX: For directeur/manager roles, when no specific store is selected,
+          // For manager role, automatically use their assigned store
-          // return empty result to force explicit store selection
+          if (user.role === 'manager') {
-          console.log('🔍 Non-admin orders - no store selection, returning empty:', {
+            if (userGroupIds.length > 0) {
-            userId: user.id,
+              groupIds = [userGroupIds[0]]; // Use first assigned store automatically
-            role: user.role,
+              console.log('🔍 Manager orders - using assigned store automatically:', {
-            userGroups: userGroupIds
+                userId: user.id,
-          });
+                role: user.role,
-          return res.json([]);
+                assignedStore: userGroupIds[0],
+                allUserGroups: userGroupIds
+              });
+            } else {
+              console.log('🚫 Manager has no assigned stores:', {
+                userId: user.id,
+                role: user.role
+              });
+              return res.json([]);
+            }
+          } else {
+            // For employee role, require explicit store selection
+            console.log('🔍 Employee orders - no store selection, returning empty:', {
+              userId: user.id,
+              role: user.role,
+              userGroups: userGroupIds
+            });
+            return res.json([]);
+          }
         }
         
         // Only filter by date if both startDate and endDate are provided
@@ -425,8 +443,8 @@ export async function registerRoutes(app: Express): Promise<Server> {
         return res.status(404).json({ message: "Order not found" });
       }
 
-      // Check if user has access to this order (only admin can access all orders)
+      // Check if user has access to this order (admin and directeur can access all orders)
-      if (user.role !== 'admin') {
+      if (user.role !== 'admin' && user.role !== 'directeur') {
         const userGroupIds = (user as any).userGroups?.map((ug: any) => ug.groupId) || [];
         if (!userGroupIds.includes(order.groupId)) {
           return res.status(403).json({ message: "Access denied" });
@@ -527,7 +545,7 @@ export async function registerRoutes(app: Express): Promise<Server> {
         return res.status(403).json({ message: "Insufficient permissions to edit orders" });
       }
 
-      if (user.role !== 'admin') {
+      if (user.role !== 'admin' && user.role !== 'directeur') {
         const userGroupIds = user.userGroups?.map((ug: any) => ug.groupId) || [];
         if (!userGroupIds.includes(order.groupId)) {
           return res.status(403).json({ message: "Access denied" });
@@ -562,7 +580,7 @@ export async function registerRoutes(app: Express): Promise<Server> {
         return res.status(403).json({ message: "Insufficient permissions to delete orders" });
       }
 
-      if (user.role !== 'admin') {
+      if (user.role !== 'admin' && user.role !== 'directeur') {
         const userGroupIds = user.userGroups?.map((ug: any) => ug.groupId) || [];
         if (!userGroupIds.includes(order.groupId)) {
           return res.status(403).json({ message: "Access denied" });
@@ -652,15 +670,15 @@ export async function registerRoutes(app: Express): Promise<Server> {
 
       console.log('Deliveries API called with:', { startDate, endDate, storeId, withBL, userRole: user.role });
 
-      if (user.role === 'admin') {
+      if (user.role === 'admin' || user.role === 'directeur') {
         let groupIds: number[] | undefined;
         
-        // If admin selected a specific store, filter by it
+        // If admin/directeur selected a specific store, filter by it
         if (storeId) {
           groupIds = [parseInt(storeId as string)];
-          console.log('🔍 Admin deliveries filtering by store:', { storeId, groupIds });
+          console.log('🔍 Admin/Directeur deliveries filtering by store:', { storeId, groupIds, role: user.role });
         } else {
-          console.log('🔍 Admin deliveries - showing all stores');
+          console.log('🔍 Admin/Directeur deliveries - showing all stores', { role: user.role });
         }
         
         // Only filter by date if both startDate and endDate are provided
@@ -672,7 +690,7 @@ export async function registerRoutes(app: Express): Promise<Server> {
           deliveries = await storage.getDeliveries(groupIds);
         }
       } else {
-        // For non-admin users (managers, employees, directeurs), filter by their assigned groups
+        // For manager and employee roles, filter by their assigned groups
         const userGroupIds = (user as any).userGroups?.map((ug: any) => ug.groupId) || [];
         let groupIds: number[] | undefined;
         
@@ -697,14 +715,32 @@ export async function registerRoutes(app: Express): Promise<Server> {
             return res.json([]);
           }
         } else {
-          // IMPORTANT FIX: For directeur/manager roles, when no specific store is selected,
+          // For manager role, automatically use their assigned store
-          // return empty result to force explicit store selection
+          if (user.role === 'manager') {
-          console.log('🔍 Non-admin deliveries - no store selection, returning empty:', {
+            if (userGroupIds.length > 0) {
-            userId: user.id,
+              groupIds = [userGroupIds[0]]; // Use first assigned store automatically
-            role: user.role,
+              console.log('🔍 Manager deliveries - using assigned store automatically:', {
-            userGroups: userGroupIds
+                userId: user.id,
-          });
+                role: user.role,
-          return res.json([]);
+                assignedStore: userGroupIds[0],
+                allUserGroups: userGroupIds
+              });
+            } else {
+              console.log('🚫 Manager has no assigned stores:', {
+                userId: user.id,
+                role: user.role
+              });
+              return res.json([]);
+            }
+          } else {
+            // For employee role, require explicit store selection
+            console.log('🔍 Employee deliveries - no store selection, returning empty:', {
+              userId: user.id,
+              role: user.role,
+              userGroups: userGroupIds
+            });
+            return res.json([]);
+          }
         }
         
         // Only filter by date if both startDate and endDate are provided
@@ -777,7 +813,7 @@ export async function registerRoutes(app: Express): Promise<Server> {
         return res.status(403).json({ message: "Insufficient permissions to edit deliveries" });
       }
 
-      if (user.role !== 'admin') {
+      if (user.role !== 'admin' && user.role !== 'directeur') {
         const userGroupIds = (user as any).userGroups?.map((ug: any) => ug.groupId) || [];
         if (!userGroupIds.includes(delivery.groupId)) {
           return res.status(403).json({ message: "Access denied" });
@@ -943,7 +979,7 @@ export async function registerRoutes(app: Express): Promise<Server> {
         return res.status(403).json({ message: "Insufficient permissions to delete deliveries" });
       }
 
-      if (user.role !== 'admin') {
+      if (user.role !== 'admin' && user.role !== 'directeur') {
         const userGroupIds = user.userGroups?.map((ug: any) => ug.groupId) || [];
         if (!userGroupIds.includes(delivery.groupId)) {
           return res.status(403).json({ message: "Access denied" });