Fix combo package null handling and cleanup initialization

- Added null checks in combo package display/selection flows
- Replaced unnecessary copies with references
- Zero-initialized SerializedObserver
- Initialized event handle array

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

@@ -234,6 +234,17 @@ void Controller::removeInventoryItem(const std::string& inventoryItemID)
     m_inventoryManagementService.removeInventoryItem(inventoryItemID);
 }
 
+/*
+Function: removeServiceBooking
+Description: Removes a service booking from the service management system by its booking ID.
+Parameter: const std::string& bookingID - ID of the service booking
+Return type: void
+*/
+void Controller::removeServiceBooking(const std::string& bookingID)
+{
+    m_serviceManagementService.removeServiceBooking(bookingID);
+}
+
 /*
 Function: addInventoryItemStock
 Description: Adds stock to an existing inventory item in the inventory management service.
@@ -265,6 +276,7 @@ util::Map<std::string, const ServiceBooking*> Controller::getServiceBookings()
     return readOnlyServiceBookings;
 }
 
+
 /*
 Function: getServiceBookingsByUser
 Description: Retrieves all service bookings for a specific user.

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/controllers/Controller.h

@@ -58,6 +58,7 @@ public:
     util::Map<std::string, const User*> getUsers(util::UserType userType);
     void createJobCard(const std::string& bookingID, const std::string& technicianID, const std::string& serviceID);
     void createService(const std::string& name, const util::Vector<std::string>& inventoryItemIDs, double laborCost);
+    void removeServiceBooking(const std::string& bookingID);
     void removeService(const std::string& serviceID);
     util::Map<std::string, const JobCard*> getJobCardsByUser();
     void updateJobStatus(const std::string& jobID);

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/datastores/DataStore.cpp

@@ -358,7 +358,7 @@ util::Map<std::string, TrackedRecord<ServiceBooking>>& DataStore::getServiceBook
             {
                 throw std::runtime_error("Invalid service index.");
             }
-            auto currentService = services.getValueAt(serviceIndex);
+            auto& currentService = services.getValueAt(serviceIndex);
             servicesInBooking[currentServiceId] = currentService.data;
         }
         serviceBooking->setServices(servicesInBooking);
@@ -369,7 +369,7 @@ util::Map<std::string, TrackedRecord<ServiceBooking>>& DataStore::getServiceBook
             {
                 throw std::runtime_error("Invalid user index.");
             }
-            auto customer = users.getValueAt(userIndex);
+            auto& customer = users.getValueAt(userIndex);
             serviceBooking->setCustomer(customer.data);
         }
         if (!serviceBooking->getAssignedTechnicianId().empty())
@@ -379,7 +379,7 @@ util::Map<std::string, TrackedRecord<ServiceBooking>>& DataStore::getServiceBook
             {
                 throw std::runtime_error("Invalid technician index.");
             }
-            auto technician = users.getValueAt(technicianIndex);
+            auto& technician = users.getValueAt(technicianIndex);
             serviceBooking->setAssignedTechnician(technician.data);
         }
     }
@@ -415,7 +415,7 @@ util::Map<std::string, TrackedRecord<JobCard>>& DataStore::getJobCards()
         {
             throw std::runtime_error("Invalid booking ID: " + bookingId);
         }
-        auto trackedBooking = serviceBookings.getValueAt(bookingIndex);
+        auto& trackedBooking = serviceBookings.getValueAt(bookingIndex);
         jobCard->setBooking(trackedBooking.data);
         const std::string& serviceId = jobCard->getServiceId();
         int serviceIndex = services.find(serviceId);
@@ -423,7 +423,7 @@ util::Map<std::string, TrackedRecord<JobCard>>& DataStore::getJobCards()
         {
             throw std::runtime_error("Invalid service ID: " + serviceId);
         }
-        auto trackedService = services.getValueAt(serviceIndex);
+        auto& trackedService = services.getValueAt(serviceIndex);
         jobCard->setService(trackedService.data);
         const std::string& technicianId = jobCard->getTechnicianId();
         if (!technicianId.empty())
@@ -433,7 +433,7 @@ util::Map<std::string, TrackedRecord<JobCard>>& DataStore::getJobCards()
             {
                 throw std::runtime_error("Invalid technician ID: " + technicianId);
             }
-            auto trackedTechnician = users.getValueAt(technicianIndex);
+            auto& trackedTechnician = users.getValueAt(technicianIndex);
             jobCard->setTechnician(trackedTechnician.data);
         }
     }
@@ -691,7 +691,7 @@ void DataStore::saveObservers(MappingInfo& mapping, util::Map<std::string, User*
     SharedMemory::setRecordCount(mapping, observerCount);
     for (size_t index = 0; index < observerCount; index++)
     {
-        SerializedObserver serializedObserver;
+        SerializedObserver serializedObserver{};
         User* user = observers.getValueAt(static_cast<int>(index));
         strcpy_s(serializedObserver.id, sizeof(serializedObserver.id), user->getId().c_str());
         SerializedObserver* destination = static_cast<SerializedObserver*>(SharedMemory::getRecordAddress(mapping, index));

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

@@ -26,7 +26,6 @@ Date:19-May-2026
 #include "UserManagementService.h"
 #include "DataStoreLockGuard.h"
 #include "Utility.h"
-#include "DataStoreLockGuard.h"
 #include "EventManager.h"
 
 /*
@@ -98,6 +97,7 @@ void ServiceManagementService::purchaseService(const util::Vector<std::string>&
     std::string title = "Service Booking succeeded";
     std::string message = "Your service booking has been successfully placed with ID " + serviceBooking->getId();
     sendNotification(authenticatedUser, title, message);
+    m_dataStore.saveServiceBookings();
     notifyAllAdmins("New Service Order Available", "A new service order has been placed with Service Booking ID " + serviceBooking->getId(), m_dataStore.getUsers(), this);
 }
 
@@ -140,6 +140,7 @@ void ServiceManagementService::purchaseComboPackage(const std::string& comboPack
     std::string title = "Combo Package Service Booking succeeded";
     std::string message = "Your service booking for the combo package has been successfully placed with ID " + serviceBooking->getId();
     sendNotification(authenticatedUser, title, message);
+    m_dataStore.saveServiceBookings();
     notifyAllAdmins("New Combo Package Order Available", "A new combo package order has been placed with Service Booking ID " + serviceBooking->getId(), m_dataStore.getUsers(), this);
 }
 
@@ -628,11 +629,23 @@ void ServiceManagementService::createJobCard(const std::string& bookingID, const
     DataStoreLockGuard lock(m_dataStore);
 	UserManagementService m_userManagementService;
 	ServiceBooking* currentBooking = getServiceBooking(bookingID);
+    if (currentBooking == nullptr)
+    {
+        throw std::runtime_error("Service Booking not available");
+    }
+    if (currentBooking->getStatus() == util::ServiceJobStatus::CANCELLED)
+    {
+        throw std::runtime_error("Cannot create job card. Service Booking was cancelled!");
+    }
 	auto& currentTrackedJobCards = m_dataStore.getJobCards();
-	if (currentBooking == nullptr)
-	{
-		throw std::runtime_error("Service Booking not available");
-	}
+    auto& currentTrackedInventoryItems = m_dataStore.getInventoryItems();
+    auto& currentTrackedServiceBookings = m_dataStore.getServiceBookings();
+    int currentTrackedServiceBookingIndex = currentTrackedServiceBookings.find(bookingID);
+    if (currentTrackedServiceBookingIndex == -1)
+    {
+        throw std::runtime_error("Invalid service booking id.");
+    }
+    auto& currentTrackedServiceBooking = currentTrackedServiceBookings.getValueAt(currentTrackedServiceBookingIndex);
 	auto& currentServices = currentBooking->getServices();
 	if (currentServices.find(serviceID) == -1)
 	{
@@ -657,10 +670,18 @@ void ServiceManagementService::createJobCard(const std::string& bookingID, const
 	for (int iterator = 0; iterator < inventoryItems.getSize(); iterator++)
 	{
 		InventoryItem* currentInventoryItem = inventoryItems.getValueAt(iterator);
+        const std::string& currentInventoryItemId = inventoryItems.getKeyAt(iterator);
 		if (currentInventoryItem)
 		{
+            int trackedCurrentInventoryItemIndex = currentTrackedInventoryItems.find(currentInventoryItemId);
+            if (trackedCurrentInventoryItemIndex == -1)
+            {
+                throw std::runtime_error("Invalid inventory item index.");
+            }
+            auto& trackedCurrentInventoryItem = currentTrackedInventoryItems.getValueAt(trackedCurrentInventoryItemIndex);
 			int currentStockQuantity = currentInventoryItem->getQuantity();
 			currentInventoryItem->setQuantity(currentStockQuantity - 1);
+            trackedCurrentInventoryItem.state = RecordState::MODIFIED;
 		}
 	}
 	currentBooking->setAssignedTechnician(selectedTechnician);
@@ -669,6 +690,7 @@ void ServiceManagementService::createJobCard(const std::string& bookingID, const
     {
         currentBooking->setStatus(util::ServiceJobStatus::STARTED);
     }
+    currentTrackedServiceBooking.state = RecordState::MODIFIED;
 	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());
@@ -685,6 +707,8 @@ void ServiceManagementService::createJobCard(const std::string& bookingID, const
     message = "A technician has been assigned to your Service Booking with ID " + bookingID;
     sendNotification(currentBooking->getCustomer(), title, message);
     m_dataStore.saveJobCards();
+    m_dataStore.saveServiceBookings();
+    m_dataStore.saveInventoryItems();
 }
 
 /*
@@ -806,6 +830,61 @@ void ServiceManagementService::removeService(const std::string& serviceID)
     m_dataStore.saveComboPackages();
 }
 
+/*
+Function: removeServiceBooking
+Description: Removes a pending service booking by its ID.
+             Cancels only if status is PENDING, otherwise throws exceptions
+             for invalid states. Sends notification to the customer and
+             persists changes.
+Parameter: const std::string& bookingID - ID of the service booking
+Return type: void
+*/
+void ServiceManagementService::removeServiceBooking(const std::string& bookingID)
+{
+    DataStoreLockGuard lock(m_dataStore);
+    auto& trackedServiceBookings = m_dataStore.getServiceBookings();
+    bool serviceBookingRemoved = false;
+    for (int iterator = 0; iterator < trackedServiceBookings.getSize(); iterator++)
+    {
+        auto& currentTrackedServiceBooking = trackedServiceBookings.getValueAt(iterator);
+        ServiceBooking* currentServiceBooking = currentTrackedServiceBooking.data;
+        if (currentServiceBooking && currentServiceBooking->getId() == bookingID)
+        {
+            if (currentServiceBooking->getStatus() == util::ServiceJobStatus::PENDING)
+            {
+                const std::string title = "Service Booking cancelled.";
+                const std::string message = "Service Booking of id " + bookingID + " successfully cancelled.";
+                currentServiceBooking->setStatus(util::ServiceJobStatus::CANCELLED);
+                currentTrackedServiceBooking.state = RecordState::MODIFIED;
+                serviceBookingRemoved = true;
+                sendNotification(currentServiceBooking->getCustomer(), title, message);
+                break;
+            }
+            else if(currentServiceBooking->getStatus() == util::ServiceJobStatus::COMPLETED)
+            {
+                throw std::runtime_error("Unable to cancel completed service booking.");
+            }
+            else if (currentServiceBooking->getStatus() == util::ServiceJobStatus::STARTED)
+            {
+                throw std::runtime_error("Unable to cancel started service booking.");
+            }
+            else if (currentServiceBooking->getStatus() == util::ServiceJobStatus::IN_PROGRESS)
+            {
+                throw std::runtime_error("Unable to cancel currently Inprogress service booking.");
+            }
+            else
+            {
+                throw std::runtime_error("Service Booking already cancelled.");
+            }
+        }
+    }
+    if (!serviceBookingRemoved)
+    {
+        throw std::runtime_error("Unable to cancel service booking.");
+    }
+    m_dataStore.saveServiceBookings();
+}
+
 /*
 Function: getServiceBookings (overloaded)
 Description: Retrieves all service bookings for a specific customer.
@@ -900,44 +979,44 @@ void ServiceManagementService::updateJobStatus(const std::string& jobID)
 {
     AuthenticationManagementService::ensureAuthorization();
     DataStoreLockGuard lock(m_dataStore);
-	AuthenticationManagementService authenticationManagementService;
-	PaymentManagementService paymentManagementService;
-	bool jobStatusUpdated = false, serviceBookingCompleted;
-	JobCard* currentJob;
-	User* currentTechnician = authenticationManagementService.getAuthenticatedUser();
-	if (currentTechnician == nullptr)
-	{
-		throw std::runtime_error("Unable to fetch current technician.");
-	}
-	util::Map<std::string, JobCard*> currentAssignedJobs = getJobCards(currentTechnician->getId());
-	if (currentAssignedJobs.getSize() == 0)
-	{
-		throw std::runtime_error("No job cards assigned to the technician.");
-	}
+    AuthenticationManagementService authenticationManagementService;
+    PaymentManagementService paymentManagementService;
+    bool jobStatusUpdated = false, serviceBookingCompleted;
+    User* currentTechnician = authenticationManagementService.getAuthenticatedUser();
+    if (currentTechnician == nullptr)
+    {
+        throw std::runtime_error("Unable to fetch current technician.");
+    }
+    util::Map<std::string, JobCard*> currentAssignedJobs = getJobCards(currentTechnician->getId());
+    if (currentAssignedJobs.getSize() == 0)
+    {
+        throw std::runtime_error("No job cards assigned to the technician.");
+    }
     auto& trackedJobCards = m_dataStore.getJobCards();
     auto& trackedServiceBookings = m_dataStore.getServiceBookings();
-	if (currentAssignedJobs.find(jobID) != -1)
-	{
+    if (currentAssignedJobs.find(jobID) != -1)
+    {
         int jobIndex = trackedJobCards.find(jobID);
         if (jobIndex == -1)
         {
             throw std::runtime_error("Unable to fetch current job.");
         }
-		currentJob = currentAssignedJobs.getValueAt(currentAssignedJobs.find(jobID));
-		if (currentJob == nullptr)
-		{
-			throw std::runtime_error("Unable to fetch current job.");
-		}
-		if (currentJob->getStatus() == util::ServiceJobStatus::STARTED)
-		{
-			currentJob->setStatus(util::ServiceJobStatus::IN_PROGRESS);
-            trackedJobCards.getValueAt(jobIndex).state = RecordState::MODIFIED;
-			jobStatusUpdated = true;
-		}
+        auto& trackedCurrentJob = trackedJobCards.getValueAt(jobIndex);
+        JobCard* currentJob = trackedCurrentJob.data;
+        if (currentJob == nullptr)
+        {
+            throw std::runtime_error("Unable to fetch current job.");
+        }
+        if (currentJob->getStatus() == util::ServiceJobStatus::STARTED)
+        {
+            currentJob->setStatus(util::ServiceJobStatus::IN_PROGRESS);
+            trackedCurrentJob.state = RecordState::MODIFIED;
+            jobStatusUpdated = true;
+        }
         else if (currentJob->getStatus() == util::ServiceJobStatus::IN_PROGRESS)
         {
             currentJob->setStatus(util::ServiceJobStatus::COMPLETED);
-            trackedJobCards.getValueAt(jobIndex).state = RecordState::MODIFIED;
+            trackedCurrentJob.state = RecordState::MODIFIED;
             jobStatusUpdated = true;
             serviceBookingCompleted = hasCompletedAllJobs(currentJob->getBookingId(), currentAssignedJobs);
             if (serviceBookingCompleted)
@@ -951,15 +1030,15 @@ void ServiceManagementService::updateJobStatus(const std::string& jobID)
                 sendNotification(currentJob->getBooking()->getCustomer(), title, message);
             }
         }
-	}
-	else
-	{
-		throw std::runtime_error("Failed to update job status. Job may already be completed.");
-	}
-	if (!jobStatusUpdated)
-	{
-		throw std::runtime_error("Failed to update job status. Job may already be completed.");
-	}
+    }
+    else
+    {
+        throw std::runtime_error("Failed to update job status. Job may already be completed.");
+    }
+    if (!jobStatusUpdated)
+    {
+        throw std::runtime_error("Failed to update job status. Job may already be completed.");
+    }
     m_dataStore.saveJobCards();
     m_dataStore.saveServiceBookings();
 }

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/ServiceManagementService.h

@@ -35,6 +35,7 @@ public:
     void createJobCard(const std::string& bookingID, const std::string& technicianID, const std::string& serviceID);
     void createService(const std::string& name, const util::Vector<std::string>& inventoryItemIDs, double laborCost);
     void removeService(const std::string& serviceID);
+    void removeServiceBooking(const std::string& bookingID);
     util::Map<std::string, JobCard*> getJobCards(const std::string& technicianID);
     void updateJobStatus(const std::string& jobID);
     void cancelCustomerServiceBookings(const std::string& customerID);

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

@@ -163,7 +163,13 @@ Return type: void
 void AdminMenu::handleNotificationEvent()
 {
 	auto notifications = m_controller.getNotifications();
-	displayNewNotification(notifications);
+	const User* authenticatedUser = m_controller.getAuthenticatedUser();
+	std::string name;
+	if (authenticatedUser)
+	{
+		name = authenticatedUser->getName();
+	}
+	displayNewNotification(notifications, name);
 }
 
 /*
@@ -332,6 +338,23 @@ void AdminMenu::removeInventoryItem()
             std::string selectedItemId = selectedItem->getId();
             m_controller.removeInventoryItem(selectedItemId);
             std::cout << "Item " << selectedItem->getPartName() << " removed successfully." << std::endl;
+			const util::Map<std::string, const Service*>& listOfService = m_controller.getServices();
+			for (int serviceIndex = 0; serviceIndex < listOfService.getSize(); serviceIndex++)
+			{
+				const Service* service = listOfService.getValueAt(serviceIndex);
+				if (!service)
+				{
+					continue;
+				}
+				const util::Map<std::string, InventoryItem*>& requiredItems = service->getRequiredInventoryItems();
+				if (requiredItems.find(selectedItemId) != -1) 
+				{
+					m_controller.removeService(service->getId()); 
+					std::cout << "Service " << service->getName()
+						<< " removed as the item "
+						<< selectedItem->getPartName() << " required for the service has been removed." << std::endl;
+				}
+			}
         }
     }
     util::pressEnter();

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

@@ -51,11 +51,12 @@ void CustomerMenu::showMenu()
                 << "\n3. Update Profile"
                 << "\n4. Change Password"
                 << "\n5. View Service History"
-                << "\n6. Complete Payments"
-                << "\n7. View Invoices"
-                << "\n8. View Notifications"
-                << "\n9. Configure Notifications"
-                << "\n10. Logout"
+                << "\n6. Cancel Service Booking"
+                << "\n7. Complete Payments"
+                << "\n8. View Invoices"
+                << "\n9. View Notifications"
+                << "\n10. Configure Notifications"
+                << "\n11. Logout"
                 << "\nEnter a choice: ";
             util::read(choice);
             if (!handleOperation(choice))
@@ -103,18 +104,21 @@ bool CustomerMenu::handleOperation(int choice)
         viewServiceHistory();
         break;
     case 6:
-        completePayments();
+        cancelServiceBooking();
         break;
     case 7:
-        viewInvoices();
+        completePayments();
         break;
     case 8:
-        viewNotifications();
+        viewInvoices();
         break;
     case 9:
-        configureNotifications();
+        viewNotifications();
         break;
     case 10:
+        configureNotifications();
+        break;
+    case 11:
         logout();
         return false;
     default:
@@ -134,7 +138,13 @@ Return type: void
 void CustomerMenu::handleNotificationEvent()
 {
     auto notifications = m_controller.getNotifications();
-    displayNewNotification(notifications);
+    const User* authenticatedUser = m_controller.getAuthenticatedUser();
+    std::string name;
+    if (authenticatedUser)
+    {
+        name = authenticatedUser->getName();
+    }
+    displayNewNotification(notifications, name);
 }
 
 /*
@@ -327,6 +337,46 @@ void CustomerMenu::viewServiceHistory()
     util::pressEnter();
 }
 
+/*
+Function: cancelServiceBooking
+Description: Allows the customer to cancel a pending service booking.
+             Displays the list of active bookings, lets the user select one,
+             and removes it from the system. If no bookings are available,
+             an appropriate message is shown.
+Parameter: None
+Return type: void
+*/
+void CustomerMenu::cancelServiceBooking()
+{
+    util::clear();
+    std::cout << "Cancel Service Booking\n";
+    const User* currentUser = m_controller.getAuthenticatedUser();
+    std::string currentUserID = currentUser->getId();
+    util::Map<std::string, const ServiceBooking*> serviceBookingsByCurrentUser = m_controller.getServiceBookingsByUser(currentUserID);
+    util::Map<int, const ServiceBooking*> serviceBookingsMap;
+    auto currentPendingServiceBookings = filterActiveServiceBookings(serviceBookingsByCurrentUser);
+    int bookingsSize = currentPendingServiceBookings.getSize();
+    if (listServiceBookings(currentPendingServiceBookings, bookingsSize, serviceBookingsMap))
+    {
+        const ServiceBooking* selectedService = selectPendingServiceBookings(serviceBookingsMap);
+        if (selectedService)
+        {
+            m_controller.removeServiceBooking(selectedService->getId());
+            std::cout << "Cancelled Service booking of id " + selectedService->getId() << std::endl << std::endl;
+        }
+        else
+        {
+            std::cout << "Invalid service booking index.\n\n";
+            return;
+        }
+    }
+    else
+    {
+        std::cout << "No pending service bookings available.\n\n";
+    }
+    util::pressEnter();
+}
+
 /*
 Function: completePayments
 Description: Allows the customer to complete pending payments for invoices.

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/CustomerMenu.h

@@ -28,5 +28,6 @@ public:
     void completePayments();
     void viewInvoices();
     void viewNotifications();
+    void cancelServiceBooking();
     void configureNotifications();
 };

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/Menu.cpp

@@ -67,7 +67,7 @@ Return type: void
 */
 void Menu::eventListenerLoop()
 {
-    HANDLE handles[3];
+    HANDLE handles[3] = { NULL, NULL, NULL };
     handles[0] = m_accountDisabledEvent;
     handles[1] = m_notificationAvailableEvent;
     handles[2] = m_shutdownEvent;
@@ -133,10 +133,16 @@ Return type: void
 void Menu::handleAccountDisabledEvent()
 {
     m_isMenuActive.store(false);
+    const User* authenticatedUser = m_controller.getAuthenticatedUser();
+    std::string messageTitle = "Account Disabled";
+    if (authenticatedUser)
+    {
+        messageTitle += " - " + authenticatedUser->getName();
+    }
     MessageBoxA(
         GetConsoleWindow(),
         "Your account has been disabled.",
-        "Account Disabled",
+        messageTitle.c_str(),
         MB_OK |
         MB_ICONWARNING |
         MB_SETFOREGROUND |

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

@@ -28,6 +28,7 @@ Date: 21-May-2026
 #include "Utility.h"
 #include "Validator.h"
 #include "Vector.h"
+#include "StringHelper.h"
 
 /*
 Function: displayAllServices
@@ -587,7 +588,7 @@ inline void displayInvoices(util::Map<std::string, const Invoice*> currentUserIn
                     << 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();
+                auto& inventoryItemsInInvoice = selectedInvoice->getParts();
                 if (inventoryItemsInInvoice.isEmpty())
                 {
                     std::cout << "No inventory items used.\n\n";
@@ -596,7 +597,6 @@ inline void displayInvoices(util::Map<std::string, const Invoice*> currentUserIn
                 std::cout << "\nItems Used:\n";
                 std::cout << std::left
                     << std::setw(20) << "ItemName"
-                    << std::setw(10) << "Quantity"
                     << std::setw(10) << "Price"
                     << std::endl;
                 std::cout << std::string(40, '-') << std::endl;
@@ -605,7 +605,6 @@ inline void displayInvoices(util::Map<std::string, const Invoice*> currentUserIn
                     InventoryItem* currentItem = inventoryItemsInInvoice.getValueAt(iterator);
                     std::cout << std::left
                         << std::setw(20) << currentItem->getPartName()
-                        << std::setw(10) << currentItem->getQuantity()
                         << std::setw(10) << currentItem->getPrice()
                         << std::endl;
                 }
@@ -1056,6 +1055,21 @@ inline const Service* selectServiceFromServices(const util::Map<std::string, con
         {
             continue;
         }
+        bool hasDepletedItem = false;
+        const util::Map<std::string, InventoryItem*>& requiredItems = currentService->getRequiredInventoryItems();
+        for (int itemIndex = 0; itemIndex < requiredItems.getSize(); itemIndex++)
+        {
+            const InventoryItem* item = requiredItems.getValueAt(itemIndex);
+            if (!item || item->getQuantity() < 1)
+            {
+                hasDepletedItem = true;
+                break;
+            }
+        }
+        if (hasDepletedItem)
+        {
+            continue; 
+        }
         activeServicesMap.insert(currentIndex, currentService);
         double partsCost = util::calculatePartsCost(currentService);
         std::cout << std::left
@@ -1130,15 +1144,18 @@ inline void displayAllComboPackages(util::Map<std::string, const ComboPackage*>
     for (int index = 0; index < comboPackages.getSize(); index++)
     {
         const ComboPackage* currentComboPackage = comboPackages.getValueAt(index);
-        if (currentComboPackage && currentComboPackage->getState() != util::State::ACTIVE)
+        if (currentComboPackage) 
         {
-            continue;
+            if (currentComboPackage->getState() != util::State::ACTIVE)
+            {
+                continue;
+            }
+            std::cout << std::left
+                << std::setw(15) << currentComboPackage->getId()
+                << std::setw(35) << util::truncateString(currentComboPackage->getPackageName(), 30)
+                << std::setw(15) << util::calculateComboServiceEstimatedCost(currentComboPackage)
+                << std::endl;
         }
-        std::cout << std::left
-            << std::setw(15) << currentComboPackage->getId()
-            << std::setw(35) << util::truncateString(currentComboPackage->getPackageName(), 30)
-            << std::setw(15) << util::calculateComboServiceEstimatedCost(currentComboPackage)
-            << std::endl;
     }
 }
 
@@ -1164,18 +1181,21 @@ inline const ComboPackage* selectComboPackageFromPackages(const util::Map<std::s
     for (int index = 0; index < comboPackages.getSize(); index++)
     {
         const ComboPackage* currentComboPackage = comboPackages.getValueAt(index);
-        if (currentComboPackage && currentComboPackage->getState() != util::State::ACTIVE)
+        if (currentComboPackage)
         {
-            continue;
+            if (currentComboPackage->getState() != util::State::ACTIVE)
+            {
+                continue;
+            }
+            activeComboPackages.insert(currentIndex, currentComboPackage);
+            std::cout << std::left
+                << std::setw(10) << currentIndex
+                << std::setw(15) << currentComboPackage->getId()
+                << std::setw(35) << util::truncateString(currentComboPackage->getPackageName(), 30)
+                << std::setw(15) << util::calculateComboServiceEstimatedCost(currentComboPackage)
+                << std::endl;
+            currentIndex++;
         }
-        activeComboPackages.insert(currentIndex, currentComboPackage);
-        std::cout << std::left
-            << std::setw(10) << currentIndex
-            << std::setw(15) << currentComboPackage->getId()
-            << std::setw(35) << util::truncateString(currentComboPackage->getPackageName(), 30)
-            << std::setw(15) << util::calculateComboServiceEstimatedCost(currentComboPackage)
-            << std::endl;
-        currentIndex++;
     }
     if (activeComboPackages.getSize() == 0)
     {
@@ -1415,9 +1435,10 @@ Description: Displays the most recent notification from the supplied
              notification collection.
 Parameter: util::Vector<const Notification*> notifications -
            collection of notifications
+           const std::string& - The name of the user currently authenticated with the system
 Return type: void
 */
-inline void displayNewNotification(util::Vector<const Notification*> notifications)
+inline void displayNewNotification(util::Vector<const Notification*> notifications, const std::string& name)
 {
     const Notification* notification = nullptr;
 	size_t numberOfNotifications = notifications.getSize();
@@ -1429,16 +1450,24 @@ inline void displayNewNotification(util::Vector<const Notification*> notificatio
 		}
 		else
 		{
-			if (notification->getId() < notifications[index]->getId())
+            if (util::extractNumber(notification->getId()) < util::extractNumber(notifications[index]->getId()))
 			{
 				notification = notifications[index];
 			}
 		}
 	}
-    MessageBoxA(
-        GetConsoleWindow(),
-        notification->getMessage().c_str(),
-        notification->getTitle().c_str(),
-        MB_OK |
-        MB_ICONINFORMATION);
+    if (notification)
+    {
+        std::string messageTitle = notification->getTitle();
+        if (!name.empty())
+        {
+            messageTitle += " - " + name;
+        }
+        MessageBoxA(
+            GetConsoleWindow(),
+            notification->getMessage().c_str(),
+            messageTitle.c_str(),
+            MB_OK |
+            MB_ICONINFORMATION);
+    }
 }

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

@@ -108,7 +108,13 @@ Return type: void
 void TechnicianMenu::handleNotificationEvent()
 {
     auto notifications = m_controller.getNotifications();
-    displayNewNotification(notifications);
+    const User* authenticatedUser = m_controller.getAuthenticatedUser();
+    std::string name;
+    if (authenticatedUser)
+    {
+        name = authenticatedUser->getName();
+    }
+    displayNewNotification(notifications, name);
 }
 
 /*