From 9439202c5acf9039629740410a36fd6018c3901a Mon Sep 17 00:00:00 2001
From: Joel Thomas <joel.thomas@trenser.com>
Date: Tue, 26 May 2026 18:04:05 +0530
Subject: [PATCH] Fix: improve combo package selection UI and empty state
 handling

- add Select a Combo Package header
- show message when no combo packages are available
- improve combo package table header labels

Fixes #1743
---
 .../Trenser.VehicleServiceSystem/views/CustomerMenu.cpp  | 9 ++++++++-
 .../Trenser.VehicleServiceSystem/views/MenuHelper.h      | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/CustomerMenu.cpp b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/CustomerMenu.cpp
index 66347aa..2f3a0f9 100644
--- a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/CustomerMenu.cpp
+++ b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/CustomerMenu.cpp
@@ -216,8 +216,15 @@ Return type: void
 void CustomerMenu::selectComboPackage()
 {
     std::string vehicleNumber, vehicleBrand, vehicleModel;
-    auto comboPackages = m_controller.getComboPackages();
     util::clear();
+    std::cout << "Select a Combo Package\n";
+    auto comboPackages = m_controller.getComboPackages();
+    if (comboPackages.isEmpty())
+    {
+        std::cout << "No combo packages available!";
+        util::pressEnter();
+        return;
+    }
     const ComboPackage* selectedComboPackage = selectComboPackageFromPackages(comboPackages);
     if (selectedComboPackage == nullptr)
     {
diff --git a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/MenuHelper.h b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/MenuHelper.h
index 62d6e00..09c4ecc 100644
--- a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/MenuHelper.h
+++ b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/MenuHelper.h
@@ -784,8 +784,8 @@ inline const ComboPackage* selectComboPackageFromPackages(const util::Map<std::s
     int userInputIndex;
     std::cout << std::left
         << std::setw(10) << "Index"
-        << std::setw(15) << "Combo Package ID"
-        << std::setw(15) << "Combo Package Name"
+        << std::setw(15) << "Combo ID"
+        << std::setw(15) << "Combo Name"
         << std::setw(15) << "Estimate Cost"
         << std::endl;
     for (int index = 0; index < comboPackages.getSize(); index++)