+
Customer Collection
+
This order is for customer collection. Mark as ready when it's prepared for pickup.
+ {!order.readyForCollection ? (
+
+ ) : (
+
+
✓ Marked ready for collection
+
+ )}
+
Royal Mail Integration
@@ -186,7 +264,7 @@ export default async function OrderDetailPage({ params }: { params: { id: string
className="w-full max-w-md border border-line bg-paper object-contain"
/>
-
{item.placementPreviewUrl ? 'On product — front' : 'Front'}
+
{item.placementPreviewUrl ? 'On product — front' : 'Front'}
{hasFrontDesign && (
-
+
+
Delivery
+
+
+
+
+
+
+ {deliveryMode === 'shipping' && (
+
+ )}
+
+ {deliveryMode === 'collection' && (
+
+
✓ Free collection pickup - no postage charge
+
+ )}
);
}
diff --git a/src/components/AdminNotifications.tsx b/src/components/AdminNotifications.tsx
index ca732ac..4a66690 100644
--- a/src/components/AdminNotifications.tsx
+++ b/src/components/AdminNotifications.tsx
@@ -17,12 +17,22 @@ export default async function AdminNotifications() {
] = await Promise.all([
prisma.order.count({
where: {
- status: 'PENDING',
- createdAt: { gte: recentThreshold },
+ OR: [
+ {
+ status: 'PENDING',
+ archived: false,
+ createdAt: { gte: recentThreshold },
+ },
+ {
+ status: 'PAID',
+ archived: false,
+ trackingNumber: null,
+ },
+ ],
},
}),
prisma.designApproval.count({
- where: { status: 'IN_REVIEW' },
+ where: { status: { in: ['PENDING', 'IN_REVIEW'] } },
}),
prisma.customRequest.count({
where: { status: 'PENDING' },
diff --git a/src/components/AdminNotificationsBadge.tsx b/src/components/AdminNotificationsBadge.tsx
index 0d6238f..df0d535 100644
--- a/src/components/AdminNotificationsBadge.tsx
+++ b/src/components/AdminNotificationsBadge.tsx
@@ -1,5 +1,6 @@
'use client';
+import Link from 'next/link';
import { useState, useRef, useEffect } from 'react';
interface AdminNotificationsBadgeProps {
@@ -46,28 +47,36 @@ export default function AdminNotificationsBadge({
Notifications
{pendingOrders > 0 && (
-
- Waiting payment
- {pendingOrders}
-
+
+
+ Action needed
+ {pendingOrders}
+
+
)}
{designApprovals > 0 && (
-
- Design approvals
- {designApprovals}
-
+
+
+ Design approvals
+ {designApprovals}
+
+
)}
{photoRequests > 0 && (
-
- Photo requests
- {photoRequests}
-
+
+
+ Photo requests
+ {photoRequests}
+
+
)}
{unreadMessages > 0 && (
-
- Unread messages
- {unreadMessages}
-
+
+
+ Unread messages
+ {unreadMessages}
+
+
)}
)}
diff --git a/src/components/AdminNotificationsWrapper.tsx b/src/components/AdminNotificationsWrapper.tsx
new file mode 100644
index 0000000..bb8e120
--- /dev/null
+++ b/src/components/AdminNotificationsWrapper.tsx
@@ -0,0 +1,53 @@
+'use client';
+
+import { useState, useEffect } from 'react';
+import AdminNotificationsBadge from './AdminNotificationsBadge';
+
+interface NotificationData {
+ total: number;
+ pendingOrders: number;
+ designApprovals: number;
+ photoRequests: number;
+ unreadMessages: number;
+}
+
+export default function AdminNotificationsWrapper() {
+ const [notifications, setNotifications] = useState
({
+ total: 0,
+ pendingOrders: 0,
+ designApprovals: 0,
+ photoRequests: 0,
+ unreadMessages: 0,
+ });
+
+ const fetchNotifications = async () => {
+ try {
+ const res = await fetch('/api/admin/notifications');
+ if (res.ok) {
+ const data = await res.json();
+ setNotifications(data);
+ }
+ } catch (err) {
+ console.error('Error fetching notifications:', err);
+ }
+ };
+
+ useEffect(() => {
+ // Fetch immediately
+ fetchNotifications();
+
+ // Refresh every 30 seconds
+ const interval = setInterval(fetchNotifications, 30000);
+ return () => clearInterval(interval);
+ }, []);
+
+ return (
+
+ );
+}
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index 04bc98a..b9ea3a1 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -10,7 +10,7 @@ import { prisma } from '@/lib/prisma';
import { getCurrentCustomer } from '@/lib/auth';
import { isAdminAuthenticated } from '@/lib/adminAuth';
import AdminMenu from './AdminMenu';
-import AdminNotifications from './AdminNotifications';
+import AdminNotificationsWrapper from './AdminNotificationsWrapper';
export default async function Header() {
const [categories, collections, customer, isAdmin] = await Promise.all([
@@ -75,7 +75,7 @@ export default async function Header() {
{isAdmin && (
)}
diff --git a/src/components/OlderOrders.tsx b/src/components/OlderOrders.tsx
index 5b2350c..ec977b4 100644
--- a/src/components/OlderOrders.tsx
+++ b/src/components/OlderOrders.tsx
@@ -6,8 +6,8 @@ import Link from 'next/link';
interface OlderOrdersProps {
orders: any[];
formatPrice: (cents: number) => string;
- statusLabel: (status: string) => string;
- statusClasses: (status: string) => string;
+ statusLabel: (status: string, trackingNumber?: string | null, collectedByCustomer?: boolean) => string;
+ statusClasses: (status: string, trackingNumber?: string | null) => string;
}
export default function OlderOrders({ orders, formatPrice, statusLabel, statusClasses }: OlderOrdersProps) {
@@ -37,8 +37,8 @@ export default function OlderOrders({ orders, formatPrice, statusLabel, statusCl
{new Date(order.createdAt).toLocaleDateString(undefined, { dateStyle: 'medium' })} ·{' '}
{order.items.length} item{order.items.length === 1 ? '' : 's'}
-
- {statusLabel(order.status)}
+
+ {statusLabel(order.status, order.trackingNumber, order.collectedByCustomer)}