Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryCreateDto.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryCreateDto.java	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryCreateDto.java	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
@@ -0,0 +1,19 @@
+package mk.ukim.finki.db.distributorapp.model.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeliveryCreateDto {
+    private Integer vehId;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date delDate;
+    private List<Long> orders;
+}
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryDto.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryDto.java	(revision 1e9fb8b7819f8def7033a7dd4ac01651a4cc9f1a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryDto.java	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
@@ -4,6 +4,6 @@
 import lombok.Data;
 
-import java.time.LocalDate;
 import java.time.LocalTime;
+import java.util.Date;
 
 @Data
@@ -11,6 +11,6 @@
 public class DeliveryDto {
     private Long id;
-    private LocalDate dateCreated;
-    private LocalDate delDate;
+    private Date dateCreated;
+    private Date delDate;
     private Integer delStartKm;
     private Integer delEndKm;
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliverySimpleDto.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliverySimpleDto.java	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliverySimpleDto.java	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
@@ -0,0 +1,19 @@
+package mk.ukim.finki.db.distributorapp.model.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeliverySimpleDto {
+    private Long deliveryId;
+    private String driverName;
+    private Date deliveryDate;
+    private Date deliveryCreatedDate;
+    private Short deliveryStatus;
+    private String deliveryStatusName;
+}
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/OrderManagerDto.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/OrderManagerDto.java	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/OrderManagerDto.java	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
@@ -0,0 +1,23 @@
+package mk.ukim.finki.db.distributorapp.model.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderManagerDto {
+    private Long id;
+    private java.sql.Date ordDate;
+    private Integer ordSum;
+    private LocalDateTime ordFulfillmentDate;
+    private String customerName;
+    private String ordComment;
+    private Short oStatusId;
+    private Long customerId;
+    private Long deliveryId;
+    private Long pfId;
+}
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/VehicleDto.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/VehicleDto.java	(revision 1e9fb8b7819f8def7033a7dd4ac01651a4cc9f1a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/VehicleDto.java	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
@@ -4,5 +4,5 @@
 import lombok.Data;
 
-import java.time.LocalDate;
+import java.util.Date;
 
 @Data
@@ -13,9 +13,9 @@
     private Short serviceInterval;
     private Integer kilometers;
-    private LocalDate lastServiceDate;
+    private Date lastServiceDate;
     private Integer lastServiceKm;
     private String plate;
     private String vin;
-    private LocalDate registrationDate;
+    private Date registrationDate;
     private Integer whId;
     private String city;
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/WarehouseInventoryDto.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/WarehouseInventoryDto.java	(revision 1e9fb8b7819f8def7033a7dd4ac01651a4cc9f1a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/WarehouseInventoryDto.java	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
@@ -9,4 +9,4 @@
     String articleName;
     String manufacturerName;
-    Integer totalUnits;
+    Long totalUnits;
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Delivery.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Delivery.java	(revision 1e9fb8b7819f8def7033a7dd4ac01651a4cc9f1a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Delivery.java	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
@@ -5,6 +5,6 @@
 import lombok.Data;
 
-import java.time.LocalDate;
 import java.time.LocalTime;
+import java.util.Date;
 import java.util.List;
 
@@ -20,9 +20,9 @@
     @NotNull
     @Column(name = "del_date_created", nullable = false)
-    private LocalDate deliveryDateCreated;
+    private Date deliveryDateCreated;
 
     @NotNull
     @Column(name = "del_date", nullable = false)
-    private LocalDate deliveryDate;
+    private Date deliveryDate;
 
     @Column(name = "del_start_km")
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Vehicle.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Vehicle.java	(revision 1e9fb8b7819f8def7033a7dd4ac01651a4cc9f1a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Vehicle.java	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
@@ -6,5 +6,5 @@
 import lombok.Data;
 
-import java.time.LocalDate;
+import java.util.Date;
 import java.util.List;
 
@@ -31,5 +31,5 @@
 
     @Column(name = "veh_last_service")
-    private LocalDate vehicleLastService;
+    private Date vehicleLastService;
 
     @Column(name = "veh_last_service_km")
@@ -48,5 +48,5 @@
     @NotNull
     @Column(name = "veh_reg", nullable = false)
-    private LocalDate vehicleRegDate;
+    private Date vehicleRegDate;
 
     @NotNull
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryRepository.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryRepository.java	(revision 1e9fb8b7819f8def7033a7dd4ac01651a4cc9f1a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryRepository.java	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
@@ -3,4 +3,5 @@
 import lombok.NonNull;
 import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto;
+import mk.ukim.finki.db.distributorapp.model.dto.DeliverySimpleDto;
 import mk.ukim.finki.db.distributorapp.model.entities.Delivery;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -10,6 +11,6 @@
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDate;
 import java.time.LocalTime;
+import java.util.Date;
 import java.util.List;
 import java.util.Optional;
@@ -52,10 +53,10 @@
     )
     Integer create(
-            @NonNull LocalDate del_date_created,
-            @NonNull LocalDate del_date,
-            @NonNull Integer del_start_km,
-            @NonNull Integer del_end_km,
-            @NonNull LocalTime del_start_time,
-            @NonNull LocalTime del_end_time,
+            @NonNull Date del_date_created,
+            @NonNull Date del_date,
+            Integer del_start_km,
+            Integer del_end_km,
+            LocalTime del_start_time,
+            LocalTime del_end_time,
             @NonNull Short del_status_id,
             @NonNull Integer veh_id
@@ -72,10 +73,10 @@
     Integer edit(
             @NonNull Long id,
-            @NonNull LocalDate del_date_created,
-            @NonNull LocalDate del_date,
-            @NonNull Integer del_start_km,
-            @NonNull Integer del_end_km,
-            @NonNull LocalTime del_start_time,
-            @NonNull LocalTime del_end_time,
+            @NonNull Date del_date_created,
+            @NonNull Date del_date,
+            Integer del_start_km,
+            Integer del_end_km,
+            LocalTime del_start_time,
+            LocalTime del_end_time,
             @NonNull Short del_status_id,
             @NonNull Integer veh_id
@@ -160,3 +161,22 @@
     )
     List<DeliveryDto> getCurrentDeliveriesByManager(@NonNull @Param("manager") Long manager_id);
+
+    @Query(
+            nativeQuery = true,
+            value = """
+                    select del.del_id as deliveryId,
+                           u.user_name as driverName,
+                           del.del_date as deliveryDate,
+                           del.del_date_created as deliveryCreatedDate,
+                           del.d_status_id as deliveryStatus,
+                           ds.d_status_name as deliveryStatusName
+                    from delivery del
+                    join delivery_status ds on ds.d_status_id=del.d_status_id
+                    join vehicle v on del.veh_id = v.veh_id
+                    join driver d on d.veh_id = v.veh_id
+                    join users u on u.user_id=d.user_id
+                    where v.veh_id = ?1
+                    """
+    )
+    List<DeliverySimpleDto> getDeliveriesByVehicle(Integer vehicleId);
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/OrdersRepository.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/OrdersRepository.java	(revision 1e9fb8b7819f8def7033a7dd4ac01651a4cc9f1a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/OrdersRepository.java	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
@@ -2,4 +2,5 @@
 
 import lombok.NonNull;
+import mk.ukim.finki.db.distributorapp.model.dto.OrderManagerDto;
 import mk.ukim.finki.db.distributorapp.model.dto.OrderSimpleDto;
 import mk.ukim.finki.db.distributorapp.model.dto.OrdersDto;
@@ -201,32 +202,37 @@
                            o.ord_sum as ordSum,
                            o.ord_fulfillment_date as ordFulfillmentDate,
-                           o.ord_comment as ordComment,
-                           o.o_status_id as oStatusId,
-                           os.o_status_name as statusName,
-                           c.user_id as customerId,
-                           c.cust_company_name as customerName,
-                           u.user_mobile as customerPhone,
-                           u.user_email as customerEmail,
-                           null as deliveryid,
-                           null as driverId,
-                           null as driverName,
-                           null as driverPhone,
-                           null as driverEmail,
-                           pf.pf_status_id as pfId,
-                           pfs.pf_status_name as pfStatus
+                           c.cust_company_name as customerName,
+                           o.ord_comment as ordComment,
+                           o.o_status_id as oStatusId,
+                           o.cust_id as customerId,
+                           o.del_id as deliveryId,
+                           o.pf_id as pfId
                     from warehouse w
                         join manager m on w.wh_id= m.wh_id
                         join article_unit au on au.wh_id = w.wh_id
                         join orders o on au.ord_id = o.ord_id
+                        join customer c on o.cust_id = c.user_id
                         join order_status os on os.o_status_id = o.o_status_id
-                        join customer c on o.cust_id = c.user_id
-                        join users u on c.user_id = u.user_id
-                        join pro_forma pf on o.pf_id = pf.pf_id
-                        join pro_forma_status pfs on pf.pf_status_id=pfs.pf_status_id
-                    where m.user_id = :manager
-                      and o.o_status_id = 1
-                    order by o.ord_date desc
-                    """
-    )
-    List<OrdersDto> getNewOrdersByManager(@NonNull @Param("manager") Long manager_id);
+                    where m.user_id = ?1
+                    """
+    )
+    List<OrderManagerDto> getNewOrdersByManager(@NonNull Long manager_id);
+
+    @Query(
+            nativeQuery = true,
+            value = """
+                    select o.ord_id as id,
+                           o.ord_date as ordDate,
+                           o.ord_sum as ordSum,
+                           o.ord_fulfillment_date as ordFulfillmentDate,
+                           o.ord_comment as ordComment,
+                           o.o_status_id as oStatusId,
+                           o.cust_id as customerId,
+                           o.del_id as deliveryId,
+                           o.pf_id as pfId
+                    from orders o
+                    where o.ord_id = ?1
+                    """
+    )
+    OrderSimpleDto findSimpleOrdersById(Long orderId);
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/VehicleRepository.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/VehicleRepository.java	(revision 1e9fb8b7819f8def7033a7dd4ac01651a4cc9f1a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/VehicleRepository.java	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
@@ -11,5 +11,5 @@
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDate;
+import java.util.Date;
 import java.util.List;
 import java.util.Optional;
@@ -57,9 +57,9 @@
             @NonNull Short vehicleServiceInterval,
             @NonNull Integer vehicleKilometers,
-            @NonNull LocalDate vehicleLastService,
+            @NonNull Date vehicleLastService,
             @NonNull Integer vehicleLastServiceKm,
             @NonNull String vehiclePlate,
             @NonNull String vehicleVIN,
-            @NonNull LocalDate vehicleRegDate,
+            @NonNull Date vehicleRegDate,
             @NonNull Integer whId);
 
@@ -78,9 +78,9 @@
             @NonNull Short vehicleServiceInterval,
             @NonNull Integer vehicleKilometers,
-            @NonNull LocalDate vehicleLastService,
+            @NonNull Date vehicleLastService,
             @NonNull Integer vehicleLastServiceKm,
             @NonNull String vehiclePlate,
             @NonNull String vehicleVIN,
-            @NonNull LocalDate vehicleRegDate,
+            @NonNull Date vehicleRegDate,
             @NonNull Integer whId);
 
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java	(revision 1e9fb8b7819f8def7033a7dd4ac01651a4cc9f1a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
@@ -1,5 +1,7 @@
 package mk.ukim.finki.db.distributorapp.service;
 
+import mk.ukim.finki.db.distributorapp.model.dto.DeliveryCreateDto;
 import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto;
+import mk.ukim.finki.db.distributorapp.model.dto.DeliverySimpleDto;
 import mk.ukim.finki.db.distributorapp.model.entities.Driver;
 import mk.ukim.finki.db.distributorapp.model.entities.Vehicle;
@@ -16,5 +18,5 @@
     DeliveryDto findDeliveryById(Long id);
 
-    Integer create(DeliveryDto deliveryDto);
+    Integer create(DeliveryCreateDto deliveryDto);
 
     Integer edit(DeliveryDto deliveryDto);
@@ -25,3 +27,5 @@
 
     List<DeliveryDto> getCurrentDeliveriesByManager (Long managerId);
+
+    List<DeliverySimpleDto> getDeliveriesByVehicle (Integer vehicleId);
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrdersService.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrdersService.java	(revision 1e9fb8b7819f8def7033a7dd4ac01651a4cc9f1a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrdersService.java	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
@@ -2,4 +2,5 @@
 
 import mk.ukim.finki.db.distributorapp.model.dto.CreateOrderDto;
+import mk.ukim.finki.db.distributorapp.model.dto.OrderManagerDto;
 import mk.ukim.finki.db.distributorapp.model.dto.OrderSimpleDto;
 import mk.ukim.finki.db.distributorapp.model.dto.OrdersDto;
@@ -14,5 +15,5 @@
     List<OrdersDto> findOrdersByCustomer(Long customerId);
 
-    List<OrderSimpleDto> findSimpleOrdersByCustoemr(Long customerId);
+    List<OrderSimpleDto> findSimpleOrdersByCustomer(Long customerId);
 
     OrdersDto findById(Long id);
@@ -27,4 +28,6 @@
     List<OrdersDto> findCurrentOrdersByCustomer(Long customerId);
 
-    List<OrdersDto> getNewOrdersByManager(Long managerId);
+    List<OrderManagerDto> getNewOrdersByManager(Long managerId);
+
+    void addOrdersToDelivery(List<Long> orderIds, Long deliveryId);
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java	(revision 1e9fb8b7819f8def7033a7dd4ac01651a4cc9f1a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
@@ -2,6 +2,10 @@
 
 import lombok.RequiredArgsConstructor;
+import mk.ukim.finki.db.distributorapp.model.dto.DeliveryCreateDto;
 import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto;
-import mk.ukim.finki.db.distributorapp.model.entities.*;
+import mk.ukim.finki.db.distributorapp.model.dto.DeliverySimpleDto;
+import mk.ukim.finki.db.distributorapp.model.entities.Delivery;
+import mk.ukim.finki.db.distributorapp.model.entities.Driver;
+import mk.ukim.finki.db.distributorapp.model.entities.Vehicle;
 import mk.ukim.finki.db.distributorapp.repository.DeliveryRepository;
 import mk.ukim.finki.db.distributorapp.service.DeliveryService;
@@ -9,4 +13,5 @@
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
@@ -78,13 +83,14 @@
 
     @Override
-    public Integer create(DeliveryDto deliveryDto) {
+    public Integer create(DeliveryCreateDto deliveryDto) {
+        Date currentDate = new Date();
         return this.deliveryRepository.create(
-                deliveryDto.getDateCreated(),
+                currentDate,
                 deliveryDto.getDelDate(),
-                deliveryDto.getDelStartKm(),
-                deliveryDto.getDelEndKm(),
-                deliveryDto.getDelStartTime(),
-                deliveryDto.getDelEndTime(),
-                deliveryDto.getDStatusId(),
+                null,
+                null,
+                null,
+                null,
+                (short) 1,
                 deliveryDto.getVehId()
         );
@@ -120,3 +126,8 @@
         return this.deliveryRepository.getCurrentDeliveriesByManager(managerId);
     }
+
+    @Override
+    public List<DeliverySimpleDto> getDeliveriesByVehicle(Integer vehicleId) {
+        return this.deliveryRepository.getDeliveriesByVehicle(vehicleId);
+    }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrdersServiceImpl.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrdersServiceImpl.java	(revision 1e9fb8b7819f8def7033a7dd4ac01651a4cc9f1a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrdersServiceImpl.java	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
@@ -66,5 +66,5 @@
 
     @Override
-    public List<OrderSimpleDto> findSimpleOrdersByCustoemr(Long customerId){
+    public List<OrderSimpleDto> findSimpleOrdersByCustomer(Long customerId){
         return this.ordersRepository.findSimpleOrdersByCustomer(customerId);
     }
@@ -148,6 +148,25 @@
 
     @Override
-    public List<OrdersDto> getNewOrdersByManager(Long managerId) {
+    public List<OrderManagerDto> getNewOrdersByManager(Long managerId) {
          return this.ordersRepository.getNewOrdersByManager(managerId);
     }
+
+    @Override
+    public void addOrdersToDelivery(List<Long> orderIds, Long deliveryId) {
+        for(Long i : orderIds){
+            OrderSimpleDto order = this.ordersRepository.findSimpleOrdersById(i);
+            order.setDeliveryId(deliveryId);
+            this.ordersRepository.edit(
+                    order.getId(),
+                    order.getOrdDate().toLocalDate(),
+                    order.getOrdSum(),
+                    order.getOrdFulfillmentDate(),
+                    order.getOrdComment(),
+                    order.getOStatusId(),
+                    order.getCustomerId(),
+                    order.getDeliveryId(),
+                    order.getPfId()
+            );
+        }
+    }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CustomerController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CustomerController.java	(revision 1e9fb8b7819f8def7033a7dd4ac01651a4cc9f1a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CustomerController.java	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
@@ -100,5 +100,5 @@
         CustomerDto customer = this.customerService.findCustomerById(user.getId());
 
-        List<OrderSimpleDto> simpleCustomerOrders = this.ordersService.findSimpleOrdersByCustoemr(customer.getId());
+        List<OrderSimpleDto> simpleCustomerOrders = this.ordersService.findSimpleOrdersByCustomer(customer.getId());
         OrderSimpleDto createdOrder = simpleCustomerOrders.get(simpleCustomerOrders.size() - 1);
         WarehouseDto wh = this.warehouseService.findByCityId(user.getCityId());
@@ -110,5 +110,5 @@
         }
 
-        return "redirect:/customer/my-orders";
+        return "redirect:/customer/dashboard";
     }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ManagerController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ManagerController.java	(revision 1e9fb8b7819f8def7033a7dd4ac01651a4cc9f1a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ManagerController.java	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
@@ -2,4 +2,6 @@
 
 import lombok.RequiredArgsConstructor;
+import mk.ukim.finki.db.distributorapp.model.dto.DeliveryCreateDto;
+import mk.ukim.finki.db.distributorapp.model.dto.DeliverySimpleDto;
 import mk.ukim.finki.db.distributorapp.model.dto.UserDto;
 import mk.ukim.finki.db.distributorapp.service.*;
@@ -9,5 +11,9 @@
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.List;
 
 @Controller
@@ -42,3 +48,33 @@
         return "all-managers";
     }
+
+    @GetMapping("/create-delivery")
+    public String createDelivery(Model model){
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        String userEmail = authentication.getName();
+        UserDto user = this.usersService.findUserDtoByEmail(userEmail);
+
+        model.addAttribute("user", user);
+        model.addAttribute("newDelivery", new DeliveryCreateDto());
+        model.addAttribute("newOrders", ordersService.getNewOrdersByManager(user.getId()));
+        model.addAttribute("vehicles", vehicleService.getVehiclesByManager(user.getId()));
+
+        return "create-delivery";
+    }
+
+    @PostMapping("/create-delivery")
+    public String createDelivery(@ModelAttribute DeliveryCreateDto newDelivery){
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        String userEmail = authentication.getName();
+        UserDto user = this.usersService.findUserDtoByEmail(userEmail);
+
+        this.deliveryService.create(newDelivery);
+
+        List<DeliverySimpleDto> deliveries = this.deliveryService.getDeliveriesByVehicle(newDelivery.getVehId());
+        DeliverySimpleDto createdDelivery = deliveries.get(0);
+
+        this.ordersService.addOrdersToDelivery(newDelivery.getOrders(),createdDelivery.getDeliveryId());
+
+        return "redirect:/manager/dashboard";
+    }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestDeliveryController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestDeliveryController.java	(revision 1e9fb8b7819f8def7033a7dd4ac01651a4cc9f1a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestDeliveryController.java	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
@@ -1,4 +1,5 @@
 package mk.ukim.finki.db.distributorapp.web.rest;
 
+import mk.ukim.finki.db.distributorapp.model.dto.DeliveryCreateDto;
 import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto;
 import mk.ukim.finki.db.distributorapp.service.DeliveryService;
@@ -24,5 +25,5 @@
 
     @PutMapping("/add")
-    public ResponseEntity<Integer> addDelivery(@RequestBody DeliveryDto DeliveryDto) {
+    public ResponseEntity<Integer> addDelivery(@RequestBody DeliveryCreateDto DeliveryDto) {
         Integer result = this.deliveryService.create(DeliveryDto);
         return ResponseEntity.ok(result);
Index: backend/src/main/resources/templates/create-delivery.html
===================================================================
--- backend/src/main/resources/templates/create-delivery.html	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
+++ backend/src/main/resources/templates/create-delivery.html	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Create Delivery</title>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css" rel="stylesheet">
+    <style>
+        .scrollable-table {
+            height: 300px;
+            overflow-y: auto;
+        }
+    </style>
+</head>
+<body>
+<div th:replace="~{fragments/navbar :: navbar}"></div>
+<div class="container mt-4">
+    <h1>Create Delivery from Undelivered Orders</h1>
+
+    <form th:action="@{/manager/create-delivery}" method="post" th:object="${newDelivery}">
+        <div class="row">
+            <div class="col-md-8">
+                <h2>Undelivered Orders</h2>
+                <div class="scrollable-table">
+                    <table class="table table-striped">
+                        <thead>
+                        <tr>
+                            <th>Select</th>
+                            <th>Order ID</th>
+                            <th>Order Date</th>
+                            <th>Order Sum</th>
+                            <th>Customer Name</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr th:each="order : ${newOrders}">
+                            <td>
+                                <input type="checkbox" name="orderIds" th:field="*{orders}" th:value="${order.id}"/>
+                            </td>
+                            <td th:text="${order.id}"></td>
+                            <td th:text="${order.ordDate}"></td>
+                            <td th:text="${order.ordSum}"></td>
+                            <td th:text="${order.customerName}"></td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+            <div class="col-md-4">
+                <div class="mb-3">
+                    <label for="deliveryDate" class="form-label">Delivery Date:</label>
+                    <input type="date" id="deliveryDate" name="deliveryDate" class="form-control" th:field="*{delDate}" required>
+                </div>
+                <h2>Select Vehicle</h2>
+                <div class="scrollable-table">
+                    <table class="table table-striped">
+                        <thead>
+                        <tr>
+                            <th>Select</th>
+                            <th>Plate</th>
+                            <th>Load Capacity</th>
+                            <th>Driver name</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr th:each="vehicle : ${vehicles}">
+                            <td>
+                                <input type="radio" name="vehicleId" th:value="${vehicle.id}" th:field="*{vehId}"/>
+                            </td>
+                            <td th:text="${vehicle.getPlate()}"></td>
+                            <td th:text="${vehicle.getCarryWeight()}"></td>
+                            <td th:text="${vehicle.getDriverName()}"></td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+
+        <!-- Submit Button -->
+        <div class="mt-3">
+            <button type="submit" class="btn btn-primary">Create Delivery</button>
+        </div>
+    </form>
+</div>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js"></script>
+</body>
+</html>
Index: backend/src/main/resources/templates/home/manager.html
===================================================================
--- backend/src/main/resources/templates/home/manager.html	(revision 1e9fb8b7819f8def7033a7dd4ac01651a4cc9f1a)
+++ backend/src/main/resources/templates/home/manager.html	(revision 411c954dc60fcc85e21493d2147a40ab238b0823)
@@ -5,4 +5,10 @@
     <title>Manager Home</title>
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css" rel="stylesheet">
+    <style>
+        .scrollable-table {
+            max-height: 300px;
+            overflow-y: auto;
+        }
+    </style>
 </head>
 <body>
@@ -14,39 +20,43 @@
         <div class="col-md-6">
             <h2> Current inventory</h2>
-            <table class="table table-striped">
-                <thead>
-                <tr>
-                    <th>Article</th>
-                    <th>Manufacturer</th>
-                    <th>Quantity</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr th:each="inventory : ${currentInventory}">
-                    <td th:text="${inventory.getArticleName()}"></td>
-                    <td th:text="${inventory.getManufacturerName()}"></td>
-                    <td th:text="${inventory.getTotalUnits()}"></td>
-                </tr>
-                </tbody>
-            </table>
+            <div class="scrollable-table">
+                <table class="table table-striped">
+                    <thead>
+                    <tr>
+                        <th>Article</th>
+                        <th>Manufacturer</th>
+                        <th>Quantity</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr th:each="inventory : ${currentInventory}">
+                        <td th:text="${inventory.getArticleName()}"></td>
+                        <td th:text="${inventory.getManufacturerName()}"></td>
+                        <td th:text="${inventory.getTotalUnits()}"></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
         </div>
         <div class="col-md-6">
             <h2>Vehicle Status</h2>
-            <table class="table table-striped">
-                <thead>
-                <tr>
-                    <th>Vehicle plate</th>
-                    <th>Registration Date</th>
-                    <th>Driver Name</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr th:each="vehicle : ${vehicleStatus}">
-                    <td th:text="${vehicle.getPlate()}"></td>
-                    <td th:text="${vehicle.getRegistrationDate()}"></td>
-                    <td th:text="${vehicle.getDriverName()}"></td>
-                </tr>
-                </tbody>
-            </table>
+            <div class="scrollable-table">
+                <table class="table table-striped">
+                    <thead>
+                    <tr>
+                        <th>Vehicle plate</th>
+                        <th>Registration Date</th>
+                        <th>Driver Name</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr th:each="vehicle : ${vehicleStatus}">
+                        <td th:text="${vehicle.getPlate()}"></td>
+                        <td th:text="${vehicle.getRegistrationDate()}"></td>
+                        <td th:text="${vehicle.getDriverName()}"></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
         </div>
     </div>
@@ -55,40 +65,44 @@
         <div class="col-md-6">
             <h2>New Orders</h2>
-            <table class="table table-striped">
-                <thead>
-                <tr>
-                    <th>Customer</th>
-                    <th>Order Date</th>
-                    <th>Order Sum</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr th:each="order : ${newOrders}">
-                    <td th:text="${order.getCustomerName()}"></td>
-                    <td th:text="${order.getOrdDate()}"></td>
-                    <td th:text="${order.getOrdSum()}"></td>
-                </tr>
-                </tbody>
-            </table>
+            <div class="scrollable-table">
+                <table class="table table-striped">
+                    <thead>
+                    <tr>
+                        <th>Customer</th>
+                        <th>Order Date</th>
+                        <th>Order Sum</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr th:each="order : ${newOrders}">
+                        <td th:text="${order.getCustomerName()}"></td>
+                        <td th:text="${order.getOrdDate()}"></td>
+                        <td th:text="${order.getOrdSum()}"></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
         </div>
 
         <div class="col-md-6">
             <h2>Current Deliveries</h2>
-            <table class="table table-striped">
-                <thead>
-                <tr>
-                    <th>Delivery Driver</th>
-                    <th>Delivery Start Time</th>
-                    <th>Delivery Status</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr th:each="delivery : ${currentDeliveries}">
-                    <td th:text="${delivery.getDriverName()}"></td>
-                    <td th:text="${delivery.getDelStartTime()}"></td>
-                    <td th:text="${delivery.getDelStatus()}"></td>
-                </tr>
-                </tbody>
-            </table>
+            <div class="scrollable-table">
+                <table class="table table-striped">
+                    <thead>
+                    <tr>
+                        <th>Delivery Driver</th>
+                        <th>Delivery Start Time</th>
+                        <th>Delivery Status</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr th:each="delivery : ${currentDeliveries}">
+                        <td th:text="${delivery.getDriverName()}"></td>
+                        <td th:text="${delivery.getDelStartTime()}"></td>
+                        <td th:text="${delivery.getDelStatus()}"></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
         </div>
     </div>