Index: src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestOrderController.java
===================================================================
--- src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestOrderController.java	(revision 65546ef268c80b0fff1e53c9830c280b81188e56)
+++ src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestOrderController.java	(revision e31f7b5f55f82ea54f09f1c8ab81d68a6547cb44)
@@ -96,4 +96,12 @@
     }
 
+    @GetMapping("/manager/unassigned-orders-by-city")
+    @PreAuthorize("hasAnyRole('MANAGER')")
+    public ResponseEntity<List<OrderSimpleDto>> getManagerUnassignedOrdersByCity(Principal principal){
+        String userEmail = principal.getName();
+        UserDto user = this.userService.findUserDtoByEmail(userEmail);
+
+    }
+
     // ------------------- MOBILE ANDROID ------------------
     @PostMapping("/mobile/customer/create-order")
Index: src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestVehicleController.java
===================================================================
--- src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestVehicleController.java	(revision 65546ef268c80b0fff1e53c9830c280b81188e56)
+++ src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestVehicleController.java	(revision e31f7b5f55f82ea54f09f1c8ab81d68a6547cb44)
@@ -52,5 +52,5 @@
     @GetMapping("/manager/vehicles/available-vehicles")
     @PreAuthorize("hasAnyRole('MANAGER')")
-    public ResponseEntity<List<VehicleBasicDto>> getManagerAvailableVehicles(
+    public ResponseEntity<?> getManagerAvailableVehicles(
             Principal principal,
             @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date
@@ -58,5 +58,18 @@
         String userEmail = principal.getName();
         UserDto user = this.userService.findUserDtoByEmail(userEmail);
-        List<VehicleBasicDto> vehicles = this.vehicleService.getAvailableVehiclesForDateByManager(user.getId(), date);
+
+        if(user==null){
+            return ResponseEntity.badRequest().body("User not found");
+        }
+
+        List<VehicleDto> vehicles;
+
+        if(date!=null){
+            vehicles = this.vehicleService.getAvailableVehiclesForDateByManager(user.getId(), date);
+        }else{
+            // TODO: Implement with proper method and DTO
+            vehicles = this.vehicleService.getVehiclesByManager(user.getId());
+        }
+
         return ResponseEntity.ok(vehicles);
     }