@@ -78,7 +92,7 @@ export default async function OrdersPage() {
Every order you've submitted, across all statuses.
-
Gift fund
diff --git a/src/components/orders/AdminOrderQueue.tsx b/src/components/orders/AdminOrderQueue.tsx
index 2306b3d..1eae7ef 100644
--- a/src/components/orders/AdminOrderQueue.tsx
+++ b/src/components/orders/AdminOrderQueue.tsx
@@ -1,7 +1,7 @@
"use client";
-import { Copy } from "lucide-react";
-import { Fragment } from "react";
+import { Copy, PackageCheck, Trash2 } from "lucide-react";
+import { Fragment, type ReactNode } from "react";
import { useRouter } from "next/navigation";
import { useState } from "react";
import { toast } from "sonner";
@@ -23,6 +23,11 @@ import {
formatApprovedStfOrders,
formatOrderForExcel,
} from "@/lib/finance/order-export";
+import {
+ computeOrderTotalCents,
+ displayPercentToBps,
+ type OrderPricingSettings,
+} from "@/lib/finance/order-pricing";
import { formatDate, formatPriceCents } from "@/lib/utils";
import { OrderStatusBadge } from "./OrderStatusBadge";
@@ -47,8 +52,11 @@ export type AdminOrderRow = {
type Action = "approve" | "deny";
-function totalCostCents(row: { quantity: number; unitCostCents: number }) {
- return row.quantity * row.unitCostCents;
+function toPricingSettings(orderPricing: OrderPricing): OrderPricingSettings {
+ return {
+ taxPercentBps: displayPercentToBps(orderPricing.taxPercent),
+ shippingPercentBps: displayPercentToBps(orderPricing.shippingPercent),
+ };
}
async function copyText(text: string, label: string) {
@@ -64,20 +72,33 @@ async function copyText(text: string, label: string) {
}
}
-export function AdminOrderQueue({ orders }: { orders: AdminOrderRow[] }) {
+export type OrderPricing = {
+ taxPercent: number;
+ shippingPercent: number;
+};
+
+export function AdminOrderQueue({
+ orders,
+ orderPricing,
+}: {
+ orders: AdminOrderRow[];
+ orderPricing: OrderPricing;
+}) {
const router = useRouter();
const [expandedId, setExpandedId] = useState(null);
const [denialComment, setDenialComment] = useState("");
const [pending, setPending] = useState(null);
+ const [deletingId, setDeletingId] = useState(null);
+ const [markingOrdered, setMarkingOrdered] = useState(false);
+ const [selectedApprovedIds, setSelectedApprovedIds] = useState>(new Set());
+ const pricingSettings = toPricingSettings(orderPricing);
const pendingOrders = orders.filter((o) => o.status === "pending");
- const otherOrders = orders.filter((o) => o.status !== "pending");
- const approvedStfCount = orders.filter(
- (o) => o.status === "approved" && o.fundType === "STF"
- ).length;
- const approvedGiftCount = orders.filter(
- (o) => o.status === "approved" && o.fundType === "Gift"
- ).length;
+ const approvedOrders = orders.filter((o) => o.status === "approved");
+ const orderedOrders = orders.filter((o) => o.status === "ordered");
+ const deniedOrders = orders.filter((o) => o.status === "denied");
+ const approvedStfCount = approvedOrders.filter((o) => o.fundType === "STF").length;
+ const approvedGiftCount = approvedOrders.filter((o) => o.fundType === "Gift").length;
async function runAction(order: AdminOrderRow, action: Action) {
setPending(action);
@@ -105,6 +126,83 @@ export function AdminOrderQueue({ orders }: { orders: AdminOrderRow[] }) {
}
}
+ async function markApprovedAsOrdered(orderIds?: number[]) {
+ const count = orderIds?.length ?? approvedOrders.length;
+ if (count === 0) return;
+
+ const message =
+ count === 1
+ ? "Move 1 approved order to the ordered archive? It will no longer appear in Excel exports."
+ : `Move ${count} approved order${count === 1 ? "" : "s"} to the ordered archive? They will no longer appear in Excel exports.`;
+ if (!confirm(message)) return;
+
+ setMarkingOrdered(true);
+ try {
+ const res = await fetch("/api/orders/mark-ordered", {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify(orderIds ? { orderIds } : {}),
+ });
+ if (!res.ok) {
+ const data = await res.json().catch(() => null);
+ throw new Error(data?.error ?? "Failed to mark orders as ordered");
+ }
+ const data = await res.json();
+ toast.success(
+ data.movedCount === 1
+ ? "1 order moved to ordered"
+ : `${data.movedCount} orders moved to ordered`
+ );
+ setExpandedId(null);
+ setSelectedApprovedIds(new Set());
+ router.refresh();
+ } catch (err) {
+ toast.error(err instanceof Error ? err.message : "Something went wrong");
+ } finally {
+ setMarkingOrdered(false);
+ }
+ }
+
+ function toggleApprovedSelection(orderId: number) {
+ setSelectedApprovedIds((prev) => {
+ const next = new Set(prev);
+ if (next.has(orderId)) next.delete(orderId);
+ else next.add(orderId);
+ return next;
+ });
+ }
+
+ function toggleAllApprovedSelection() {
+ setSelectedApprovedIds((prev) => {
+ if (prev.size === approvedOrders.length) return new Set();
+ return new Set(approvedOrders.map((o) => o.id));
+ });
+ }
+
+ async function deleteOrder(order: AdminOrderRow) {
+ const message =
+ order.status === "approved" || order.status === "ordered"
+ ? `Delete ${order.status} order for "${order.itemName}"? This removes it from the archive and restores any gift fund deduction.`
+ : `Delete order for "${order.itemName}"? This cannot be undone.`;
+ if (!confirm(message)) return;
+
+ setDeletingId(order.id);
+ try {
+ const res = await fetch(`/api/orders/${order.id}`, { method: "DELETE" });
+ if (!res.ok) {
+ const data = await res.json().catch(() => null);
+ throw new Error(data?.error ?? "Failed to delete order");
+ }
+ toast.success("Order deleted");
+ setExpandedId(null);
+ router.refresh();
+ } catch (err) {
+ toast.error(err instanceof Error ? err.message : "Something went wrong");
+ } finally {
+ setDeletingId(null);
+ }
+ }
+
if (orders.length === 0) {
return (
@@ -115,7 +213,7 @@ export function AdminOrderQueue({ orders }: { orders: AdminOrderRow[] }) {
return (
- {(approvedStfCount > 0 || approvedGiftCount > 0) && (
+ {(approvedStfCount > 0 || approvedGiftCount > 0 || approvedOrders.length > 0) && (
copyText(
- formatApprovedStfOrders(orders),
+ formatApprovedStfOrders(orders, pricingSettings),
`${approvedStfCount} approved STF order${approvedStfCount === 1 ? "" : "s"}`
)
}
@@ -145,6 +243,14 @@ export function AdminOrderQueue({ orders }: { orders: AdminOrderRow[] }) {
+
markApprovedAsOrdered()}
+ >
+
)}
- {otherOrders.length > 0 ? (
+ {approvedOrders.length > 0 ? (
+
setExpandedId((prev) => (prev === id ? null : id))}
+ denialComment={denialComment}
+ onDenialCommentChange={setDenialComment}
+ pending={pending}
+ onAction={runAction}
+ showActions={false}
+ orderPricing={orderPricing}
+ onDelete={deleteOrder}
+ deletingId={deletingId}
+ selection={{
+ selectedIds: selectedApprovedIds,
+ onToggle: toggleApprovedSelection,
+ onToggleAll: toggleAllApprovedSelection,
+ allSelected:
+ selectedApprovedIds.size === approvedOrders.length &&
+ approvedOrders.length > 0,
+ someSelected:
+ selectedApprovedIds.size > 0 &&
+ selectedApprovedIds.size < approvedOrders.length,
+ }}
+ headerAction={
+ markApprovedAsOrdered(Array.from(selectedApprovedIds))}
+ >
+
+ }
+ />
+ ) : null}
+ {deniedOrders.length > 0 ? (
setExpandedId((prev) => (prev === id ? null : id))}
denialComment={denialComment}
@@ -172,6 +317,26 @@ export function AdminOrderQueue({ orders }: { orders: AdminOrderRow[] }) {
pending={pending}
onAction={runAction}
showActions={false}
+ orderPricing={orderPricing}
+ onDelete={deleteOrder}
+ deletingId={deletingId}
+ />
+ ) : null}
+ {orderedOrders.length > 0 ? (
+ setExpandedId((prev) => (prev === id ? null : id))}
+ denialComment={denialComment}
+ onDenialCommentChange={setDenialComment}
+ pending={pending}
+ onAction={runAction}
+ showActions={false}
+ orderPricing={orderPricing}
+ onDelete={deleteOrder}
+ deletingId={deletingId}
/>
) : null}
@@ -180,6 +345,7 @@ export function AdminOrderQueue({ orders }: { orders: AdminOrderRow[] }) {
function OrderSection({
title,
+ description,
orders,
expandedId,
onToggle,
@@ -188,8 +354,14 @@ function OrderSection({
pending,
onAction,
showActions,
+ orderPricing,
+ onDelete,
+ deletingId,
+ selection,
+ headerAction,
}: {
title: string;
+ description?: string;
orders: AdminOrderRow[];
expandedId: number | null;
onToggle: (id: number) => void;
@@ -198,16 +370,52 @@ function OrderSection({
pending: Action | null;
onAction: (order: AdminOrderRow, action: Action) => void;
showActions: boolean;
+ orderPricing: OrderPricing;
+ onDelete?: (order: AdminOrderRow) => void;
+ deletingId?: number | null;
+ selection?: {
+ selectedIds: Set
;
+ onToggle: (id: number) => void;
+ onToggleAll: () => void;
+ allSelected: boolean;
+ someSelected: boolean;
+ };
+ headerAction?: ReactNode;
}) {
if (orders.length === 0) return null;
+ const pricingSettings = toPricingSettings(orderPricing);
+ const columnCount = selection ? 7 : 6;
+
return (
-
{title}
+
+
+
{title}
+ {description ? (
+
{description}
+ ) : null}
+
+ {headerAction ?
{headerAction}
: null}
+
+ {selection ? (
+
+
+ ) : null}
Submitted by
Item
Fund / bucket
@@ -228,6 +436,17 @@ function OrderSection({
className="cursor-pointer"
onClick={() => onToggle(o.id)}
>
+ {selection ? (
+ e.stopPropagation()}>
+
+ ) : null}
{o.requesterName ?? o.requesterEmail ?? "-"}
@@ -239,7 +458,13 @@ function OrderSection({
{o.stfBucketName ? ` · ${o.stfBucketName}` : ""}
- {formatPriceCents(totalCostCents(o))}
+ {formatPriceCents(
+ computeOrderTotalCents(
+ o.quantity,
+ o.unitCostCents,
+ pricingSettings
+ )
+ )}
{formatDate(o.createdAt)}
@@ -250,7 +475,10 @@ function OrderSection({
{expanded ? (
-
+
@@ -279,6 +510,9 @@ function OrderDetail({
onDenialCommentChange,
pending,
onAction,
+ orderPricing,
+ onDelete,
+ deletingId,
}: {
order: AdminOrderRow;
showActions: boolean;
@@ -286,8 +520,13 @@ function OrderDetail({
onDenialCommentChange: (v: string) => void;
pending: Action | null;
onAction: (order: AdminOrderRow, action: Action) => void;
+ orderPricing: OrderPricing;
+ onDelete?: (order: AdminOrderRow) => void;
+ deletingId?: number | null;
}) {
- const excelRow = formatOrderForExcel(order);
+ const pricingSettings = toPricingSettings(orderPricing);
+ const excelRow = formatOrderForExcel(order, false, pricingSettings);
+ const total = computeOrderTotalCents(order.quantity, order.unitCostCents, pricingSettings);
return (
@@ -295,7 +534,7 @@ function OrderDetail({
-
+
Link
@@ -374,6 +613,18 @@ function OrderDetail({
+ ) : onDelete ? (
+
e.stopPropagation()}>
+ onDelete(order)}
+ disabled={deletingId === order.id}
+ >
+
+
) : null}
- Total cost:{" "}
+ Total cost (incl. tax & shipping):{" "}
{formatPriceCents(totalCostCents)}
diff --git a/src/components/orders/OrderStatusBadge.tsx b/src/components/orders/OrderStatusBadge.tsx
index 72a533b..cb5de0f 100644
--- a/src/components/orders/OrderStatusBadge.tsx
+++ b/src/components/orders/OrderStatusBadge.tsx
@@ -12,6 +12,7 @@ const STATUS: Record<
> = {
pending: { label: "Pending", variant: "outline" },
approved: { label: "Approved", variant: "default" },
+ ordered: { label: "Ordered", variant: "secondary" },
denied: { label: "Denied", variant: "destructive" },
};
diff --git a/src/components/orders/OrderTable.tsx b/src/components/orders/OrderTable.tsx
index dfb7033..95373f4 100644
--- a/src/components/orders/OrderTable.tsx
+++ b/src/components/orders/OrderTable.tsx
@@ -23,6 +23,11 @@ import {
TableRow,
} from "@/components/ui/table";
import type { FundType, OrderStatus } from "@/lib/db/schema";
+import {
+ computeOrderTotalCents,
+ displayPercentToBps,
+ type OrderPricingSettings,
+} from "@/lib/finance/order-pricing";
import { formatDate, formatPriceCents } from "@/lib/utils";
import { OrderStatusBadge } from "./OrderStatusBadge";
@@ -43,20 +48,36 @@ type StatusFilter = "all" | OrderStatus;
type FundFilter = "all" | FundType;
type SortKey = "newest" | "oldest" | "item-asc" | "item-desc" | "total-desc" | "total-asc";
-function totalCostCents(row: { quantity: number; unitCostCents: number }) {
- return row.quantity * row.unitCostCents;
+function totalCostCents(
+ row: { quantity: number; unitCostCents: number },
+ pricing: OrderPricingSettings
+) {
+ return computeOrderTotalCents(row.quantity, row.unitCostCents, pricing);
}
function canModifyOrder(status: OrderStatus) {
return status === "pending" || status === "denied";
}
-export function OrderTable({ orders }: { orders: MemberOrderRow[] }) {
+export function OrderTable({
+ orders,
+ orderPricing,
+}: {
+ orders: MemberOrderRow[];
+ orderPricing: { taxPercent: number; shippingPercent: number };
+}) {
const router = useRouter();
const [statusFilter, setStatusFilter] = useState("all");
const [fundFilter, setFundFilter] = useState("all");
const [sortKey, setSortKey] = useState("newest");
const [deletingId, setDeletingId] = useState(null);
+ const pricingSettings = useMemo(
+ () => ({
+ taxPercentBps: displayPercentToBps(orderPricing.taxPercent),
+ shippingPercentBps: displayPercentToBps(orderPricing.shippingPercent),
+ }),
+ [orderPricing.taxPercent, orderPricing.shippingPercent]
+ );
const filteredOrders = useMemo(() => {
let rows = orders.filter((order) => {
@@ -74,9 +95,9 @@ export function OrderTable({ orders }: { orders: MemberOrderRow[] }) {
case "item-desc":
return b.itemName.localeCompare(a.itemName);
case "total-desc":
- return totalCostCents(b) - totalCostCents(a);
+ return totalCostCents(b, pricingSettings) - totalCostCents(a, pricingSettings);
case "total-asc":
- return totalCostCents(a) - totalCostCents(b);
+ return totalCostCents(a, pricingSettings) - totalCostCents(b, pricingSettings);
case "newest":
default:
return b.createdAt.getTime() - a.createdAt.getTime();
@@ -84,7 +105,7 @@ export function OrderTable({ orders }: { orders: MemberOrderRow[] }) {
});
return rows;
- }, [fundFilter, orders, sortKey, statusFilter]);
+ }, [fundFilter, orders, pricingSettings, sortKey, statusFilter]);
async function handleDelete(order: MemberOrderRow) {
if (!confirm(`Delete your order for "${order.itemName}"? This cannot be undone.`)) return;
@@ -117,6 +138,7 @@ export function OrderTable({ orders }: { orders: MemberOrderRow[] }) {
all: "All statuses",
pending: "Pending",
approved: "Approved",
+ ordered: "Ordered",
denied: "Denied",
};
@@ -150,6 +172,7 @@ export function OrderTable({ orders }: { orders: MemberOrderRow[] }) {
All statuses
Pending
Approved
+ Ordered
Denied
@@ -221,7 +244,7 @@ export function OrderTable({ orders }: { orders: MemberOrderRow[] }) {
{o.stfBucketName ? ` · ${o.stfBucketName}` : ""}
- {formatPriceCents(totalCostCents(o))}
+ {formatPriceCents(totalCostCents(o, pricingSettings))}
("all");
const [fundFilter, setFundFilter] = useState("all");
const [sortKey, setSortKey] = useState("newest");
+ const pricingSettings = useMemo(
+ () => ({
+ taxPercentBps: displayPercentToBps(orderPricing.taxPercent),
+ shippingPercentBps: displayPercentToBps(orderPricing.shippingPercent),
+ }),
+ [orderPricing.taxPercent, orderPricing.shippingPercent]
+ );
const filteredOrders = useMemo(() => {
let rows = orders.filter((order) => {
@@ -68,9 +93,9 @@ export function TeamOrderTable({ orders }: { orders: TeamOrderRow[] }) {
case "item-desc":
return b.itemName.localeCompare(a.itemName);
case "total-desc":
- return totalCostCents(b) - totalCostCents(a);
+ return totalCostCents(b, pricingSettings) - totalCostCents(a, pricingSettings);
case "total-asc":
- return totalCostCents(a) - totalCostCents(b);
+ return totalCostCents(a, pricingSettings) - totalCostCents(b, pricingSettings);
case "newest":
default:
return b.createdAt.getTime() - a.createdAt.getTime();
@@ -78,12 +103,12 @@ export function TeamOrderTable({ orders }: { orders: TeamOrderRow[] }) {
});
return rows;
- }, [fundFilter, orders, sortKey, statusFilter]);
+ }, [fundFilter, orders, pricingSettings, sortKey, statusFilter]);
if (orders.length === 0) {
return (
- No orders have been submitted yet.
+ {emptyMessage ?? "No orders have been submitted yet."}
);
}
@@ -92,6 +117,7 @@ export function TeamOrderTable({ orders }: { orders: TeamOrderRow[] }) {
all: "All statuses",
pending: "Pending",
approved: "Approved",
+ ordered: "Ordered",
denied: "Denied",
};
@@ -112,56 +138,59 @@ export function TeamOrderTable({ orders }: { orders: TeamOrderRow[] }) {
return (
-
- setStatusFilter(value as StatusFilter)}
- >
-
-
-
- All statuses
- Pending
- Approved
- Denied
-
-
-
- setFundFilter(value as FundFilter)}
- >
-
-
-
- All funds
- STF
- Gift
-
-
-
- setSortKey(value as SortKey)}
- >
-
-
-
- Newest first
- Oldest first
- Item A–Z
- Item Z–A
- Highest total
- Lowest total
-
-
-
+ {showFilters ? (
+
+ setStatusFilter(value as StatusFilter)}
+ >
+
+
+
+ All statuses
+ Pending
+ Approved
+ Ordered
+ Denied
+
+
+
+ setFundFilter(value as FundFilter)}
+ >
+
+
+
+ All funds
+ STF
+ Gift
+
+
+
+ setSortKey(value as SortKey)}
+ >
+
+
+
+ Newest first
+ Oldest first
+ Item A–Z
+ Item Z–A
+ Highest total
+ Lowest total
+
+
+
+ ) : null}
{filteredOrders.length === 0 ? (
@@ -198,7 +227,7 @@ export function TeamOrderTable({ orders }: { orders: TeamOrderRow[] }) {
{o.stfBucketName ? ` · ${o.stfBucketName}` : ""}
- {formatPriceCents(totalCostCents(o))}
+ {formatPriceCents(totalCostCents(o, pricingSettings))}
`coalesce(sum(${order.quantity} * ${order.unitCostCents}), 0)`,
+ quantity: order.quantity,
+ unitCostCents: order.unitCostCents,
})
.from(order)
.where(
and(
eq(order.stfBucketId, bucketId),
eq(order.quarterId, quarterId),
- eq(order.status, "approved")
+ inArray(order.status, ["approved", "ordered"])
)
)
- .get();
- return row?.total ?? 0;
+ .all();
+
+ return rows.reduce(
+ (sum, row) => sum + computeOrderTotalCents(row.quantity, row.unitCostCents, settings),
+ 0
+ );
}
export function getBucketRemainingCents(bucketId: number): number | null {
@@ -153,6 +208,54 @@ export function deductGiftFundForApproval(
.run();
}
+export function restoreGiftFundForDeletion(
+ orderId: number,
+ totalCostCents: number,
+ changedBy: string | null
+) {
+ const current = getGiftFundValueCents();
+ const next = current + totalCostCents;
+
+ db.update(giftFund).set({ currentValueCents: next }).where(eq(giftFund.id, GIFT_FUND_ID)).run();
+
+ db.insert(giftFundLog)
+ .values({
+ changedBy,
+ changeType: "order_deleted",
+ previousValueCents: current,
+ newValueCents: next,
+ orderId,
+ note: "Refund for deleted approved order",
+ })
+ .run();
+}
+
+export function markApprovedOrdersAsOrdered(changedBy: string, orderIds?: number[]): number {
+ const approvedOrders =
+ orderIds && orderIds.length > 0
+ ? db
+ .select()
+ .from(order)
+ .where(and(eq(order.status, "approved"), inArray(order.id, orderIds)))
+ .all()
+ : db.select().from(order).where(eq(order.status, "approved")).all();
+
+ for (const existing of approvedOrders) {
+ db.update(order).set({ status: "ordered" }).where(eq(order.id, existing.id)).run();
+
+ db.insert(orderHistory)
+ .values({
+ orderId: existing.id,
+ fromStatus: "approved",
+ toStatus: "ordered",
+ changedBy,
+ note: "Marked as ordered",
+ })
+ .run();
+ }
+ return approvedOrders.length;
+}
+
export function adjustGiftFund(
newValueCents: number,
changedBy: string,
diff --git a/src/lib/finance/order-export.test.ts b/src/lib/finance/order-export.test.ts
index 41211c0..edf0413 100644
--- a/src/lib/finance/order-export.test.ts
+++ b/src/lib/finance/order-export.test.ts
@@ -7,10 +7,9 @@ import {
formatApprovedStfOrders,
formatApprovedGiftOrders,
STF_PRICE_FLUX,
- STF_TAX_RATE,
- STF_SHIPPING_RATE,
type OrderExportRow,
} from "./order-export";
+import { DEFAULT_ORDER_PRICING } from "./order-pricing";
const BASE_STF: OrderExportRow = {
itemName: "Motor Controller",
@@ -42,13 +41,12 @@ const BASE_GIFT: OrderExportRow = {
describe("stfOrderCalculations", () => {
it("applies flux, tax, and shipping multipliers correctly", () => {
- // qty=2, unitCostCents=5000 → unitCost=$50
- const calc = stfOrderCalculations(2, 5000);
+ const calc = stfOrderCalculations(2, 5000, DEFAULT_ORDER_PRICING);
expect(calc.unitCost).toBe(50);
expect(calc.unitCostFlux).toBeCloseTo(50 * STF_PRICE_FLUX);
expect(calc.preTaxTotal).toBeCloseTo(2 * 50 * STF_PRICE_FLUX);
- expect(calc.tax).toBeCloseTo(calc.preTaxTotal * STF_TAX_RATE);
- expect(calc.shipping).toBeCloseTo(calc.preTaxTotal * STF_SHIPPING_RATE);
+ expect(calc.tax).toBeCloseTo(calc.preTaxTotal * 0.11);
+ expect(calc.shipping).toBeCloseTo(calc.preTaxTotal * 0.2);
expect(calc.total).toBeCloseTo(calc.preTaxTotal + calc.tax + calc.shipping);
});
@@ -70,6 +68,15 @@ describe("stfOrderCalculations", () => {
const calc = stfOrderCalculations(3, 1000);
expect(calc.total).toBeCloseTo(calc.preTaxTotal + calc.tax + calc.shipping, 10);
});
+
+ it("uses custom tax and shipping settings", () => {
+ const calc = stfOrderCalculations(2, 5000, {
+ taxPercentBps: 500,
+ shippingPercentBps: 1000,
+ });
+ expect(calc.tax).toBeCloseTo(calc.preTaxTotal * 0.05);
+ expect(calc.shipping).toBeCloseTo(calc.preTaxTotal * 0.1);
+ });
});
describe("formatStfOrderRow", () => {
@@ -135,6 +142,7 @@ describe("formatOrderForExcel", () => {
it("returns null for non-approved orders", () => {
expect(formatOrderForExcel({ ...BASE_STF, status: "pending" })).toBeNull();
expect(formatOrderForExcel({ ...BASE_STF, status: "denied" })).toBeNull();
+ expect(formatOrderForExcel({ ...BASE_STF, status: "ordered" })).toBeNull();
});
it("returns an STF row for an approved STF order", () => {
@@ -154,6 +162,7 @@ describe("formatApprovedStfOrders", () => {
it("returns empty string when there are no approved STF orders", () => {
expect(formatApprovedStfOrders([])).toBe("");
expect(formatApprovedStfOrders([{ ...BASE_STF, status: "pending" }])).toBe("");
+ expect(formatApprovedStfOrders([{ ...BASE_STF, status: "ordered" }])).toBe("");
});
it("returns one row per approved STF order joined by newline", () => {
@@ -172,6 +181,7 @@ describe("formatApprovedGiftOrders", () => {
it("returns empty string when there are no approved Gift orders", () => {
expect(formatApprovedGiftOrders([])).toBe("");
expect(formatApprovedGiftOrders([{ ...BASE_GIFT, status: "denied" }])).toBe("");
+ expect(formatApprovedGiftOrders([{ ...BASE_GIFT, status: "ordered" }])).toBe("");
});
it("returns one row per approved Gift order", () => {
diff --git a/src/lib/finance/order-export.ts b/src/lib/finance/order-export.ts
index 762083a..850f43a 100644
--- a/src/lib/finance/order-export.ts
+++ b/src/lib/finance/order-export.ts
@@ -1,8 +1,7 @@
import type { FundType, OrderStatus } from "@/lib/db/schema";
+import { DEFAULT_ORDER_PRICING, type OrderPricingSettings } from "@/lib/finance/order-pricing";
export const STF_PRICE_FLUX = 1.2;
-export const STF_TAX_RATE = 0.11;
-export const STF_SHIPPING_RATE = 0.2;
export type OrderExportRow = {
itemName: string;
@@ -67,20 +66,31 @@ function joinRow(cells: (string | number)[]): string {
return cells.map((cell) => escapeTsvCell(String(cell))).join("\t");
}
-export function stfOrderCalculations(quantity: number, unitCostCents: number) {
+export function stfOrderCalculations(
+ quantity: number,
+ unitCostCents: number,
+ settings: OrderPricingSettings = DEFAULT_ORDER_PRICING
+) {
const unitCost = unitCostCents / 100;
const unitCostFlux = unitCost * STF_PRICE_FLUX;
const preTaxTotal = quantity * unitCostFlux;
- const tax = preTaxTotal * STF_TAX_RATE;
- const shipping = preTaxTotal * STF_SHIPPING_RATE;
+ const taxRate = settings.taxPercentBps / 10_000;
+ const shippingRate = settings.shippingPercentBps / 10_000;
+ const tax = preTaxTotal * taxRate;
+ const shipping = preTaxTotal * shippingRate;
const total = preTaxTotal + tax + shipping;
return { unitCost, unitCostFlux, preTaxTotal, tax, shipping, total };
}
-export function formatStfOrderRow(order: OrderExportRow, includeHeader = false): string {
+export function formatStfOrderRow(
+ order: OrderExportRow,
+ includeHeader = false,
+ settings: OrderPricingSettings = DEFAULT_ORDER_PRICING
+): string {
const { unitCost, unitCostFlux, preTaxTotal, tax, shipping, total } = stfOrderCalculations(
order.quantity,
- order.unitCostCents
+ order.unitCostCents,
+ settings
);
const row = joinRow([
@@ -118,17 +128,24 @@ export function formatGiftOrderRow(order: OrderExportRow, includeHeader = false)
return `${joinRow([...GIFT_EXCEL_HEADERS])}\n${row}`;
}
-export function formatOrderForExcel(order: OrderExportRow, includeHeader = false): string | null {
+export function formatOrderForExcel(
+ order: OrderExportRow,
+ includeHeader = false,
+ settings: OrderPricingSettings = DEFAULT_ORDER_PRICING
+): string | null {
if (order.status !== "approved") return null;
- if (order.fundType === "STF") return formatStfOrderRow(order, includeHeader);
+ if (order.fundType === "STF") return formatStfOrderRow(order, includeHeader, settings);
if (order.fundType === "Gift") return formatGiftOrderRow(order, includeHeader);
return null;
}
-export function formatApprovedStfOrders(orders: OrderExportRow[]): string {
+export function formatApprovedStfOrders(
+ orders: OrderExportRow[],
+ settings: OrderPricingSettings = DEFAULT_ORDER_PRICING
+): string {
const approved = orders.filter((o) => o.status === "approved" && o.fundType === "STF");
if (approved.length === 0) return "";
- return approved.map((o) => formatStfOrderRow(o)).join("\n");
+ return approved.map((o) => formatStfOrderRow(o, false, settings)).join("\n");
}
export function formatApprovedGiftOrders(orders: OrderExportRow[]): string {
diff --git a/src/lib/finance/order-pricing.test.ts b/src/lib/finance/order-pricing.test.ts
new file mode 100644
index 0000000..ac0f118
--- /dev/null
+++ b/src/lib/finance/order-pricing.test.ts
@@ -0,0 +1,36 @@
+import { describe, it, expect } from "vitest";
+
+import {
+ computeOrderTotalCents,
+ DEFAULT_ORDER_PRICING,
+ displayPercentToBps,
+ percentBpsToDisplay,
+} from "./order-pricing";
+
+describe("computeOrderTotalCents", () => {
+ it("adds tax and shipping percentages to the subtotal", () => {
+ expect(computeOrderTotalCents(2, 5000, DEFAULT_ORDER_PRICING)).toBe(13_100);
+ });
+
+ it("returns subtotal when tax and shipping are zero", () => {
+ expect(computeOrderTotalCents(2, 5000, { taxPercentBps: 0, shippingPercentBps: 0 })).toBe(
+ 10_000
+ );
+ });
+
+ it("returns 0 when quantity is 0", () => {
+ expect(computeOrderTotalCents(0, 5000)).toBe(0);
+ });
+});
+
+describe("percent conversions", () => {
+ it("converts between display percent and basis points", () => {
+ expect(displayPercentToBps(11)).toBe(1100);
+ expect(percentBpsToDisplay(1100)).toBe(11);
+ });
+
+ it("supports zero and full-percent basis point values", () => {
+ expect(displayPercentToBps(0)).toBe(0);
+ expect(displayPercentToBps(100)).toBe(10_000);
+ });
+});
diff --git a/src/lib/finance/order-pricing.ts b/src/lib/finance/order-pricing.ts
new file mode 100644
index 0000000..0c800c4
--- /dev/null
+++ b/src/lib/finance/order-pricing.ts
@@ -0,0 +1,35 @@
+export const DEFAULT_TAX_PERCENT_BPS = 1100;
+export const DEFAULT_SHIPPING_PERCENT_BPS = 2000;
+
+export type OrderPricingSettings = {
+ taxPercentBps: number;
+ shippingPercentBps: number;
+};
+
+export const DEFAULT_ORDER_PRICING: OrderPricingSettings = {
+ taxPercentBps: DEFAULT_TAX_PERCENT_BPS,
+ shippingPercentBps: DEFAULT_SHIPPING_PERCENT_BPS,
+};
+
+export function percentBpsToDisplay(percentBps: number): number {
+ return percentBps / 100;
+}
+
+export function displayPercentToBps(percent: number): number {
+ return Math.round(percent * 100);
+}
+
+export function orderSubtotalCents(quantity: number, unitCostCents: number): number {
+ return quantity * unitCostCents;
+}
+
+export function computeOrderTotalCents(
+ quantity: number,
+ unitCostCents: number,
+ settings: OrderPricingSettings = DEFAULT_ORDER_PRICING
+): number {
+ const subtotal = orderSubtotalCents(quantity, unitCostCents);
+ const tax = Math.round((subtotal * settings.taxPercentBps) / 10_000);
+ const shipping = Math.round((subtotal * settings.shippingPercentBps) / 10_000);
+ return subtotal + tax + shipping;
+}
diff --git a/src/lib/validation.test.ts b/src/lib/validation.test.ts
index 133d457..338d3fb 100644
--- a/src/lib/validation.test.ts
+++ b/src/lib/validation.test.ts
@@ -2,6 +2,8 @@ import { describe, it, expect } from "vitest";
import {
orderInputSchema,
giftFundAdjustSchema,
+ financeSettingsUpdateSchema,
+ markOrderedSchema,
vaultEntrySchema,
whitelistRequestSchema,
stfBucketInputSchema,
@@ -105,6 +107,65 @@ describe("giftFundAdjustSchema", () => {
});
});
+describe("financeSettingsUpdateSchema", () => {
+ it("accepts valid tax and shipping percentages", () => {
+ expect(() =>
+ financeSettingsUpdateSchema.parse({ taxPercent: 11, shippingPercent: 20 })
+ ).not.toThrow();
+ });
+
+ it("accepts zero for tax and shipping", () => {
+ expect(() =>
+ financeSettingsUpdateSchema.parse({ taxPercent: 0, shippingPercent: 0 })
+ ).not.toThrow();
+ });
+
+ it("rejects negative tax", () => {
+ const result = financeSettingsUpdateSchema.safeParse({
+ taxPercent: -1,
+ shippingPercent: 10,
+ });
+ expect(result.success).toBe(false);
+ });
+
+ it("rejects negative shipping", () => {
+ const result = financeSettingsUpdateSchema.safeParse({
+ taxPercent: 10,
+ shippingPercent: -0.01,
+ });
+ expect(result.success).toBe(false);
+ });
+
+ it("rejects percentages above 100", () => {
+ expect(
+ financeSettingsUpdateSchema.safeParse({ taxPercent: 101, shippingPercent: 10 }).success
+ ).toBe(false);
+ expect(
+ financeSettingsUpdateSchema.safeParse({ taxPercent: 10, shippingPercent: 100.01 })
+ .success
+ ).toBe(false);
+ });
+});
+
+describe("markOrderedSchema", () => {
+ it("accepts an empty body to move all approved orders", () => {
+ expect(() => markOrderedSchema.parse({})).not.toThrow();
+ });
+
+ it("accepts a list of order ids", () => {
+ expect(() => markOrderedSchema.parse({ orderIds: [1, 2, 3] })).not.toThrow();
+ });
+
+ it("rejects an empty orderIds array", () => {
+ const result = markOrderedSchema.safeParse({ orderIds: [] });
+ expect(result.success).toBe(false);
+ });
+
+ it("rejects invalid order ids", () => {
+ expect(markOrderedSchema.safeParse({ orderIds: [0, -1] }).success).toBe(false);
+ });
+});
+
describe("vaultEntrySchema (discriminated union)", () => {
it("accepts a valid login entry", () => {
expect(() =>
diff --git a/src/lib/validation.ts b/src/lib/validation.ts
index c4d9414..b8930bd 100644
--- a/src/lib/validation.ts
+++ b/src/lib/validation.ts
@@ -54,6 +54,10 @@ export const ORDER_ACTION_STATUS = {
deny: "denied",
} as const;
+export const markOrderedSchema = z.object({
+ orderIds: z.array(z.coerce.number().int().positive()).min(1).optional(),
+});
+
// Finance ------------------------------------------------------------------
export const stfBucketInputSchema = z.object({
@@ -81,6 +85,11 @@ export const quarterResetSchema = z.object({
newQuarterName: z.string().trim().min(1).max(100),
});
+export const financeSettingsUpdateSchema = z.object({
+ taxPercent: z.coerce.number().min(0, "Tax cannot be negative").max(100),
+ shippingPercent: z.coerce.number().min(0, "Shipping cannot be negative").max(100),
+});
+
// API keys -----------------------------------------------------------------
export const createApiKeySchema = z.object({
diff --git a/vitest.config.ts b/vitest.config.ts
index bcc7efc..ce810ce 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -6,5 +6,9 @@ export default defineConfig({
},
test: {
environment: "node",
+ env: {
+ DATABASE_PATH: "db/test.db",
+ },
+ globalSetup: ["./vitest.global-setup.ts"],
},
});
diff --git a/vitest.global-setup.ts b/vitest.global-setup.ts
new file mode 100644
index 0000000..d0eb1b5
--- /dev/null
+++ b/vitest.global-setup.ts
@@ -0,0 +1,21 @@
+import { execSync } from "node:child_process";
+import { existsSync, mkdirSync, unlinkSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+
+const TEST_DB_PATH = resolve(process.cwd(), "db/test.db");
+
+function removeDbFiles(path: string) {
+ for (const file of [path, `${path}-wal`, `${path}-shm`]) {
+ if (existsSync(file)) unlinkSync(file);
+ }
+}
+
+export default function setup() {
+ mkdirSync(dirname(TEST_DB_PATH), { recursive: true });
+ removeDbFiles(TEST_DB_PATH);
+
+ execSync("pnpm db:migrate", {
+ stdio: "inherit",
+ env: { ...process.env, DATABASE_PATH: TEST_DB_PATH },
+ });
+}