Fix: create missing directories before file creation

Changes:
- Added ensureDirectoryExists() helper using _mkdir()
- Automatically create missing directories before file operations
- Added FileHelper include in FileManager
- Removed placeholder files/README.md

Fixes #1793

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/controllers/Controller.cpp

@@ -409,10 +409,8 @@ void Controller::removeUser(const std::string& userID)
     User* user = m_userManagementService.getUser(userID);
     if (!user)
     {
-        throw std::runtime_error("Error User not Found.\n");
+        throw std::runtime_error("Error: User not Found.\n");
     }
-    m_serviceManagementService.cancelCustomerServiceBookings(userID);
-    m_serviceManagementService.cancelTechnicianJobs(userID);
     m_userManagementService.removeUser(userID);
 }
 

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/files/README.md

@@ -1 +0,0 @@
-Place files here.

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/models/ServiceBooking.cpp

@@ -24,9 +24,10 @@ Parameters: None
 Returns: A new ServiceBooking object.
 */
 ServiceBooking::ServiceBooking()
-    : m_id("SRV" + std::to_string(++m_uid)),
+    : m_id("SBK" + std::to_string(++m_uid)),
     m_customer(nullptr),
     m_assignedTechnician(nullptr),
+    m_status(util::ServiceJobStatus::PENDING),
     m_discountPercentage(0.0) {}
 
 /*
@@ -56,7 +57,7 @@ ServiceBooking::ServiceBooking(
     const std::string& vehicleModel,
     double discountPercentage
 )
-    : m_id("SRV" + std::to_string(++m_uid)),
+    : m_id("SBK" + std::to_string(++m_uid)),
     m_status(status),
     m_services(services),
     m_customerId(customerId),

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/InventoryManagementService.cpp

@@ -80,7 +80,7 @@ void InventoryManagementService::sendLowStockAlerts()
 	{
 		throw std::runtime_error("The system has no admins present!");
 	}
-	for (int index = 0; index <= inventoryItemsSize; index++)
+	for (int index = 0; index < inventoryItemsSize; index++)
 	{
 		InventoryItem* inventoryItem = inventoryItems.getValueAt(index);
 		if (inventoryItem && inventoryItem->getQuantity() < config::threshold::INVENTORY_LOW_STOCK_THRESHOLD)
@@ -323,7 +323,7 @@ void InventoryManagementService::sendNotification(User* user, const std::string&
 				Factory::getObject<Notification>(
 					user->getId(),
 					user,
-					"InventoryManagementService: " + title,
+					title,
 					message,
 					util::Timestamp()
 				);

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/PaymentManagementService.cpp

@@ -86,7 +86,7 @@ void PaymentManagementService::sendNotification(User* user, const std::string& t
 				Factory::getObject<Notification>(
 					user->getId(),
 					user,
-					"PaymentManagementService: " + title,
+					title,
 					message,
 					util::Timestamp()
 				);
@@ -294,7 +294,7 @@ void PaymentManagementService::generateInvoice(ServiceBooking* booking)
 	{
 		throw std::runtime_error("Invoice generation failed: booking is null.");
 	}
-	double totalLabourCost = 0, totalPartsCost = 0, totalServiceCost = 0;
+	double totalLaborCost = 0, totalPartsCost = 0, totalServiceCost = 0;
 	double discountPercentage = booking->getDiscountPercentage();
 	std::string bookingID = booking->getId();
 	util::Map<std::string, Service*> servicesInTheBookedService = booking->getServices();
@@ -303,9 +303,10 @@ void PaymentManagementService::generateInvoice(ServiceBooking* booking)
 	for (int iterator = 0; iterator < currentJobCards.getSize(); iterator++)
 	{
 		JobCard* currentJobCard = currentJobCards.getValueAt(iterator);
-		if (currentJobCard->getBookingId() == bookingID && currentJobCard->getStatus() != util::ServiceJobStatus::COMPLETED)
+		util::ServiceJobStatus currentJobCardStatus = currentJobCard->getStatus();
+		if (currentJobCard->getBookingId() == bookingID && currentJobCardStatus != util::ServiceJobStatus::CANCELLED && currentJobCardStatus != util::ServiceJobStatus::COMPLETED)
 		{
-			throw std::runtime_error("Invoice generation failed: not all job cards are completed for booking '" + bookingID + "'.");
+			throw std::runtime_error("Invoice generation failed: Not all job cards are completed for booking '" + bookingID + "'.");
 		}
 	}
 	for (int iterator = 0; iterator < servicesInTheBookedService.getSize(); iterator++)
@@ -314,13 +315,13 @@ void PaymentManagementService::generateInvoice(ServiceBooking* booking)
 		if (currentService)
 		{
 			createInventoryItemsMap(completeInventoryItemMapOfBooking, currentService);
-			totalLabourCost += currentService->getLaborCost();
+			totalLaborCost += currentService->getLaborCost();
 			totalPartsCost += util::calculatePartsCost(currentService);
 		}
 	}
-	totalServiceCost = totalLabourCost + totalPartsCost;
+	totalServiceCost = totalLaborCost + totalPartsCost;
 	totalServiceCost -= (totalServiceCost * (discountPercentage / 100));
-	Invoice* invoice = Factory::getObject<Invoice>(bookingID, booking, util::Timestamp(), totalLabourCost, completeInventoryItemMapOfBooking, totalPartsCost, discountPercentage, totalServiceCost, util::Timestamp(), util::PaymentMode::NOTSET, util::PaymentStatus::PENDING);
+	Invoice* invoice = Factory::getObject<Invoice>(bookingID, booking, util::Timestamp(), totalLaborCost, completeInventoryItemMapOfBooking, totalPartsCost, discountPercentage, totalServiceCost, util::Timestamp(), util::PaymentMode::NOTSET, util::PaymentStatus::PENDING);
 	util::Map<std::string, Invoice*>& currentInvoices = m_dataStore.getInvoices();
 	currentInvoices.insert(invoice->getId(), invoice);
 }
@@ -375,7 +376,7 @@ void PaymentManagementService::completePayment(const std::string& invoiceID, uti
 			invoice->setStatus(util::PaymentStatus::COMPLETED);
 			std::string title, message;
 			title = "Payment successful";
-			message = "Payment successful for invoice ID " + invoiceID;
+			message = "Payment successful for Invoice ID " + invoiceID;
 			sendNotification(currentUser, title, message);
 		}
 	}

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/ServiceManagementService.cpp

@@ -23,7 +23,6 @@ Date:19-May-2026
 #include "ServiceBooking.h"
 #include "ServiceManagementService.h"
 #include "Timestamp.h"
-#include "Timestamp.h"
 #include "User.h"
 #include "UserManagementService.h"
 #include "Utility.h"
@@ -61,7 +60,7 @@ void ServiceManagementService::purchaseService(const util::Vector<std::string>&
 		Service* service = servicesMap.getValueAt(serviceIndex);
 		selectedServices[service->getId()] = service;
 	}
-	ServiceBooking* serviceBooking = Factory::getObject<ServiceBooking>(util::ServiceJobStatus::STARTED, selectedServices, authenticatedUser->getId(), authenticatedUser, vehicleNumber, vehicleBrand, vehicleModel, 0);
+	ServiceBooking* serviceBooking = Factory::getObject<ServiceBooking>(util::ServiceJobStatus::PENDING, selectedServices, authenticatedUser->getId(), authenticatedUser, vehicleNumber, vehicleBrand, vehicleModel, 0);
 	if (serviceBooking == nullptr)
 	{
 		throw std::runtime_error("Failed to create service booking");
@@ -100,7 +99,7 @@ void ServiceManagementService::purchaseComboPackage(const std::string& comboPack
 	}
 	const ComboPackage* comboPackage = comboPackagesMap[comboPackageID];
 	util::Map<std::string, Service*> selectedServices = comboPackage->getServices();
-	ServiceBooking* serviceBooking = Factory::getObject<ServiceBooking>(util::ServiceJobStatus::STARTED, selectedServices, authenticatedUser->getId(), authenticatedUser, vehicleNumber, vehicleBrand, vehicleModel, comboPackage->getDiscountPercentage());
+	ServiceBooking* serviceBooking = Factory::getObject<ServiceBooking>(util::ServiceJobStatus::PENDING, selectedServices, authenticatedUser->getId(), authenticatedUser, vehicleNumber, vehicleBrand, vehicleModel, comboPackage->getDiscountPercentage());
 	if (serviceBooking == nullptr)
 	{
 		throw std::runtime_error("Failed to create combo package service booking");
@@ -175,7 +174,7 @@ void ServiceManagementService::sendNotification(User* user, const std::string& t
 				Factory::getObject<Notification>(
 					user->getId(),
 					user,
-					"ServiceManagementService: " + title,
+					title,
 					message,
 					util::Timestamp()
 				);
@@ -508,6 +507,89 @@ void ServiceManagementService::saveObservers()
     util::saveObservers(config::file::SERVICEMANAGEMENTOBSERVERS, this);
 }
 
+/*
+Function: restoreInventory
+Description: Restores inventory quantities for all required items in the services associated
+             with a given booking. Each item's quantity is incremented by a fixed value.
+Parameter: ServiceBooking* booking - Pointer to the booking whose inventory items need to be restored
+Return type: void
+*/
+static void restoreInventory(ServiceBooking* booking)
+{
+    const int INCREMENT_VALUE = 1;
+    if (!booking) 
+    {
+        return;
+    }
+    const auto& services = booking->getServices();
+    for (int serviceIterator = 0; serviceIterator < services.getSize(); ++serviceIterator)
+    {
+        Service* service = services.getValueAt(serviceIterator);
+        if (!service) 
+        {
+            continue;
+        }
+        const auto& items = service->getRequiredInventoryItems();
+        for (int InventoryIterator = 0; InventoryIterator < items.getSize(); ++InventoryIterator)
+        {
+            InventoryItem* item = items.getValueAt(InventoryIterator);
+            if (item)
+            {
+                item->setQuantity(item->getQuantity() + INCREMENT_VALUE);
+            }
+        }
+    }
+}
+
+/*
+Function: processBookingCancellation
+Description: Cancels jobs and updates the status of a given booking. Sends notifications to the
+             specified user, resets technician assignment if needed, and restores inventory items.
+Parameter: ServiceBooking* booking - Pointer to the booking being cancelled
+           util::ServiceJobStatus newServiceBookingStatus - New status to assign to the booking
+           const std::string& notificationTitle - Title of the booking cancellation notification
+           const std::string& notificationMessage - Message body of the booking cancellation notification
+           User* notifyUser - User to notify about the cancellation
+           util::ServiceJobStatus jobCardStatus - New status to assign to associated job cards
+           const std::string& jobNotificationTitle - Title of the job cancellation notification
+           const std::string& jobNotificationMessage - Message body of the job cancellation notification
+           util::Map<std::string, JobCard*>& jobs - Collection of job cards to update
+           ServiceManagementService& currentService - Reference to the service for sending notifications
+Return type: void
+*/
+static void processBookingCancellation(ServiceBooking* booking,
+    util::ServiceJobStatus newServiceBookingStatus,
+    const std::string& notificationTitle,
+    const std::string& notificationMessage,
+    User* notifyUser,
+    util::ServiceJobStatus jobCardStatus,
+    const std::string& jobNotificationTitle,
+    const std::string& jobNotificationMessage,
+    util::Map<std::string, JobCard*>& jobs, ServiceManagementService& currentService)
+{
+    if (!booking || !notifyUser)
+    {
+        return;
+    }
+    for (int jobIterator = 0; jobIterator < jobs.getSize(); ++jobIterator)
+    {
+        JobCard* jobCard = jobs.getValueAt(jobIterator);
+        if (jobCard && jobCard->getBookingId() == booking->getId())
+        {
+            jobCard->setStatus(jobCardStatus);
+            currentService.sendNotification(notifyUser, jobNotificationTitle, jobNotificationMessage);
+        }
+    }
+    booking->setStatus(newServiceBookingStatus);
+    currentService.sendNotification(notifyUser, notificationTitle, notificationMessage);
+    if (newServiceBookingStatus == util::ServiceJobStatus::PENDING)
+    {
+        booking->setAssignedTechnician(nullptr);
+        booking->setAssignedTechnicianId("");
+    }
+    restoreInventory(booking);
+}
+
 /*
 Function: cancelCustomerServiceBookings
 Description: Cancels all service bookings associated with a given customer or technician.
@@ -516,69 +598,47 @@ Description: Cancels all service bookings associated with a given customer or te
 Parameter: const std::string& userID - ID of the customer or technician
 Return type: void
 */
-void ServiceManagementService::cancelCustomerServiceBookings(const std::string& userID)
+void ServiceManagementService::cancelCustomerServiceBookings(const std::string& customerID)
 {
-    const int INCREMENT_VALUE = 1;
     auto& users = m_dataStore.getUsers();
-    int userIndex = users.find(userID);
+    int userIndex = users.find(customerID);
     if (userIndex == -1)
     {
-        throw std::runtime_error("User not found: " + userID);
+        throw std::runtime_error("User not found: " + customerID);
     }
-    User* user = users.getValueAt(userIndex);
+    User* customer = users.getValueAt(userIndex);
-    if (user == nullptr)
+    if (!customer)
     {
-        throw std::runtime_error("User not found: " + userID);
+        throw std::runtime_error("User not found: " + customerID);
     }
-    util::UserType type = user->getUserType();
+    auto& bookings = m_dataStore.getServiceBookings();
-    auto& bookings = DataStore::getInstance().getServiceBookings();
+    auto& jobs = m_dataStore.getJobCards();
-    for (int bookingIterator = 0; bookingIterator < bookings.getSize(); bookingIterator++)
+    for (int iteratorOne = 0; iteratorOne < bookings.getSize(); iteratorOne++)
     {
-        ServiceBooking* booking = bookings.getValueAt(bookingIterator);
+        ServiceBooking* booking = bookings.getValueAt(iteratorOne);
-        if (booking != nullptr &&
+        if (!booking)
-            (booking->getCustomerId() == userID || booking->getAssignedTechnicianId() == userID))
         {
-            if (booking->getStatus() == util::ServiceJobStatus::PENDING ||
+            continue;
-                booking->getStatus() == util::ServiceJobStatus::STARTED)
+        }
+        if (booking->getCustomerId() != customerID)
         {
-                if (type == util::UserType::CUSTOMER)
+            continue;
+        }
+        if (booking->getStatus() != util::ServiceJobStatus::PENDING && booking->getStatus() != util::ServiceJobStatus::STARTED)
         {
-                    booking->setStatus(util::ServiceJobStatus::CANCELLED);
+            continue;
-                    booking->setCustomer(nullptr);
+        }
-                    booking->setCustomerId("");
         User* assignedTechnician = booking->getAssignedTechnician();
-                    std::string title = "Customer Service Cancelled";
+        std::string titleToTechnician = "Customer Service Cancelled";
-                    std::string message = "The customer has cancelled their service booking. Your assigned job card has been cancelled and the inventory has been restocked.";
+        std::string messageToTechnician = "The customer has cancelled their service booking. Your assigned job card has been cancelled and the inventory has been restocked.";
-                    sendNotification(assignedTechnician, title, message);
+        std::string jobTitle = "Job Cancelled";
-                }
+        std::string jobMessage = "The job has been cancelled. Your job card has been cancelled and the inventory has been restocked.";
-                else if (type == util::UserType::TECHNICIAN)
+        processBookingCancellation(booking, 
-                {
+            util::ServiceJobStatus::CANCELLED,
-                    booking->setStatus(util::ServiceJobStatus::PENDING);
+            titleToTechnician, messageToTechnician, assignedTechnician,
-                    std::string title = "Technician Unavailable";
+            util::ServiceJobStatus::CANCELLED,
-                    std::string message = "Your assigned technician is no longer available. Your booking has been reset to pending, and we will reassign a new technician shortly.";
+            jobTitle, jobMessage, jobs, *this
-                    sendNotification(booking->getCustomer(), title, message); 
+        );
-                }
-                booking->setAssignedTechnician(nullptr);
-                booking->setAssignedTechnicianId("");
-                const auto& ListOfServices = booking->getServices();
-                for (int serviceIterator = 0; serviceIterator < ListOfServices.getSize(); serviceIterator++)
-                {
-                    Service* service = ListOfServices.getValueAt(serviceIterator);
-                    if (service != nullptr)
-                    {
-                        const auto& items = service->getRequiredInventoryItems();
-                        for (int itemIterator = 0; itemIterator < items.getSize(); itemIterator++)
-                        {
-                            InventoryItem* item = items.getValueAt(itemIterator);
-                            if (item != nullptr)
-                            {
-                                item->setQuantity(item->getQuantity() + INCREMENT_VALUE);
-                            }
-                        }
-                    }
-                }
-            }
-        }
     }
 }
 
@@ -591,34 +651,48 @@ Return type: void
 */
 void ServiceManagementService::cancelTechnicianJobs(const std::string& technicianID)
 {
-    const int INCREMENT_VALUE = 1;
+    auto& users = m_dataStore.getUsers();
+    int userIndex = users.find(technicianID);
+    if (userIndex == -1)
+    {
+        throw std::runtime_error("User not found: " + technicianID);
+    }
+    User* technician = users.getValueAt(userIndex);
+    if (!technician)
+    {
+        throw std::runtime_error("User not found: " + technicianID);
+    }
+    auto& bookings = m_dataStore.getServiceBookings();
     auto& jobs = m_dataStore.getJobCards();
-    for (int jobIterator = 0; jobIterator < jobs.getSize(); jobIterator++)
+    for (int iteratorOne = 0; iteratorOne < bookings.getSize(); iteratorOne++)
     {
-        JobCard* job = jobs.getValueAt(jobIterator);
+        ServiceBooking* booking = bookings.getValueAt(iteratorOne);
-        if (job != nullptr && job->getTechnicianId() == technicianID)
+        if (!booking)
         {
-            if (job->getStatus() == util::ServiceJobStatus::PENDING || job->getStatus() == util::ServiceJobStatus::STARTED)
+            continue;
-            {
-                job->setStatus(util::ServiceJobStatus::CANCELLED);
-                std::string title = "Job Cancelled";
-                std::string message = "The Job has cancelled. Your job card has been cancelled and the inventory has been restocked.";
-                sendNotification(job->getTechnician(), title, message);
-                Service* service = job->getService();
-                if (service != nullptr)
-                {
-                    const auto& items = service->getRequiredInventoryItems();
-                    for (int itemIterator = 0; itemIterator < items.getSize(); itemIterator++)
-                    {
-                        InventoryItem* item = items.getValueAt(itemIterator);
-                        if (item != nullptr)
-                        {
-                            item->setQuantity(item->getQuantity() + INCREMENT_VALUE);
-                        }
         }
+        std::string technicianId = booking->getAssignedTechnicianId();
+        if (technicianId != technicianID)
+        {
+            continue;
         }
+        if (booking->getStatus() != util::ServiceJobStatus::PENDING && booking->getStatus() != util::ServiceJobStatus::STARTED)
+        {
+            continue;
         }
+        User* customer = booking->getCustomer();
+        if (!customer)
+        {
+            continue;
         }
+        std::string title = "Technician Unavailable";
+        std::string message = "Your assigned technician is no longer available. Your booking has been reset to pending and we will reassign a new technician shortly.";
+        processBookingCancellation(booking,
+            util::ServiceJobStatus::PENDING,
+            title, message, customer,
+            util::ServiceJobStatus::CANCELLED,
+            title, message, jobs, *this
+        );
     }
 }
 
@@ -817,6 +891,10 @@ void ServiceManagementService::createJobCard(const std::string& bookingID, const
 	}
 	currentBooking->setAssignedTechnician(selectedTechnician);
 	currentBooking->setAssignedTechnicianId(selectedTechnician->getId());
+    if (currentBooking->getStatus() == util::ServiceJobStatus::PENDING)
+    {
+        currentBooking->setStatus(util::ServiceJobStatus::STARTED);
+    }
 	std::string title = "Job card created";
 	std::string message = "Job card created for the service and you are assigned for that.";
 	JobCard* jobCard = Factory::getObject<JobCard>(bookingID, currentBooking, currentService, serviceID, technicianID, selectedTechnician, util::Timestamp(), util::ServiceJobStatus::STARTED, util::Timestamp());
@@ -829,6 +907,9 @@ void ServiceManagementService::createJobCard(const std::string& bookingID, const
 	{
 		throw std::runtime_error("Failed to create job card.");
 	}
+    title = "Technician assigned";
+    message = "A technician has been assigned to your Service Booking with ID " + bookingID;
+    sendNotification(currentBooking->getCustomer(), title, message);
 }
 
 /*
@@ -906,9 +987,27 @@ Throws:
 void ServiceManagementService::removeService(const std::string& serviceID)
 {
 	util::Map<std::string, Service*>& currentServices = m_dataStore.getServices();
+    util::Map<std::string, ComboPackage*>& currentComboPackages =  m_dataStore.getComboPackages();
 	if (currentServices.find(serviceID) != -1)
 	{
 		currentServices.getValueAt(currentServices.find(serviceID))->setState(util::State::INACTIVE);
+        for (int iterator = 0; iterator < currentComboPackages.getSize(); iterator++)
+        {
+            ComboPackage* currentComboPackage = currentComboPackages.getValueAt(iterator);
+            if (currentComboPackage && currentComboPackage->getState() == util::State::ACTIVE)
+            {
+                util::Map<std::string, Service*> currentServices = currentComboPackage->getServices();
+                for (int iterator = 0; iterator < currentServices.getSize(); iterator++)
+                {
+                    auto currentService = currentServices.getValueAt(iterator);
+                    if (currentService->getId() == serviceID)
+                    {
+                        currentComboPackage->setState(util::State::INACTIVE);
+                        break;
+                    }
+                }
+            }
+        }
 	}
 	else
 	{
@@ -1033,11 +1132,11 @@ void ServiceManagementService::completeJob(const std::string& jobID)
 	}
 	else
 	{
-		throw std::runtime_error("Failed to complete the job, some error occured or job already completed.");
+		throw std::runtime_error("Failed to complete the job, some error occurred or job already completed.");
 	}
 	if (!jobStatusUpdated)
 	{
-		throw std::runtime_error("Failed to complete the job, some error occured or job already completed.");
+		throw std::runtime_error("Failed to complete the job, some error occurred or job already completed.");
 	}
 
 	serviceBookingCompleted = hasCompletedAllJobs(currentJob->getBookingId(), currentAssignedJobs);
@@ -1045,8 +1144,8 @@ void ServiceManagementService::completeJob(const std::string& jobID)
 	{
 		currentJob->getBooking()->setStatus(util::ServiceJobStatus::COMPLETED);
 		paymentManagementService.generateInvoice(currentJob->getBooking());
-		std::string title = "Service Booking completed,Invoice Generated.\n";
+		std::string title = "Service Booking completed. Invoice Generated.";
-		std::string message = "Services completed for the booking and invoice generated.\n";
+		std::string message = "Services completed for the booking and invoice generated.";
 		sendNotification(currentJob->getBooking()->getCustomer(), title, message);
 	}
 }

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/UserManagementService.cpp

@@ -19,7 +19,7 @@ Date:19-May-2026
 #include "User.h"
 #include "UserManagementService.h"
 #include "Vector.h"
-
+#include "Validator.h"
 
 /*
 Function: ensureAdminExists
@@ -74,16 +74,18 @@ void UserManagementService::createUser(const std::string& username, const std::s
 	PaymentManagementService paymentManagementService;
 	ServiceManagementService serviceManagementService;
 	auto& usersMap = m_dataStore.getUsers();
-	int index = usersMap.findIf(
+	if (util::isUsernameDuplicate(username, usersMap))
-		[&](const std::string&, User* user)
-		{
-			return user->getUserName() == username;
-		}
-	);
-	if (index != -1)
 	{
 		throw std::runtime_error("Username already exists");
 	}
+	if (util::isEmailDuplicate(email, usersMap))
+	{
+		throw std::runtime_error("Email already exists");
+	}
+	if (util::isPhoneDuplicate(phone, usersMap))
+	{
+		throw std::runtime_error("Phone already exists");
+	}
 	User* newUser = Factory::getObject<User>(username, password, name, phone, email, type);
 	usersMap.insert(newUser->getId(), newUser);
 	paymentManagementService.attach(newUser);
@@ -109,9 +111,23 @@ void UserManagementService::updateUserDetails(const std::string& userID, const s
 	int index = usersMap.find(userID);
 	if (index == -1)
 	{
-		throw std::runtime_error("User does not exist!");
+		throw std::runtime_error("User does not exist!\n");
 	}
 	User* user = usersMap.getValueAt(index);
+	if (email != user->getEmail())
+	{
+		if (util::isEmailDuplicate(email, usersMap))
+		{
+			throw std::runtime_error("Email already exists!\n");
+		}
+	}
+	if (phone != user->getPhone())
+	{
+		if (util::isPhoneDuplicate(phone, usersMap))
+		{
+			throw std::runtime_error("Phone number already exists!\n");
+		}
+	}
 	user->setEmail(email);
 	user->setPhone(phone);
 }
@@ -281,13 +297,27 @@ Return type: void
 */
 void UserManagementService::removeUser(const std::string& userID)
 {
+	InventoryManagementService inventoryManagementService;
+	PaymentManagementService paymentManagementService;
+	ServiceManagementService serviceManagementService;
 	int index = m_dataStore.getUsers().find(userID);
 	if (index != -1)
 	{
 		User* user = m_dataStore.getUsers().getValueAt(index);
 		if (user != nullptr)
 		{
+			if (user->getUserType() == util::UserType::CUSTOMER)
+			{
+				serviceManagementService.cancelCustomerServiceBookings(userID);	
+			}
+			if (user->getUserType() == util::UserType::TECHNICIAN)
+			{
+				serviceManagementService.cancelTechnicianJobs(userID);
+			}
 			user->setState(util::State::INACTIVE);
+			inventoryManagementService.detach(user);
+			paymentManagementService.detach(user);
+			serviceManagementService.detach(user);
 		}
 	}
 }
@@ -299,7 +329,7 @@ util::Map<std::string, User*> UserManagementService::getUsers(util::UserType typ
 	for (int iterator = 0; iterator < currentUsers.getSize(); iterator++)
 	{
 		User* currentUser = currentUsers.getValueAt(iterator);
-		if (currentUser->getUserType() == type)
+		if (currentUser && currentUser->getState() == util::State::ACTIVE && currentUser->getUserType() == type)
 		{
 			filteredUsersMap.insert(currentUser->getId(), currentUser);
 		}

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/utilities/Enums.h

@@ -137,6 +137,10 @@ namespace util
         {
             return PaymentMode::OFFLINE;
         }
+        if (value == "NOTSET")
+        {
+            return PaymentMode::NOTSET;
+        }
         throw std::invalid_argument("Invalid PaymentMode string");
     }
 

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/utilities/FileHelper.h

@@ -11,10 +11,39 @@ Date: 22-May-2026
 #include <fstream>
 #include <string>
 #include <stdexcept>
+#include <direct.h>
 #include "Vector.h"
 
 namespace util
 {
+    /*
+    Function: ensureDirectoryExists
+    Description: Creates all missing directories present in the given file path.
+                Iteratively parses the path and creates each directory level
+                using _mkdir() before file operations are performed.
+    Parameters:
+        - filePath: const std::string&, relative or absolute file path
+    Returns:
+        - void
+    Throws:
+        - None (_mkdir failures are intentionally ignored if directory already exists)
+    */
+    inline void ensureDirectoryExists(const std::string& filePath)
+    {
+        size_t position = 0;
+
+        while ((position = filePath.find('/', position)) != std::string::npos)
+        {
+            std::string directory = filePath.substr(0, position);
+
+            if (!directory.empty())
+            {
+                (void)_mkdir(directory.c_str());
+            }
+            position++;
+        }
+    }
+
     /*
     Function: loadRecords
     Description: Loads records from a given file path into a vector of strings.
@@ -32,6 +61,7 @@ namespace util
         std::ifstream file(filePath);
         if (!file.is_open())
         {
+            ensureDirectoryExists(filePath);
             std::ofstream newFile(filePath);
             newFile.close();
             file.open(filePath);

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/utilities/FileManager.h

@@ -15,6 +15,7 @@ Date: 22-May-2026
 #include <fstream>
 #include "Vector.h"
 #include "Map.h"
+#include "FileHelper.h"
 
 namespace util
 {
@@ -51,6 +52,7 @@ namespace util
 		std::ifstream file(m_filePath);
 		if (!file.is_open())
 		{
+			ensureDirectoryExists(m_filePath);
 			std::ofstream newFile(m_filePath);
 			newFile.close();
 			file.open(m_filePath);

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/utilities/InputHelper.h

@@ -62,6 +62,7 @@ namespace util
      */
     inline void pressEnter()
     {
+        std::cout << std::endl;
         system("pause");
     }
 }

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/utilities/OutputHelper.h

@@ -21,4 +21,28 @@ namespace util
     {
         std::cout << "\x1B[2J\x1B[H" << std::flush;
     }
+
+    /*
+    Function: truncateString
+    Description:
+        Truncates a string if its length exceeds the given maximum length.
+        The truncated string ends with "..." to indicate omitted characters.
+    Parameters:
+        - text: const std::string&, input string to truncate
+        - maxLength: size_t, maximum allowed length of the returned string
+    Returns:
+        - std::string: Original string if within limit, otherwise truncated string with "..."
+    */
+    inline std::string truncateString(const std::string& text, size_t maxLength)
+    {
+        if (text.length() <= maxLength)
+        {
+            return text;
+        }
+        if (maxLength <= 3)
+        {
+            return std::string(maxLength, '.');
+        }
+        return text.substr(0, maxLength - 3) + "...";
+    }
 }

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/utilities/Validator.cpp

@@ -107,3 +107,69 @@ bool util::isPasswordValid(const std::string& password)
 
     return hasUpper && hasLower && hasDigit && hasSpecial;
 }
+
+/*
+ * Function: isUsernameDuplicate
+ * Description: Checks if the given username already exists among active users.
+ * Parameters:
+ *     username - string containing the username to validate
+ *     usersMap - map of user objects keyed by identifier
+ * Returns:
+ *     bool - true if the username is already in use by an active user, false otherwise
+ * Notes:
+ *     - Only considers users with state util::State::ACTIVE
+ */
+bool util::isUsernameDuplicate(const std::string& username, const util::Map<std::string, User*>& usersMap)
+{
+    int index = usersMap.findIf(
+        [&](const std::string&, User* user)
+        {
+            return (user->getUserName() == username && user->getState() == util::State::ACTIVE);
+        }
+    );
+    return index != -1;
+}
+
+/*
+ * Function: isPhoneDuplicate
+ * Description: Checks if the given phone number already exists among active users.
+ * Parameters:
+ *     phone - string containing the phone number to validate
+ *     usersMap - map of user objects keyed by identifier
+ * Returns:
+ *     bool - true if the phone number is already in use by an active user, false otherwise
+ * Notes:
+ *     - Only considers users with state util::State::ACTIVE
+ */
+bool util::isPhoneDuplicate(const std::string& phone, const util::Map<std::string, User*>& usersMap)
+{
+    int index = usersMap.findIf(
+        [&](const std::string&, User* user)
+        {
+            return (user->getPhone() == phone && user->getState() == util::State::ACTIVE);
+        }
+    );
+    return index != -1;
+}
+
+/*
+ * Function: isEmailDuplicate
+ * Description: Checks if the given email address already exists among active users.
+ * Parameters:
+ *     email - string containing the email address to validate
+ *     usersMap - map of user objects keyed by identifier
+ * Returns:
+ *     bool - true if the email address is already in use by an active user, false otherwise
+ * Notes:
+ *     - Only considers users with state util::State::ACTIVE
+ */
+bool util::isEmailDuplicate(const std::string& email, const util::Map<std::string, User*>& usersMap)
+{
+    int index = usersMap.findIf(
+        [&](const std::string&, User* user)
+        {
+            return (user->getEmail() == email && user->getState() == util::State::ACTIVE);
+        }
+    );
+    return index != -1;
+}

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/utilities/Validator.h

@@ -9,10 +9,15 @@
 #include<string>
 #include<algorithm>
 #include<cctype>
+#include "Map.h"
+#include "User.h"
 
 namespace util
 {
 	bool isPhoneNumberValid(const std::string&);
 	bool isEmailValid(const std::string&);
 	bool isPasswordValid(const std::string&);
+	bool isUsernameDuplicate(const std::string&, const util::Map<std::string, User*>&);
+	bool isPhoneDuplicate(const std::string&, const util::Map<std::string, User*>&);
+	bool isEmailDuplicate(const std::string&, const util::Map<std::string, User*>&);
 }

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/AdminMenu.cpp

@@ -158,10 +158,33 @@ void AdminMenu::viewStockLevels()
 {
     util::clear();
 	auto inventoryItems = m_controller.getInventoryItems();
+	bool hasActiveItems = false;
+	std::cout << "View Stock Levels" << std::endl;
+	if (inventoryItems.isEmpty())
+	{
+		std::cout << "No items found in Inventory.\n";
+		util::pressEnter();
+		return;
+	}
+	for (int index = 0; index < inventoryItems.getSize(); index++)
+	{
+		const InventoryItem* item = inventoryItems.getValueAt(index);
+		if (item->getState() == util::State::ACTIVE)
+		{
+			hasActiveItems = true;
+			break;
+		}
+	}
+	if (!hasActiveItems)
+	{
+		std::cout << "No active Inventory Item found.\n";
+		util::pressEnter();
+		return;
+	}
 	std::cout << std::left << std::setw(15) << "Item ID"
 		<< std::setw(25) << "Part Name"
-		<< std::setw(10) << "Quantity"
+		<< std::setw(15) << "Quantity"
-		<< std::setw(10) << "Price"
+		<< std::setw(15) << "Price"
 		<< std::endl;
 	for (int iterator = 0; iterator < inventoryItems.getSize(); ++iterator)
 	{
@@ -172,12 +195,14 @@ void AdminMenu::viewStockLevels()
 			{
 				std::cout << std::left << std::setw(15) << item->getId()
 					<< std::setw(25) << item->getPartName()
-					<< std::setw(10) << item->getQuantity()
+					<< std::setw(15) << item->getQuantity()
-					<< std::setw(10) << item->getPrice()
+					<< std::setw(15) << item->getPrice()
 					<< std::endl;
 			}
 		}
 	}
+	std::cout << "\n";
+	util::pressEnter();
 }
 
 /*
@@ -193,13 +218,15 @@ void AdminMenu::addInventoryItem()
 	int choice, quantity;
 	double price;
 	std::string partName;
-	std::cout << "1. Add new item \n2. Add Quantity\nEnter your choice : ";
+	std::cout << "Add Inventory Item\n";
+	std::cout << "1. Add new item \n2. Restock Item\n\nEnter your choice : ";
 	util::read(choice);
 	switch (choice)
 	{
 	case 1:
 	{
-		std::cout << "--------Enter Item Details----------\n";
+		util::clear();
+		std::cout << "Enter Item Details\n";
 		std::cout << "Part Name : ";
 		util::read(partName);
 		std::cout << "Quantity : ";
@@ -207,15 +234,21 @@ void AdminMenu::addInventoryItem()
 		std::cout << "Price : ";
 		util::read(price);
 		m_controller.addInventoryItem(partName, quantity, price);
-		std::cout << "New Item " << partName << " added to the Inventory.\n";
+		std::cout << "\nNew Item " << partName << " added to the Inventory.\n\n";
 		break;
 	}
 	case 2:
 	{
+		util::clear();
+		std::cout << "Select Item to Restock\n";
 		auto inventoryItems = m_controller.getInventoryItems();
 		addQuantityToItem(inventoryItems, m_controller);
 		break;
 	}
+	default:
+	{
+		std::cout << "\nEnter a valid choice.\n\n";
+	}
 	}
 	util::pressEnter();
 }
@@ -230,6 +263,7 @@ Return type: void
 void AdminMenu::removeInventoryItem()
 {
     util::clear();
+	std::cout << "Remove Inventory Item\n";
     auto inventoryItems = m_controller.getInventoryItems();
     auto activeItems = filterActiveItems(inventoryItems);
     int activeItemsSize = activeItems.getSize();
@@ -273,8 +307,10 @@ void AdminMenu::checkStockAvailability()
 {
 	util::clear();
 	std::string itemId;
-	std::cout << "Enter the Item Id : ";
+	std::cout << "Check Stock Availability \n";
+	std::cout << "Enter the Item ID : ";
 	util::read(itemId);
+	util::clear();
 	const InventoryItem* selectedItem = m_controller.getInventoryItem(itemId);
 	if (selectedItem != nullptr)
 	{
@@ -287,6 +323,10 @@ void AdminMenu::checkStockAvailability()
 			std::cout << "Quantity     : " << selectedItem->getQuantity() << "\n";
 		}
 	}
+	else
+	{
+		std::cout << "Item not Found" << std::endl;
+	}
 	util::pressEnter();
 }
 
@@ -302,14 +342,16 @@ Returns:
 void AdminMenu::assignJob()
 {
 	util::clear();
+	std::cout << "Assign Job to Technician\n";
 	std::string selectedService;
 	bool hasPendingService = false;
 	auto currentBookings = m_controller.getServiceBookings();
+	auto pendingServiceBookings = filterActiveServiceBookings(currentBookings);
 	auto availableTechnicians = m_controller.getUsers(util::UserType::TECHNICIAN);
-	int bookingsSize = currentBookings.getSize();
+	int bookingsSize = pendingServiceBookings.getSize();
 	util::Map<int, const ServiceBooking*> serviceBookingsMap;
 	util::Map<int, const User*> currentAvailableTechniciansMap;
-	if (listServiceBookings(currentBookings, bookingsSize, serviceBookingsMap))
+	if (listServiceBookings(pendingServiceBookings, bookingsSize, serviceBookingsMap))
 	{
 		const ServiceBooking* selectedService = selectPendingServiceBookings(serviceBookingsMap);
 		if (selectedService)
@@ -325,14 +367,19 @@ void AdminMenu::assignJob()
 					{
 						m_controller.createJobCard(selectedService->getId(), selectedTechnician->getId(), servicesInBooking.getValueAt(iterator)->getId());
 					}
+					std::cout << "Job card created for each service and technician successfully assigned.\n\n";
 				}
 			}
 			else
 			{
-				std::cout << "No technicians are currently available.";
+				std::cout << "No technicians are currently available.\n\n";
 			}
 		}
 	}
+	else
+	{
+		std::cout << "No pending service bookings available.\n\n";
+	}
 	util::pressEnter();
 }
 
@@ -347,17 +394,24 @@ Returns:
 void AdminMenu::createService()
 {
 	util::clear();
+	std::cout << "Create Service\n";
 	std::string serviceName;
 	double labourCost;
 	std::cout << "Enter the service name: ";
 	util::read(serviceName);
 	util::Map<std::string, const InventoryItem*> currentInventoryItems = m_controller.getInventoryItems();
+	util::Map<std::string, const InventoryItem*> activeInventoryItems = filterActiveItems(currentInventoryItems);
 	util::Vector<std::string> selectedInventoryItems;
-	selectInventoryItems(currentInventoryItems,selectedInventoryItems);
+	selectInventoryItems(activeInventoryItems,selectedInventoryItems);
-	std::cout << "Enter the labour cost: ";
+	if (selectedInventoryItems.isEmpty())
+	{
+		util::pressEnter();
+		return;
+	}
+	std::cout << "\nEnter the labour cost: ";
 	util::read(labourCost);
     m_controller.createService(serviceName, selectedInventoryItems, labourCost);
-    std::cout << "Service created sucessfully.\n";
+    std::cout << "\nService created sucessfully.\n\n";
 	util::pressEnter();
 }
 
@@ -372,17 +426,19 @@ Returns:
 void AdminMenu::removeService()
 {
 	util::clear();
+	std::cout << "Remove Service\n";
 	std::string selectedServiceID;
 	util::Map<std::string, const Service*> currentServices = m_controller.getServices();
-	selectedServiceID = selectServicesToRemove(currentServices);
+	util::Map<std::string, const Service*> currentActiveServices = filterActiveServices(currentServices);
+	selectedServiceID = selectServicesToRemove(currentActiveServices);
 	if (selectedServiceID != "")
 	{
 		m_controller.removeService(selectedServiceID);
-		std::cout << "Service removed sucessfully.";
+		std::cout << "Service removed successfully.\n\n";
 	}
 	else
 	{
-		std::cout << "Failed  to remove service.";
+		std::cout << "Failed  to remove service.\n\n";
 	}
 	util::pressEnter();
 }
@@ -397,36 +453,37 @@ void AdminMenu::addTechnician()
 {
 	util::clear();
 	std::string username, name, password, email, phoneNumber;
-	std::cout << std::left << std::setw(25) << "Enter Technician Username: ";
+	std::cout << "Add Technician\n";
+	std::cout << "Enter Technician Username: ";
 	util::read(username);
-	std::cout << std::left << std::setw(25) << "Enter Technician Name: ";
+	std::cout << "Enter Technician Name: ";
 	util::read(name);
-	std::cout << std::setw(25) << "Enter Technician Password: ";
+	std::cout << "Enter Technician Password: ";
 	util::read(password);
 	if(!util::isPasswordValid(password))
 	{
-		std::cout << "Error: Password is invalid!";
+		std::cout << "\nError: Password is invalid!\n\n";
 		util::pressEnter();
 		return;
 	}
-	std::cout << std::setw(25) << "Enter Technician Email: ";
+	std::cout << "Enter Technician Email: ";
 	util::read(email);
 	if(!util::isEmailValid(email))
 	{
-		std::cout << "Error: Email is invalid!";
+		std::cout << "\nError: Email is invalid!\n\n";
 		util::pressEnter();
 		return;
 	}
-	std::cout << std::setw(25) << "Enter Technician Phone: ";
+	std::cout << "Enter Technician Phone: ";
 	util::read(phoneNumber);
 	if(!util::isPhoneNumberValid(phoneNumber))
 	{
-		std::cout << "Error: Phone Number is invalid!";
+		std::cout << "\nError: Phone Number is invalid!\n\n";
 		util::pressEnter();
 		return;
 	}
 	m_controller.createTechnician(username, name, password, email, phoneNumber);
-	std::cout << "\nTechnician Added Successfully.\n";
+	std::cout << "\nTechnician Added Successfully.\n\n";
 	util::pressEnter();
 }
 
@@ -443,6 +500,7 @@ void AdminMenu::removeUser()
 	auto listOfUsers = m_controller.getUsers();
 	auto listOfActiveUsers = filterActiveUsers(listOfUsers);
 	int activeUserCount = listOfActiveUsers.getSize();
+	std::cout << "Remove User \n";
 	if (activeUserCount < 1)
 	{
 		std::cout << "No Active users." << std::endl;
@@ -477,7 +535,10 @@ Return type: void
 void AdminMenu::createComboPackages()
 {
 	util::clear();
+	std::cout << "Create Combo Packages\n";
 	auto serviceList = m_controller.getServices();
+	auto activeServices = filterActiveServices(serviceList);
+	int currentActiveServicesCount = activeServices.getSize();
     const int NUMBER_OF_SERVICE_PER_PACKAGE = 2;
 	util::Vector<std::string> selectedServiceID;
     for (int iterator = 0; iterator < NUMBER_OF_SERVICE_PER_PACKAGE; iterator++)
@@ -485,10 +546,10 @@ void AdminMenu::createComboPackages()
         const Service* chosenService = nullptr;
         while (true)
         {
-            chosenService = selectServiceFromServices(serviceList);
+            chosenService = selectServiceFromServices(activeServices);
-            if (chosenService == nullptr)
+            if (!chosenService)
             {
-                std::cout << "Failed to create combo package!";
+                std::cout << "Failed to create combo package!\n\n";
                 util::pressEnter();
                 return;
             }
@@ -503,11 +564,19 @@ void AdminMenu::createComboPackages()
             }
             if (alreadyChosen)
             {
+				if (currentActiveServicesCount < 2)
+				{
+					break;
+				}
                 std::cout << "Service already selected. Please choose a different one." << std::endl;
                 continue; 
             }
             selectedServiceID.push_back(chosenService->getId());
-            util::clear();
+            break;
+        }
+		if (currentActiveServicesCount < 2)
+		{
+			std::cout << "All the available services selected\n\n";
 			break;
 		}
     }
@@ -537,16 +606,17 @@ Return type: void
 void AdminMenu::removeComboPackage()
 {
 	util::clear();
+	std::cout << "Remove Combo Package\n";
 	util::Map<std::string, const ComboPackage*> currentComboPackages = m_controller.getComboPackages();
 	std::string selectedComboPackageID = selectComboPackage(currentComboPackages);
-	if (selectedComboPackageID != "")
+	if (!selectedComboPackageID.empty())
 	{
 		m_controller.removeComboPackage(selectedComboPackageID);
-		std::cout << "Combo Package removed successfully.\n";
+		std::cout << "Combo Package removed successfully.\n\n";
 	}
 	else
 	{
-		std::cout << "Combo package removal failed.\n";
+		std::cout << "Combo package removal failed.\n\n";
 	}
 	util::pressEnter();
 }

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/CustomerMenu.cpp

@@ -144,11 +144,12 @@ void CustomerMenu::updateDetails()
 {
 	std::string email, phone;
 	util::clear();
+    std::cout << "Update Details\n";
 	std::cout << "Enter new email: ";
 	util::read(email);
 	if (!util::isEmailValid(email))
 	{
-		std::cout << "Error: Email is invalid!";
+		std::cout << "Error: Email is invalid!\n";
 		util::pressEnter();
 		return;
 	}
@@ -156,12 +157,12 @@ void CustomerMenu::updateDetails()
 	util::read(phone);
 	if (!util::isPhoneNumberValid(phone))
 	{
-		std::cout << "Error: Phone number is invalid!";
+		std::cout << "Error: Phone number is invalid!\n";
 		util::pressEnter();
 		return;
 	}
 	m_controller.updateUserDetails(email, phone);
-	std::cout << "Profile details updated successfully";
+	std::cout << "Profile details updated successfully\n";
 	util::pressEnter();
 }
 
@@ -175,9 +176,16 @@ Return type: void
 void CustomerMenu::selectService()
 {
     std::string vehicleNumber, vehicleBrand, vehicleModel;
-	auto services = m_controller.getServices();
-    util::Vector<std::string> selectedServices;
     util::clear();
+    std::cout << "Select a Service\n";
+	auto services = m_controller.getServices();
+    if (services.isEmpty())
+    {
+        std::cout << "No services available!";
+        util::pressEnter();
+        return;
+    }
+    util::Vector<std::string> selectedServices;
     const Service* selectedService = selectServiceFromServices(services);
     if (selectedService == nullptr)
     {
@@ -187,6 +195,7 @@ void CustomerMenu::selectService()
     }
     selectedServices.push_back(selectedService->getId());
     util::clear();
+    std::cout << "Enter Vehicle Details\n";
     std::cout << "Enter vehicle number: ";
     util::read(vehicleNumber);
     std::cout << "Enter vehicle brand: ";
@@ -208,16 +217,27 @@ Return type: void
 void CustomerMenu::selectComboPackage()
 {
     std::string vehicleNumber, vehicleBrand, vehicleModel;
-    auto comboPackages = m_controller.getComboPackages();
     util::clear();
-    const ComboPackage* selectedComboPackage = selectComboPackageFromPackages(comboPackages);
+    std::cout << "Select a Combo Package\n";
-    if (selectedComboPackage == nullptr)
+    auto comboPackages = m_controller.getComboPackages();
+    util::Map<std::string, const ComboPackage*> activeComboPackages = filterComboPackages(comboPackages);
+    if (activeComboPackages.isEmpty())
     {
-        std::cout << "Failed to book combo package!";
+        std::cout << "No combo packages available!\n\n";
         util::pressEnter();
         return;
     }
+    const ComboPackage* selectedComboPackage = selectComboPackageFromPackages(activeComboPackages);
+    if (selectedComboPackage == nullptr)
+    {
+        std::cout << "Failed to book combo package!\n\n";
+        util::pressEnter();
+        return;
+    }
+    std::cout << "Combo Package selected\n";
+    util::pressEnter();
     util::clear();
+    std::cout << "Enter the vehicle details\n";
     std::cout << "Enter vehicle number: ";
     util::read(vehicleNumber);
     std::cout << "Enter vehicle brand: ";
@@ -225,7 +245,7 @@ void CustomerMenu::selectComboPackage()
     std::cout << "Enter vehicle model: ";
     util::read(vehicleModel);
     m_controller.purchaseComboPackage(selectedComboPackage->getId(), vehicleNumber, vehicleBrand, vehicleModel);
-    std::cout << "Combo Package has been booked successfully";
+    std::cout << "Combo Package has been booked successfully\n\n";
     util::pressEnter();
 }
 
@@ -245,16 +265,17 @@ void CustomerMenu::viewServiceHistory()
 	const User* currentUser = m_controller.getAuthenticatedUser();
 	std::string currentUserID = currentUser->getId();
 	util::Map<std::string, const ServiceBooking*> serviceBookingsByCurrentUser = m_controller.getServiceBookingsByUser(currentUserID);
+    std::cout << "View Service History" << std::endl;
     if (serviceBookingsByCurrentUser.getSize() != 0)
     {
         std::cout << std::left
-            << std::setw(12) << "Booking ID"
+            << std::setw(15) << "Booking ID"
             << std::setw(20) << "Technician"
-            << std::setw(15) << "Vehicle Brand"
+            << std::setw(20) << "Vehicle Brand"
-            << std::setw(15) << "Vehicle Number"
+            << std::setw(20) << "Vehicle Number"
-            << std::setw(15) << "Vehicle Model"
+            << std::setw(20) << "Vehicle Model"
-            << std::setw(10) << "Discount %"
+            << std::setw(20) << "Discount %"
-            << std::setw(12) << "Status"
+            << std::setw(20) << "Status"
             << std::endl;
         for (int iterator = 0; iterator < serviceBookingsByCurrentUser.getSize(); iterator++)
         {
@@ -263,13 +284,13 @@ void CustomerMenu::viewServiceHistory()
                 ? "Not Assigned"
                 : currentBooking->getAssignedTechnician()->getName();
             std::cout << std::left
-                << std::setw(12) << currentBooking->getId()
+                << std::setw(15) << currentBooking->getId()
                 << std::setw(20) << technicianName
-                << std::setw(15) << currentBooking->getVehicleBrand()
+                << std::setw(20) << currentBooking->getVehicleBrand()
-                << std::setw(15) << currentBooking->getVehicleNumber()
+                << std::setw(20) << currentBooking->getVehicleNumber()
-                << std::setw(15) << currentBooking->getVehicleModel()
+                << std::setw(20) << currentBooking->getVehicleModel()
-                << std::setw(10) << currentBooking->getDiscountPercentage()
+                << std::setw(20) << currentBooking->getDiscountPercentage()
-                << std::setw(12) << util::getServiceJobStatusString(currentBooking->getStatus())
+                << std::setw(20) << util::getServiceJobStatusString(currentBooking->getStatus())
                 << std::endl;
             hasServiceHistory = true;
         }
@@ -293,11 +314,35 @@ Returns:
 void CustomerMenu::completePayments()
 {
 	util::clear();
+    std::cout << "Complete Payments\n";
 	util::Map<std::string, const Invoice*> currentInvoices = m_controller.getInvoicesByUser();
+    if (currentInvoices.isEmpty())
+    {
+        std::cout << "No pending invoices available for payment.\n";
+        util::pressEnter();
+        return;
+    }
+    bool hasPending = false;
+    for (int index = 0; index < currentInvoices.getSize(); ++index)
+    {
+        const Invoice* invoice = currentInvoices.getValueAt(index);
+        if (invoice && invoice->getStatus() == util::PaymentStatus::PENDING)
+        {
+            hasPending = true;
+            break;
+        }
+    }
+    if (!hasPending)
+    {
+        std::cout << "No pending invoices available for payment.\n";
+        util::pressEnter();
+        return;
+    }
 	std::string selectedID = selectInvoiceFromUserForPayment(currentInvoices);
     if (selectedID == "")
     {
         std::cout << "Payment failed.\n";
+        util::pressEnter();
         return;
     }
     util::PaymentMode paymentMode = selectPaymentMode();
@@ -317,6 +362,7 @@ Returns:
 void CustomerMenu::viewInvoices()
 {
 	util::clear();
+    std::cout << "View Invoices\n";
 	util::Map<std::string, const Invoice*> currentUserInvoices = m_controller.getInvoicesByUser();
 	displayInvoices(currentUserInvoices);
     util::pressEnter();

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/MenuHelper.h

@@ -39,36 +39,34 @@ Returns:
 */
 inline std::string selectServicesToRemove(util::Map<std::string, const Service*> currentServices)
 {
+    if (currentServices.getSize() == 0)
+    {
+        std::cout << "No Services Currently Available.\n";
+        return "";
+    }
     util::Map<int, const Service*> currentServicesMap;
-    bool hasServices = false;
     int currentIndex = 1, choice;
     std::cout << std::left
         << std::setw(6) << "Index"
         << std::setw(12) << "Service ID"
-        << std::setw(20) << "Name"
+        << std::setw(35) << "Name"
         << std::setw(10) << "Labor Cost"
         << std::endl;
     for (int iterator = 0; iterator < currentServices.getSize(); iterator++)
     {
         const Service* currentService = currentServices.getValueAt(iterator);
-        if (currentService->getState() == util::State::INACTIVE)
+        if (currentService == nullptr || currentService->getState() == util::State::INACTIVE)
         {
             continue;
         }
         std::cout << std::left
             << std::setw(6) << currentIndex
             << std::setw(12) << currentService->getId()
-            << std::setw(20) << currentService->getName()
+            << std::setw(35) << util::truncateString(currentService->getName(), 30)
             << std::setw(10) << currentService->getLaborCost()
             << std::endl;
-        hasServices = true;
         currentServicesMap.insert(currentIndex++, currentService);
     }
-    if (!hasServices)
-    {
-        std::cout << "No services currently available." << std::endl;
-        return "";
-    }
     std::cout << "Enter your choice: ";
     util::read(choice);
     if (currentServicesMap.find(choice) != -1)
@@ -77,7 +75,7 @@ inline std::string selectServicesToRemove(util::Map<std::string, const Service*>
     }
     else
 {
-        std::cout << "Invalid choice." << std::endl;
+        std::cout << "Invalid index." << std::endl;
         return "";
     }
 }
@@ -91,18 +89,21 @@ Parameters:
 Returns:
     - void
 */
-static void selectInventoryItems(util::Map<std::string, const InventoryItem*>& currentInventoryItems, util::Vector<std::string>& selectedInventoryItems)
+inline void selectInventoryItems(util::Map<std::string, const InventoryItem*>& currentInventoryItems, util::Vector<std::string>& selectedInventoryItems)
 {
-	bool doRun = true, hasInventoryItems = false;
+    bool doRun = true;
     util::Map<int, const InventoryItem*> currentInventoryMap;
-	int currentIndex = 1;
     int choice;
-	if (currentInventoryItems.getSize() == 0)
+    if (currentInventoryItems.isEmpty())
     {
-		std::cout << "Inventory empty.";
+        std::cout << "No Items Present, Inventory empty.\n";
+        return;
     }
     while (doRun)
     {
+        util::clear();
+        std::cout << "Create Service\n";
+        std::cout << "\nSelect Required Items\n";
         bool hasInventoryItems = false;
         int currentIndex = 1;
         currentInventoryMap.clear();
@@ -116,7 +117,20 @@ static void selectInventoryItems(util::Map<std::string, const InventoryItem*>& c
         for (int iterator = 0; iterator < currentInventoryItems.getSize(); iterator++)
         {
             const InventoryItem* currentInventoryItem = currentInventoryItems.getValueAt(iterator);
-			if (currentInventoryItem->getState() == util::State::INACTIVE)
+            if (currentInventoryItem == nullptr || currentInventoryItem->getState() == util::State::INACTIVE)
+            {
+                continue;
+            }
+            bool alreadySelected = false;
+            for (int iteratorOne = 0; iteratorOne < selectedInventoryItems.getSize(); iteratorOne++)
+            {
+                if (selectedInventoryItems[iteratorOne] == currentInventoryItem->getId())
+                {
+                    alreadySelected = true;
+                    break;
+                }
+            }
+            if (alreadySelected)
             {
                 continue;
             }
@@ -127,35 +141,54 @@ static void selectInventoryItems(util::Map<std::string, const InventoryItem*>& c
                 << std::setw(10) << currentInventoryItem->getPrice()
                 << std::setw(10) << currentInventoryItem->getQuantity()
                 << std::endl;
-
-			hasInventoryItems = true;
             currentInventoryMap.insert(currentIndex++, currentInventoryItem);
+            hasInventoryItems = true;
         }
         if (!hasInventoryItems)
         {
-			std::cout << "No items present in the inventory." << std::endl;
-			doRun = false;
             break;
         }
-		std::cout << "Select the item (Index) or enter -1 to exit: ";
+        std::cout << "Select the item (Index) or enter 0 to exit: ";
         util::read(choice);
-
+        if (choice == 0)
-		if (choice == -1)
         {
             doRun = false;
         }
         else if (currentInventoryMap.find(choice) != -1)
         {
-			selectedInventoryItems.push_back(currentInventoryMap.getValueAt(choice)->getId());
+            selectedInventoryItems.push_back(currentInventoryMap.getValueAt(currentInventoryMap.find(choice))->getId());
-			std::cout << "Item added successfully." << std::endl;
+            std::cout << "Item added successfully.\n" << std::endl;
+            util::pressEnter();
         }
         else
         {
-			std::cout << "Enter a valid integer." << std::endl;
+            std::cout << "Enter a valid integer.\n" << std::endl;
         }
     }
 }
 
+/*
+Function: filterActiveServiceBookings
+Description: Filters the given service bookings and returns only bookings with PENDING status.
+Parameters:
+    - currentBookings: util::Map<std::string, const ServiceBooking*>, collection of current service bookings
+Returns:
+    - util::Map<std::string, const ServiceBooking*>: map containing only active (PENDING) service bookings
+*/
+inline util::Map<std::string, const ServiceBooking*> filterActiveServiceBookings(util::Map<std::string, const ServiceBooking*>& currentBookings)
+{
+    util::Map<std::string, const ServiceBooking*> activeServiceBookings;
+    for (int iterator = 0; iterator < currentBookings.getSize(); iterator++)
+    {
+        const ServiceBooking* currentServiceBooking = currentBookings.getValueAt(iterator);
+        if (currentServiceBooking && currentServiceBooking->getStatus() == util::ServiceJobStatus::PENDING)
+        {
+            activeServiceBookings.insert(currentServiceBooking->getId(), currentServiceBooking);
+        }
+    }
+    return activeServiceBookings;
+}
+
 /*
 Function: listServiceBookings  
 Description: Lists all pending service bookings and maps them to indices for selection.
@@ -166,10 +199,14 @@ Parameters:
 Returns:
 	- bool: True if pending services exist, False otherwise
 */
-static bool listServiceBookings(util::Map<std::string, const ServiceBooking*>& currentBookings, int& bookingsSize, util::Map<int, const ServiceBooking*>& serviceBookingsMap)
+inline bool listServiceBookings(util::Map<std::string, const ServiceBooking*>& currentBookings, int& bookingsSize, util::Map<int, const ServiceBooking*>& serviceBookingsMap)
 {
+    if (currentBookings.getSize() == 0)
+    {
+        return false;
+    }
     int currentIndex = 1;
-	bool hasPendingService = false;
+    std::cout << "\nSelect Service Booking" << std::endl;
     std::cout << std::left
         << std::setw(10) << "Index"
         << std::setw(10) << "ID"
@@ -179,15 +216,12 @@ static bool listServiceBookings(util::Map<std::string, const ServiceBooking*>& c
         << std::setw(15) << "VehicleNo"
         << std::setw(15) << "Brand"
         << std::setw(15) << "Model"
-		<< std::setw(20) << "Technician"
-		<< std::setw(15) << "TechnicianID"
         << std::endl;
     for (int iterator = 0; iterator < bookingsSize; iterator++)
     {
         const ServiceBooking* currentBooking = currentBookings.getValueAt(iterator);
         if (currentBooking && currentBooking->getStatus() == util::ServiceJobStatus::PENDING)
         {
-			hasPendingService = true;
             const User* currentAssignedTechnician = currentBooking->getAssignedTechnician();
             std::cout << std::left
                 << std::setw(10) << currentIndex
@@ -198,16 +232,9 @@ static bool listServiceBookings(util::Map<std::string, const ServiceBooking*>& c
                 << std::setw(15) << currentBooking->getVehicleNumber()
                 << std::setw(15) << currentBooking->getVehicleBrand()
                 << std::setw(15) << currentBooking->getVehicleModel()
-				<< std::setw(20) << ((currentAssignedTechnician == nullptr ||  currentAssignedTechnician->getName().empty()) ? "Null" : currentAssignedTechnician->getName())
-				<< std::setw(15) << ((currentAssignedTechnician == nullptr || currentAssignedTechnician->getId().empty()) ? "Null" : currentAssignedTechnician->getId())
                 << std::endl;
             serviceBookingsMap.insert(currentIndex++, currentBooking);
         }
-	}
-	if (!hasPendingService)
-    {
-		std::cout << "No pending service available." << std::endl;
-		return false;
     }
     return true;
 }
@@ -220,18 +247,18 @@ Parameters:
 Returns:
 	- const ServiceBooking*: Pointer to the selected booking, or nullptr if invalid
 */
-static const ServiceBooking* selectPendingServiceBookings(util::Map<int, const ServiceBooking*>& serviceBookingsMap)
+inline const ServiceBooking* selectPendingServiceBookings(util::Map<int, const ServiceBooking*>& serviceBookingsMap)
 {
 	int userInputIndex;
-	std::cout << "Enter a valid service index: ";
+	std::cout << "\nEnter a service index: ";
     util::read(userInputIndex);
 	if (serviceBookingsMap.find(userInputIndex) != -1)
     {
-		return serviceBookingsMap.getValueAt(userInputIndex);
+		return serviceBookingsMap.getValueAt(serviceBookingsMap.find(userInputIndex));
 	}
 	else
 	{
-		std::cout << "Enter a valid index.";
+		std::cout << "Enter a valid index.\n\n";
         return nullptr;
     }
 }
@@ -246,10 +273,11 @@ Parameters:
 Returns:
 	- void
 */
-static void listAvailableTechnicians(util::Map<std::string, const User*> currentAvailableTechnicians, int numberOfTechnicians, util::Map<int, const User*>& currentAvailableTechniciansMap)
+inline void listAvailableTechnicians(util::Map<std::string, const User*> currentAvailableTechnicians, int numberOfTechnicians, util::Map<int, const User*>& currentAvailableTechniciansMap)
 {
 	bool hasTechnicians = false;
     int currentIndex = 1;
+    std::cout << "\nSelect Technician\n";
     std::cout << std::left
 		<< std::setw(6) << "Index"
 		<< std::setw(15) << "Technician ID"
@@ -272,7 +300,7 @@ static void listAvailableTechnicians(util::Map<std::string, const User*> current
     }
 	if (!hasTechnicians)
     {
-		std::cout << "No technicians currently available.";
+		std::cout << "No technicians currently available.\n\n";
     }
 }
 
@@ -284,17 +312,18 @@ Parameters:
 Returns:
 	- const User*: Pointer to the selected technician, or nullptr if invalid
 */
-static const User* selectTechnician(util::Map<int, const User*>& currentAvailableTechniciansMap)
+inline const User* selectTechnician(util::Map<int, const User*>& currentAvailableTechniciansMap)
 {
     int userInputIndex;
+    std::cout << "\nEnter technician index: ";
     util::read(userInputIndex);
     if (currentAvailableTechniciansMap.find(userInputIndex) != -1)
     {
-		return currentAvailableTechniciansMap.getValueAt(userInputIndex);
+        return currentAvailableTechniciansMap.getValueAt(currentAvailableTechniciansMap.find(userInputIndex));
     }
     else
     {
-		std::cout << "Enter a valid index.";
+        std::cout << "Enter a valid index.\n\n";
         return nullptr;
     }
 }
@@ -307,20 +336,20 @@ Parameters:
 Returns:
 	- std::string: ID of the selected invoice, or empty string if none selected
 */
-static std::string selectInvoiceFromUserForPayment(const util::Map<std::string, const Invoice*>& currentInvoices)
+inline std::string selectInvoiceFromUserForPayment(const util::Map<std::string, const Invoice*>& currentInvoices)
 {
 	int currentIndex = 1, choice;
 	util::Map<int, const Invoice*> pendingInvoicesForPayment;
     std::cout << std::left
-		<< std::setw(6) << "Index"
+        << std::setw(8) << "Index"
-		<< std::setw(12) << "BookingID"
+        << std::setw(15) << "Booking ID"
-		<< std::setw(15) << "VehicleBrand"
+        << std::setw(20) << "Vehicle Brand"
-		<< std::setw(15) << "VehicleNumber"
+        << std::setw(20) << "Vehicle Number"
-		<< std::setw(12) << "TechID"
+        << std::setw(18) << "Technician ID"
-		<< std::setw(20) << "TechnicianName"
+        << std::setw(25) << "Technician Name"
-		<< std::setw(10) << "Discount(%)"
+        << std::setw(15) << "Discount(%)"
-		<< std::setw(12) << "TotalAmount"
+        << std::setw(15) << "TotalAmount"
-		<< std::setw(20) << "InvoiceDate"
+        << std::setw(22) << "Invoice Timestamp"
         << std::endl;
 	for (int iterator = 0; iterator < currentInvoices.getSize(); iterator++)
 	{
@@ -329,17 +358,17 @@ static std::string selectInvoiceFromUserForPayment(const util::Map<std::string,
 {
 			const User* currentTechnician = currentInvoice->getBooking()->getAssignedTechnician();
             std::cout << std::left
-				<< std::setw(6) << currentIndex
+                << std::setw(8) << currentIndex
-				<< std::setw(12) << currentInvoice->getBookingId()
+                << std::setw(15) << currentInvoice->getBookingId()
-				<< std::setw(15) << currentInvoice->getBooking()->getVehicleBrand()
+                << std::setw(20) << currentInvoice->getBooking()->getVehicleBrand()
-				<< std::setw(15) << currentInvoice->getBooking()->getVehicleNumber()
+                << std::setw(20) << currentInvoice->getBooking()->getVehicleNumber()
-				<< std::setw(12) << ((currentTechnician != nullptr && currentTechnician->getId() != "") ? 
+                << std::setw(18) << ((currentTechnician != nullptr && currentTechnician->getId() != "") ?
                     currentTechnician->getId() : "Null")
-				<< std::setw(20) << ((currentTechnician != nullptr && currentTechnician->getName() != "") ? 
+                << std::setw(25) << ((currentTechnician != nullptr && currentTechnician->getName() != "") ?
                     currentTechnician->getName() : "Null")
-				<< std::setw(10) << currentInvoice->getDiscountPercentage()
+                << std::setw(15) << currentInvoice->getDiscountPercentage()
-				<< std::setw(12) << currentInvoice->getTotalAmount()
+                << std::setw(15) << currentInvoice->getTotalAmount()
-				<< std::setw(20) << currentInvoice->getInvoiceDate().toString()
+                << std::setw(22) << currentInvoice->getInvoiceDate().toString()
                 << std::endl;
 			pendingInvoicesForPayment.insert(currentIndex++, currentInvoice);
 		}
@@ -359,7 +388,7 @@ static std::string selectInvoiceFromUserForPayment(const util::Map<std::string,
         }
 	else
 	{
-		std::cout << "Invalid choice.\n";
+		std::cout << "Invalid index.\n";
 		return "";
     }
 }
@@ -372,9 +401,12 @@ Parameters:
 Returns:
 	- util::PaymentMode: Selected payment mode
 */
-static util::PaymentMode selectPaymentMode()
+inline util::PaymentMode selectPaymentMode()
 {
     int choice;
+    while (true)
+    {
+        util::clear();
         std::cout << "Enter the payment Mode\n1.OFFLINE\n2.ONLINE\nChoice: ";
         util::read(choice);
         if (choice == 1)
@@ -389,8 +421,76 @@ static util::PaymentMode selectPaymentMode()
         }
         else
         {
-		std::cout << "Invalid choice, Offline mode selected.\n";
+            std::cout << "Invalid choice. Try again.\n";
-		return util::PaymentMode::OFFLINE;
+            util::pressEnter();
+        }
+    }
+}
+
+/*
+Function: displayInvoicesInTabularForm
+Description:
+    Displays all invoices in a tabular format. Each row shows booking details,
+    vehicle info, technician details, discount, total amount, invoice date,
+    and payment status. If inventory items exist for an invoice, they are
+    displayed in a separate table below the invoice row.
+Parameters:
+    - currentInvoices: util::Map<std::string, const Invoice*>
+      Map of invoice IDs to Invoice pointers.
+Returns:
+    - void
+*/
+inline const Invoice* selectInvoiceToDisplay(util::Map<std::string, const Invoice*>& currentInvoices)
+{
+    int currentIndex = 1, choice;
+    util::Map<int, const Invoice*> currentInvoicesIndexMap;
+    if (currentInvoices.isEmpty())
+    {
+        std::cout << "No invoices available.\n\n";
+        return nullptr;
+    }
+    std::cout  
+        << std::left
+        << std::setw(10) << "Index"
+        << std::setw(12) << "BookingID"
+        << std::setw(20) << "Vehicle Number"
+        << std::setw(20) << "Technician Name"
+        << std::setw(15) << "Total Amount"
+        << std::setw(25) << "Invoice Date"
+        << std::setw(20) << "Payment Status"
+        << std::setw(15) << "Payment Mode"
+        << std::endl;
+    for (int iterator = 0; iterator < currentInvoices.getSize(); iterator++)
+    {
+        const Invoice* currentInvoice = currentInvoices.getValueAt(iterator);
+        if (!currentInvoice)
+        {
+            continue;
+        }
+        const User* currentTechnician = currentInvoice->getBooking()->getAssignedTechnician();
+        std::cout << std::left
+            << std::setw(10) << currentIndex
+            << std::setw(12) << currentInvoice->getBookingId()
+            << std::setw(20) << currentInvoice->getBooking()->getVehicleNumber()
+            << std::setw(20) << ((currentTechnician && !currentTechnician->getName().empty()) ? currentTechnician->getName() : "NULL")
+            << std::setw(15) << currentInvoice->getTotalAmount()
+            << std::setw(25) << currentInvoice->getInvoiceDate().toString()
+            << std::setw(20) << util::getPaymentStatusString(currentInvoice->getStatus())
+            << std::setw(15) << util::getPaymentModeString(currentInvoice->getPaymentMethod())
+            << std::endl;
+        currentInvoicesIndexMap.insert(currentIndex++, currentInvoice);
+    }
+    std::cout << "Enter an index: ";
+    util::read(choice);
+    int currentSelectedIndex = currentInvoicesIndexMap.find(choice);
+    if (currentSelectedIndex != -1)
+    {
+        return currentInvoicesIndexMap.getValueAt(currentSelectedIndex);
+    }
+    else
+    {
+        std::cout << "Enter a valid index.\n";
+        return nullptr;
     }
 }
 
@@ -405,37 +505,55 @@ Returns:
 Throws:
 	- std::runtime_error if a null invoice is encountered
 */
-static void displayInvoices(util::Map<std::string, const Invoice*> currentUserInvoices)
+inline void displayInvoices(util::Map<std::string, const Invoice*> currentUserInvoices)
 {
+    std::cout << std::endl;
     if (currentUserInvoices.getSize() == 0)
     {
-		std::cout << "No invoices found for this account." << std::endl;
+        std::cout << "No invoices found for this account.\n\n";
-		util::pressEnter();
         return;
     }
     else
     {
-		for (int index = 0; index < currentUserInvoices.getSize(); index++)
+        bool doRun = true;
+        do
         {
-			const Invoice* currentInvoice = currentUserInvoices.getValueAt(index);
+            const Invoice* selectedInvoice;
-			if (currentInvoice)
+            int choice;
+            selectedInvoice = selectInvoiceToDisplay(currentUserInvoices);
+            if (selectedInvoice)
             {
-				const User* currentTechnician = currentInvoice->getBooking()->getAssignedTechnician();
+                const User* currentTechnician = selectedInvoice->getBooking()->getAssignedTechnician();
-				std::cout << "\nInvoice Details\n";
+                util::clear();
-				std::cout << "Booking ID: " << currentInvoice->getBookingId() << std::endl;
+                std::cout << "Invoice Details\n";
-				std::cout << "Vehicle Brand: " << currentInvoice->getBooking()->getVehicleBrand() << std::endl;
+                std::cout << std::left << std::setw(20) << "Booking ID:"
-				std::cout << "Vehicle Number: " << currentInvoice->getBooking()->getVehicleNumber() << std::endl;
+                    << selectedInvoice->getBookingId() << std::endl;
-				std::cout << "Technician ID: " <<
+                std::cout << std::left << std::setw(20) << "Vehicle Brand:"
-					((currentTechnician != nullptr && currentTechnician->getId() != "") ? 
+                    << selectedInvoice->getBooking()->getVehicleBrand() << std::endl;
-						currentTechnician->getId() : "Null") << std::endl;
+                std::cout << std::left << std::setw(20) << "Vehicle Number:"
-				std::cout << "Technician Name: " <<
+                    << selectedInvoice->getBooking()->getVehicleNumber() << std::endl;
-					((currentTechnician != nullptr && currentTechnician->getName() != "") ?
+                std::cout << std::left << std::setw(20) << "Technician ID:"
-						currentTechnician->getName() : "Null") << std::endl;
+                    << ((currentTechnician != nullptr && !currentTechnician->getId().empty())
-				std::cout << "Discount(%): " << currentInvoice->getDiscountPercentage() << std::endl;
+                        ? currentTechnician->getId() : "NULL") << std::endl;
-				std::cout << "Total Amount: " << currentInvoice->getTotalAmount() << std::endl;
+                std::cout << std::left << std::setw(20) << "Technician Name:"
-				std::cout << "Invoice Date: " << currentInvoice->getInvoiceDate().toString() << std::endl;
+                    << ((currentTechnician != nullptr && !currentTechnician->getName().empty())
-				std::cout << "Payment Status: " << util::getPaymentStatusString(currentInvoice->getStatus()) << std::endl;
+                        ? currentTechnician->getName() : "NULL") << std::endl;
-				auto inventoryItemsInInvoice = currentInvoice->getParts();
+                std::cout << std::left << std::setw(20) << "Discount(%):"
+                    << selectedInvoice->getDiscountPercentage() << std::endl;
+                std::cout << std::left << std::setw(20) << "Total Amount:"
+                    << selectedInvoice->getTotalAmount() << std::endl;
+                std::cout << std::left << std::setw(20) << "Invoice Date:"
+                    << selectedInvoice->getInvoiceDate().toString() << std::endl;
+                std::cout << std::left << std::setw(20) << "Payment Status:"
+                    << util::getPaymentStatusString(selectedInvoice->getStatus()) << std::endl;
+                std::cout << std::left << std::setw(20) << "Payment Mode:"
+                    << util::getPaymentModeString(selectedInvoice->getPaymentMethod()) << std::endl;
+                auto inventoryItemsInInvoice = selectedInvoice->getParts();
+                if (inventoryItemsInInvoice.isEmpty())
+                {
+                    std::cout << "No inventory items used.\n\n";
+                    continue;
+                }
                 std::cout << "\nItems Used:\n";
                 std::cout << std::left
                     << std::setw(20) << "ItemName"
@@ -452,14 +570,53 @@ static void displayInvoices(util::Map<std::string, const Invoice*> currentUserIn
                         << std::setw(10) << currentItem->getPrice()
                         << std::endl;
                 }
+                std::cout << "\n\nDo you want to display another Invoice (1-Yes, 2-No): ";
+                util::read(choice);
+                if (choice == 1)
+                {
+                    doRun = true;
+                    util::clear();
+                }
+                else if (choice == 2)
+                {
+                    doRun = false;
                 }
                 else
                 {
-				throw std::runtime_error("Null invoice encountered while displaying invoices.");
+                    std::cout << "Invalid choice\n";
-				util::pressEnter();
+                    doRun = false;
                 }
             }
+            else
+            {
+                std::cout << "Unable to fetch the selected invoice\n";
+                doRun = false;
             }
+
+        } while (doRun);
+    }
+}
+
+/*
+Function: filterStartedJobCards
+Description: Filters the given list of job cards and returns only those with status STARTED.
+Parameters:
+    - assignedJobCards: Map of job card IDs to JobCard pointers.
+Returns:
+    - util::Map<std::string, const JobCard*> containing only job cards with status STARTED.
+*/
+inline util::Map<std::string, const JobCard*> filterStartedJobCards(util::Map<std::string, const JobCard*>& assignedJobCards)
+{
+    util::Map<std::string, const JobCard*> startedJobCards;
+    for (int iterator = 0; iterator  < assignedJobCards.getSize(); iterator++)
+    {
+        const JobCard* currentJobCard = assignedJobCards.getValueAt(iterator);
+        if (currentJobCard && currentJobCard->getStatus() == util::ServiceJobStatus::STARTED)
+        {
+            startedJobCards.insert(currentJobCard->getId(), currentJobCard);
+        }
+    }
+    return startedJobCards;
 }
 
 /*
@@ -471,11 +628,17 @@ Parameters:
 Returns:
 	- std::string: ID of the selected job card, or empty string if none selected
 */
-static std::string selectJobCardToComplete(util::Map<std::string, const JobCard*>& assignedJobCards, util::Map<int, const JobCard*>& incompleteJobCards)
+inline std::string selectJobCardToComplete(util::Map<std::string, const JobCard*>& assignedJobCards)
 {
+    util::Map<int, const JobCard* > incompleteJobCards;
+    if (assignedJobCards.getSize() == 0)
+    {
+        std::cout << "No started jobs available to complete.\n";
+        return "";
+    }
     int currentIndex = 1;
     int choice;
-	bool hasIncompleteJobCard = false;
+    std::cout << std::endl;
     std::cout << std::left
         << std::setw(6) << "Index"
         << std::setw(12) << "BookingID"
@@ -494,14 +657,8 @@ static std::string selectJobCardToComplete(util::Map<std::string, const JobCard*
                 << std::setw(20) << currentJobCard->getService()->getName()
                 << std::setw(12) << currentJobCard->getServiceId()
                 << std::endl;
-			hasIncompleteJobCard = true;
             incompleteJobCards.insert(currentIndex++, currentJobCard);
         }
-    }
-	if (!hasIncompleteJobCard)
-    {
-		std::cout << "No pending jobs are present.\n";
-		return "";
     }
     std::cout << "Select the Job Card to complete (Index): ";
     util::read(choice);
@@ -513,7 +670,8 @@ static std::string selectJobCardToComplete(util::Map<std::string, const JobCard*
     }
     else
     {
-		std::cout << "Invalid choice.\n";
+        std::cout << "Invalid index.\n";
+        std::cout << "Failed to complete jobs.\n\n";
         return "";
     }
 }
@@ -528,16 +686,11 @@ Return type: const Notification* - pointer to the selected notification
 */
 inline const Notification* selectNotification(const util::Vector<const Notification*>& notifications)
 {
-    if (notifications.getSize() == 0)
-    {
-        std::cout << "No notifications available." << std::endl;
-        return nullptr;
-    }
     util::Map<int, const Notification*> indexedNotifications;
     std::cout << std::left
-        << std::setw(6) << "Index"
+        << std::setw(10) << "Index"
         << std::setw(15) << "ID"
-        << std::setw(30) << "Title"
+        << std::setw(35) << "Title"
         << std::setw(25) << "Timestamp"
         << std::endl;
     int currentIndex = 1;
@@ -547,9 +700,9 @@ inline const Notification* selectNotification(const util::Vector<const Notificat
         if (currentNotification)
         {
             std::cout << std::left
-                << std::setw(6) << currentIndex
+                << std::setw(10) << currentIndex
                 << std::setw(15) << currentNotification->getId()
-                << std::setw(30) << currentNotification->getTitle()
+                << std::setw(35) << util::truncateString(currentNotification->getTitle(), 30)
                 << std::setw(25) << currentNotification->getCreatedAt().toString()
                 << std::endl;
             indexedNotifications.insert(currentIndex, currentNotification);
@@ -561,7 +714,7 @@ inline const Notification* selectNotification(const util::Vector<const Notificat
     util::read(selectedIndex);
     if (!indexedNotifications.containsKey(selectedIndex))
     {
-        std::cout << "Invalid selection." << std::endl;
+        std::cout << "Invalid index." << std::endl;
         return nullptr;
     }
     return indexedNotifications[selectedIndex];
@@ -602,6 +755,13 @@ inline void viewAndDeleteNotification(Controller& controller)
 {
     util::clear();
     auto notifications = controller.getNotifications();
+    std::cout << "View and Delete Notification" << std::endl;
+    if (notifications.getSize() == 0)
+    {
+        std::cout << "No notifications available." << std::endl;
+        util::pressEnter();
+        return;
+    }
     const Notification* selectedNotification = selectNotification(notifications);
     if (!selectedNotification)
     {
@@ -623,10 +783,16 @@ Return type: void
 inline void changePasswordHelper(Controller& controller)
 {
     util::clear();
-    std::string newPassword;
+    const User* authenticatedUser = controller.getAuthenticatedUser();
+    if (!authenticatedUser)
+    {
+        throw std::runtime_error("No user is currently logged in!");
+    }
+    std::string newPassword, confirmedPassword;
     while (true)
     {
         util::clear();
+        std::cout << "Change Password\n";
         std::cout << "Enter new password: ";
         util::read(newPassword);
         if (!util::isPasswordValid(newPassword))
@@ -635,6 +801,20 @@ inline void changePasswordHelper(Controller& controller)
             util::pressEnter();
             continue;
         }
+        if (newPassword == authenticatedUser->getPassword())
+        {
+            std::cout << "New password cannot be same as old password. Try again\n";
+            util::pressEnter();
+            continue;
+        }
+        std::cout << "Confirm new password: ";
+        util::read(confirmedPassword);
+        if (confirmedPassword != newPassword)
+        {
+            std::cout << "Passwords are different. Try again\n";
+            util::pressEnter();
+            continue;
+        }
         controller.changePassword(newPassword);
         std::cout << "Password changed successfully\n";
         util::pressEnter();
@@ -655,7 +835,7 @@ inline util::Map<std::string, const User*> filterActiveUsers(const util::Map<std
     for (int index = 0; index < inventorySize; index++)
     {
         const User* user = listOfUsers.getValueAt(index);
-        if (user != nullptr && user->getState() != util::State::INACTIVE)
+        if (user != nullptr && user->getState() != util::State::INACTIVE && user->getUserType() != util::UserType::ADMIN)
         {
             activeUsers.insert(user->getId(), user);
         }
@@ -675,6 +855,7 @@ inline void displayAllActiveUsers(util::Map<std::string, const User*>& activeUse
     std::cout << std::left << std::setw(10) << "Index"
         << std::setw(15) << "User ID"
         << std::setw(25) << "Username"
+        << std::setw(25) << "Full Name"
         << std::setw(25) << "User Type"
         << std::endl;
     for (int iterator = 0; iterator < activeUserCount; iterator++)
@@ -685,6 +866,7 @@ inline void displayAllActiveUsers(util::Map<std::string, const User*>& activeUse
             std::cout << std::left << std::setw(10) << (iterator + 1)
                 << std::setw(15) << user->getId()
                 << std::setw(25) << user->getUserName()
+                << std::setw(25) << user->getName()
                 << std::setw(25) << util::getUserTypeString(user->getUserType())
                 << std::endl;
         }
@@ -697,6 +879,28 @@ inline void displayAllActiveUsers(util::Map<std::string, const User*>& activeUse
     }
 }
 
+/*
+Function: filterActiveServices
+Description: Filters the given list of services and returns only those that are active.
+Parameters:
+    - serviceList: Map of service IDs to Service pointers.
+Returns:
+    - util::Map<std::string, const Service*> containing only active services.
+*/
+inline util::Map<std::string, const Service*> filterActiveServices(util::Map<std::string, const Service*>& serviceList)
+{
+    util::Map<std::string, const Service*> activeServices;
+    for (int iterator = 0; iterator < serviceList.getSize(); iterator++)
+    {
+        const Service* currentService = serviceList.getValueAt(iterator);
+        if (currentService && currentService->getState() == util::State::ACTIVE)
+        {
+            activeServices.insert(currentService->getId(), currentService);
+        }
+    }
+    return activeServices;
+}
+
 /*
 Function: selectServiceFromServices
 Description: Displays active services and allows the customer to select one by index.
@@ -705,6 +909,12 @@ Return type: const Service* - selected service
 */
 inline const Service* selectServiceFromServices(const util::Map<std::string, const Service*>& services)
 {
+    if (services.getSize() == 0)
+    {
+        std::cout << "No active services available." << std::endl;
+        return nullptr;
+    }
+    std::cout << std::endl;
     util::Map<int, const Service*> activeServicesMap;
     int currentIndex = 1;
     int userInputIndex;
@@ -751,6 +961,31 @@ inline const Service* selectServiceFromServices(const util::Map<std::string, con
     return activeServicesMap[userInputIndex];
 }
 
+/*
+Function: filterComboPackages
+Description:
+    Filters the given list of combo packages and returns only those that are ACTIVE.
+Parameters:
+    - comboPackages: util::Map<std::string, const ComboPackage*>&
+      Map of combo package IDs to ComboPackage pointers.
+Returns:
+    - util::Map<std::string, const ComboPackage*>
+      Map containing only active combo packages.
+*/
+inline util::Map<std::string, const ComboPackage*> filterComboPackages(util::Map<std::string, const ComboPackage*>& comboPackages)
+{
+    util::Map<std::string, const ComboPackage*> activeComboPackages;
+    for (int iterator = 0; iterator < comboPackages.getSize(); iterator++)
+    {
+        const ComboPackage* currentComboPackage = comboPackages.getValueAt(iterator);
+        if (currentComboPackage && currentComboPackage->getState() == util::State::ACTIVE)
+        {
+            activeComboPackages.insert(currentComboPackage->getId(), currentComboPackage);
+        }
+    }
+    return activeComboPackages;
+}
+
 /*
 Function: selectComboPackageFromPackages
 Description: Displays active combo packages and allows the customer to select one by index.
@@ -762,10 +997,11 @@ inline const ComboPackage* selectComboPackageFromPackages(const util::Map<std::s
     util::Map<int, const ComboPackage*> activeComboPackages;
     int currentIndex = 1;
     int userInputIndex;
+    std::cout << std::endl;
     std::cout << std::left
         << std::setw(10) << "Index"
-        << std::setw(15) << "Combo Package ID"
+        << std::setw(15) << "Combo ID"
-        << std::setw(15) << "Combo Package Name"
+        << std::setw(35) << "Combo Name"
         << std::setw(15) << "Estimate Cost"
         << std::endl;
     for (int index = 0; index < comboPackages.getSize(); index++)
@@ -779,7 +1015,7 @@ inline const ComboPackage* selectComboPackageFromPackages(const util::Map<std::s
         std::cout << std::left
             << std::setw(10) << currentIndex
             << std::setw(15) << currentComboPackage->getId()
-            << std::setw(25) << currentComboPackage->getPackageName()
+            << std::setw(35) << util::truncateString(currentComboPackage->getPackageName(), 30)
             << std::setw(15) << util::calculateComboServiceEstimatedCost(currentComboPackage)
             << std::endl;
         currentIndex++;
@@ -847,7 +1083,7 @@ inline util::Map<std::string, const InventoryItem*> filterActiveItems(const util
     for (int index = 0; index < inventorySize; index++)
     {
         const InventoryItem* item = inventoryItems.getValueAt(index);
-        if (item != nullptr && item->getState() != util::State::INACTIVE)
+        if (item && item->getState() != util::State::INACTIVE)
         {
             activeItems.insert(item->getId(), item);
         }
@@ -885,6 +1121,7 @@ inline void displayInventoryWithItems(util::Map<std::string, const InventoryItem
                 << std::endl;
         }
     }
+    std::cout << std::endl;
 }
 
 /*
@@ -904,7 +1141,7 @@ inline void addQuantityToItem(util::Map<std::string, const InventoryItem*>& inve
     int activeSize = activeItems.getSize();
     if (activeSize == 0)
     {
-        std::cout << "No active items available in Inventory" << std::endl;
+        std::cout << "\nNo active items available in Inventory" << std::endl << std::endl;
         return;
     }
     displayInventoryWithItems(activeItems);
@@ -912,7 +1149,7 @@ inline void addQuantityToItem(util::Map<std::string, const InventoryItem*>& inve
     util::read(itemIndex);
     if (itemIndex < 1 || itemIndex > activeSize)
     {
-        std::cout << "Invalid index selected." << std::endl;
+        std::cout << "\nInvalid index selected." << std::endl << std::endl;
         return;
     }
     std::cout << "Enter quantity to add: ";
@@ -927,13 +1164,14 @@ inline void addQuantityToItem(util::Map<std::string, const InventoryItem*>& inve
     {
         std::string selectedItemId = selectedItem->getId();
         m_controller.addInventoryItemStock(selectedItemId, quantity);
-        std::cout << "Updated " << selectedItem->getPartName()
+        std::cout << "\nUpdated " << selectedItem->getPartName()
             << " stock. New quantity: " << selectedItem->getQuantity()
+            << std::endl
             << std::endl;
     }
     else
     {
-        std::cout << "Error: Selected item could not be found." << std::endl;
+        std::cout << "\nError: Selected item could not be found." << std::endl << std::endl;
     }
 }
 
@@ -957,14 +1195,14 @@ inline void displayComboPackagesWithIndex(util::Map<int, const ComboPackage*>& c
             std::cout << std::left
                 << std::setw(8) << "Index"
                 << std::setw(10) << "ID"
-                << std::setw(20) << "Package Name"
+                << std::setw(35) << "Package Name"
                 << std::setw(15) << "Discount (%)"
                 << "\n";
         }
         std::cout << std::left
             << std::setw(8) << currentComboPackageIndexMap.getKeyAt(iterator)
             << std::setw(10) << currentComboPackage->getId()
-            << std::setw(20) << currentComboPackage->getPackageName()
+            << std::setw(35) << util::truncateString(currentComboPackage->getPackageName(), 30)
             << std::setw(15) << currentComboPackage->getDiscountPercentage()
             << "\n";
     }
@@ -981,7 +1219,8 @@ inline std::string selectComboPackage(util::Map<std::string, const ComboPackage*
     util::Map<int, const ComboPackage*> currentComboPackageIndexMap;
     if (currentComboPackages.getSize() == 0)
     {
-        throw std::runtime_error("No combo packages are available.\n");
+        std::cout << "No combo packages are available.\n";
+        return "";
     }
     int currentIndex = 1, choice, selectedIndex;
     for (int iterator = 0; iterator < currentComboPackages.getSize(); iterator++)
@@ -994,7 +1233,8 @@ inline std::string selectComboPackage(util::Map<std::string, const ComboPackage*
     }
     if (currentComboPackageIndexMap.getSize() == 0)
     {
-        throw std::runtime_error("No combo packages currently active.");
+        std::cout << "No combo packages currently active.\n";
+        return "";
     }
     displayComboPackagesWithIndex(currentComboPackageIndexMap);
     std::cout << "Enter your choice(Index): ";

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/TechnicianMenu.cpp

@@ -6,6 +6,7 @@ Description: Implementation file containing the method definitions of the
 Author: Trenser
 Date:19-May-2026
 */
+
 #include "Enums.h"
 #include "InputHelper.h"
 #include "JobCard.h"
@@ -92,18 +93,15 @@ Returns:
 */
 void TechnicianMenu::completeJob()
 {
+    util::clear();
+    std::cout << "Complete Job\n";
 	util::Map<std::string, const JobCard*> assignedJobCards = m_controller.getJobCardsByUser();
-	util::Map<int, const JobCard*> incompleteJobCards;
+    util::Map<std::string, const JobCard*> startedJobCards = filterStartedJobCards(assignedJobCards);
-	std::cout << "Jobs to be completed.\n";
+	std::string selectedJobID = selectJobCardToComplete(startedJobCards);
-	std::string selectedJobID = selectJobCardToComplete(assignedJobCards, incompleteJobCards);
+    if (!selectedJobID.empty())
-	if (selectedJobID == "")
-	{
-		std::cout << "Failed to complete the job.\n";
-	}
-	else
 	{
 		m_controller.completeJob(selectedJobID);
-		std::cout << "Job marked as completed.\n";
+		std::cout << "\nJob marked as completed.\n\n";
 	}
     util::pressEnter();
 }

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/UserInterface.cpp

@@ -7,6 +7,8 @@ Author: Trenser
 Date:19-May-2026
 */
 
+#include <iostream>
+#include <stdexcept>
 #include "Enums.h"
 #include "InputHelper.h"
 #include "OutputHelper.h"
@@ -22,6 +24,8 @@ Parameter: None
 Return type: void
 */
 void UserInterface::run()
+{
+	try
 	{
 		m_controller.loadSystemData();
 		m_controller.runSystemChecks();
@@ -47,6 +51,19 @@ void UserInterface::run()
 		}
 		m_controller.saveSystemData();
 	}
+	catch (const std::invalid_argument& exception)
+	{
+		std::cout << "Exception: Invalid Argument: " << exception.what() << std::endl;
+	}
+	catch (const std::exception& exception)
+	{
+		std::cout << "Exception: " << exception.what() << std::endl;
+	}
+	catch (...)
+	{
+		std::cout << "Unknown error occurred." << std::endl;
+	}
+}
 
 /*
 Function: handleOperation
@@ -85,6 +102,7 @@ void UserInterface::login()
 {
 	std::string username, password;
 	util::clear();
+	std::cout << "Login\n";
 	std::cout << "Enter username: ";
 	util::read(username);
 	std::cout << "Enter password: ";
@@ -92,7 +110,7 @@ void UserInterface::login()
 	if (m_controller.login(username, password))
 	{
 		const User* authenticatedUser = m_controller.getAuthenticatedUser();
-		if (authenticatedUser != nullptr)
+		if (authenticatedUser && authenticatedUser->getState() != util::State::INACTIVE)
 		{
 			switch (authenticatedUser->getUserType())
 			{
@@ -110,10 +128,16 @@ void UserInterface::login()
 				break;
 			}
 		}
+		else if (authenticatedUser && authenticatedUser->getState() == util::State::INACTIVE)
+		{
+			std::cout << "\nError: Your account has been disabled. Please contact your Administrator.";
+			util::pressEnter();
+		}
 	}
 	else
 	{
 		std::cout << "\nError: Invalid Username or Password";
+		util::pressEnter();
 	}
 }
 
@@ -129,6 +153,7 @@ void UserInterface::registerCustomer()
 {
 	std::string username, name, email, phone, password;
 	util::clear();
+	std::cout << "Register Customer\n";
 	std::cout << "Enter username: ";
 	util::read(username);
 	std::cout << "Enter name: ";