replaced vague notes with specific intended use, also fixed modal on top of modal for reviews

This commit is contained in:
jackiettran
2025-11-25 16:40:42 -05:00
parent 13268784fd
commit 8de814fdee
16 changed files with 282 additions and 85 deletions

View File

@@ -183,7 +183,7 @@ router.post("/", authenticateToken, requireVerifiedEmail, async (req, res) => {
endDateTime,
deliveryMethod,
deliveryAddress,
notes,
intendedUse,
stripePaymentMethodId,
} = req.body;
@@ -274,7 +274,7 @@ router.post("/", authenticateToken, requireVerifiedEmail, async (req, res) => {
status: "pending",
deliveryMethod,
deliveryAddress,
notes,
intendedUse,
};
// Only add stripePaymentMethodId if it's provided (for paid rentals)
@@ -1099,7 +1099,7 @@ router.post("/:id/cancel", authenticateToken, async (req, res) => {
// Mark item return status (owner only)
router.post("/:id/mark-return", authenticateToken, async (req, res) => {
try {
const { status, actualReturnDateTime, notes, statusOptions } = req.body;
const { status, actualReturnDateTime, statusOptions } = req.body;
const rentalId = req.params.id;
const userId = req.user.id;
@@ -1133,7 +1133,6 @@ router.post("/:id/mark-return", authenticateToken, async (req, res) => {
status: "completed",
payoutStatus: "pending",
actualReturnDateTime: actualReturnDateTime || rental.endDateTime,
notes: notes || null,
});
// Fetch full rental details with associations for email
@@ -1177,15 +1176,13 @@ router.post("/:id/mark-return", authenticateToken, async (req, res) => {
status: "damaged",
payoutStatus: "pending",
actualReturnDateTime: actualReturnDateTime || rental.endDateTime,
notes: notes || null,
};
// Check if ALSO returned late
if (statusOptions?.returned_late && actualReturnDateTime) {
const lateReturnDamaged = await LateReturnService.processLateReturn(
rentalId,
actualReturnDateTime,
notes
actualReturnDateTime
);
damageUpdates.status = "returned_late_and_damaged";
damageUpdates.lateFees = lateReturnDamaged.lateCalculation.lateFee;
@@ -1207,8 +1204,7 @@ router.post("/:id/mark-return", authenticateToken, async (req, res) => {
const lateReturn = await LateReturnService.processLateReturn(
rentalId,
actualReturnDateTime,
notes
actualReturnDateTime
);
updatedRental = lateReturn.rental;
@@ -1221,7 +1217,6 @@ router.post("/:id/mark-return", authenticateToken, async (req, res) => {
status: "lost",
payoutStatus: "pending",
itemLostReportedAt: new Date(),
notes: notes || null,
});
// Send notification to customer service