joelthomastrenser/Training-VehicleService-May26
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merged PR 1134: Fix Invoice Deserialization Failure for PaymentMode::NOTSET

Browse Source 
Changes:

- Added support for PaymentMode::NOTSET in payment mode string-to-enum conversion.
- Improved invoice table column labels and spacing for better readability in invoice display screens.

Fixes #1789

Related work items: #1646, #1789
This commit is contained in:
Joel Thomas
2026-05-27 19:51:59 +05:30
parent 807490443e f78e02ed3d
commit e739ec6ee2
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/utilities/Enums.h
+4
View File
@@ -137,6 +137,10 @@ namespace util
{ {
return PaymentMode::OFFLINE; return PaymentMode::OFFLINE;
} }
if (value == "NOTSET")
{
return PaymentMode::NOTSET;
}
throw std::invalid_argument("Invalid PaymentMode string"); throw std::invalid_argument("Invalid PaymentMode string");
} }
Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/MenuHelper.h
+4 -4
View File
@@ -453,11 +453,11 @@ inline const Invoice* selectInvoiceToDisplay(util::Map<std::string, const Invoic
<< std::left << std::left
<< std::setw(10) << "Index" << std::setw(10) << "Index"
<< std::setw(12) << "BookingID" << std::setw(12) << "BookingID"
<< std::setw(15) << "VehicleNumber" << std::setw(20) << "Vehicle Number"
<< std::setw(20) << "Technician Name" << std::setw(20) << "Technician Name"
<< std::setw(15) << "Total Amount" << std::setw(15) << "Total Amount"
<< std::setw(25) << "Invoice Date" << std::setw(25) << "Invoice Date"
<< std::setw(15) << "PaymentStatus" << std::setw(20) << "Payment Status"
<< std::setw(15) << "Payment Mode" << std::setw(15) << "Payment Mode"
<< std::endl; << std::endl;
for (int iterator = 0; iterator < currentInvoices.getSize(); iterator++) for (int iterator = 0; iterator < currentInvoices.getSize(); iterator++)
@@ -471,11 +471,11 @@ inline const Invoice* selectInvoiceToDisplay(util::Map<std::string, const Invoic
std::cout << std::left std::cout << std::left
<< std::setw(10) << currentIndex << std::setw(10) << currentIndex
<< std::setw(12) << currentInvoice->getBookingId() << std::setw(12) << currentInvoice->getBookingId()
<< std::setw(15) << currentInvoice->getBooking()->getVehicleNumber() << std::setw(20) << currentInvoice->getBooking()->getVehicleNumber()
<< std::setw(20) << ((currentTechnician && !currentTechnician->getName().empty()) ? currentTechnician->getName() : "NULL") << std::setw(20) << ((currentTechnician && !currentTechnician->getName().empty()) ? currentTechnician->getName() : "NULL")
<< std::setw(15) << currentInvoice->getTotalAmount() << std::setw(15) << currentInvoice->getTotalAmount()
<< std::setw(25) << currentInvoice->getInvoiceDate().toString() << std::setw(25) << currentInvoice->getInvoiceDate().toString()
<< std::setw(15) << util::getPaymentStatusString(currentInvoice->getStatus()) << std::setw(20) << util::getPaymentStatusString(currentInvoice->getStatus())
<< std::setw(15) << util::getPaymentModeString(currentInvoice->getPaymentMethod()) << std::setw(15) << util::getPaymentModeString(currentInvoice->getPaymentMethod())
<< std::endl; << std::endl;
currentInvoicesIndexMap.insert(currentIndex++, currentInvoice); currentInvoicesIndexMap.insert(currentIndex++, currentInvoice);