Merged PR 1128: Fix customer removal flow, admin inventory UI issues, and user display improvements
Changes:
- Refactored customer and technician removal flow:
- Ensured linked job cards and service bookings are properly cancelled.
- Centralized cancellation logic with processBookingCancellation helper for consistent notifications, technician reassignment, and inventory restoration.
- Prevented duplicate inventory restocking during customer removal.
- Preserved customer references and IDs correctly during booking cancellation.
- Admin inventory management improvements:
- Added heading output to Remove Inventory Item submenu for clearer context.
- Prevented service creation with empty inventory selection by adding validation and early return.
- Improved combo package creation by simplifying null checks with modern idioms.
- Enhanced inventory selection flow:
- Clear screen and context header for better UX.
- Prevent duplicate item selection by checking already chosen items.
- Changed exit option from -1 to 0 for consistency.
- Added pressEnter prompt after successful item addition.
- Simplified pointer checks using concise conditions (e.g., if (item)).
- User management UI fix:
- Updated active user display in Remove User menu to include Full Name column, ensuring administrators have complete visibility when managing users.
Fixes #1788
Fixes #1778
Fixes #1781
Related work items: #1778, #1781, #1788
This commit is contained in:
Avinash Rajesh
+154
-79
@@ -507,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.
|
||||
@@ -515,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);
|
||||
if (user == nullptr)
|
||||
User* customer = users.getValueAt(userIndex);
|
||||
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 = DataStore::getInstance().getServiceBookings();
|
||||
for (int bookingIterator = 0; bookingIterator < bookings.getSize(); bookingIterator++)
|
||||
auto& bookings = m_dataStore.getServiceBookings();
|
||||
auto& jobs = m_dataStore.getJobCards();
|
||||
for (int iteratorOne = 0; iteratorOne < bookings.getSize(); iteratorOne++)
|
||||
{
|
||||
ServiceBooking* booking = bookings.getValueAt(bookingIterator);
|
||||
if (booking != nullptr &&
|
||||
(booking->getCustomerId() == userID || booking->getAssignedTechnicianId() == userID))
|
||||
ServiceBooking* booking = bookings.getValueAt(iteratorOne);
|
||||
if (!booking)
|
||||
{
|
||||
if (booking->getStatus() == util::ServiceJobStatus::PENDING ||
|
||||
booking->getStatus() == util::ServiceJobStatus::STARTED)
|
||||
{
|
||||
if (type == util::UserType::CUSTOMER)
|
||||
{
|
||||
booking->setStatus(util::ServiceJobStatus::CANCELLED);
|
||||
booking->setCustomer(nullptr);
|
||||
booking->setCustomerId("");
|
||||
User* assignedTechnician = booking->getAssignedTechnician();
|
||||
std::string title = "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.";
|
||||
sendNotification(assignedTechnician, title, message);
|
||||
}
|
||||
else if (type == util::UserType::TECHNICIAN)
|
||||
{
|
||||
booking->setStatus(util::ServiceJobStatus::PENDING);
|
||||
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.";
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if (booking->getCustomerId() != customerID)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
if (booking->getStatus() != util::ServiceJobStatus::PENDING && booking->getStatus() != util::ServiceJobStatus::STARTED)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
User* assignedTechnician = booking->getAssignedTechnician();
|
||||
std::string titleToTechnician = "Customer Service Cancelled";
|
||||
std::string messageToTechnician = "The customer has cancelled their service booking. Your assigned job card has been cancelled and the inventory has been restocked.";
|
||||
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.";
|
||||
processBookingCancellation(booking,
|
||||
util::ServiceJobStatus::CANCELLED,
|
||||
titleToTechnician, messageToTechnician, assignedTechnician,
|
||||
util::ServiceJobStatus::CANCELLED,
|
||||
jobTitle, jobMessage, jobs, *this
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -590,34 +651,48 @@ Return type: void
|
||||
*/
|
||||
void ServiceManagementService::cancelTechnicianJobs(const std::string& technicianID)
|
||||
{
|
||||
const int INCREMENT_VALUE = 1;
|
||||
auto& jobs = m_dataStore.getJobCards();
|
||||
for (int jobIterator = 0; jobIterator < jobs.getSize(); jobIterator++)
|
||||
auto& users = m_dataStore.getUsers();
|
||||
int userIndex = users.find(technicianID);
|
||||
if (userIndex == -1)
|
||||
{
|
||||
JobCard* job = jobs.getValueAt(jobIterator);
|
||||
if (job != nullptr && job->getTechnicianId() == technicianID)
|
||||
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 iteratorOne = 0; iteratorOne < bookings.getSize(); iteratorOne++)
|
||||
{
|
||||
ServiceBooking* booking = bookings.getValueAt(iteratorOne);
|
||||
if (!booking)
|
||||
{
|
||||
if (job->getStatus() == util::ServiceJobStatus::PENDING || job->getStatus() == util::ServiceJobStatus::STARTED)
|
||||
{
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
continue;
|
||||
}
|
||||
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
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1069,7 +1144,7 @@ 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.";
|
||||
std::string title = "Service Booking completed. Invoice Generated.";
|
||||
std::string message = "Services completed for the booking and invoice generated.";
|
||||
sendNotification(currentJob->getBooking()->getCustomer(), title, message);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user