From 8612622dd8f99496c4a71dea6038a12186a8c43c Mon Sep 17 00:00:00 2001
From: Benson Cho <100653148+choden-dev@users.noreply.github.com>
Date: Tue, 14 Jul 2026 19:38:58 +1000
Subject: [PATCH 1/2] feat(admin): manage timeslot link + per-order download on
 orders-by-timeslot

---
 components/admin/OrdersByTimeslotView.tsx | 61 ++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 2 deletions(-)

diff --git a/components/admin/OrdersByTimeslotView.tsx b/components/admin/OrdersByTimeslotView.tsx
index 67ef1ac..09275d3 100644
--- a/components/admin/OrdersByTimeslotView.tsx
+++ b/components/admin/OrdersByTimeslotView.tsx
@@ -195,9 +195,15 @@ function OrdersByTimeslotViewInner() {
 		[getFileKey],
 	);
 
-	/** Download all files for all orders in a timeslot group sequentially */
+	/**
+	 * Open every downloadable file across the given orders in new tabs.
+	 *
+	 * Shared by the per-timeslot "Download All Files" button and the per-order
+	 * download button, so both behave identically (parallel presign, sequential
+	 * open with a small delay to dodge popup blockers).
+	 */
 	const downloadingRef = useRef(false);
-	const handleDownloadAllFiles = useCallback(
+	const downloadFilesForOrders = useCallback(
 		async (orders: OrderData[]) => {
 			if (downloadingRef.current) return;
 			downloadingRef.current = true;
@@ -265,6 +271,18 @@ function OrdersByTimeslotViewInner() {
 		[getFileKey],
 	);
 
+	/** Download all files across every order in a timeslot group. */
+	const handleDownloadAllFiles = useCallback(
+		(orders: OrderData[]) => downloadFilesForOrders(orders),
+		[downloadFilesForOrders],
+	);
+
+	/** Download all files for a single order. */
+	const handleDownloadOrderFiles = useCallback(
+		(order: OrderData) => downloadFilesForOrders([order]),
+		[downloadFilesForOrders],
+	);
+
 	return (
 		<div style={{ padding: "24px", maxWidth: "1200px", margin: "0 auto" }}>
 			<BackToDashboard />
@@ -457,6 +475,23 @@ function OrdersByTimeslotViewInner() {
 								>
 									⬇ Download All Files
 								</button>
+								<a
+									href={`/admin/collections/timeslots/${timeslot.id}`}
+									title="Open this timeslot to edit or delete it"
+									style={{
+										padding: "3px 10px",
+										fontSize: "12px",
+										fontWeight: 600,
+										background: "rgba(255,255,255,0.15)",
+										color: "#fff",
+										border: "1px solid rgba(255,255,255,0.3)",
+										borderRadius: "4px",
+										cursor: "pointer",
+										textDecoration: "none",
+									}}
+								>
+									⚙ Manage Timeslot
+								</a>
 							</div>
 						</div>
 
@@ -691,6 +726,28 @@ function OrdersByTimeslotViewInner() {
 												)}
 											</td>
 											<td style={{ padding: "10px 12px", textAlign: "right" }}>
+												{order.files?.some(
+													(f) => f.stagingKey || f.permanentKey,
+												) && (
+													<button
+														type="button"
+														onClick={() => handleDownloadOrderFiles(order)}
+														title="Download all files for this order"
+														style={{
+															padding: "4px 12px",
+															background: "#00695c",
+															color: "#fff",
+															border: "none",
+															borderRadius: "4px",
+															fontSize: "12px",
+															fontWeight: 600,
+															cursor: "pointer",
+															marginRight: "4px",
+														}}
+													>
+														⬇ Download All
+													</button>
+												)}
 												{order.status === OrderStatus.AWAITING_PICKUP && (
 													<button
 														type="button"

From ee2bf2e1433ba8a67c61c55d919594b0fdd07cb4 Mon Sep 17 00:00:00 2001
From: Benson Cho <100653148+choden-dev@users.noreply.github.com>
Date: Tue, 14 Jul 2026 19:43:40 +1000
Subject: [PATCH 2/2] fix(admin): sort timeslots by date then start/end time on
 orders-by-timeslot

---
 app/api/admin/orders-by-timeslot/route.ts | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/app/api/admin/orders-by-timeslot/route.ts b/app/api/admin/orders-by-timeslot/route.ts
index aa4be81..ce92a6f 100644
--- a/app/api/admin/orders-by-timeslot/route.ts
+++ b/app/api/admin/orders-by-timeslot/route.ts
@@ -61,6 +61,28 @@ export async function GET(request: NextRequest) {
 			});
 		}
 
+		// Sort chronologically by date, then start/end time. The Payload query
+		// only sorts by date, so slots on the same day would otherwise appear in
+		// an arbitrary order. `date` is "YYYY-MM-DD" and the times are zero-padded
+		// "HH:MM", so lexicographic comparison is chronological.
+		const normaliseDate = (value: unknown): string =>
+			typeof value === "string"
+				? value.includes("T")
+					? value.split("T")[0]
+					: value
+				: "";
+		timeslots = [...timeslots].sort((a, b) => {
+			const dateCmp = normaliseDate(a.date).localeCompare(
+				normaliseDate(b.date),
+			);
+			if (dateCmp !== 0) return dateCmp;
+			const startCmp = String(a.startTime ?? "").localeCompare(
+				String(b.startTime ?? ""),
+			);
+			if (startCmp !== 0) return startCmp;
+			return String(a.endTime ?? "").localeCompare(String(b.endTime ?? ""));
+		});
+
 		const timeslotIds = timeslots.map((t) => String(t.id));
 
 		// ── 2. Fetch orders in two parallel queries ──────────────────────