feat(admin): apply design system to Orders list/detail/edit/table

- Add PageHeader + Operations eyebrow on list page
- Detail page: PageHeader with order-id/date eyebrow, customer title,
  total/status subtitle, AdminBadge tone for pickup + payment processor
- AdminOrdersPanel: KPIStat for stat cards, EmptyState with Create your
  first order CTA, AdminBadge tone for status pills, lucide-react icons,
  all hardcoded Tailwind colors replaced with var(--admin-*) tokens
- OrderTableBody: AdminBadge tone for status + pickup pills, all hardcoded
  colors replaced with tokens
- OrderEditForm: ha-field-label + ha-field-input / ha-field-textarea classes
  for form fields, ha-segment control for status buttons, semantic pickup
  toggle with primary/warning tokens, all hardcoded colors replaced

Behavior preserved end-to-end. Type-check clean.
This commit is contained in:
Tyler
2026-06-17 00:34:58 -06:00
parent 685a1269a4
commit 467f7e63fd
5 changed files with 849 additions and 292 deletions
+244 -70
View File
@@ -4,6 +4,8 @@ import OrderEditForm from "@/components/admin/OrderEditForm";
import OrderPaymentSection from "@/components/admin/OrderPaymentSection"; import OrderPaymentSection from "@/components/admin/OrderPaymentSection";
import OrderPickupAction from "@/components/admin/OrderPickupAction"; import OrderPickupAction from "@/components/admin/OrderPickupAction";
import AdminAccessDenied from "@/components/admin/AdminAccessDenied"; import AdminAccessDenied from "@/components/admin/AdminAccessDenied";
import AdminBadge from "@/components/admin/design-system/AdminBadge";
import { PageHeader } from "@/components/admin/design-system";
import { formatDate } from "@/lib/format-date"; import { formatDate } from "@/lib/format-date";
import { redirect } from "next/navigation"; import { redirect } from "next/navigation";
import Link from "next/link"; import Link from "next/link";
@@ -34,16 +36,31 @@ export default async function OrderDetailPage({ params }: OrderDetailPageProps)
if (!order) { if (!order) {
return ( return (
<main className="min-h-screen px-6 py-10"> <main
className="min-h-screen px-6 py-10"
style={{ backgroundColor: "var(--admin-bg)" }}
>
<div className="mx-auto max-w-4xl"> <div className="mx-auto max-w-4xl">
<Link <Link
href="/admin/orders" href="/admin/orders"
className="inline-flex items-center gap-2 text-sm text-stone-500 hover:text-stone-700" className="inline-flex items-center gap-2 text-sm transition-colors"
style={{ color: "var(--admin-text-muted)" }}
> >
Back to Orders Back to Orders
</Link> </Link>
<div className="mt-8 rounded-2xl border border-red-200 bg-red-50 p-8 text-center"> <div
<p className="text-lg font-semibold text-red-700">Order not found</p> className="mt-8 rounded-2xl border p-8 text-center"
style={{
borderColor: "var(--admin-danger-soft)",
backgroundColor: "var(--admin-danger-soft)",
}}
>
<p
className="text-lg font-semibold"
style={{ color: "var(--admin-danger)" }}
>
Order not found
</p>
</div> </div>
</div> </div>
</main> </main>
@@ -67,46 +84,66 @@ export default async function OrderDetailPage({ params }: OrderDetailPageProps)
const total = subtotal + taxAmount - discount_amount; const total = subtotal + taxAmount - discount_amount;
return ( return (
<main className="min-h-screen px-6 py-8"> <main
className="min-h-screen px-6 py-8"
style={{ backgroundColor: "var(--admin-bg)" }}
>
<div className="mx-auto max-w-4xl space-y-6"> <div className="mx-auto max-w-4xl space-y-6">
{/* Back link */}
<Link
href="/admin/orders"
className="inline-flex items-center gap-2 text-xs font-semibold transition-colors"
style={{ color: "var(--admin-text-muted)" }}
>
<svg className="h-3.5 w-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
<path strokeLinecap="round" strokeLinejoin="round" d="M15 19l-7-7 7-7" />
</svg>
Back to Orders
</Link>
{/* Header */} {/* Header */}
<div className="flex items-center justify-between"> <div>
<div className="flex items-center gap-4"> <p className="ha-eyebrow mb-2">
<Link Order #{order.id.slice(0, 8).toUpperCase()} · {formatDate(order.created_at)}
href="/admin/orders" </p>
className="flex h-9 w-9 items-center justify-center rounded-xl border border-stone-200 bg-white text-stone-500 hover:bg-stone-50 transition-colors" <PageHeader
> title={order.customer_name}
<svg className="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}> subtitle={`${formatCurrency(total)} · ${order.pickup_complete ? "Picked Up" : "Awaiting Pickup"}${order.stops ? ` · ${order.stops.city}, ${order.stops.state}` : ""}`}
<path strokeLinecap="round" strokeLinejoin="round" d="M15 19l-7-7 7-7" /> actions={
</svg> <div className="flex items-center gap-2">
</Link> <AdminBadge tone={order.pickup_complete ? "success" : "warning"} dot>
<div> {order.pickup_complete ? "Picked Up" : "Pending"}
<h1 className="text-2xl font-bold text-stone-950 tracking-tight">Order Details</h1> </AdminBadge>
<p className="text-sm text-stone-500">{formatDate(order.created_at)}</p> {order.payment_processor && (
</div> <AdminBadge tone="info">{order.payment_processor}</AdminBadge>
</div> )}
<div className="flex items-center gap-3"> </div>
<span className={`rounded-full px-3 py-1 text-xs font-bold ${ }
order.pickup_complete />
? "bg-green-50 text-green-700 border border-green-200"
: "bg-amber-50 text-amber-700 border border-amber-200"
}`}>
{order.pickup_complete ? "✓ Picked Up" : "⏳ Pending"}
</span>
{order.payment_processor && (
<span className="rounded-full bg-violet-50 px-2.5 py-0.5 text-xs font-semibold text-violet-700 border border-violet-200">
{order.payment_processor}
</span>
)}
</div>
</div> </div>
{/* Customer info */} {/* Customer info */}
<div className="rounded-2xl border border-stone-200 bg-white p-6 shadow-sm"> <div
className="rounded-2xl border p-6 shadow-sm"
style={{
borderColor: "var(--admin-border)",
backgroundColor: "var(--admin-card-bg)",
}}
>
<div className="flex items-start justify-between gap-4"> <div className="flex items-start justify-between gap-4">
<div> <div>
<p className="text-xs font-semibold uppercase tracking-wider text-stone-400">Customer</p> <p
<h2 className="mt-1 text-2xl font-bold text-stone-950">{order.customer_name}</h2> className="text-xs font-semibold uppercase tracking-wider"
style={{ color: "var(--admin-text-muted)" }}
>
Customer
</p>
<h2
className="mt-1 text-2xl font-bold"
style={{ color: "var(--admin-text-primary)" }}
>
{order.customer_name}
</h2>
</div> </div>
<OrderPickupAction <OrderPickupAction
orderId={order.id} orderId={order.id}
@@ -118,14 +155,34 @@ export default async function OrderDetailPage({ params }: OrderDetailPageProps)
<div className="mt-5 grid grid-cols-2 gap-4"> <div className="mt-5 grid grid-cols-2 gap-4">
{order.customer_phone && ( {order.customer_phone && (
<div> <div>
<p className="text-xs font-semibold text-stone-400">Phone</p> <p
<p className="mt-0.5 text-sm font-medium text-stone-700">{order.customer_phone}</p> className="text-xs font-semibold"
style={{ color: "var(--admin-text-muted)" }}
>
Phone
</p>
<p
className="mt-0.5 text-sm font-medium"
style={{ color: "var(--admin-text-primary)" }}
>
{order.customer_phone}
</p>
</div> </div>
)} )}
{order.customer_email && ( {order.customer_email && (
<div> <div>
<p className="text-xs font-semibold text-stone-400">Email</p> <p
<p className="mt-0.5 text-sm font-medium text-stone-700">{order.customer_email}</p> className="text-xs font-semibold"
style={{ color: "var(--admin-text-muted)" }}
>
Email
</p>
<p
className="mt-0.5 text-sm font-medium"
style={{ color: "var(--admin-text-primary)" }}
>
{order.customer_email}
</p>
</div> </div>
)} )}
</div> </div>
@@ -133,64 +190,133 @@ export default async function OrderDetailPage({ params }: OrderDetailPageProps)
{/* Stop info */} {/* Stop info */}
{order.stops && ( {order.stops && (
<div className="rounded-2xl border border-stone-200 bg-white p-6 shadow-sm"> <div
<p className="text-xs font-semibold uppercase tracking-wider text-stone-400">Pickup Location</p> className="rounded-2xl border p-6 shadow-sm"
<p className="mt-1 text-lg font-bold text-stone-950"> style={{
borderColor: "var(--admin-border)",
backgroundColor: "var(--admin-card-bg)",
}}
>
<p
className="text-xs font-semibold uppercase tracking-wider"
style={{ color: "var(--admin-text-muted)" }}
>
Pickup Location
</p>
<p
className="mt-1 text-lg font-bold"
style={{ color: "var(--admin-text-primary)" }}
>
{order.stops.city}, {order.stops.state} {order.stops.city}, {order.stops.state}
</p> </p>
<p className="mt-0.5 text-sm text-stone-500">{formatDate(order.stops.date)}</p> <p
className="mt-0.5 text-sm"
style={{ color: "var(--admin-text-muted)" }}
>
{formatDate(order.stops.date)}
</p>
</div> </div>
)} )}
{/* Order items */} {/* Order items */}
<div className="rounded-2xl border border-stone-200 bg-white p-6 shadow-sm"> <div
<h3 className="text-lg font-bold text-stone-950">Order Items</h3> className="rounded-2xl border p-6 shadow-sm"
style={{
borderColor: "var(--admin-border)",
backgroundColor: "var(--admin-card-bg)",
}}
>
<h3
className="text-lg font-bold"
style={{ color: "var(--admin-text-primary)" }}
>
Order Items
</h3>
{order.order_items && order.order_items.length > 0 ? ( {order.order_items && order.order_items.length > 0 ? (
<div className="mt-4 divide-y divide-stone-100"> <div
className="mt-4 divide-y"
style={{ borderColor: "var(--admin-border-light)" }}
>
{order.order_items.map((item: OrderItem) => ( {order.order_items.map((item: OrderItem) => (
<div <div
key={item.id} key={item.id}
className="flex items-center justify-between py-3" className="flex items-center justify-between py-3"
> >
<div> <div>
<p className="font-medium text-stone-900"> <p
className="font-medium"
style={{ color: "var(--admin-text-primary)" }}
>
{item.products?.name ?? "Unknown Product"} {item.products?.name ?? "Unknown Product"}
</p> </p>
<p className="text-xs text-stone-400">Qty: {item.quantity} × {formatCurrency(Number(item.price))}</p> <p
className="text-xs"
style={{ color: "var(--admin-text-muted)" }}
>
Qty: {item.quantity} × {formatCurrency(Number(item.price))}
</p>
</div> </div>
<p className="font-semibold text-stone-900"> <p
className="font-semibold"
style={{ color: "var(--admin-text-primary)" }}
>
{formatCurrency(Number(item.price) * item.quantity)} {formatCurrency(Number(item.price) * item.quantity)}
</p> </p>
</div> </div>
))} ))}
</div> </div>
) : ( ) : (
<p className="mt-4 text-sm text-stone-400">No items found</p> <p
className="mt-4 text-sm"
style={{ color: "var(--admin-text-muted)" }}
>
No items found
</p>
)} )}
{/* Totals */} {/* Totals */}
<div className="mt-6 border-t border-stone-100 pt-6 space-y-2"> <div
className="mt-6 border-t pt-6 space-y-2"
style={{ borderColor: "var(--admin-border-light)" }}
>
<div className="flex justify-between text-sm"> <div className="flex justify-between text-sm">
<span className="text-stone-500">Subtotal</span> <span style={{ color: "var(--admin-text-muted)" }}>Subtotal</span>
<span className="text-stone-900">{formatCurrency(subtotal)}</span> <span style={{ color: "var(--admin-text-primary)" }}>
{formatCurrency(subtotal)}
</span>
</div> </div>
{taxAmount > 0 && ( {taxAmount > 0 && (
<div className="flex justify-between text-sm"> <div className="flex justify-between text-sm">
<span className="text-stone-500">Tax</span> <span style={{ color: "var(--admin-text-muted)" }}>Tax</span>
<span className="text-stone-900">{formatCurrency(taxAmount)}</span> <span style={{ color: "var(--admin-text-primary)" }}>
{formatCurrency(taxAmount)}
</span>
</div> </div>
)} )}
{discount_amount > 0 && ( {discount_amount > 0 && (
<div className="flex justify-between text-sm"> <div className="flex justify-between text-sm">
<span className="text-stone-500">Discount</span> <span style={{ color: "var(--admin-text-muted)" }}>Discount</span>
<span className="text-red-600">-{formatCurrency(discount_amount)}</span> <span style={{ color: "var(--admin-danger)" }}>
-{formatCurrency(discount_amount)}
</span>
{order.discount_reason && ( {order.discount_reason && (
<span className="text-xs text-stone-400 ml-2">({order.discount_reason})</span> <span
className="text-xs ml-2"
style={{ color: "var(--admin-text-muted)" }}
>
({order.discount_reason})
</span>
)} )}
</div> </div>
)} )}
<div className="flex justify-between text-lg font-bold text-stone-950 pt-2 border-t border-stone-200"> <div
className="flex justify-between text-lg font-bold pt-2 border-t"
style={{
color: "var(--admin-text-primary)",
borderColor: "var(--admin-border)",
}}
>
<span>Total</span> <span>Total</span>
<span>{formatCurrency(total)}</span> <span>{formatCurrency(total)}</span>
</div> </div>
@@ -198,9 +324,25 @@ export default async function OrderDetailPage({ params }: OrderDetailPageProps)
</div> </div>
{/* Payment & Refunds */} {/* Payment & Refunds */}
<div className="rounded-2xl border border-stone-200 bg-white p-6 shadow-sm"> <div
<h3 className="text-lg font-bold text-stone-950">Payment & Refunds</h3> className="rounded-2xl border p-6 shadow-sm"
<p className="mt-1 text-sm text-stone-500">Record payment details and manage refunds</p> style={{
borderColor: "var(--admin-border)",
backgroundColor: "var(--admin-card-bg)",
}}
>
<h3
className="text-lg font-bold"
style={{ color: "var(--admin-text-primary)" }}
>
Payment & Refunds
</h3>
<p
className="mt-1 text-sm"
style={{ color: "var(--admin-text-muted)" }}
>
Record payment details and manage refunds
</p>
<div className="mt-5"> <div className="mt-5">
<OrderPaymentSection <OrderPaymentSection
@@ -218,9 +360,25 @@ export default async function OrderDetailPage({ params }: OrderDetailPageProps)
</div> </div>
{/* Edit form */} {/* Edit form */}
<div className="rounded-2xl border border-stone-200 bg-white p-6 shadow-sm"> <div
<h3 className="text-lg font-bold text-stone-950">Edit Order</h3> className="rounded-2xl border p-6 shadow-sm"
<p className="mt-1 text-sm text-stone-500">Update customer details, pricing, and status</p> style={{
borderColor: "var(--admin-border)",
backgroundColor: "var(--admin-card-bg)",
}}
>
<h3
className="text-lg font-bold"
style={{ color: "var(--admin-text-primary)" }}
>
Edit Order
</h3>
<p
className="mt-1 text-sm"
style={{ color: "var(--admin-text-muted)" }}
>
Update customer details, pricing, and status
</p>
<div className="mt-5"> <div className="mt-5">
<OrderEditForm order={order as unknown as Parameters<typeof OrderEditForm>[0]["order"]} brandId={brandId} /> <OrderEditForm order={order as unknown as Parameters<typeof OrderEditForm>[0]["order"]} brandId={brandId} />
@@ -229,9 +387,25 @@ export default async function OrderDetailPage({ params }: OrderDetailPageProps)
{/* Internal notes */} {/* Internal notes */}
{order.internal_notes && ( {order.internal_notes && (
<div className="rounded-2xl border border-amber-200 bg-amber-50 p-6"> <div
<p className="text-xs font-semibold uppercase tracking-wider text-amber-600">Internal Notes</p> className="rounded-2xl border p-6"
<p className="mt-1 text-sm text-stone-700">{order.internal_notes}</p> style={{
borderColor: "var(--admin-warning-soft)",
backgroundColor: "var(--admin-warning-soft)",
}}
>
<p
className="text-xs font-semibold uppercase tracking-wider"
style={{ color: "var(--admin-warning)" }}
>
Internal Notes
</p>
<p
className="mt-1 text-sm"
style={{ color: "var(--admin-text-primary)" }}
>
{order.internal_notes}
</p>
</div> </div>
)} )}
</div> </div>
+10 -3
View File
@@ -65,11 +65,12 @@ export default async function AdminOrdersPage() {
} }
return ( return (
<div className="min-h-screen bg-[var(--admin-bg)]"> <div className="min-h-screen" style={{ backgroundColor: "var(--admin-bg)" }}>
<div className="px-4 sm:px-6 md:px-8 pt-4 sm:pt-6"> <div className="px-4 sm:px-6 md:px-8 pt-4 sm:pt-6">
<p className="ha-eyebrow mb-2">Operations</p>
<PageHeader <PageHeader
title="Orders" title="Orders"
subtitle="Manage customer orders and pickup status" subtitle="View, filter, and manage customer orders."
icon={ icon={
<svg className="h-5 w-5 sm:h-6 sm:w-6" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"> <svg className="h-5 w-5 sm:h-6 sm:w-6" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
<path d="M6 2 3 6v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V6l-3-4Z"/> <path d="M6 2 3 6v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V6l-3-4Z"/>
@@ -82,7 +83,13 @@ export default async function AdminOrdersPage() {
{/* Content */} {/* Content */}
<div className="px-4 sm:px-6 md:px-8 py-4 sm:py-6"> <div className="px-4 sm:px-6 md:px-8 py-4 sm:py-6">
<div className="rounded-2xl border border-[var(--admin-border)] bg-white overflow-hidden"> <div
className="rounded-2xl border overflow-hidden"
style={{
borderColor: "var(--admin-border)",
backgroundColor: "var(--admin-card-bg)",
}}
>
<AdminOrdersPanel <AdminOrdersPanel
initialOrders={brandOrders} initialOrders={brandOrders}
initialStops={brandStops} initialStops={brandStops}
+423 -141
View File
@@ -3,11 +3,31 @@
import { useState, useMemo, useCallback, useEffect } from "react"; import { useState, useMemo, useCallback, useEffect } from "react";
import Link from "next/link"; import Link from "next/link";
import { useSearchParams } from "next/navigation"; import { useSearchParams } from "next/navigation";
import {
Check,
ChevronDown,
ChevronLeft,
ChevronRight,
MapPin,
Package,
X,
} from "lucide-react";
import { markPickupComplete } from "@/actions/pickup"; import { markPickupComplete } from "@/actions/pickup";
import { createAdminOrder, type AdminCreateOrderItem } from "@/actions/orders/create-admin-order"; import { createAdminOrder, type AdminCreateOrderItem } from "@/actions/orders/create-admin-order";
import { formatDate } from "@/lib/format-date"; import { formatDate } from "@/lib/format-date";
import AdminBadge from "./design-system/AdminBadge"; import AdminBadge from "./design-system/AdminBadge";
import { AdminButton, AdminSearchInput, AdminFilterTabs, AdminIconButton, useToast, AdminInput, AdminTextInput, AdminSelect } from "./design-system"; import {
AdminButton,
AdminSearchInput,
AdminFilterTabs,
AdminIconButton,
useToast,
AdminInput,
AdminTextInput,
AdminSelect,
EmptyState,
KPIStat,
} from "./design-system";
import { Skeleton } from "./design-system"; import { Skeleton } from "./design-system";
type OrderItem = { type OrderItem = {
@@ -66,55 +86,13 @@ function formatCurrency(amount: number) {
return new Intl.NumberFormat("en-US", { style: "currency", currency: "USD" }).format(amount); return new Intl.NumberFormat("en-US", { style: "currency", currency: "USD" }).format(amount);
} }
// Icons // Icon wrappers (lucide-react) — kept compact for inline use.
const Icons = { const MapPinIcon = () => <MapPin className="h-4 w-4" strokeWidth={2} />;
mapPin: (className: string) => ( const CheckIcon = () => <Check className="h-4 w-4" strokeWidth={2} />;
<svg className={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"> const XIcon = () => <X className="h-3 w-3" strokeWidth={2} />;
<path d="M15 10.5a3 3 0 1 1-6 0 3 3 0 0 1 6 0z"/> const ChevronDownIcon = () => <ChevronDown className="h-4 w-4" strokeWidth={2} />;
<path d="M19.5 10.5c0 7.142-7.5 11.25-7.5 11.25S4.5 17.642 4.5 10.5a7.5 7.5 0 1 1 15 0z"/> const ChevronLeftIcon = () => <ChevronLeft className="h-4 w-4" strokeWidth={2} />;
</svg> const ChevronRightIcon = () => <ChevronRight className="h-4 w-4" strokeWidth={2} />;
),
check: (className: string) => (
<svg className={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
<polyline points="20 6 9 17 4 12"/>
</svg>
),
x: (className: string) => (
<svg className={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
<line x1="18" y1="6" x2="6" y2="18"/>
<line x1="6" y1="6" x2="18" y2="18"/>
</svg>
),
chevronDown: (className: string) => (
<svg className={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
<path d="m6 9 6 6 6-6"/>
</svg>
),
chevronLeft: (className: string) => (
<svg className={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
<path d="m15 18-6-6 6-6"/>
</svg>
),
chevronRight: (className: string) => (
<svg className={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
<path d="m9 18 6-6-6-6"/>
</svg>
),
package: (className: string) => (
<svg className={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
<path d="M16.5 9.4 7.55 4.24"/>
<path d="M21 16V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16z"/>
<polyline points="3.29 7 12 12 20.71 7"/>
<line x1="12" y1="22" x2="12" y2="12"/>
</svg>
),
selectAll: (className: string) => (
<svg className={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
<rect x="3" y="3" width="18" height="18" rx="2" ry="2"/>
<polyline points="9 11 12 14 22 4"/>
</svg>
),
};
export default function AdminOrdersPanel({ export default function AdminOrdersPanel({
initialOrders, initialOrders,
@@ -355,12 +333,23 @@ export default function AdminOrdersPanel({
{/* Header */} {/* Header */}
<div className="flex items-center justify-between mb-6"> <div className="flex items-center justify-between mb-6">
<div className="flex items-center gap-3"> <div className="flex items-center gap-3">
<div className="flex h-10 w-10 items-center justify-center rounded-xl bg-[var(--admin-accent)]"> <div
{Icons.package("h-5 w-5 text-white")} className="flex h-10 w-10 items-center justify-center rounded-xl"
style={{ backgroundColor: "var(--admin-accent)" }}
>
<Package className="h-5 w-5 text-white" strokeWidth={2} />
</div> </div>
<div> <div>
<h2 className="text-base sm:text-lg font-bold text-[var(--admin-text-primary)]">Orders</h2> <h2
<p className="text-[10px] sm:text-xs text-[var(--admin-text-muted)]"> className="text-base sm:text-lg font-bold"
style={{ color: "var(--admin-text-primary)" }}
>
Orders
</h2>
<p
className="text-[10px] sm:text-xs"
style={{ color: "var(--admin-text-muted)" }}
>
{filteredOrders.length} order{filteredOrders.length !== 1 ? "s" : ""} {filteredOrders.length} order{filteredOrders.length !== 1 ? "s" : ""}
</p> </p>
</div> </div>
@@ -368,7 +357,7 @@ export default function AdminOrdersPanel({
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
{brandId && ( {brandId && (
<AdminBadge variant="info">Brand scoped</AdminBadge> <AdminBadge tone="info">Brand scoped</AdminBadge>
)} )}
<AdminButton <AdminButton
onClick={openNewOrderModal} onClick={openNewOrderModal}
@@ -382,18 +371,21 @@ export default function AdminOrdersPanel({
{/* Stats Cards */} {/* Stats Cards */}
<div className="grid grid-cols-2 sm:grid-cols-3 gap-3 mb-6"> <div className="grid grid-cols-2 sm:grid-cols-3 gap-3 mb-6">
<div className="bg-white rounded-xl border border-[var(--admin-border)] p-4"> <KPIStat
<p className="text-[10px] sm:text-xs text-[var(--admin-text-muted)] font-medium">Total</p> label="Total"
<p className="text-lg sm:text-xl md:text-2xl font-bold text-[var(--admin-text-primary)] mt-1">{isLoading ? <Skeleton variant="text" className="w-16 h-8" /> : orders.length}</p> value={isLoading ? <Skeleton variant="text" className="w-16 h-8" /> : orders.length}
</div> tone="default"
<div className="bg-white rounded-xl border border-[var(--admin-border)] p-4"> />
<p className="text-[10px] sm:text-xs text-[var(--admin-text-muted)] font-medium">Pending</p> <KPIStat
<p className="text-lg sm:text-xl md:text-2xl font-bold text-amber-600 mt-1">{isLoading ? <Skeleton variant="text" className="w-12 h-8" /> : pendingCount}</p> label="Pending"
</div> value={isLoading ? <Skeleton variant="text" className="w-12 h-8" /> : pendingCount}
<div className="bg-white rounded-xl border border-[var(--admin-border)] p-4"> tone="warning"
<p className="text-[10px] sm:text-xs text-[var(--admin-text-muted)] font-medium">Picked Up</p> />
<p className="text-lg sm:text-xl md:text-2xl font-bold text-[var(--admin-accent)] mt-1">{isLoading ? <Skeleton variant="text" className="w-12 h-8" /> : pickedUpCount}</p> <KPIStat
</div> label="Picked Up"
value={isLoading ? <Skeleton variant="text" className="w-12 h-8" /> : pickedUpCount}
tone="primary"
/>
</div> </div>
{/* Filters */} {/* Filters */}
@@ -423,40 +415,92 @@ export default function AdminOrdersPanel({
<div className="relative"> <div className="relative">
<button <button
onClick={() => setShowStopDropdown(!showStopDropdown)} onClick={() => setShowStopDropdown(!showStopDropdown)}
className={`flex items-center gap-2 rounded-xl border px-4 py-2.5 text-sm font-medium transition-colors ${ className="flex items-center gap-2 rounded-xl border px-4 py-2.5 text-sm font-medium transition-colors"
style={
selectedStops.length > 0 selectedStops.length > 0
? "border-[var(--admin-accent)] bg-[var(--admin-accent-light)] text-[var(--admin-accent-text)]" ? {
: "border-[var(--admin-border)] bg-white text-stone-600 hover:bg-stone-50" borderColor: "var(--admin-accent)",
}`} backgroundColor: "var(--admin-accent-light)",
color: "var(--admin-accent-text)",
}
: {
borderColor: "var(--admin-border)",
backgroundColor: "var(--admin-card-bg)",
color: "var(--admin-text-secondary)",
}
}
> >
{Icons.mapPin("h-4 w-4")} <MapPinIcon />
<span>Stops</span> <span>Stops</span>
{selectedStops.length > 0 && ( {selectedStops.length > 0 && (
<span className="rounded-full bg-[var(--admin-accent)] text-white px-1.5 py-0.5 text-xs font-semibold">{selectedStops.length}</span> <span
className="rounded-full text-white px-1.5 py-0.5 text-xs font-semibold"
style={{ backgroundColor: "var(--admin-accent)" }}
>
{selectedStops.length}
</span>
)} )}
{Icons.chevronDown("h-4 w-4")} <ChevronDownIcon />
</button> </button>
{showStopDropdown && ( {showStopDropdown && (
<> <>
<div className="fixed inset-0 z-10" onClick={() => setShowStopDropdown(false)} /> <div className="fixed inset-0 z-10" onClick={() => setShowStopDropdown(false)} />
<div className="absolute right-0 top-full mt-2 z-20 w-72 rounded-xl border border-[var(--admin-border)] bg-white shadow-lg"> <div
<div className="flex items-center justify-between border-b border-stone-100 px-4 py-3"> className="absolute right-0 top-full mt-2 z-20 w-72 rounded-xl border shadow-lg"
<span className="text-sm font-semibold text-stone-700">Filter by Stop</span> style={{
<button onClick={clearStops} className="text-xs text-[var(--admin-accent)] hover:text-[var(--admin-accent-hover)] font-medium">Clear all</button> borderColor: "var(--admin-border)",
backgroundColor: "var(--admin-card-bg)",
}}
>
<div
className="flex items-center justify-between border-b px-4 py-3"
style={{ borderColor: "var(--admin-border-light)" }}
>
<span
className="text-sm font-semibold"
style={{ color: "var(--admin-text-primary)" }}
>
Filter by Stop
</span>
<button
onClick={clearStops}
className="text-xs font-medium"
style={{ color: "var(--admin-accent)" }}
>
Clear all
</button>
</div> </div>
<div className="max-h-64 overflow-y-auto p-2"> <div className="max-h-64 overflow-y-auto p-2">
{stops.map((stop) => ( {stops.map((stop) => (
<label key={stop.id} className="flex items-center gap-3 rounded-lg px-3 py-2 hover:bg-stone-50 cursor-pointer"> <label
key={stop.id}
className="flex items-center gap-3 rounded-lg px-3 py-2 cursor-pointer transition-colors"
style={{ color: "var(--admin-text-primary)" }}
>
<input <input
type="checkbox" type="checkbox"
checked={selectedStops.includes(stop.id)} checked={selectedStops.includes(stop.id)}
onChange={() => toggleStop(stop.id)} onChange={() => toggleStop(stop.id)}
className="h-4 w-4 rounded border-stone-300 text-[var(--admin-accent)] focus:ring-[var(--admin-accent)]" className="h-4 w-4 rounded"
style={{
borderColor: "var(--admin-border-strong)",
accentColor: "var(--admin-accent)",
}}
/> />
<div className="flex-1"> <div className="flex-1">
<span className="text-sm font-medium text-stone-700">{stop.city}, {stop.state}</span> <span
<span className="ml-2 text-xs text-stone-400">{formatDate(stop.date)}</span> className="text-sm font-medium"
style={{ color: "var(--admin-text-primary)" }}
>
{stop.city}, {stop.state}
</span>
<span
className="ml-2 text-xs"
style={{ color: "var(--admin-text-muted)" }}
>
{formatDate(stop.date)}
</span>
</div> </div>
</label> </label>
))} ))}
@@ -474,10 +518,23 @@ export default function AdminOrdersPanel({
const stop = stops.find((s) => s.id === stopId); const stop = stops.find((s) => s.id === stopId);
if (!stop) return null; if (!stop) return null;
return ( return (
<span key={stopId} className="inline-flex items-center gap-1 rounded-full bg-[var(--admin-accent-light)] border border-[var(--admin-accent)] px-3 py-1 text-xs font-medium text-[var(--admin-accent-text)]"> <span
key={stopId}
className="inline-flex items-center gap-1 rounded-full border px-3 py-1 text-xs font-medium"
style={{
backgroundColor: "var(--admin-accent-light)",
borderColor: "var(--admin-accent)",
color: "var(--admin-accent-text)",
}}
>
{stop.city}, {stop.state} {stop.city}, {stop.state}
<button onClick={() => toggleStop(stopId)} className="ml-1 hover:text-[var(--admin-accent-hover)]"> <button
{Icons.x("h-3 w-3")} onClick={() => toggleStop(stopId)}
className="ml-1"
style={{ color: "var(--admin-accent-hover)" }}
aria-label={`Remove ${stop.city}, ${stop.state}`}
>
<XIcon />
</button> </button>
</span> </span>
); );
@@ -487,14 +544,24 @@ export default function AdminOrdersPanel({
{/* Bulk actions bar */} {/* Bulk actions bar */}
{selectedOrders.size > 0 && ( {selectedOrders.size > 0 && (
<div className="mb-4 flex items-center justify-between rounded-xl border border-[var(--admin-accent)] bg-[var(--admin-accent-light)] px-4 py-3"> <div
className="mb-4 flex items-center justify-between rounded-xl border px-4 py-3"
style={{
borderColor: "var(--admin-accent)",
backgroundColor: "var(--admin-accent-light)",
}}
>
<div className="flex items-center gap-3"> <div className="flex items-center gap-3">
<span className="text-sm font-semibold text-[var(--admin-accent-text)]"> <span
className="text-sm font-semibold"
style={{ color: "var(--admin-accent-text)" }}
>
{selectedOrders.size} order{selectedOrders.size !== 1 ? 's' : ''} selected {selectedOrders.size} order{selectedOrders.size !== 1 ? 's' : ''} selected
</span> </span>
<button <button
onClick={() => setSelectedOrders(new Set())} onClick={() => setSelectedOrders(new Set())}
className="text-xs text-[var(--admin-text-muted)] hover:text-[var(--admin-text-secondary)]" className="text-xs"
style={{ color: "var(--admin-text-muted)" }}
> >
Clear Clear
</button> </button>
@@ -504,7 +571,7 @@ export default function AdminOrdersPanel({
size="sm" size="sm"
onClick={handleBulkMarkPickup} onClick={handleBulkMarkPickup}
isLoading={bulkMarkingUp} isLoading={bulkMarkingUp}
icon={Icons.check("h-4 w-4")} icon={<CheckIcon />}
> >
Mark All as Picked Up Mark All as Picked Up
</AdminButton> </AdminButton>
@@ -513,7 +580,13 @@ export default function AdminOrdersPanel({
{/* Orders Table */} {/* Orders Table */}
{isLoading ? ( {isLoading ? (
<div className="rounded-xl border border-[var(--admin-border)] bg-white p-6"> <div
className="rounded-xl border p-6"
style={{
borderColor: "var(--admin-border)",
backgroundColor: "var(--admin-card-bg)",
}}
>
<div className="space-y-4"> <div className="space-y-4">
{Array.from({ length: 5 }).map((_, i) => ( {Array.from({ length: 5 }).map((_, i) => (
<div key={i} className="flex items-center gap-4"> <div key={i} className="flex items-center gap-4">
@@ -526,80 +599,184 @@ export default function AdminOrdersPanel({
</div> </div>
</div> </div>
) : paginatedOrders.length === 0 ? ( ) : paginatedOrders.length === 0 ? (
<div className="text-center py-12 rounded-xl border border-[var(--admin-border)] bg-white"> <div
<div className="flex h-16 w-16 mx-auto items-center justify-center rounded-full bg-stone-100 mb-4"> className="rounded-xl border"
{Icons.package("h-8 w-8 text-stone-400")} style={{
</div> borderColor: "var(--admin-border)",
<p className="text-sm font-medium text-stone-600">No orders found</p> backgroundColor: "var(--admin-card-bg)",
<p className="text-xs text-stone-400 mt-1">Try adjusting your filters</p> }}
>
<EmptyState
icon={<Package className="h-9 w-9" strokeWidth={1.25} />}
title={orders.length === 0 ? "No orders yet" : "No orders match your filters"}
description={
orders.length === 0
? "Create your first order to get started."
: "Try adjusting your filters or clearing your search."
}
action={
orders.length === 0
? { label: "Create your first order", href: "/admin/orders?new=true" }
: undefined
}
/>
</div> </div>
) : ( ) : (
<div className="overflow-x-auto rounded-xl border border-[var(--admin-border)] bg-white"> <div
className="overflow-x-auto rounded-xl border"
style={{
borderColor: "var(--admin-border)",
backgroundColor: "var(--admin-card-bg)",
}}
>
<table className="w-full text-sm min-w-[700px]"> <table className="w-full text-sm min-w-[700px]">
<thead className="bg-stone-50"> <thead style={{ backgroundColor: "var(--admin-bg)" }}>
<tr className="border-b border-[var(--admin-border)]"> <tr style={{ borderBottom: "1px solid var(--admin-border)" }}>
<th className="w-10 px-4 py-3"> <th className="w-10 px-4 py-3">
<input <input
type="checkbox" type="checkbox"
checked={selectedOrders.size === paginatedOrders.length && paginatedOrders.length > 0} checked={selectedOrders.size === paginatedOrders.length && paginatedOrders.length > 0}
onChange={toggleSelectAll} onChange={toggleSelectAll}
className="h-4 w-4 rounded border-stone-300 text-[var(--admin-accent)] focus:ring-[var(--admin-accent)] cursor-pointer" className="h-4 w-4 rounded cursor-pointer"
style={{
borderColor: "var(--admin-border-strong)",
accentColor: "var(--admin-accent)",
}}
/> />
</th> </th>
<th className="text-left px-4 py-3 font-semibold text-[var(--admin-text-muted)] text-xs">Order</th> <th
<th className="text-left px-4 py-3 font-semibold text-[var(--admin-text-muted)] text-xs">Customer</th> className="text-left px-4 py-3 font-semibold text-xs"
<th className="text-left px-4 py-3 font-semibold text-[var(--admin-text-muted)] text-xs hidden md:table-cell">Stop</th> style={{ color: "var(--admin-text-muted)" }}
<th className="text-left px-4 py-3 font-semibold text-[var(--admin-text-muted)] text-xs hidden lg:table-cell">Date</th> >
<th className="text-center px-4 py-3 font-semibold text-[var(--admin-text-muted)] text-xs">Items</th> Order
<th className="text-right px-4 py-3 font-semibold text-[var(--admin-text-muted)] text-xs">Total</th> </th>
<th className="text-center px-4 py-3 font-semibold text-[var(--admin-text-muted)] text-xs">Status</th> <th
className="text-left px-4 py-3 font-semibold text-xs"
style={{ color: "var(--admin-text-muted)" }}
>
Customer
</th>
<th
className="text-left px-4 py-3 font-semibold text-xs hidden md:table-cell"
style={{ color: "var(--admin-text-muted)" }}
>
Stop
</th>
<th
className="text-left px-4 py-3 font-semibold text-xs hidden lg:table-cell"
style={{ color: "var(--admin-text-muted)" }}
>
Date
</th>
<th
className="text-center px-4 py-3 font-semibold text-xs"
style={{ color: "var(--admin-text-muted)" }}
>
Items
</th>
<th
className="text-right px-4 py-3 font-semibold text-xs"
style={{ color: "var(--admin-text-muted)" }}
>
Total
</th>
<th
className="text-center px-4 py-3 font-semibold text-xs"
style={{ color: "var(--admin-text-muted)" }}
>
Status
</th>
</tr> </tr>
</thead> </thead>
<tbody className="divide-y divide-[var(--admin-border)]"> <tbody style={{ borderColor: "var(--admin-border)" }}>
{paginatedOrders.map((order) => ( {paginatedOrders.map((order) => (
<tr key={order.id} className="hover:bg-stone-50 transition-colors"> <tr
key={order.id}
className="transition-colors"
style={{ borderTop: "1px solid var(--admin-border-light)" }}
>
<td className="px-4 py-3"> <td className="px-4 py-3">
<input <input
type="checkbox" type="checkbox"
checked={selectedOrders.has(order.id)} checked={selectedOrders.has(order.id)}
onChange={() => toggleOrderSelection(order.id)} onChange={() => toggleOrderSelection(order.id)}
className="h-4 w-4 rounded border-stone-300 text-[var(--admin-accent)] focus:ring-[var(--admin-accent)] cursor-pointer" className="h-4 w-4 rounded cursor-pointer"
style={{
borderColor: "var(--admin-border-strong)",
accentColor: "var(--admin-accent)",
}}
/> />
</td> </td>
<td className="px-4 py-3"> <td className="px-4 py-3">
<Link href={`/admin/orders/${order.id}`} className="font-mono text-xs text-[var(--admin-accent)] hover:text-[var(--admin-accent-hover)]"> <Link
href={`/admin/orders/${order.id}`}
className="font-mono text-xs"
style={{ color: "var(--admin-accent)" }}
>
{shortId(order.id)} {shortId(order.id)}
</Link> </Link>
</td> </td>
<td className="px-4 py-3"> <td className="px-4 py-3">
<div className="font-medium text-[var(--admin-text-primary)]">{order.customer_name}</div> <div
{order.customer_phone && <div className="font-mono text-xs text-stone-400">{order.customer_phone}</div>} className="font-medium"
style={{ color: "var(--admin-text-primary)" }}
>
{order.customer_name}
</div>
{order.customer_phone && (
<div
className="font-mono text-xs"
style={{ color: "var(--admin-text-muted)" }}
>
{order.customer_phone}
</div>
)}
</td> </td>
<td className="px-4 py-3 hidden md:table-cell"> <td className="px-4 py-3 hidden md:table-cell">
{order.stops ? ( {order.stops ? (
<span className="text-sm text-[var(--admin-text-primary)]">{order.stops.city}, {order.stops.state}</span> <span
className="text-sm"
style={{ color: "var(--admin-text-primary)" }}
>
{order.stops.city}, {order.stops.state}
</span>
) : ( ) : (
<span className="text-stone-300"></span> <span style={{ color: "var(--admin-text-muted)" }}></span>
)} )}
</td> </td>
<td className="px-4 py-3 hidden lg:table-cell"> <td className="px-4 py-3 hidden lg:table-cell">
<span className="text-sm text-stone-500">{formatDate(order.created_at)}</span> <span
className="text-sm"
style={{ color: "var(--admin-text-muted)" }}
>
{formatDate(order.created_at)}
</span>
</td> </td>
<td className="px-4 py-3 text-center"> <td className="px-4 py-3 text-center">
<span className="font-mono text-sm text-stone-600">{order.order_items?.length ?? 0}</span> <span
className="font-mono text-sm"
style={{ color: "var(--admin-text-secondary)" }}
>
{order.order_items?.length ?? 0}
</span>
</td> </td>
<td className="px-4 py-3 text-right"> <td className="px-4 py-3 text-right">
<span className="font-mono font-semibold text-[var(--admin-text-primary)]">{formatCurrency(order.subtotal)}</span> <span
className="font-mono font-semibold"
style={{ color: "var(--admin-text-primary)" }}
>
{formatCurrency(order.subtotal)}
</span>
</td> </td>
<td className="px-4 py-3 text-center"> <td className="px-4 py-3 text-center">
<div className="flex items-center justify-center gap-2"> <div className="flex items-center justify-center gap-2">
{order.pickup_complete ? ( {order.pickup_complete ? (
<AdminBadge variant="success" dot>Picked Up</AdminBadge> <AdminBadge tone="success" dot>Picked Up</AdminBadge>
) : ( ) : (
<AdminBadge variant="warning" dot>Pending</AdminBadge> <AdminBadge tone="warning" dot>Pending</AdminBadge>
)} )}
{order.payment_processor === "square" && ( {order.payment_processor === "square" && (
<AdminBadge variant="info">Square</AdminBadge> <AdminBadge tone="info">Square</AdminBadge>
)} )}
{!order.pickup_complete && ( {!order.pickup_complete && (
<AdminButton <AdminButton
@@ -623,8 +800,14 @@ export default function AdminOrdersPanel({
{/* Pagination */} {/* Pagination */}
{totalPages > 1 && ( {totalPages > 1 && (
<div className="flex items-center justify-between mt-4 pt-4 border-t border-[var(--admin-border)]"> <div
<p className="text-xs text-[var(--admin-text-muted)]"> className="flex items-center justify-between mt-4 pt-4 border-t"
style={{ borderColor: "var(--admin-border)" }}
>
<p
className="text-xs"
style={{ color: "var(--admin-text-muted)" }}
>
Showing {(page * PAGE_SIZE) + 1} to {Math.min((page + 1) * PAGE_SIZE, filteredOrders.length)} of {filteredOrders.length} Showing {(page * PAGE_SIZE) + 1} to {Math.min((page + 1) * PAGE_SIZE, filteredOrders.length)} of {filteredOrders.length}
</p> </p>
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
@@ -636,9 +819,14 @@ export default function AdminOrdersPanel({
disabled={page === 0} disabled={page === 0}
className="!rounded-lg" className="!rounded-lg"
> >
{Icons.chevronLeft("h-4 w-4")} <ChevronLeftIcon />
</AdminIconButton> </AdminIconButton>
<span className="px-3 text-sm font-medium text-stone-700">{page + 1} / {totalPages}</span> <span
className="px-3 text-sm font-medium"
style={{ color: "var(--admin-text-primary)" }}
>
{page + 1} / {totalPages}
</span>
<AdminIconButton <AdminIconButton
variant="secondary" variant="secondary"
size="sm" size="sm"
@@ -647,7 +835,7 @@ export default function AdminOrdersPanel({
disabled={page >= totalPages - 1} disabled={page >= totalPages - 1}
className="!rounded-lg" className="!rounded-lg"
> >
{Icons.chevronRight("h-4 w-4")} <ChevronRightIcon />
</AdminIconButton> </AdminIconButton>
</div> </div>
</div> </div>
@@ -656,19 +844,54 @@ export default function AdminOrdersPanel({
{/* New Order Modal (admin manual entry) - sibling to the main panel content */} {/* New Order Modal (admin manual entry) - sibling to the main panel content */}
{showNewOrderModal && ( {showNewOrderModal && (
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/40 p-4"> <div className="fixed inset-0 z-50 flex items-center justify-center p-4" style={{ backgroundColor: "rgba(26, 24, 20, 0.4)" }}>
<div className="w-full max-w-2xl rounded-2xl border border-[var(--admin-border)] bg-white shadow-2xl"> <div
<div className="flex items-center justify-between border-b border-[var(--admin-border)] px-6 py-4"> className="w-full max-w-2xl rounded-2xl border shadow-2xl"
style={{
borderColor: "var(--admin-border)",
backgroundColor: "var(--admin-card-bg)",
}}
>
<div
className="flex items-center justify-between border-b px-6 py-4"
style={{ borderColor: "var(--admin-border)" }}
>
<div> <div>
<h3 className="text-lg font-semibold text-[var(--admin-text-primary)]">New Order (Admin)</h3> <h3
<p className="text-xs text-[var(--admin-text-muted)]">Manual entry for testing / phone orders</p> className="text-lg font-semibold"
style={{ color: "var(--admin-text-primary)" }}
>
New Order (Admin)
</h3>
<p
className="text-xs"
style={{ color: "var(--admin-text-muted)" }}
>
Manual entry for testing / phone orders
</p>
</div> </div>
<button onClick={closeNewOrderModal} className="text-2xl leading-none text-stone-400 hover:text-stone-600">×</button> <button
onClick={closeNewOrderModal}
className="text-2xl leading-none"
style={{ color: "var(--admin-text-muted)" }}
aria-label="Close"
>
×
</button>
</div> </div>
<div className="p-6 space-y-5 max-h-[70vh] overflow-auto"> <div className="p-6 space-y-5 max-h-[70vh] overflow-auto">
{newOrderError && ( {newOrderError && (
<div className="rounded-lg bg-red-50 border border-red-200 px-4 py-2 text-sm text-red-700">{newOrderError}</div> <div
className="rounded-lg border px-4 py-2 text-sm"
style={{
backgroundColor: "var(--admin-danger-soft)",
borderColor: "var(--admin-danger-soft)",
color: "var(--admin-danger)",
}}
>
{newOrderError}
</div>
)} )}
{/* Customer */} {/* Customer */}
@@ -715,8 +938,18 @@ export default function AdminOrdersPanel({
{/* Items */} {/* Items */}
<div> <div>
<div className="flex items-center justify-between mb-2"> <div className="flex items-center justify-between mb-2">
<label className="block text-xs font-semibold text-[var(--admin-text-secondary)]">Items</label> <label
<span className="text-xs text-[var(--admin-text-muted)]">Total: ${newOrderTotal.toFixed(2)}</span> className="block text-xs font-semibold"
style={{ color: "var(--admin-text-secondary)" }}
>
Items
</label>
<span
className="text-xs"
style={{ color: "var(--admin-text-muted)" }}
>
Total: ${newOrderTotal.toFixed(2)}
</span>
</div> </div>
{products.length > 0 ? ( {products.length > 0 ? (
@@ -733,20 +966,41 @@ export default function AdminOrdersPanel({
/> />
</div> </div>
) : ( ) : (
<p className="text-xs text-amber-600 mb-2">No products loaded for this brand. You can still enter custom items if the action supports it.</p> <p
className="text-xs mb-2"
style={{ color: "var(--admin-warning)" }}
>
No products loaded for this brand. You can still enter custom items if the action supports it.
</p>
)} )}
{newOrderItems.length === 0 && ( {newOrderItems.length === 0 && (
<p className="text-xs text-[var(--admin-text-muted)]">No items yet. Use the selector above.</p> <p
className="text-xs"
style={{ color: "var(--admin-text-muted)" }}
>
No items yet. Use the selector above.
</p>
)} )}
{newOrderItems.length > 0 && ( {newOrderItems.length > 0 && (
<div className="space-y-2 border border-[var(--admin-border)] rounded-xl p-3 bg-[var(--admin-bg)]"> <div
className="space-y-2 border rounded-xl p-3"
style={{
borderColor: "var(--admin-border)",
backgroundColor: "var(--admin-bg)",
}}
>
{newOrderItems.map((item, idx) => { {newOrderItems.map((item, idx) => {
const prod = products.find((p) => p.id === item.product_id); const prod = products.find((p) => p.id === item.product_id);
return ( return (
<div key={idx} className="grid grid-cols-12 gap-2 items-center text-sm"> <div key={idx} className="grid grid-cols-12 gap-2 items-center text-sm">
<div className="col-span-5 font-medium truncate">{prod?.name ?? item.product_id}</div> <div
className="col-span-5 font-medium truncate"
style={{ color: "var(--admin-text-primary)" }}
>
{prod?.name ?? item.product_id}
</div>
<div className="col-span-2"> <div className="col-span-2">
<input <input
type="number" type="number"
@@ -754,6 +1008,11 @@ export default function AdminOrdersPanel({
value={item.quantity} value={item.quantity}
onChange={(e) => updateNewOrderItem(idx, { quantity: Math.max(1, parseInt(e.target.value) || 1) })} onChange={(e) => updateNewOrderItem(idx, { quantity: Math.max(1, parseInt(e.target.value) || 1) })}
className="w-full rounded border px-2 py-1 text-sm" className="w-full rounded border px-2 py-1 text-sm"
style={{
borderColor: "var(--admin-border)",
backgroundColor: "var(--admin-card-bg)",
color: "var(--admin-text-primary)",
}}
/> />
</div> </div>
<div className="col-span-2"> <div className="col-span-2">
@@ -763,6 +1022,11 @@ export default function AdminOrdersPanel({
value={item.price} value={item.price}
onChange={(e) => updateNewOrderItem(idx, { price: parseFloat(e.target.value) || 0 })} onChange={(e) => updateNewOrderItem(idx, { price: parseFloat(e.target.value) || 0 })}
className="w-full rounded border px-2 py-1 text-sm" className="w-full rounded border px-2 py-1 text-sm"
style={{
borderColor: "var(--admin-border)",
backgroundColor: "var(--admin-card-bg)",
color: "var(--admin-text-primary)",
}}
/> />
</div> </div>
<div className="col-span-2"> <div className="col-span-2">
@@ -770,13 +1034,25 @@ export default function AdminOrdersPanel({
value={item.fulfillment} value={item.fulfillment}
onChange={(e) => updateNewOrderItem(idx, { fulfillment: e.target.value as "pickup" | "ship" })} onChange={(e) => updateNewOrderItem(idx, { fulfillment: e.target.value as "pickup" | "ship" })}
className="w-full rounded border px-2 py-1 text-sm" className="w-full rounded border px-2 py-1 text-sm"
style={{
borderColor: "var(--admin-border)",
backgroundColor: "var(--admin-card-bg)",
color: "var(--admin-text-primary)",
}}
> >
<option value="pickup">pickup</option> <option value="pickup">pickup</option>
<option value="ship">ship</option> <option value="ship">ship</option>
</select> </select>
</div> </div>
<div className="col-span-1 text-right"> <div className="col-span-1 text-right">
<button type="button" onClick={() => removeNewOrderItem(idx)} className="text-red-500 text-xs hover:underline">remove</button> <button
type="button"
onClick={() => removeNewOrderItem(idx)}
className="text-xs hover:underline"
style={{ color: "var(--admin-danger)" }}
>
remove
</button>
</div> </div>
</div> </div>
); );
@@ -786,7 +1062,13 @@ export default function AdminOrdersPanel({
</div> </div>
</div> </div>
<div className="flex items-center justify-end gap-3 border-t border-[var(--admin-border)] px-6 py-4 bg-stone-50 rounded-b-2xl"> <div
className="flex items-center justify-end gap-3 border-t px-6 py-4 rounded-b-2xl"
style={{
borderColor: "var(--admin-border)",
backgroundColor: "var(--admin-bg-subtle)",
}}
>
<AdminButton variant="secondary" onClick={closeNewOrderModal} disabled={newOrderSubmitting}> <AdminButton variant="secondary" onClick={closeNewOrderModal} disabled={newOrderSubmitting}>
Cancel Cancel
</AdminButton> </AdminButton>
+117 -44
View File
@@ -198,8 +198,22 @@ export default function OrderEditForm({ order, brandId }: OrderEditFormProps) {
return ( return (
<div className="space-y-6"> <div className="space-y-6">
{error && ( {error && (
<div className="rounded-xl bg-red-50 border border-red-200 p-4 text-sm text-red-600 flex items-start gap-3"> <div
<svg className="h-5 w-5 shrink-0 text-red-500" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}> className="rounded-xl border p-4 text-sm flex items-start gap-3"
style={{
borderColor: "var(--admin-danger-soft)",
backgroundColor: "var(--admin-danger-soft)",
color: "var(--admin-danger)",
}}
>
<svg
className="h-5 w-5 shrink-0"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
strokeWidth={2}
style={{ color: "var(--admin-danger)" }}
>
<path strokeLinecap="round" strokeLinejoin="round" d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" /> <path strokeLinecap="round" strokeLinejoin="round" d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
</svg> </svg>
{error} {error}
@@ -208,11 +222,17 @@ export default function OrderEditForm({ order, brandId }: OrderEditFormProps) {
{/* Order items */} {/* Order items */}
<div> <div>
<p className="mb-3 text-sm font-semibold text-stone-700"> <p className="ha-field-label mb-3">
Order Items ({visibleItems.length}) Order Items ({visibleItems.length})
</p> </p>
{visibleItems.length === 0 ? ( {visibleItems.length === 0 ? (
<p className="rounded-xl border border-dashed border-stone-300 p-4 text-center text-sm text-stone-400"> <p
className="rounded-xl border border-dashed p-4 text-center text-sm"
style={{
borderColor: "var(--admin-border-strong)",
color: "var(--admin-text-muted)",
}}
>
No items No items
</p> </p>
) : ( ) : (
@@ -220,13 +240,23 @@ export default function OrderEditForm({ order, brandId }: OrderEditFormProps) {
{visibleItems.map((item) => ( {visibleItems.map((item) => (
<div <div
key={item.id} key={item.id}
className="rounded-xl border border-stone-200 bg-white p-4" className="rounded-xl border p-4"
style={{
borderColor: "var(--admin-border)",
backgroundColor: "var(--admin-card-bg)",
}}
> >
<div className="flex items-start justify-between gap-3"> <div className="flex items-start justify-between gap-3">
<p className="font-medium text-stone-900">{item.productName}</p> <p
className="font-medium"
style={{ color: "var(--admin-text-primary)" }}
>
{item.productName}
</p>
<button <button
onClick={() => removeItem(item.id)} onClick={() => removeItem(item.id)}
className="shrink-0 rounded-lg px-2 py-1 text-xs font-medium text-red-600 hover:bg-red-50" className="shrink-0 rounded-lg px-2 py-1 text-xs font-medium"
style={{ color: "var(--admin-danger)" }}
> >
Remove Remove
</button> </button>
@@ -234,7 +264,7 @@ export default function OrderEditForm({ order, brandId }: OrderEditFormProps) {
<div className="mt-3 grid grid-cols-1 sm:grid-cols-2 gap-3"> <div className="mt-3 grid grid-cols-1 sm:grid-cols-2 gap-3">
<div> <div>
<label className="block text-xs font-medium text-stone-500 mb-1">Qty</label> <label className="ha-field-label mb-1">Qty</label>
<input <input
type="number" type="number"
min="1" min="1"
@@ -242,13 +272,18 @@ export default function OrderEditForm({ order, brandId }: OrderEditFormProps) {
onChange={(e) => onChange={(e) =>
updateItem(item.id, "quantity", Number(e.target.value)) updateItem(item.id, "quantity", Number(e.target.value))
} }
className="w-full rounded-xl border border-stone-200 bg-stone-50 px-3 py-2 text-sm outline-none focus:border-[var(--admin-accent)] focus:ring-2 focus:ring-[var(--admin-accent)]/20" className="ha-field-input ha-field-input-mono"
/> />
</div> </div>
<div> <div>
<label className="block text-xs font-medium text-stone-500 mb-1">Price</label> <label className="ha-field-label mb-1">Price</label>
<div className="relative"> <div className="relative">
<span className="absolute left-3 top-1/2 -translate-y-1/2 text-stone-400 text-sm">$</span> <span
className="absolute left-3 top-1/2 -translate-y-1/2 text-sm"
style={{ color: "var(--admin-text-muted)" }}
>
$
</span>
<input <input
type="number" type="number"
step="0.01" step="0.01"
@@ -257,13 +292,16 @@ export default function OrderEditForm({ order, brandId }: OrderEditFormProps) {
onChange={(e) => onChange={(e) =>
updateItem(item.id, "price", Number(e.target.value)) updateItem(item.id, "price", Number(e.target.value))
} }
className="w-full rounded-xl border border-stone-200 bg-stone-50 pl-8 pr-3 py-2 text-sm outline-none focus:border-[var(--admin-accent)] focus:ring-2 focus:ring-[var(--admin-accent)]/20" className="ha-field-input ha-field-input-mono pl-8 pr-3"
/> />
</div> </div>
</div> </div>
</div> </div>
<p className="mt-2 text-right text-sm font-semibold text-stone-900"> <p
className="mt-2 text-right text-sm font-semibold"
style={{ color: "var(--admin-text-primary)" }}
>
{formatCurrency(Number(item.price) * item.quantity)} {formatCurrency(Number(item.price) * item.quantity)}
</p> </p>
</div> </div>
@@ -280,48 +318,71 @@ export default function OrderEditForm({ order, brandId }: OrderEditFormProps) {
step="0.01" step="0.01"
value={subtotal} value={subtotal}
readOnly readOnly
className="w-full rounded-xl border border-stone-200 bg-stone-50 px-4 py-2.5 text-sm text-stone-500" className="ha-field-input ha-field-input-mono"
style={{ color: "var(--admin-text-muted)" }}
/> />
</AdminInput> </AdminInput>
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4"> <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
<div> <div>
<label className="block text-xs font-semibold text-stone-500 mb-1.5">Discount Amount</label> <label className="ha-field-label mb-1.5">Discount Amount</label>
<div className="relative"> <div className="relative">
<span className="absolute left-3 top-1/2 -translate-y-1/2 text-stone-400 text-sm">$</span> <span
className="absolute left-3 top-1/2 -translate-y-1/2 text-sm"
style={{ color: "var(--admin-text-muted)" }}
>
$
</span>
<input <input
type="number" type="number"
step="0.01" step="0.01"
min="0" min="0"
value={discount_amount} value={discount_amount}
onChange={(e) => setDiscount_amount(Number(e.target.value))} onChange={(e) => setDiscount_amount(Number(e.target.value))}
className={`w-full rounded-xl border px-8 pr-3 py-2.5 text-sm outline-none focus:ring-2 focus:ring-[var(--admin-accent)]/20 ${ className="ha-field-input ha-field-input-mono pl-8 pr-3"
style={
fieldErrors.discount_amount fieldErrors.discount_amount
? "border-red-400 bg-red-50" ? { borderColor: "var(--admin-danger)", backgroundColor: "var(--admin-danger-soft)" }
: "border-stone-200 bg-white focus:border-[var(--admin-accent)]" : undefined
}`} }
/> />
</div> </div>
{fieldErrors.discount_amount && ( {fieldErrors.discount_amount && (
<p className="mt-1 text-xs text-red-500">{fieldErrors.discount_amount}</p> <p className="mt-1 text-xs" style={{ color: "var(--admin-danger)" }}>
{fieldErrors.discount_amount}
</p>
)} )}
</div> </div>
<div> <div>
<label className="block text-xs font-semibold text-stone-500 mb-1.5">Discount Reason</label> <label className="ha-field-label mb-1.5">Discount Reason</label>
<input <input
type="text" type="text"
value={discount_reason} value={discount_reason}
onChange={(e) => setDiscount_reason(e.target.value)} onChange={(e) => setDiscount_reason(e.target.value)}
placeholder="Optional" placeholder="Optional"
className="w-full rounded-xl border border-stone-200 bg-white px-3 py-2.5 text-sm outline-none focus:border-[var(--admin-accent)] focus:ring-2 focus:ring-[var(--admin-accent)]/20" className="ha-field-input"
/> />
</div> </div>
</div> </div>
<div className="rounded-xl border border-stone-200 bg-stone-50 p-4"> <div
className="rounded-xl border p-4"
style={{
borderColor: "var(--admin-border)",
backgroundColor: "var(--admin-bg-subtle)",
}}
>
<div className="flex justify-between"> <div className="flex justify-between">
<span className="text-sm font-medium text-stone-600">Total</span> <span
<span className="text-xl font-bold text-stone-900"> className="text-sm font-medium"
style={{ color: "var(--admin-text-secondary)" }}
>
Total
</span>
<span
className="text-xl font-bold"
style={{ color: "var(--admin-text-primary)" }}
>
{formatCurrency(subtotal + Number(order.tax_amount ?? 0) - discount_amount)} {formatCurrency(subtotal + Number(order.tax_amount ?? 0) - discount_amount)}
</span> </span>
</div> </div>
@@ -331,8 +392,9 @@ export default function OrderEditForm({ order, brandId }: OrderEditFormProps) {
{/* Customer fields */} {/* Customer fields */}
<div className="space-y-4"> <div className="space-y-4">
<div> <div>
<label className="block text-xs font-semibold text-stone-500 mb-1.5"> <label className="ha-field-label mb-1.5">
Name <span className="text-red-500">*</span> <span>Name</span>
<span className="ha-field-label-required">*</span>
</label> </label>
<input <input
type="text" type="text"
@@ -345,14 +407,17 @@ export default function OrderEditForm({ order, brandId }: OrderEditFormProps) {
return next; return next;
}); });
}} }}
className={`w-full rounded-xl border px-3 py-2.5 text-sm outline-none focus:ring-2 focus:ring-[var(--admin-accent)]/20 ${ className="ha-field-input"
style={
fieldErrors.customer_name fieldErrors.customer_name
? "border-red-400 bg-red-50" ? { borderColor: "var(--admin-danger)", backgroundColor: "var(--admin-danger-soft)" }
: "border-stone-200 bg-white focus:border-[var(--admin-accent)]" : undefined
}`} }
/> />
{fieldErrors.customer_name && ( {fieldErrors.customer_name && (
<p className="mt-1 text-xs text-red-500">{fieldErrors.customer_name}</p> <p className="mt-1 text-xs" style={{ color: "var(--admin-danger)" }}>
{fieldErrors.customer_name}
</p>
)} )}
</div> </div>
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4"> <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
@@ -376,17 +441,15 @@ export default function OrderEditForm({ order, brandId }: OrderEditFormProps) {
{/* Status & pickup */} {/* Status & pickup */}
<div className="space-y-4"> <div className="space-y-4">
<div> <div>
<label className="mb-2 block text-xs font-semibold text-stone-500">Status</label> <label className="ha-field-label mb-2">Status</label>
<div className="flex gap-2"> <div className="ha-segment">
{["pending", "confirmed", "cancelled"].map((s) => ( {["pending", "confirmed", "cancelled"].map((s) => (
<button <button
key={s} key={s}
type="button" type="button"
onClick={() => setStatus(s)} onClick={() => setStatus(s)}
className={`flex-1 rounded-xl px-4 py-2.5 text-sm font-semibold capitalize transition-colors ${ className={`ha-segment-btn capitalize ${
status === s status === s ? "ha-segment-btn--active" : ""
? "bg-[var(--admin-accent)] text-white"
: "bg-white text-stone-600 border border-stone-200 hover:bg-stone-50"
}`} }`}
> >
{s} {s}
@@ -396,15 +459,24 @@ export default function OrderEditForm({ order, brandId }: OrderEditFormProps) {
</div> </div>
<div> <div>
<label className="mb-2 block text-xs font-semibold text-stone-500">Pickup</label> <label className="ha-field-label mb-2">Pickup</label>
<button <button
type="button" type="button"
onClick={() => setPickup_complete((v) => !v)} onClick={() => setPickup_complete((v) => !v)}
className={`w-full rounded-xl px-4 py-2.5 text-sm font-semibold transition-colors ${ className="ha-segment-btn w-full justify-center"
style={
pickup_complete pickup_complete
? "bg-green-100 text-green-700 border border-green-200" ? {
: "bg-amber-100 text-amber-700 border border-amber-200" backgroundColor: "var(--admin-primary-soft)",
}`} color: "var(--admin-primary)",
border: "1px solid var(--admin-primary)",
}
: {
backgroundColor: "var(--admin-warning-soft)",
color: "var(--admin-warning)",
border: "1px solid var(--admin-warning)",
}
}
> >
{pickup_complete ? "✓ Picked Up" : "○ Not Picked Up"} {pickup_complete ? "✓ Picked Up" : "○ Not Picked Up"}
</button> </button>
@@ -428,6 +500,7 @@ export default function OrderEditForm({ order, brandId }: OrderEditFormProps) {
variant="primary" variant="primary"
fullWidth fullWidth
size="lg" size="lg"
className="ha-btn-primary"
> >
{saving ? "Saving..." : "Save Changes"} {saving ? "Saving..." : "Save Changes"}
</AdminButton> </AdminButton>
+49 -28
View File
@@ -2,6 +2,7 @@
import { useState } from "react"; import { useState } from "react";
import { formatDate } from "@/lib/format-date"; import { formatDate } from "@/lib/format-date";
import AdminBadge from "./design-system/AdminBadge";
import { toggleOrderPickupComplete } from "@/actions/orders"; import { toggleOrderPickupComplete } from "@/actions/orders";
type Order = { type Order = {
@@ -15,6 +16,16 @@ type Order = {
created_at: string; created_at: string;
}; };
type OrderStatusTone = "warning" | "info" | "success" | "danger" | "neutral";
const statusToTone: Record<string, OrderStatusTone> = {
pending: "warning",
confirmed: "info",
paid: "success",
cancelled: "danger",
completed: "neutral",
};
export default function OrderTableBody({ orders }: { orders: Order[] }) { export default function OrderTableBody({ orders }: { orders: Order[] }) {
const [pickupToggles, setPickupToggles] = useState<Record<string, boolean>>( const [pickupToggles, setPickupToggles] = useState<Record<string, boolean>>(
() => Object.fromEntries(orders.map((o) => [o.id, o.pickup_complete])) () => Object.fromEntries(orders.map((o) => [o.id, o.pickup_complete]))
@@ -33,68 +44,78 @@ export default function OrderTableBody({ orders }: { orders: Order[] }) {
} }
} }
const statusColors: Record<string, string> = {
pending: "bg-yellow-100 text-yellow-700",
confirmed: "bg-blue-900/40 text-blue-700",
paid: "bg-green-900/40 text-green-400",
cancelled: "bg-red-900/40 text-red-400",
completed: "bg-zinc-950 text-zinc-400",
};
return ( return (
<tbody className="divide-y divide-slate-200"> <tbody style={{ borderColor: "var(--admin-border)" }}>
{error && ( {error && (
<tr> <tr>
<td colSpan={6} className="px-3 py-2 text-sm text-red-400"> <td
colSpan={6}
className="px-3 py-2 text-sm"
style={{ color: "var(--admin-danger)" }}
>
{error} {error}
</td> </td>
</tr> </tr>
)} )}
{orders.map((order) => ( {orders.map((order) => (
<tr key={order.id} className="hover:bg-zinc-800"> <tr
key={order.id}
className="transition-colors"
style={{ borderTop: "1px solid var(--admin-border-light)" }}
>
<td className="px-3 py-2"> <td className="px-3 py-2">
<span className="font-mono text-sm text-zinc-500"> <span
className="font-mono text-sm"
style={{ color: "var(--admin-text-muted)" }}
>
{order.id.slice(0, 8)} {order.id.slice(0, 8)}
</span> </span>
</td> </td>
<td className="px-3 py-2"> <td className="px-3 py-2">
<div className="font-medium text-zinc-100"> <div
className="font-medium"
style={{ color: "var(--admin-text-primary)" }}
>
{order.customer_name} {order.customer_name}
</div> </div>
<div className="text-sm text-zinc-500"> <div
className="text-sm"
style={{ color: "var(--admin-text-muted)" }}
>
{order.customer_email} {order.customer_email}
</div> </div>
</td> </td>
<td className="px-3 py-2"> <td className="px-3 py-2">
<span <AdminBadge tone={statusToTone[order.status] ?? "neutral"}>
className={`rounded-full px-2 py-0.5 text-xs font-medium ${
statusColors[order.status] ?? "bg-zinc-950 text-zinc-400"
}`}
>
{order.status ?? "pending"} {order.status ?? "pending"}
</span> </AdminBadge>
</td> </td>
<td className="px-3 py-2 font-semibold text-zinc-100"> <td
className="px-3 py-2 font-semibold"
style={{ color: "var(--admin-text-primary)" }}
>
${Number(order.subtotal).toFixed(2)} ${Number(order.subtotal).toFixed(2)}
</td> </td>
<td className="px-3 py-2"> <td className="px-3 py-2">
<button <button
type="button"
onClick={() => togglePickup(order.id, pickupToggles[order.id])} onClick={() => togglePickup(order.id, pickupToggles[order.id])}
className={`rounded-full px-2 py-0.5 text-xs font-medium ${ className="transition-opacity hover:opacity-80"
pickupToggles[order.id]
? "bg-green-900/40 text-green-400"
: "bg-zinc-950 text-zinc-500"
}`}
> >
{pickupToggles[order.id] ? "Picked up" : "Pending"} <AdminBadge tone={pickupToggles[order.id] ? "success" : "neutral"} dot>
{pickupToggles[order.id] ? "Picked up" : "Pending"}
</AdminBadge>
</button> </button>
</td> </td>
<td className="px-3 py-2 text-sm text-zinc-500"> <td
className="px-3 py-2 text-sm"
style={{ color: "var(--admin-text-muted)" }}
>
{formatDate(new Date(order.created_at))} {formatDate(new Date(order.created_at))}
</td> </td>
</tr> </tr>