@kahitsan/ksui 0.37.1 → 0.38.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kahitsan/ksui",
-  "version": "0.37.1",
+  "version": "0.38.1",
   "description": "ksui is a standalone set of SolidJS UI components for KahitSan/Hilinga and any SolidJS app. Published to the public npm registry and consumed as a normal dependency. Ships source under a `solid` export condition so the consumer's vite-plugin-solid compiles it with only solid-js externalized; it depends on nothing but solid-js + lucide-solid and injects its own CSS.",
   "type": "module",
   "main": "./src/index.ts",

package/src/components/composite/VoucherPicker.test.tsx

@@ -1,36 +1,71 @@
-// fetchUrl prop threading — the default stays the vouchers plugin's own API so
-// existing consumers are unaffected; a consumer without vouchers.view can
-// point the picker at a peer proxy route with the same response shape.
+// The picker pages the list in from the server (page/limit) and delegates the
+// search to it, so these assert the request contract as well as the rendering.
 import { describe, expect, it, vi } from "vitest";
 import { fireEvent, render, waitFor } from "@solidjs/testing-library";
-import VoucherPicker from "./VoucherPicker";
+import VoucherPicker, { type VoucherOption } from "./VoucherPicker";
 
-function mockFetchOnce(): typeof fetch {
-  const impl = vi.fn(async () => ({
-    ok: true,
-    json: async () => ({ data: [] }),
-  })) as unknown as typeof fetch;
+/** Captures every requested URL and serves pages out of `rows`. */
+function mockPagedFetch(rows: VoucherOption[]) {
+  const calls: string[] = [];
+  const impl = vi.fn(async (url: string) => {
+    calls.push(url);
+    const parsed = new URL(url, "http://localhost");
+    const page = Number(parsed.searchParams.get("page") ?? "1");
+    const limit = Number(parsed.searchParams.get("limit") ?? "25");
+    const search = (parsed.searchParams.get("search") ?? "").toLowerCase();
+    const matched = search
+      ? rows.filter((r) => `${r.code} ${r.notes ?? ""}`.toLowerCase().includes(search))
+      : rows;
+    const start = (page - 1) * limit;
+    return {
+      ok: true,
+      json: async () => ({
+        data: matched.slice(start, start + limit),
+        total: matched.length,
+        page,
+        limit,
+      }),
+    };
+  }) as unknown as typeof fetch;
   vi.stubGlobal("fetch", impl);
-  return impl;
+  return { impl, calls };
+}
+
+function voucher(over: Partial<VoucherOption> & Pick<VoucherOption, "id" | "code">): VoucherOption {
+  return {
+    type: "percentage",
+    value: 20,
+    max_discount_amount: null,
+    applicable_packages: null,
+    minimum_purchase: 0,
+    valid_from: null,
+    valid_until: null,
+    is_active: true,
+    ...over,
+  };
+}
+
+function manyVouchers(n: number): VoucherOption[] {
+  return Array.from({ length: n }, (_, i) =>
+    voucher({ id: i + 1, code: `BULK_${String(i + 1).padStart(3, "0")}` }),
+  );
 }
 
 describe("VoucherPicker fetchUrl", () => {
   it("defaults to the vouchers plugin's own API when fetchUrl is omitted", async () => {
-    const fetchMock = mockFetchOnce();
+    const { calls } = mockPagedFetch([]);
     const { getByTestId } = render(() => (
       <VoucherPicker selected={null} onChange={vi.fn()} subtotal={100} packageIds={[]} />
     ));
     fireEvent.click(getByTestId("voucher-picker-trigger"));
 
-    await waitFor(() => expect(fetchMock).toHaveBeenCalled());
-    expect(fetchMock).toHaveBeenCalledWith(
-      "/api/vouchers?status=active&limit=200",
-      expect.objectContaining({ credentials: "include" }),
-    );
+    await waitFor(() => expect(calls.length).toBeGreaterThan(0));
+    expect(calls[0]).toContain("/api/vouchers");
+    expect(calls[0]).toContain("status=active");
   });
 
   it("fetches the overridden URL when fetchUrl is provided", async () => {
-    const fetchMock = mockFetchOnce();
+    const { calls } = mockPagedFetch([]);
     const { getByTestId } = render(() => (
       <VoucherPicker
         selected={null}
@@ -42,10 +77,356 @@ describe("VoucherPicker fetchUrl", () => {
     ));
     fireEvent.click(getByTestId("voucher-picker-trigger"));
 
-    await waitFor(() => expect(fetchMock).toHaveBeenCalled());
-    expect(fetchMock).toHaveBeenCalledWith(
-      "/api/counter/vouchers",
-      expect.objectContaining({ credentials: "include" }),
+    await waitFor(() => expect(calls.length).toBeGreaterThan(0));
+    expect(calls[0]).toContain("/api/counter/vouchers");
+  });
+
+  it("requests only the first page up front, not the whole table", async () => {
+    const { calls } = mockPagedFetch(manyVouchers(120));
+    const { getByTestId, getAllByTestId } = render(() => (
+      <VoucherPicker selected={null} onChange={vi.fn()} subtotal={1000} packageIds={[]} />
+    ));
+    fireEvent.click(getByTestId("voucher-picker-trigger"));
+
+    await waitFor(() =>
+      expect(getAllByTestId(/^voucher-picker-result-/).length).toBeGreaterThan(0),
+    );
+    expect(calls[0]).toContain("page=1");
+    expect(calls[0]).toContain("limit=25");
+    // 120 rows exist but only the first page is mounted.
+    expect(getAllByTestId(/^voucher-picker-result-/).length).toBe(25);
+  });
+});
+
+describe("VoucherPicker dialog", () => {
+  it("opens a dialog and only commits the pick on Confirm", async () => {
+    mockPagedFetch([voucher({ id: 1, code: "SAVE20" })]);
+    const onChange = vi.fn();
+    const { getByTestId, queryByTestId } = render(() => (
+      <VoucherPicker selected={null} onChange={onChange} subtotal={1000} packageIds={[]} />
+    ));
+
+    expect(queryByTestId("voucher-picker-popup")).toBeNull();
+    fireEvent.click(getByTestId("voucher-picker-trigger"));
+
+    await waitFor(() => expect(getByTestId("voucher-picker-result-1")).toBeTruthy());
+    expect(getByTestId("voucher-picker-popup").closest("dialog")).not.toBeNull();
+
+    // Staging a row must not reach the consumer yet.
+    fireEvent.click(getByTestId("voucher-picker-result-1"));
+    expect(onChange).not.toHaveBeenCalled();
+    expect(getByTestId("voucher-picker-draft-summary").textContent).toContain("SAVE20");
+
+    fireEvent.click(getByTestId("voucher-picker-confirm"));
+    expect(onChange).toHaveBeenCalledWith(expect.objectContaining({ id: 1, code: "SAVE20" }));
+    await waitFor(() => expect(queryByTestId("voucher-picker-popup")).toBeNull());
+  });
+
+  it("discards the staged pick on Cancel", async () => {
+    mockPagedFetch([voucher({ id: 1, code: "SAVE20" })]);
+    const onChange = vi.fn();
+    const { getByTestId, queryByTestId } = render(() => (
+      <VoucherPicker selected={null} onChange={onChange} subtotal={1000} packageIds={[]} />
+    ));
+    fireEvent.click(getByTestId("voucher-picker-trigger"));
+    await waitFor(() => expect(getByTestId("voucher-picker-result-1")).toBeTruthy());
+
+    fireEvent.click(getByTestId("voucher-picker-result-1"));
+    fireEvent.click(getByTestId("voucher-picker-cancel"));
+
+    expect(onChange).not.toHaveBeenCalled();
+    await waitFor(() => expect(queryByTestId("voucher-picker-popup")).toBeNull());
+  });
+
+  it("re-tapping the staged row unstages it", async () => {
+    mockPagedFetch([voucher({ id: 1, code: "SAVE20" })]);
+    const { getByTestId } = render(() => (
+      <VoucherPicker selected={null} onChange={vi.fn()} subtotal={1000} packageIds={[]} />
+    ));
+    fireEvent.click(getByTestId("voucher-picker-trigger"));
+    await waitFor(() => expect(getByTestId("voucher-picker-result-1")).toBeTruthy());
+
+    fireEvent.click(getByTestId("voucher-picker-result-1"));
+    expect(getByTestId("voucher-picker-draft-summary").textContent).toContain("SAVE20");
+
+    fireEvent.click(getByTestId("voucher-picker-result-1"));
+    expect(getByTestId("voucher-picker-draft-summary").textContent).toContain("No voucher selected");
+  });
+
+  it("delegates the search to the server and highlights the match", async () => {
+    const { calls } = mockPagedFetch([
+      voucher({ id: 1, code: "SAVE20" }),
+      voucher({ id: 2, code: "PARTNER_ACES" }),
+    ]);
+    const { getByTestId, queryByTestId } = render(() => (
+      <VoucherPicker selected={null} onChange={vi.fn()} subtotal={1000} packageIds={[]} />
+    ));
+    fireEvent.click(getByTestId("voucher-picker-trigger"));
+    await waitFor(() => expect(getByTestId("voucher-picker-result-1")).toBeTruthy());
+
+    fireEvent.input(getByTestId("voucher-picker-search"), { target: { value: "partner" } });
+
+    await waitFor(() => expect(calls.some((u) => u.includes("search=partner"))).toBe(true));
+    await waitFor(() => expect(queryByTestId("voucher-picker-result-1")).toBeNull());
+
+    const row = getByTestId("voucher-picker-result-2");
+    const mark = row.querySelector("mark");
+    expect(mark).not.toBeNull();
+    expect(mark!.textContent?.toLowerCase()).toBe("partner");
+  });
+
+  it("shows the voucher description in the row and the staged summary", async () => {
+    mockPagedFetch([
+      voucher({ id: 50, code: "PARTNER_ACES", notes: "BISCAST ACES outreach discount" }),
+    ]);
+    const { getByTestId } = render(() => (
+      <VoucherPicker selected={null} onChange={vi.fn()} subtotal={1000} packageIds={[]} />
+    ));
+    fireEvent.click(getByTestId("voucher-picker-trigger"));
+
+    await waitFor(() => expect(getByTestId("voucher-picker-result-50")).toBeTruthy());
+    expect(getByTestId("voucher-picker-result-50").textContent).toContain(
+      "BISCAST ACES outreach discount",
+    );
+
+    fireEvent.click(getByTestId("voucher-picker-result-50"));
+    expect(getByTestId("voucher-picker-draft-summary").textContent).toContain(
+      "BISCAST ACES outreach discount",
+    );
+  });
+
+  it("finds a voucher by its description and highlights the match in it", async () => {
+    const { calls } = mockPagedFetch([
+      voucher({ id: 51, code: "PARTNER_UAPGA", notes: "UAPGA Camarines Chapter discount" }),
+      voucher({ id: 52, code: "GENERIC" }),
+    ]);
+    const { getByTestId, queryByTestId } = render(() => (
+      <VoucherPicker selected={null} onChange={vi.fn()} subtotal={1000} packageIds={[]} />
+    ));
+    fireEvent.click(getByTestId("voucher-picker-trigger"));
+    await waitFor(() => expect(getByTestId("voucher-picker-result-51")).toBeTruthy());
+
+    fireEvent.input(getByTestId("voucher-picker-search"), {
+      target: { value: "camarines" },
+    });
+
+    await waitFor(() => expect(calls.some((u) => u.includes("search=camarines"))).toBe(true));
+    await waitFor(() => expect(queryByTestId("voucher-picker-result-52")).toBeNull());
+
+    const row = getByTestId("voucher-picker-result-51");
+    const mark = row.querySelector("mark");
+    expect(mark).not.toBeNull();
+    expect(mark!.textContent?.toLowerCase()).toBe("camarines");
+  });
+
+  it("skips the description line for a blank description", async () => {
+    mockPagedFetch([
+      voucher({ id: 53, code: "PLAIN", notes: "   " }),
+      voucher({ id: 54, code: "PLAIN" }),
+    ]);
+    const { getByTestId } = render(() => (
+      <VoucherPicker selected={null} onChange={vi.fn()} subtotal={1000} packageIds={[]} />
+    ));
+    fireEvent.click(getByTestId("voucher-picker-trigger"));
+
+    await waitFor(() => expect(getByTestId("voucher-picker-result-53")).toBeTruthy());
+    // Identical rows — a whitespace-only description must render nothing extra.
+    expect(getByTestId("voucher-picker-result-53").textContent).toBe(
+      getByTestId("voucher-picker-result-54").textContent,
     );
   });
+
+  it("shows when a voucher expires", async () => {
+    const soon = new Date(Date.now() + 3 * 86400000).toISOString().slice(0, 10);
+    mockPagedFetch([voucher({ id: 9, code: "ENDINGSOON", valid_until: soon })]);
+    const { getByTestId } = render(() => (
+      <VoucherPicker selected={null} onChange={vi.fn()} subtotal={1000} packageIds={[]} />
+    ));
+    fireEvent.click(getByTestId("voucher-picker-trigger"));
+
+    await waitFor(() => expect(getByTestId("voucher-picker-result-9")).toBeTruthy());
+    expect(getByTestId("voucher-picker-result-9").textContent).toContain("Expires in 3 days");
+  });
+
+  it("reads a full timestamp date the same as a bare date", async () => {
+    const soon = new Date(Date.now() + 3 * 86400000).toISOString().slice(0, 10);
+    mockPagedFetch([
+      voucher({ id: 10, code: "TIMESTAMPED", valid_until: `${soon}T16:00:00.000Z` }),
+    ]);
+    const { getByTestId } = render(() => (
+      <VoucherPicker selected={null} onChange={vi.fn()} subtotal={1000} packageIds={[]} />
+    ));
+    fireEvent.click(getByTestId("voucher-picker-trigger"));
+
+    await waitFor(() => expect(getByTestId("voucher-picker-result-10")).toBeTruthy());
+    const text = getByTestId("voucher-picker-result-10").textContent ?? "";
+    expect(text).toContain("Expires in 3 days");
+    expect(text).not.toContain("T16:00:00");
+  });
+
+  it("shows how many redemptions are used against the limit", async () => {
+    mockPagedFetch([
+      voucher({ id: 20, code: "LIMITED", usage_count: 3, usage_limit_total: 10 }),
+    ]);
+    const { getByTestId } = render(() => (
+      <VoucherPicker selected={null} onChange={vi.fn()} subtotal={1000} packageIds={[]} />
+    ));
+    fireEvent.click(getByTestId("voucher-picker-trigger"));
+
+    await waitFor(() => expect(getByTestId("voucher-picker-result-20")).toBeTruthy());
+    expect(getByTestId("voucher-picker-result-20").textContent).toContain("3/10 used");
+  });
+
+  it("omits the usage line for an unlimited voucher", async () => {
+    mockPagedFetch([voucher({ id: 21, code: "UNLIMITED", usage_count: 42 })]);
+    const { getByTestId } = render(() => (
+      <VoucherPicker selected={null} onChange={vi.fn()} subtotal={1000} packageIds={[]} />
+    ));
+    fireEvent.click(getByTestId("voucher-picker-trigger"));
+
+    await waitFor(() => expect(getByTestId("voucher-picker-result-21")).toBeTruthy());
+    expect(getByTestId("voucher-picker-result-21").textContent).not.toContain("used");
+  });
+
+  it("blocks a fully-redeemed voucher the same way the server does", async () => {
+    mockPagedFetch([
+      voucher({ id: 22, code: "SPENT", usage_count: 10, usage_limit_total: 10 }),
+    ]);
+    const { getByTestId, queryByTestId } = render(() => (
+      <VoucherPicker selected={null} onChange={vi.fn()} subtotal={1000} packageIds={[]} />
+    ));
+    fireEvent.click(getByTestId("voucher-picker-trigger"));
+
+    await waitFor(() => expect(getByTestId("voucher-picker-inapplicable-22")).toBeTruthy());
+    // Never selectable — it would be rejected at charge time.
+    expect(queryByTestId("voucher-picker-result-22")).toBeNull();
+    expect(getByTestId("voucher-picker-inapplicable-22").textContent).toContain("Fully redeemed");
+  });
+
+  it("explains why an ineligible voucher can't be used", async () => {
+    mockPagedFetch([voucher({ id: 7, code: "BIGSPEND", minimum_purchase: 5000 })]);
+    const { getByTestId } = render(() => (
+      <VoucherPicker selected={null} onChange={vi.fn()} subtotal={1000} packageIds={[]} />
+    ));
+    fireEvent.click(getByTestId("voucher-picker-trigger"));
+
+    await waitFor(() => expect(getByTestId("voucher-picker-inapplicable-7")).toBeTruthy());
+    expect(getByTestId("voucher-picker-inapplicable-7").textContent).toContain("minimum");
+  });
+
+  it("previews a discount range while nothing is priced yet", async () => {
+    mockPagedFetch([voucher({ id: 3, code: "SAVE20" })]);
+    const { getByTestId } = render(() => (
+      <VoucherPicker
+        selected={null}
+        onChange={vi.fn()}
+        subtotal={0}
+        subtotalRange={{ min: 99, max: 118 }}
+        packageIds={[]}
+      />
+    ));
+    fireEvent.click(getByTestId("voucher-picker-trigger"));
+
+    await waitFor(() => expect(getByTestId("voucher-picker-result-3")).toBeTruthy());
+    // 20% of 99 and of 118, both rounded the same way the server rounds.
+    expect(getByTestId("voucher-picker-result-3").textContent).toContain("₱20.00 to ₱24.00");
+  });
+
+  it("shows a single amount once the cart has a real subtotal", async () => {
+    mockPagedFetch([voucher({ id: 4, code: "SAVE20" })]);
+    const { getByTestId } = render(() => (
+      <VoucherPicker
+        selected={null}
+        onChange={vi.fn()}
+        subtotal={99}
+        subtotalRange={{ min: 99, max: 118 }}
+        packageIds={[]}
+      />
+    ));
+    fireEvent.click(getByTestId("voucher-picker-trigger"));
+
+    await waitFor(() => expect(getByTestId("voucher-picker-result-4")).toBeTruthy());
+    const text = getByTestId("voucher-picker-result-4").textContent ?? "";
+    expect(text).toContain("₱20.00");
+    expect(text).not.toContain("₱24.00");
+  });
+
+  it("names the specific reason each ineligible voucher can't be used", async () => {
+    const yesterday = new Date(Date.now() - 86400000).toISOString().slice(0, 10);
+    const nextWeek = new Date(Date.now() + 7 * 86400000).toISOString().slice(0, 10);
+    mockPagedFetch([
+      voucher({ id: 30, code: "TOO_SMALL", minimum_purchase: 5000 }),
+      voucher({ id: 31, code: "GONE", valid_until: yesterday }),
+      voucher({ id: 32, code: "NOT_YET", valid_from: nextWeek }),
+      voucher({ id: 33, code: "OFF", is_active: false }),
+      voucher({ id: 34, code: "OTHER_ITEMS", applicable_packages: [99] }),
+    ]);
+    const { getByTestId } = render(() => (
+      <VoucherPicker selected={null} onChange={vi.fn()} subtotal={1000} packageIds={[1]} />
+    ));
+    fireEvent.click(getByTestId("voucher-picker-trigger"));
+
+    await waitFor(() => expect(getByTestId("voucher-picker-inapplicable-30")).toBeTruthy());
+    expect(getByTestId("voucher-picker-inapplicable-30").textContent).toContain("minimum");
+    expect(getByTestId("voucher-picker-inapplicable-31").textContent).toContain("Expired");
+    expect(getByTestId("voucher-picker-inapplicable-32").textContent).toContain("Starts");
+    expect(getByTestId("voucher-picker-inapplicable-33").textContent).toContain("Inactive");
+    expect(getByTestId("voucher-picker-inapplicable-34").textContent).toContain(
+      "Doesn't cover every item",
+    );
+  });
+
+  it("surfaces a load failure instead of rendering an empty list", async () => {
+    vi.stubGlobal(
+      "fetch",
+      vi.fn(async () => ({ ok: false, status: 403, json: async () => ({}) })) as unknown as typeof fetch,
+    );
+    const { getByTestId, queryByTestId } = render(() => (
+      <VoucherPicker selected={null} onChange={vi.fn()} subtotal={1000} packageIds={[]} />
+    ));
+    fireEvent.click(getByTestId("voucher-picker-trigger"));
+
+    await waitFor(() =>
+      expect(getByTestId("voucher-picker-popup").textContent).toContain("Permission denied"),
+    );
+    // The misleading "nothing here" copy must not stand in for a real failure.
+    expect(queryByTestId("voucher-picker-popup")!.textContent).not.toContain(
+      "No vouchers available.",
+    );
+  });
+
+  it("reopening discards a pick that was staged but never confirmed", async () => {
+    mockPagedFetch([voucher({ id: 40, code: "STAGED" }), voucher({ id: 41, code: "OTHER" })]);
+    const onChange = vi.fn();
+    const { getByTestId } = render(() => (
+      <VoucherPicker selected={null} onChange={onChange} subtotal={1000} packageIds={[]} />
+    ));
+
+    fireEvent.click(getByTestId("voucher-picker-trigger"));
+    await waitFor(() => expect(getByTestId("voucher-picker-result-40")).toBeTruthy());
+    fireEvent.click(getByTestId("voucher-picker-result-40"));
+    fireEvent.click(getByTestId("voucher-picker-cancel"));
+
+    fireEvent.click(getByTestId("voucher-picker-trigger"));
+    await waitFor(() => expect(getByTestId("voucher-picker-result-40")).toBeTruthy());
+    expect(getByTestId("voucher-picker-draft-summary").textContent).toContain("No voucher selected");
+    expect(onChange).not.toHaveBeenCalled();
+  });
+
+  it("keeps Escape from reaching an ancestor's document-level dismiss handler", async () => {
+    mockPagedFetch([]);
+    const ancestorEsc = vi.fn();
+    document.addEventListener("keydown", ancestorEsc);
+
+    const { getByTestId } = render(() => (
+      <VoucherPicker selected={null} onChange={vi.fn()} subtotal={100} packageIds={[]} />
+    ));
+    fireEvent.click(getByTestId("voucher-picker-trigger"));
+    await waitFor(() => expect(getByTestId("voucher-picker-popup")).toBeTruthy());
+
+    fireEvent.keyDown(getByTestId("voucher-picker-search"), { key: "Escape" });
+    expect(ancestorEsc).not.toHaveBeenCalled();
+
+    document.removeEventListener("keydown", ancestorEsc);
+  });
 });

package/src/components/composite/VoucherPicker.tsx

@@ -1,19 +1,20 @@
 // Vendored into plugin remotes.
 //
 // Cross-plugin picker: fetches vouchers over HTTP and degrades gracefully:
-// when the endpoint isn't reachable the popup shows a "couldn't load" notice
+// when the endpoint isn't reachable the dialog shows a "couldn't load" notice
 // and the sale records with no voucher (the manual-discount field stays
 // available). Defaults to the vouchers plugin's own public API
 // (/api/vouchers); `fetchUrl` overrides it for a consumer that reaches
 // vouchers through a peer proxy route instead (same response shape required).
 
-import { Portal } from "solid-js/web";
-import { useTopLayer } from "../../utils/top-layer";
-import { usePopoverMount } from "../../utils/modal-layer";
+import { Modal } from "../base/Modal";
+import { highlightMatch } from "../../utils/highlight";
 import { createEffect, createMemo, createSignal, For, onCleanup, Show, type JSX } from "solid-js";
 import Ticket from "lucide-solid/icons/ticket";
 import X from "lucide-solid/icons/x";
+import Search from "lucide-solid/icons/search";
 import Loader2 from "lucide-solid/icons/loader-2";
+import CalendarClock from "lucide-solid/icons/calendar-clock";
 
 export interface VoucherOption {
   id: number;
@@ -26,6 +27,12 @@ export interface VoucherOption {
   valid_from: string | null;
   valid_until: string | null;
   is_active: boolean;
+  /** Redemptions so far. Absent on endpoints that don't expose usage. */
+  usage_count?: number | null;
+  /** Total redemptions allowed; null/absent means unlimited. */
+  usage_limit_total?: number | null;
+  /** Free-text description; absent on endpoints that don't expose it. */
+  notes?: string | null;
 }
 
 const DEFAULT_FETCH_URL = "/api/vouchers?status=active&limit=200";
@@ -41,11 +48,12 @@ interface VoucherPickerProps {
    *  a consumer with no `vouchers.view` grant can point this at a peer proxy
    *  route instead. */
   fetchUrl?: string;
+  /** Cheapest/priciest total still reachable from what the cart offers. Used to
+   *  preview a discount RANGE while `subtotal` is still 0, instead of a
+   *  meaningless zero. */
+  subtotalRange?: { min: number; max: number };
 }
 
-const POPUP_MAX_HEIGHT = 360;
-const POPUP_MIN_WIDTH = 320;
-
 function asNumber(v: string | number | null | undefined): number {
   if (v == null) return 0;
   return typeof v === "string" ? parseFloat(v) : v;
@@ -69,22 +77,61 @@ function formatCurrency(amount: number): string {
   return new Intl.NumberFormat("en-PH", { style: "currency", currency: "PHP" }).format(amount);
 }
 
-function isApplicable(
+/** True once every allowed redemption is spent. Unlimited codes never exhaust. */
+function usageExhausted(v: VoucherOption): boolean {
+  const limit = v.usage_limit_total;
+  if (limit == null || limit <= 0) return false;
+  return (v.usage_count ?? 0) >= limit;
+}
+
+/** "3/10 used" — null when the endpoint omits usage or the code is unlimited. */
+function formatUsage(v: VoucherOption): string | null {
+  const limit = v.usage_limit_total;
+  if (limit == null || limit <= 0) return null;
+  return `${v.usage_count ?? 0}/${limit} used`;
+}
+
+/** Few enough redemptions left that the cashier should notice. */
+function nearlyUsedUp(v: VoucherOption): boolean {
+  const limit = v.usage_limit_total;
+  if (limit == null || limit <= 0) return false;
+  const left = limit - (v.usage_count ?? 0);
+  return left > 0 && left <= Math.max(1, Math.ceil(limit * 0.2));
+}
+
+/** Null when the voucher can be applied; otherwise the shopper-facing reason it can't. */
+function ineligibilityReason(
   voucher: VoucherOption,
   subtotal: number,
   packageIds: number[],
   todayIso: string,
-): boolean {
-  if (!voucher.is_active) return false;
-  if (voucher.valid_from && todayIso < voucher.valid_from) return false;
-  if (voucher.valid_until && todayIso > voucher.valid_until) return false;
-  if (asNumber(voucher.minimum_purchase) > subtotal) return false;
+): string | null {
+  if (!voucher.is_active) return "Inactive";
+  if (voucher.valid_from && todayIso < toDay(voucher.valid_from))
+    return `Starts ${toDay(voucher.valid_from)}`;
+  if (voucher.valid_until && todayIso > toDay(voucher.valid_until))
+    return `Expired ${toDay(voucher.valid_until)}`;
+  // Mirrors the server's usage gate — without it an exhausted code looks
+  // selectable here and is only rejected at charge time.
+  if (usageExhausted(voucher)) return "Fully redeemed";
+  if (asNumber(voucher.minimum_purchase) > subtotal)
+    return `Needs ${formatCurrency(asNumber(voucher.minimum_purchase))} minimum`;
   if (voucher.applicable_packages && voucher.applicable_packages.length > 0) {
-    if (packageIds.length === 0) return false;
+    if (packageIds.length === 0) return "Only for specific items";
     const allowed = new Set(voucher.applicable_packages);
-    if (!packageIds.every((id) => allowed.has(id))) return false;
+    if (!packageIds.every((id) => allowed.has(id))) return "Doesn't cover every item";
   }
-  return true;
+  return null;
+}
+
+// Single source of truth with the reason list above, so the two can't drift.
+function isApplicable(
+  voucher: VoucherOption,
+  subtotal: number,
+  packageIds: number[],
+  todayIso: string,
+): boolean {
+  return ineligibilityReason(voucher, subtotal, packageIds, todayIso) === null;
 }
 
 function formatVoucherDescription(v: VoucherOption): string {
@@ -99,24 +146,72 @@ function formatVoucherDescription(v: VoucherOption): string {
   return "";
 }
 
+/** A date column may serialize as a bare date or a full timestamp; keep the day. */
+function toDay(value: string): string {
+  return value.slice(0, 10);
+}
+
+/** Whole days from today to `day`; negative once it's in the past. */
+function daysUntil(day: string, todayIso: string): number {
+  return Math.round((Date.parse(`${day}T00:00:00Z`) - Date.parse(`${todayIso}T00:00:00Z`)) / 86400000);
+}
+
+/** Short human expiry for the row's meta line. Null when the voucher never expires. */
+function formatExpiry(validUntil: string | null, todayIso: string): string | null {
+  if (!validUntil) return null;
+  const day = toDay(validUntil);
+  if (day < todayIso) return `Expired ${day}`;
+  const days = daysUntil(day, todayIso);
+  if (days === 0) return "Expires today";
+  if (days === 1) return "Expires tomorrow";
+  if (days <= 30) return `Expires in ${days} days`;
+  return `Expires ${day}`;
+}
+
+// Server page size. The list is paged in on scroll so an account with hundreds
+// of codes doesn't ship (or mount) all of them just to open the picker.
+const PAGE_SIZE = 25;
+const SEARCH_DEBOUNCE_MS = 200;
+
 export default function VoucherPicker(props: VoucherPickerProps): JSX.Element {
-  const popoverMount = usePopoverMount();
   const [open, setOpen] = createSignal(false);
   const [vouchers, setVouchers] = createSignal<VoucherOption[]>([]);
   const [loading, setLoading] = createSignal(false);
+  const [loadingMore, setLoadingMore] = createSignal(false);
   const [error, setError] = createSignal<string | null>(null);
-  const [popupStyle, setPopupStyle] = createSignal<JSX.CSSProperties>({});
+  const [query, setQuery] = createSignal("");
+  const [debouncedQuery, setDebouncedQuery] = createSignal("");
+  const [page, setPage] = createSignal(1);
+  const [total, setTotal] = createSignal(0);
+  // Staged choice. `props.selected` only changes on Confirm.
+  const [draft, setDraft] = createSignal<VoucherOption | null>(null);
+
+  // Signal, not a plain ref: the sentinel mounts only once the first page
+  // reveals there are more, which is after the observer effect first runs.
+  const [sentinel, setSentinel] = createSignal<HTMLDivElement | undefined>();
 
-  let triggerRef: HTMLButtonElement | undefined;
-  let popupRef: HTMLDivElement | undefined;
   let activeFetchToken = 0;
+  let debounceTimer: ReturnType<typeof setTimeout> | undefined;
 
-  createEffect(() => {
-    if (!open()) return;
+  const baseUrl = () => props.fetchUrl ?? DEFAULT_FETCH_URL;
+
+  // The endpoint may already carry query params; append rather than assume "?".
+  const pageUrl = (p: number, search: string): string => {
+    const [path, existing] = baseUrl().split("?");
+    const qs = new URLSearchParams(existing ?? "");
+    qs.set("page", String(p));
+    qs.set("limit", String(PAGE_SIZE));
+    if (search) qs.set("search", search);
+    else qs.delete("search");
+    return `${path}?${qs.toString()}`;
+  };
+
+  const loadPage = (p: number, search: string, append: boolean) => {
     const token = ++activeFetchToken;
-    setLoading(true);
+    if (append) setLoadingMore(true);
+    else setLoading(true);
     setError(null);
-    fetch(props.fetchUrl ?? DEFAULT_FETCH_URL, { credentials: "include" })
+    fetch(pageUrl(p, search), { credentials: "include" })
       .then((r) => {
         if (!r.ok)
           throw new Error(
@@ -130,17 +225,64 @@ export default function VoucherPicker(props: VoucherPickerProps): JSX.Element {
       })
       .then((json) => {
         if (token !== activeFetchToken) return;
-        setVouchers((json.data || []) as VoucherOption[]);
+        const rows = (json.data || []) as VoucherOption[];
+        setTotal(typeof json.total === "number" ? json.total : rows.length);
+        setPage(p);
+        setVouchers((prev) => (append ? [...prev, ...rows] : rows));
       })
       .catch((e) => {
         if (token !== activeFetchToken) return;
         setError(e instanceof Error ? e.message : "Failed to load");
-        setVouchers([]);
+        if (!append) setVouchers([]);
       })
       .finally(() => {
         if (token !== activeFetchToken) return;
         setLoading(false);
+        setLoadingMore(false);
       });
+  };
+
+  // Debounce the keystrokes into a server-side search, so filtering spans the
+  // whole table rather than only the pages already pulled down.
+  createEffect(() => {
+    const q = query();
+    if (!open()) return;
+    clearTimeout(debounceTimer);
+    debounceTimer = setTimeout(() => setDebouncedQuery(q.trim()), SEARCH_DEBOUNCE_MS);
+  });
+  onCleanup(() => clearTimeout(debounceTimer));
+
+  // Refetch from page 1 whenever the dialog opens or the search term settles.
+  createEffect(() => {
+    if (!open()) return;
+    const search = debouncedQuery();
+    loadPage(1, search, false);
+  });
+
+  const hasMore = createMemo(() => vouchers().length < total());
+
+  const loadNext = () => {
+    if (loading() || loadingMore() || !hasMore()) return;
+    loadPage(page() + 1, debouncedQuery(), true);
+  };
+
+  // Scroll sentinel: pull the next page when the end of the list comes into view.
+  // Re-created after every append — an observer only reports a CHANGE in
+  // intersection, so a sentinel that stays on screen (list still shorter than
+  // the viewport) would never fire again and paging would stall.
+  createEffect(() => {
+    const loadedCount = vouchers().length;
+    if (!open() || loadedCount === 0) return;
+    const el = sentinel();
+    if (!el || typeof IntersectionObserver === "undefined") return;
+    const io = new IntersectionObserver(
+      (entries) => {
+        if (entries.some((e) => e.isIntersecting)) loadNext();
+      },
+      { rootMargin: "120px" },
+    );
+    io.observe(el);
+    onCleanup(() => io.disconnect());
   });
 
   const today = () => new Date().toISOString().slice(0, 10);
@@ -152,75 +294,36 @@ export default function VoucherPicker(props: VoucherPickerProps): JSX.Element {
 
   const inapplicable = createMemo(() => {
     const today_ = today();
-    return vouchers().filter((v) => !isApplicable(v, props.subtotal, props.packageIds, today_));
+    return vouchers()
+      .filter((v) => !isApplicable(v, props.subtotal, props.packageIds, today_))
+      .map((v) => ({
+        voucher: v,
+        reason: ineligibilityReason(v, props.subtotal, props.packageIds, today_) ?? "",
+      }));
   });
 
-  const updatePosition = () => {
-    if (!triggerRef) return;
-    const rect = triggerRef.getBoundingClientRect();
-    const vpHeight = window.innerHeight;
-    const vpWidth = window.innerWidth;
-    const width = Math.max(POPUP_MIN_WIDTH, rect.width);
-    const spaceBelow = vpHeight - rect.bottom;
-    const spaceAbove = rect.top;
-    const flipUp = spaceBelow < POPUP_MAX_HEIGHT && spaceAbove > spaceBelow;
-    const maxHeight = Math.max(
-      200,
-      Math.min(POPUP_MAX_HEIGHT, flipUp ? spaceAbove - 12 : spaceBelow - 12),
-    );
-    const left = Math.min(Math.max(8, rect.left), vpWidth - width - 8);
-    if (flipUp) {
-      setPopupStyle({
-        position: "fixed",
-        bottom: `${vpHeight - rect.top + 4}px`,
-        left: `${left}px`,
-        width: `${width}px`,
-        "max-height": `${maxHeight}px`,
-      });
-    } else {
-      setPopupStyle({
-        position: "fixed",
-        top: `${rect.bottom + 4}px`,
-        left: `${left}px`,
-        width: `${width}px`,
-        "max-height": `${maxHeight}px`,
-      });
-    }
+  const openPicker = () => {
+    if (props.disabled) return;
+    setQuery("");
+    setDebouncedQuery("");
+    setVouchers([]);
+    setPage(1);
+    setTotal(0);
+    setDraft(props.selected);
+    setOpen(true);
   };
 
-  createEffect(() => {
-    if (!open()) return;
-    updatePosition();
-
-    const onDocClick = (e: MouseEvent) => {
-      const t = e.target as Node;
-      if (triggerRef?.contains(t)) return;
-      if (popupRef?.contains(t)) return;
-      setOpen(false);
-    };
-    const onEsc = (e: KeyboardEvent) => {
-      if (e.key === "Escape") {
-        e.stopPropagation();
-        setOpen(false);
-      }
-    };
-    const onReflow = () => updatePosition();
-
-    document.addEventListener("mousedown", onDocClick);
-    document.addEventListener("keydown", onEsc, true);
-    window.addEventListener("resize", onReflow);
-    window.addEventListener("scroll", onReflow, true);
-    onCleanup(() => {
-      document.removeEventListener("mousedown", onDocClick);
-      document.removeEventListener("keydown", onEsc, true);
-      window.removeEventListener("resize", onReflow);
-      window.removeEventListener("scroll", onReflow, true);
-    });
-  });
+  const close = () => setOpen(false);
 
-  const select = (v: VoucherOption | null) => {
-    props.onChange(v);
-    setOpen(false);
+  // Picking a row only stages it; nothing reaches the cart until Confirm, so a
+  // mis-tap on a touch screen can be corrected without re-opening the dialog.
+  const stage = (v: VoucherOption) => {
+    setDraft((current) => (current?.id === v.id ? null : v));
+  };
+
+  const confirm = () => {
+    props.onChange(draft());
+    close();
   };
 
   const clear = (e: MouseEvent) => {
@@ -230,18 +333,74 @@ export default function VoucherPicker(props: VoucherPickerProps): JSX.Element {
 
   const previewDiscount = createMemo(() => calculateDiscount(props.selected, props.subtotal));
 
+  // A fixed_amount description already reads "₱X off"; repeating the computed
+  // figure beside it just says the same thing twice.
+  const showTriggerAmount = createMemo(
+    () => previewDiscount() > 0 && props.selected?.type !== "fixed_amount",
+  );
+
+  // Nothing priced yet: preview against the cheapest/priciest total the cart
+  // could still reach, so the row shows a real range instead of a bare zero.
+  const rangePreview = createMemo(() => {
+    const r = props.subtotalRange;
+    if (props.subtotal > 0 || !r || r.max <= 0) return null;
+    return r;
+  });
+
+  const discountLabel = (v: VoucherOption): string => {
+    const r = rangePreview();
+    if (!r) return `−${formatCurrency(calculateDiscount(v, props.subtotal))}`;
+    const lo = calculateDiscount(v, r.min);
+    const hi = calculateDiscount(v, r.max);
+    return lo === hi
+      ? `−${formatCurrency(hi)}`
+      : `−${formatCurrency(lo)} to ${formatCurrency(hi)}`;
+  };
+
+  // An ancestor may close itself on a document-level Escape; the dialog handles
+  // its own dismissal, so keep the key from reaching that listener.
+  const swallowEscape = (e: KeyboardEvent) => {
+    if (e.key === "Escape") e.stopPropagation();
+  };
+
+  createEffect(() => {
+    if (!open()) return;
+    document.addEventListener("keydown", swallowEscape, true);
+    onCleanup(() => document.removeEventListener("keydown", swallowEscape, true));
+  });
+
+  const metaLine = (v: VoucherOption): string =>
+    [formatVoucherDescription(v), formatExpiry(v.valid_until, today()), formatUsage(v)]
+      .filter(Boolean)
+      .join(" · ");
+
+  // Staged description, trimmed — the footer read it twice, and a signal call
+  // in JSX doesn't narrow across re-evaluations.
+  const draftNotes = createMemo(() => {
+    const n = draft()?.notes?.trim();
+    return n ? n : null;
+  });
+
+  const expiresSoon = (v: VoucherOption): boolean => {
+    if (!v.valid_until) return false;
+    const days = daysUntil(toDay(v.valid_until), today());
+    return days >= 0 && days <= 7;
+  };
+
+  // Either scarcity signal warrants the amber treatment on the meta line.
+  const runningOut = (v: VoucherOption): boolean => expiresSoon(v) || nearlyUsedUp(v);
+
   return (
     <>
       <button
-        ref={triggerRef}
         type="button"
         data-testid="voucher-picker-trigger"
         disabled={props.disabled}
-        onClick={() => !props.disabled && setOpen((o) => !o)}
+        onClick={openPicker}
         class={`${props.compact ? "inline-flex" : "w-full flex"} items-center gap-2 ${
           props.compact ? "px-2.5 py-2" : "px-3 py-2.5"
         } rounded-lg bg-[color-mix(in_srgb,var(--ks-border,rgba(39,39,42,0.5))_30%,transparent)] border border-[color-mix(in_srgb,var(--ks-border-strong,#3f3f46)_50%,transparent)] hover:border-[color-mix(in_srgb,var(--ks-primary,#c9a961)_40%,transparent)] hover:bg-[color-mix(in_srgb,var(--ks-primary,#c9a961)_5%,transparent)] transition-colors text-sm text-left cursor-pointer disabled:cursor-not-allowed disabled:opacity-60`}
-        aria-haspopup="listbox"
+        aria-haspopup="dialog"
         aria-expanded={open()}
       >
         <Ticket size={16} class="shrink-0 text-[var(--ks-fg-muted,#a1a1aa)]" />
@@ -250,7 +409,9 @@ export default function VoucherPicker(props: VoucherPickerProps): JSX.Element {
             <span class="block truncate text-[var(--ks-fg,#ffffff)] font-medium">{props.selected!.code}</span>
             <span class="block truncate text-[11px] text-[var(--ks-success-fg,#34d399)]">
               {formatVoucherDescription(props.selected!)}
-              <Show when={previewDiscount() > 0}> · {formatCurrency(previewDiscount())} off</Show>
+              {/* A fixed-amount voucher already names the peso figure — appending
+                  the computed one would just repeat it. */}
+              <Show when={showTriggerAmount()}> · {formatCurrency(previewDiscount())} off</Show>
             </span>
           </span>
           <button
@@ -267,31 +428,62 @@ export default function VoucherPicker(props: VoucherPickerProps): JSX.Element {
       </button>
 
       <Show when={open()}>
-        <Portal mount={popoverMount()}>
-          <div
-            ref={(el) => {
-              popupRef = el;
-              onCleanup(useTopLayer(el));
-            }}
-            data-testid="voucher-picker-popup"
-            class="z-[100] rounded-md border border-[var(--ks-input-border,#3f3f46)] bg-[color-mix(in_srgb,var(--ks-overlay-surface,#18181b)_95%,transparent)] backdrop-blur shadow-xl overflow-hidden flex flex-col"
-            style={popupStyle()}
-          >
-            <div class="px-3 py-2 border-b border-[var(--ks-border-strong,#3f3f46)] flex items-center gap-2">
-              <Ticket size={14} class="text-[var(--ks-fg-subtle,#71717a)] shrink-0" />
-              <span class="text-xs uppercase tracking-widest text-[var(--ks-fg-subtle,#71717a)] font-bold">Vouchers</span>
-              <Show when={loading()}>
-                <Loader2 size={14} class="animate-spin text-[var(--ks-fg-subtle,#71717a)] ml-auto shrink-0" />
+        <Modal onClose={close} size="xl" ariaLabel="Select a voucher">
+          <div data-testid="voucher-picker-popup" class="flex flex-col max-h-[70vh]">
+            {/* Bled to the card edges (the card owns the padding) so the rule
+                under the title spans the full width. */}
+            <div class="-mx-6 -mt-6 px-5 sm:px-6 py-3 border-b border-[color-mix(in_srgb,var(--ks-border,rgba(39,39,42,0.5))_60%,transparent)] flex items-center justify-between gap-3 shrink-0">
+              <div class="flex items-center gap-2 min-w-0">
+                <Ticket size={16} class="text-[var(--ks-fg-muted,#a1a1aa)] shrink-0" aria-hidden="true" />
+                <h2 class="m-0 text-base font-semibold text-[var(--ks-fg,#ffffff)] truncate">
+                  Select a voucher
+                </h2>
+                <Show when={loading()}>
+                  <Loader2 size={14} class="animate-spin text-[var(--ks-fg-subtle,#71717a)] shrink-0" />
+                </Show>
+              </div>
+              <button
+                type="button"
+                data-testid="voucher-picker-close"
+                onClick={close}
+                class="w-8 h-8 flex items-center justify-center rounded text-[var(--ks-fg-muted,#a1a1aa)] hover:text-[var(--ks-fg,#ffffff)] hover:bg-[color-mix(in_srgb,var(--ks-surface-raised,#1a1a1a)_50%,transparent)] transition-colors cursor-pointer shrink-0"
+                aria-label="Close"
+              >
+                <X size={16} />
+              </button>
+            </div>
+
+            <div class="mt-4 shrink-0 flex items-center gap-2 px-3 py-2 rounded-lg border border-[color-mix(in_srgb,var(--ks-border-strong,#3f3f46)_60%,transparent)] bg-[color-mix(in_srgb,var(--ks-border,rgba(39,39,42,0.5))_25%,transparent)] focus-within:border-[color-mix(in_srgb,var(--ks-primary,#c9a961)_50%,transparent)] transition-colors">
+              <Search size={16} class="shrink-0 text-[var(--ks-fg-subtle,#71717a)]" aria-hidden="true" />
+              <input
+                type="text"
+                data-testid="voucher-picker-search"
+                value={query()}
+                onInput={(e) => setQuery(e.currentTarget.value)}
+                placeholder="Search voucher code…"
+                aria-label="Search voucher code"
+                class="flex-1 min-w-0 bg-transparent border-0 outline-none text-sm text-[var(--ks-fg,#ffffff)] placeholder:text-[var(--ks-fg-subtle,#71717a)]"
+              />
+              <Show when={query() !== ""}>
+                <button
+                  type="button"
+                  onClick={() => setQuery("")}
+                  class="shrink-0 p-0.5 rounded text-[var(--ks-fg-subtle,#71717a)] hover:text-[var(--ks-fg,#ffffff)] transition-colors cursor-pointer"
+                  aria-label="Clear search"
+                >
+                  <X size={14} />
+                </button>
               </Show>
             </div>
+
             <ul
               role="listbox"
               aria-label="Available vouchers"
-              class="m-0 p-0 list-none flex-1 overflow-y-auto"
+              class="m-0 mt-3 p-0 list-none flex-1 overflow-y-auto -mx-1 px-1"
             >
               <Show when={error()}>
                 <li>
-                  <div role="status" class="px-3 py-2 text-xs text-[var(--ks-danger-fg,#f87171)]">
+                  <div role="status" class="px-3 py-3 text-sm text-[var(--ks-danger-fg,#f87171)]">
                     {error()}
                   </div>
                 </li>
@@ -300,35 +492,56 @@ export default function VoucherPicker(props: VoucherPickerProps): JSX.Element {
                 when={!loading() && !error() && applicable().length === 0 && inapplicable().length === 0}
               >
                 <li>
-                  <div role="status" class="px-3 py-4 text-xs text-[var(--ks-fg-subtle,#71717a)] text-center">
-                    No vouchers available.
+                  <div role="status" class="px-3 py-8 text-sm text-[var(--ks-fg-subtle,#71717a)] text-center">
+                    <Show when={debouncedQuery() !== ""} fallback="No vouchers available.">
+                      No voucher matches “{debouncedQuery()}”.
+                    </Show>
                   </div>
                 </li>
               </Show>
               <For each={applicable()}>
                 {(v) => {
-                  const discount = () => calculateDiscount(v, props.subtotal);
-                  const selected = () => props.selected?.id === v.id;
+                  const selected = () => draft()?.id === v.id;
                   return (
                     <li role="option" aria-selected={selected()}>
                       <button
                         type="button"
                         data-testid={`voucher-picker-result-${v.id}`}
-                        onClick={() => select(v)}
-                        class="w-full text-left px-3 py-2 hover:bg-[color-mix(in_srgb,var(--ks-primary,#c9a961)_10%,transparent)] transition-colors flex items-start gap-2 cursor-pointer"
+                        onClick={() => stage(v)}
+                        class="w-full text-left px-3 py-3 mb-1 rounded-lg border transition-colors flex items-center gap-3 cursor-pointer border-[color-mix(in_srgb,var(--ks-border-strong,#3f3f46)_40%,transparent)] hover:border-[color-mix(in_srgb,var(--ks-primary,#c9a961)_50%,transparent)] hover:bg-[color-mix(in_srgb,var(--ks-primary,#c9a961)_8%,transparent)]"
+                        classList={{
+                          "border-[color-mix(in_srgb,var(--ks-primary,#c9a961)_60%,transparent)] bg-[color-mix(in_srgb,var(--ks-primary,#c9a961)_12%,transparent)]":
+                            selected(),
+                        }}
                       >
-                        <Ticket size={14} class="shrink-0 mt-0.5 text-[var(--ks-success-fg,#34d399)]" aria-hidden="true" />
+                        <Ticket size={18} class="shrink-0 text-[var(--ks-success-fg,#34d399)]" aria-hidden="true" />
                         <span class="flex-1 min-w-0">
-                          <span class="block text-sm text-[var(--ks-fg,#ffffff)] truncate">{v.code}</span>
-                          <span class="block text-[11px] text-[var(--ks-fg-subtle,#71717a)] truncate">
-                            {formatVoucherDescription(v)}
+                          <span class="block text-sm font-medium text-[var(--ks-fg,#ffffff)] truncate">
+                            {highlightMatch(v.code, debouncedQuery())}
                           </span>
+                          <span class="flex items-center gap-1 text-xs text-[var(--ks-fg-subtle,#71717a)] min-w-0">
+                            <Show when={runningOut(v)}>
+                              <CalendarClock
+                                size={12}
+                                class="shrink-0 text-[var(--ks-warning-fg,#fbbf24)]"
+                                aria-hidden="true"
+                              />
+                            </Show>
+                            <span class="truncate" classList={{ "text-[var(--ks-warning-fg,#fbbf24)]": runningOut(v) }}>
+                              {metaLine(v)}
+                            </span>
+                          </span>
+                          <Show when={v.notes && v.notes.trim()}>
+                            <span class="block text-xs text-[var(--ks-fg-subtle,#71717a)] truncate">
+                              {highlightMatch(v.notes!, debouncedQuery())}
+                            </span>
+                          </Show>
                         </span>
-                        <span class="text-xs text-[var(--ks-success-fg,#34d399)] shrink-0 mt-0.5 font-mono">
-                          {formatCurrency(discount())}
+                        <span class="text-sm text-[var(--ks-success-fg,#34d399)] shrink-0 font-mono">
+                          {discountLabel(v)}
                         </span>
                         <Show when={selected()}>
-                          <span class="text-[var(--ks-accent,#fbbf24)] shrink-0 mt-0.5">✓</span>
+                          <span class="text-[var(--ks-accent,#fbbf24)] shrink-0" aria-hidden="true">✓</span>
                         </Show>
                       </button>
                     </li>
@@ -337,46 +550,111 @@ export default function VoucherPicker(props: VoucherPickerProps): JSX.Element {
               </For>
               <Show when={inapplicable().length > 0}>
                 <li>
-                  <div class="px-3 pt-3 pb-1 text-[10px] uppercase tracking-widest text-[var(--ks-fg-subtle,#71717a)] font-semibold border-t border-[var(--ks-border-strong,#3f3f46)] mt-1">
+                  <div class="px-1 pt-3 pb-2 text-[11px] uppercase tracking-widest text-[var(--ks-fg-subtle,#71717a)] font-semibold border-t border-[var(--ks-border-strong,#3f3f46)] mt-2">
                     Not applicable to this cart
                   </div>
                 </li>
                 <For each={inapplicable()}>
-                  {(v) => (
+                  {(entry) => (
                     <li>
                       <div
-                        data-testid={`voucher-picker-inapplicable-${v.id}`}
-                        class="w-full text-left px-3 py-2 flex items-start gap-2 opacity-50 cursor-not-allowed"
+                        data-testid={`voucher-picker-inapplicable-${entry.voucher.id}`}
+                        class="w-full text-left px-3 py-3 mb-1 rounded-lg border border-transparent flex items-center gap-3 opacity-60 cursor-not-allowed"
                         aria-disabled="true"
                       >
-                        <Ticket size={14} class="shrink-0 mt-0.5 text-[var(--ks-fg-subtle,#71717a)]" aria-hidden="true" />
+                        <Ticket size={18} class="shrink-0 text-[var(--ks-fg-subtle,#71717a)]" aria-hidden="true" />
                         <span class="flex-1 min-w-0">
-                          <span class="block text-sm text-[var(--ks-fg,#ffffff)] truncate">{v.code}</span>
-                          <span class="block text-[11px] text-[var(--ks-fg-subtle,#71717a)] truncate">
-                            {formatVoucherDescription(v)}
+                          <span class="block text-sm text-[var(--ks-fg,#ffffff)] truncate">
+                            {highlightMatch(entry.voucher.code, debouncedQuery())}
+                          </span>
+                          <span class="block text-xs text-[var(--ks-fg-subtle,#71717a)] truncate">
+                            {metaLine(entry.voucher)}
                           </span>
+                          <Show when={entry.voucher.notes && entry.voucher.notes.trim()}>
+                            <span class="block text-xs text-[var(--ks-fg-subtle,#71717a)] truncate">
+                              {highlightMatch(entry.voucher.notes!, debouncedQuery())}
+                            </span>
+                          </Show>
+                        </span>
+                        <span class="text-xs text-[var(--ks-warning-fg,#fbbf24)] shrink-0 text-right max-w-[45%] truncate">
+                          {entry.reason}
                         </span>
                       </div>
                     </li>
                   )}
                 </For>
               </Show>
+
+              {/* Sentinel: intersecting pulls the next page. */}
+              <Show when={hasMore()}>
+                <li>
+                  <div
+                    ref={setSentinel}
+                    data-testid="voucher-picker-sentinel"
+                    class="px-3 py-3 flex items-center justify-center gap-2 text-xs text-[var(--ks-fg-subtle,#71717a)]"
+                  >
+                    <Show when={loadingMore()} fallback={<span>Scroll for more</span>}>
+                      <Loader2 size={14} class="animate-spin shrink-0" />
+                      <span>Loading more…</span>
+                    </Show>
+                  </div>
+                </li>
+              </Show>
             </ul>
-            <Show when={props.selected}>
-              <div class="border-t border-[var(--ks-border-strong,#3f3f46)]">
+
+            {/* Bled to the card edges so the rule spans the full width, matching
+                the header. */}
+            <div class="-mx-6 -mb-6 mt-4 px-5 sm:px-6 py-3 border-t border-[color-mix(in_srgb,var(--ks-border,rgba(39,39,42,0.5))_60%,transparent)] flex items-center justify-between gap-3 shrink-0">
+              <span
+                data-testid="voucher-picker-draft-summary"
+                class="text-xs text-[var(--ks-fg-subtle,#71717a)] min-w-0 truncate"
+              >
+                <Show when={draft()} fallback="No voucher selected">
+                  <span class="text-[var(--ks-fg,#ffffff)]">{draft()!.code}</span>
+                  <Show when={draftNotes()}>
+                    {" · "}
+                    <span class="text-[var(--ks-fg-muted,#a1a1aa)]">{draftNotes()}</span>
+                  </Show>
+                  {" · "}
+                  {discountLabel(draft()!).replace("−", "")} off
+                </Show>
+              </span>
+              <div class="flex items-center gap-2 shrink-0">
+                <Show when={props.selected && draft()}>
+                  <button
+                    type="button"
+                    data-testid="voucher-picker-clear-from-list"
+                    onClick={() => setDraft(null)}
+                    class="px-3 py-2 rounded-lg text-sm text-[var(--ks-danger-fg,#f87171)] hover:bg-[color-mix(in_srgb,var(--ks-danger,#ef4444)_10%,transparent)] transition-colors cursor-pointer"
+                  >
+                    Remove
+                  </button>
+                </Show>
+                <button
+                  type="button"
+                  data-testid="voucher-picker-cancel"
+                  onClick={close}
+                  class="px-3 py-2 rounded-lg text-sm text-[var(--ks-fg-muted,#a1a1aa)] hover:text-[var(--ks-fg,#ffffff)] hover:bg-[color-mix(in_srgb,var(--ks-surface-raised,#1a1a1a)_50%,transparent)] transition-colors cursor-pointer"
+                >
+                  Cancel
+                </button>
                 <button
                   type="button"
-                  data-testid="voucher-picker-clear-from-list"
-                  onClick={() => select(null)}
-                  class="w-full text-left px-3 py-2 text-xs text-[var(--ks-danger-fg,#f87171)] hover:bg-[color-mix(in_srgb,var(--ks-danger,#ef4444)_10%,transparent)] transition-colors flex items-center gap-2 cursor-pointer"
+                  data-testid="voucher-picker-confirm"
+                  onClick={confirm}
+                  disabled={draft()?.id === props.selected?.id}
+                  class="px-4 py-2 rounded-lg text-sm font-medium bg-[var(--ks-primary,#c9a961)] text-[var(--ks-fg-on-accent,#0a0a0a)] hover:opacity-90 transition-opacity cursor-pointer disabled:cursor-not-allowed disabled:opacity-40"
                 >
-                  <X size={12} />
-                  <span>Remove voucher</span>
+                  <Show when={props.selected} fallback="Apply voucher">
+                    <Show when={draft()} fallback="Remove voucher">
+                      Change voucher
+                    </Show>
+                  </Show>
                 </button>
               </div>
-            </Show>
+            </div>
           </div>
-        </Portal>
+        </Modal>
       </Show>
     </>
   );