alvin/Challenge_15_Magazijn_App_Maken
1
0
Fork 0
mirror of https://github.com/Alvin-Zilverstand/Challenge_15_Magazijn_App_Maken.git synced 2026-03-06 13:22:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enhance reservation management: add 'Mark Returned' button and update return status handling

Browse Source
This commit is contained in:
Alvin
2025-10-22 14:50:40 +02:00
parent cb2a0b4344
commit de1930e5a3
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/js/admin-reservations.js
View File

@@ -83,7 +83,9 @@ function filterAndDisplayReservations() {
<i class="bi bi-x-lg"></i><span class="btn-text"> Reject Return</span> <i class="bi bi-x-lg"></i><span class="btn-text"> Reject Return</span>
</button> </button>
` : reservation.status === 'APPROVED' ? ` ` : reservation.status === 'APPROVED' ? `
<span class="text-success"><i class="bi bi-check-circle"></i><span class="btn-text"> Currently Borrowed</span></span> <button class="btn btn-info" onclick="updateReservation('${reservation._id}', 'RETURNED')" title="Mark as Returned">
<i class="bi bi-arrow-return-left"></i><span class="btn-text"> Mark Returned</span>
</button>
` : reservation.status === 'RETURNED' ? ` ` : reservation.status === 'RETURNED' ? `
<button class="btn btn-secondary" onclick="archiveReservation('${reservation._id}')" title="Archive Reservation"> <button class="btn btn-secondary" onclick="archiveReservation('${reservation._id}')" title="Archive Reservation">
<i class="bi bi-archive"></i><span class="btn-text"> Archive</span> <i class="bi bi-archive"></i><span class="btn-text"> Archive</span>

6
routes/reservations.js
View File

@@ -150,7 +150,11 @@ router.patch('/:id', auth, async (req, res) => {
item.reserved = Math.max(0, item.reserved - (reservation.quantity || 1)); item.reserved = Math.max(0, item.reserved - (reservation.quantity || 1));
await item.save(); await item.save();
} else if (oldStatus === 'RETURN_PENDING' && newStatus === 'RETURNED') { } else if (oldStatus === 'RETURN_PENDING' && newStatus === 'RETURNED') {
// Admin approved the return // Admin approved the return request
item.reserved = Math.max(0, item.reserved - (reservation.quantity || 1));
await item.save();
} else if (oldStatus === 'APPROVED' && newStatus === 'RETURNED') {
// Admin directly marked approved item as returned
item.reserved = Math.max(0, item.reserved - (reservation.quantity || 1)); item.reserved = Math.max(0, item.reserved - (reservation.quantity || 1));
await item.save(); await item.save();
} }