Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1032fc64bd | |||
| cfd1a2b675 |
@@ -462,6 +462,38 @@ util::Map<std::string, const Invoice*> Controller::getInvoicesByUser()
|
||||
return userInvoicesReadOnly;
|
||||
}
|
||||
|
||||
/*
|
||||
Function: getAllInvoices
|
||||
Description: Retrieves all invoices from the PaymentManagementService and returns them as a read-only map.
|
||||
Parameters:
|
||||
- none
|
||||
Returns:
|
||||
- util::Map<std::string, const Invoice*>: Map of invoice IDs to invoice objects
|
||||
*/
|
||||
util::Map<std::string, const Invoice*> Controller::getAllInvoices()
|
||||
{
|
||||
auto invoices = m_paymentManagementService.getAllInvoices();
|
||||
util::Map<std::string, const Invoice*> readOnlyInvoice;
|
||||
for (int iterator = 0; iterator < invoices.getSize(); iterator++)
|
||||
{
|
||||
readOnlyInvoice.insert(invoices.getKeyAt(iterator), invoices.getValueAt(iterator));
|
||||
}
|
||||
return readOnlyInvoice;
|
||||
}
|
||||
|
||||
/*
|
||||
Function: confirmPayment
|
||||
Description: Delegates payment confirmation for a given invoice ID to the PaymentManagementService.
|
||||
Parameters:
|
||||
- invoiceID: std::string, ID of the invoice to confirm
|
||||
Returns:
|
||||
- void
|
||||
*/
|
||||
void Controller::confirmPayment(const std::string& invoiceID)
|
||||
{
|
||||
m_paymentManagementService.confirmPayment(invoiceID);
|
||||
}
|
||||
|
||||
/*
|
||||
Function: completePayment
|
||||
Description: Completes payment for a specific invoice using the given payment mode.
|
||||
|
||||
@@ -64,6 +64,8 @@ public:
|
||||
void createComboPackage(const std::string& name, const util::Vector<std::string>& serviceIDs, double discountPercentage);
|
||||
void removeComboPackage(const std::string& comboPackageID);
|
||||
util::Map<std::string, const Invoice*> getInvoicesByUser();
|
||||
util::Map<std::string, const Invoice*> getAllInvoices();
|
||||
void confirmPayment(const std::string& invoiceID);
|
||||
void completePayment(const std::string& invoiceID, util::PaymentMode paymentMode);
|
||||
util::Vector<const Notification*> getNotifications();
|
||||
void deleteNotification(const std::string& notificationID);
|
||||
|
||||
+46
-2
@@ -368,12 +368,12 @@ void PaymentManagementService::completePayment(const std::string& invoiceID, uti
|
||||
if (invoiceIndex != -1)
|
||||
{
|
||||
Invoice* invoice = currentInvoices.getValueAt(invoiceIndex);
|
||||
if (invoice && invoice->getStatus() != util::PaymentStatus::COMPLETED)
|
||||
if (invoice && invoice->getStatus() != util::PaymentStatus::PAID)
|
||||
{
|
||||
User* currentUser = invoice->getBooking()->getCustomer();
|
||||
invoice->setPaymentMethod(paymentMode);
|
||||
invoice->setPaymentDate(util::Timestamp());
|
||||
invoice->setStatus(util::PaymentStatus::COMPLETED);
|
||||
invoice->setStatus(util::PaymentStatus::PAID);
|
||||
std::string title, message;
|
||||
title = "Payment successful";
|
||||
message = "Payment successful for Invoice ID " + invoiceID;
|
||||
@@ -384,4 +384,48 @@ void PaymentManagementService::completePayment(const std::string& invoiceID, uti
|
||||
{
|
||||
throw std::runtime_error("Payment failed: invalid invoice ID.");
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
Function: getAllInvoice
|
||||
Description: Provides access to all invoices stored in the data store.
|
||||
Parameters:
|
||||
- none
|
||||
Returns:
|
||||
- util::Map<std::string, Invoice*>&: Map of invoice IDs to invoice objects
|
||||
*/
|
||||
util::Map<std::string, Invoice*>& PaymentManagementService::getAllInvoices()
|
||||
{
|
||||
return m_dataStore.getInvoices();
|
||||
}
|
||||
|
||||
/*
|
||||
Function: confirmPayment
|
||||
Description: Confirms payment for a specific invoice. Updates payment date and status,
|
||||
then sends a notification to the customer.
|
||||
Parameters:
|
||||
- invoiceID: std::string, ID of the invoice to confirm
|
||||
Returns:
|
||||
- void
|
||||
Throws:
|
||||
- std::runtime_error if the invoice ID is invalid
|
||||
*/
|
||||
void PaymentManagementService::confirmPayment(const std::string& invoiceID)
|
||||
{
|
||||
auto& currentInvoices = m_dataStore.getInvoices();
|
||||
int invoiceIndex = currentInvoices.find(invoiceID);
|
||||
if (invoiceIndex == -1)
|
||||
{
|
||||
throw std::runtime_error("Payment confirmation failed: invalid invoice ID.");
|
||||
}
|
||||
Invoice* invoice = currentInvoices.getValueAt(invoiceIndex);
|
||||
if (!invoice || invoice->getStatus() != util::PaymentStatus::PAID)
|
||||
{
|
||||
throw std::runtime_error("Payment confirmation failed: invoice is not awaiting confirmation.");
|
||||
}
|
||||
User* currentUser = invoice->getBooking()->getCustomer();
|
||||
invoice->setStatus(util::PaymentStatus::COMPLETED);
|
||||
std::string title = "Payment Confirmed";
|
||||
std::string message = "Payment Confirmed for Invoice ID " + invoiceID;
|
||||
sendNotification(currentUser, title, message);
|
||||
}
|
||||
+2
@@ -28,6 +28,8 @@ public:
|
||||
void generateInvoice(ServiceBooking* booking);
|
||||
util::Map<std::string, Invoice*> getInvoices(const std::string& customerID);
|
||||
void completePayment(const std::string& invoiceID, util::PaymentMode paymentMode);
|
||||
util::Map<std::string, Invoice*>& getAllInvoices();
|
||||
void confirmPayment(const std::string& invoiceID);
|
||||
void sendPaymentReminders();
|
||||
void sendNotification(User* user, const std::string& title, const std::string& message) override;
|
||||
void attach(User* user) override;
|
||||
|
||||
@@ -29,7 +29,8 @@ namespace util
|
||||
enum class PaymentStatus
|
||||
{
|
||||
PENDING,
|
||||
COMPLETED
|
||||
COMPLETED,
|
||||
PAID
|
||||
};
|
||||
|
||||
enum class ServiceJobStatus
|
||||
@@ -161,6 +162,8 @@ namespace util
|
||||
return "PENDING";
|
||||
case PaymentStatus::COMPLETED:
|
||||
return "COMPLETED";
|
||||
case PaymentStatus::PAID:
|
||||
return "PAID";
|
||||
}
|
||||
throw std::invalid_argument("Invalid PaymentStatus");
|
||||
}
|
||||
|
||||
@@ -53,7 +53,8 @@ void AdminMenu::showMenu()
|
||||
<< "\n14. Remove Combo Package"
|
||||
<< "\n15. View Notifications"
|
||||
<< "\n16. Change Password"
|
||||
<< "\n17. Logout"
|
||||
<< "\n17. Confirm Payment"
|
||||
<< "\n18. Logout"
|
||||
<< "\nEnter a choice: ";
|
||||
util::read(choice);
|
||||
if (!handleOperation(choice))
|
||||
@@ -127,7 +128,10 @@ bool AdminMenu::handleOperation(int choice)
|
||||
case 16:
|
||||
changePassword();
|
||||
break;
|
||||
case 17:
|
||||
case 17:
|
||||
confirmPayment();
|
||||
break;
|
||||
case 18:
|
||||
logout();
|
||||
return false;
|
||||
default:
|
||||
@@ -496,6 +500,54 @@ void AdminMenu::displayUsers()
|
||||
util::pressEnter();
|
||||
}
|
||||
|
||||
/*
|
||||
Function: confirmPayment
|
||||
Description: Confirms payment for a selected invoice. Validates invoice status, updates payment date,
|
||||
sets status to COMPLETED, and sends a notification to the customer.
|
||||
Parameters:
|
||||
- invoiceID: std::string, ID of the invoice to confirm
|
||||
Returns:
|
||||
- void
|
||||
*/
|
||||
void AdminMenu::confirmPayment()
|
||||
{
|
||||
util::clear();
|
||||
std::cout << "Confirm Payment\n";
|
||||
auto invoiceList = m_controller.getAllInvoices();
|
||||
if (invoiceList.isEmpty())
|
||||
{
|
||||
std::cout << "No pending invoices available for confirmation.";
|
||||
util::pressEnter();
|
||||
return;
|
||||
}
|
||||
bool hasConfirmableInvoice = false;
|
||||
for (int index = 0; index < invoiceList.getSize(); ++index)
|
||||
{
|
||||
const Invoice* invoice = invoiceList.getValueAt(index);
|
||||
if (invoice && invoice->getStatus() == util::PaymentStatus::PAID)
|
||||
{
|
||||
hasConfirmableInvoice = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!hasConfirmableInvoice)
|
||||
{
|
||||
std::cout << "No invoices awaiting confirmation.\n";
|
||||
util::pressEnter();
|
||||
return;
|
||||
}
|
||||
std::string selectedID = selectInvoiceFromUserForPayment(invoiceList, util::PaymentStatus::PAID);
|
||||
if (selectedID == "")
|
||||
{
|
||||
std::cout << "Payment failed.\n";
|
||||
util::pressEnter();
|
||||
return;
|
||||
}
|
||||
m_controller.confirmPayment(selectedID);
|
||||
std::cout << "Payment Confirmed successfully.\n";
|
||||
util::pressEnter();
|
||||
}
|
||||
|
||||
/*
|
||||
Function: addTechnician
|
||||
Description: Adds a new technician after validating username, password, email, and phone number.
|
||||
|
||||
@@ -28,6 +28,7 @@ public:
|
||||
void createService();
|
||||
void removeService();
|
||||
void displayUsers();
|
||||
void confirmPayment();
|
||||
void addTechnician();
|
||||
void removeUser();
|
||||
void displayComboPackages();
|
||||
|
||||
@@ -338,7 +338,7 @@ void CustomerMenu::completePayments()
|
||||
util::pressEnter();
|
||||
return;
|
||||
}
|
||||
std::string selectedID = selectInvoiceFromUserForPayment(currentInvoices);
|
||||
std::string selectedID = selectInvoiceFromUserForPayment(currentInvoices, util::PaymentStatus::PENDING);
|
||||
if (selectedID == "")
|
||||
{
|
||||
std::cout << "Payment failed.\n";
|
||||
|
||||
@@ -364,14 +364,18 @@ inline const User* selectTechnician(util::Map<int, const User*>& currentAvailabl
|
||||
}
|
||||
|
||||
/*
|
||||
Function: selectInvoiceFromUserForPayment
|
||||
Description: Lists all pending invoices for the customer and allows selection by index.
|
||||
Function: selectInvoiceFromUserForPayment
|
||||
Description: Displays a list of invoices filtered by the required payment status.
|
||||
Allows the user to select an invoice by index and returns the corresponding invoice ID.
|
||||
Parameters:
|
||||
- currentInvoices: util::Map<std::string, const Invoice*>&, map of customer invoices
|
||||
- currentInvoices: const util::Map<std::string, const Invoice*>&,
|
||||
map of all invoices keyed by invoice ID
|
||||
- requiredStatus: util::PaymentStatus,
|
||||
the status to filter invoices (e.g., PENDING, PAID, COMPLETED)
|
||||
Returns:
|
||||
- std::string: ID of the selected invoice, or empty string if none selected
|
||||
- std::string: ID of the selected invoice, or empty string if none selected or invalid index
|
||||
*/
|
||||
inline std::string selectInvoiceFromUserForPayment(const util::Map<std::string, const Invoice*>& currentInvoices)
|
||||
inline std::string selectInvoiceFromUserForPayment(const util::Map<std::string, const Invoice*>& currentInvoices, util::PaymentStatus requiredStatus)
|
||||
{
|
||||
int currentIndex = 1, choice;
|
||||
util::Map<int, const Invoice*> pendingInvoicesForPayment;
|
||||
@@ -389,7 +393,7 @@ inline std::string selectInvoiceFromUserForPayment(const util::Map<std::string,
|
||||
for (int iterator = 0; iterator < currentInvoices.getSize(); iterator++)
|
||||
{
|
||||
const Invoice* currentInvoice = currentInvoices.getValueAt(iterator);
|
||||
if (currentInvoice && currentInvoice->getStatus() == util::PaymentStatus::PENDING)
|
||||
if (currentInvoice && currentInvoice->getStatus() == requiredStatus)
|
||||
{
|
||||
const User* currentTechnician = currentInvoice->getBooking()->getAssignedTechnician();
|
||||
std::cout << std::left
|
||||
|
||||
Reference in New Issue
Block a user