Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
698a49ae82 | ||
|
|
97438aaa56 | ||
|
|
2e2694354d |
@@ -121,8 +121,7 @@ export function initializeDatabase(sqlite: Database) {
|
||||
);
|
||||
`);
|
||||
|
||||
// Databases created before internal order notes existed keep their orders table, so add the column in place.
|
||||
if (!columnExists(sqlite, "orders", "notes")) {
|
||||
sqlite.exec("ALTER TABLE orders ADD COLUMN notes TEXT;");
|
||||
sqlite.exec("ALTER TABLE orders ADD COLUMN notes TEXT");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -98,14 +98,14 @@ export async function findOrderDetail(context: DatabaseContext, orderId: string)
|
||||
status: header.order.status as OrderDetail["status"],
|
||||
createdAt: header.order.createdAt,
|
||||
updatedAt: header.order.updatedAt,
|
||||
notes: header.order.notes,
|
||||
customer: {
|
||||
id: header.customer.id,
|
||||
name: header.customer.name,
|
||||
email: header.customer.email
|
||||
},
|
||||
shippingAddress: toAddress(header.address),
|
||||
items: itemRows.map(toOrderItemDetail),
|
||||
notes: header.order.notes
|
||||
items: itemRows.map(toOrderItemDetail)
|
||||
} satisfies OrderDetail;
|
||||
}
|
||||
|
||||
@@ -124,6 +124,10 @@ export async function updateOrderItemQuantity(context: DatabaseContext, itemId:
|
||||
await context.db.update(orderItems).set({ quantity }).where(eq(orderItems.id, itemId));
|
||||
}
|
||||
|
||||
export async function updateOrderNotes(context: DatabaseContext, orderId: string, notes: string) {
|
||||
await context.db.update(orders).set({ notes }).where(eq(orders.id, orderId));
|
||||
}
|
||||
|
||||
export async function updateOrderTimestamp(context: DatabaseContext, orderId: string, updatedAt: string) {
|
||||
await context.db.update(orders).set({ updatedAt }).where(eq(orders.id, orderId));
|
||||
}
|
||||
@@ -132,10 +136,6 @@ export async function updateOrderStatus(context: DatabaseContext, orderId: strin
|
||||
await context.db.update(orders).set({ status, updatedAt }).where(eq(orders.id, orderId));
|
||||
}
|
||||
|
||||
export async function updateOrderNotes(context: DatabaseContext, orderId: string, notes: string, updatedAt: string) {
|
||||
await context.db.update(orders).set({ notes, updatedAt }).where(eq(orders.id, orderId));
|
||||
}
|
||||
|
||||
export async function updateOrderAddress(context: DatabaseContext, orderId: string, address: Address) {
|
||||
const [row] = await context.db.select({ shippingAddressId: orders.shippingAddressId }).from(orders).where(eq(orders.id, orderId));
|
||||
|
||||
|
||||
@@ -6,8 +6,7 @@ import { cancelOrder } from "./cancel-order";
|
||||
import { getOrder } from "./get-order";
|
||||
import { listAuditEvents } from "./list-audit-events";
|
||||
import { listOrders } from "./list-orders";
|
||||
import { changeOrderItemQuantity } from "./update-order-item";
|
||||
import { changeOrderNotes } from "./update-order-notes";
|
||||
import { changeOrderItemQuantity, updateOrderNotes } from "./update-order-item";
|
||||
import { changeShippingAddress } from "./update-shipping-address";
|
||||
|
||||
interface OrderRouteOptions {
|
||||
@@ -100,6 +99,31 @@ export const registerOrderRoutes: FastifyPluginAsync<OrderRouteOptions> = async
|
||||
return result.order;
|
||||
});
|
||||
|
||||
app.post<{ Params: IdParams; Body: NotesBody }>("/orders/:orderId/notes", {
|
||||
schema: {
|
||||
body: {
|
||||
type: "object",
|
||||
required: ["notes"],
|
||||
properties: {
|
||||
notes: { type: "string", maxLength: 1000 }
|
||||
}
|
||||
}
|
||||
}
|
||||
}, async (request, reply) => {
|
||||
const currentUser = (request as AuthenticatedRequest).currentUser;
|
||||
const result = await updateOrderNotes(options.db, {
|
||||
orderId: request.params.orderId,
|
||||
notes: request.body.notes,
|
||||
actor: currentUser.username
|
||||
});
|
||||
|
||||
if (result.statusCode !== 200) {
|
||||
return reply.code(result.statusCode).send({ message: result.message });
|
||||
}
|
||||
|
||||
return result.order;
|
||||
});
|
||||
|
||||
app.post<{ Params: IdParams; Body: Address }>("/orders/:orderId/shipping-address", {
|
||||
schema: {
|
||||
body: {
|
||||
@@ -139,31 +163,6 @@ export const registerOrderRoutes: FastifyPluginAsync<OrderRouteOptions> = async
|
||||
return result.order;
|
||||
});
|
||||
|
||||
app.post<{ Params: IdParams; Body: NotesBody }>("/orders/:orderId/notes", {
|
||||
schema: {
|
||||
body: {
|
||||
type: "object",
|
||||
required: ["notes"],
|
||||
properties: {
|
||||
notes: { type: "string" }
|
||||
}
|
||||
}
|
||||
}
|
||||
}, async (request, reply) => {
|
||||
const currentUser = (request as AuthenticatedRequest).currentUser;
|
||||
const result = await changeOrderNotes(options.db, {
|
||||
orderId: request.params.orderId,
|
||||
notes: request.body.notes,
|
||||
actor: currentUser.username
|
||||
});
|
||||
|
||||
if (result.statusCode !== 200) {
|
||||
return reply.code(result.statusCode).send({ message: result.message });
|
||||
}
|
||||
|
||||
return result.order;
|
||||
});
|
||||
|
||||
app.post<{ Params: IdParams; Body: CancelBody }>("/orders/:orderId/cancel", {
|
||||
schema: {
|
||||
body: {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import type { DatabaseContext } from "../db/database";
|
||||
import { canEditOrderItems } from "./order-status";
|
||||
import { appendAuditEvent, findOrderDetail, findOrderItemRecord, updateOrderItemQuantity, updateOrderTimestamp } from "./order-repository";
|
||||
import { appendAuditEvent, findOrderDetail, findOrderItemRecord, updateOrderItemQuantity, updateOrderNotes as saveOrderNotes, updateOrderTimestamp } from "./order-repository";
|
||||
|
||||
export async function changeOrderItemQuantity(
|
||||
context: DatabaseContext,
|
||||
@@ -47,3 +47,44 @@ export async function changeOrderItemQuantity(
|
||||
order: await findOrderDetail(context, input.orderId)
|
||||
} as const;
|
||||
}
|
||||
|
||||
export async function updateOrderNotes(
|
||||
context: DatabaseContext,
|
||||
input: {
|
||||
orderId: string;
|
||||
notes: string;
|
||||
actor: string;
|
||||
}
|
||||
) {
|
||||
const order = await findOrderDetail(context, input.orderId);
|
||||
|
||||
if (!order) {
|
||||
return { statusCode: 404, message: "Order not found." } as const;
|
||||
}
|
||||
|
||||
const notes = input.notes.trim();
|
||||
|
||||
if (!notes) {
|
||||
return { statusCode: 400, message: "Notes cannot be empty." } as const;
|
||||
}
|
||||
|
||||
if (notes.length > 1000) {
|
||||
return { statusCode: 400, message: "Notes must be 1000 characters or fewer." } as const;
|
||||
}
|
||||
|
||||
const updatedAt = new Date().toISOString();
|
||||
await saveOrderNotes(context, input.orderId, notes);
|
||||
await updateOrderTimestamp(context, input.orderId, updatedAt);
|
||||
await appendAuditEvent(context, {
|
||||
orderId: input.orderId,
|
||||
actor: input.actor,
|
||||
type: "order.notes_updated",
|
||||
message: "Updated internal order notes.",
|
||||
createdAt: updatedAt
|
||||
});
|
||||
|
||||
return {
|
||||
statusCode: 200,
|
||||
order: await findOrderDetail(context, input.orderId)
|
||||
} as const;
|
||||
}
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
import { maxOrderNotesLength } from "@orderops/shared";
|
||||
import type { DatabaseContext } from "../db/database";
|
||||
import { appendAuditEvent, findOrderDetail, updateOrderNotes } from "./order-repository";
|
||||
|
||||
export async function changeOrderNotes(
|
||||
context: DatabaseContext,
|
||||
input: {
|
||||
orderId: string;
|
||||
notes: string;
|
||||
actor: string;
|
||||
}
|
||||
) {
|
||||
const notes = input.notes.trim();
|
||||
|
||||
if (!notes) {
|
||||
return { statusCode: 400, message: "Notes cannot be empty." } as const;
|
||||
}
|
||||
|
||||
if (notes.length > maxOrderNotesLength) {
|
||||
return { statusCode: 400, message: `Notes cannot be longer than ${maxOrderNotesLength} characters.` } as const;
|
||||
}
|
||||
|
||||
const order = await findOrderDetail(context, input.orderId);
|
||||
|
||||
if (!order) {
|
||||
return { statusCode: 404, message: "Order not found." } as const;
|
||||
}
|
||||
|
||||
const updatedAt = new Date().toISOString();
|
||||
await updateOrderNotes(context, input.orderId, notes, updatedAt);
|
||||
await appendAuditEvent(context, {
|
||||
orderId: input.orderId,
|
||||
actor: input.actor,
|
||||
type: "order.notes_updated",
|
||||
message: "Updated internal notes.",
|
||||
createdAt: updatedAt
|
||||
});
|
||||
|
||||
return {
|
||||
statusCode: 200,
|
||||
order: await findOrderDetail(context, input.orderId)
|
||||
} as const;
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
@@ -21,13 +21,6 @@ export function updateOrderItemQuantity(orderId: string, itemId: string, quantit
|
||||
});
|
||||
}
|
||||
|
||||
export function updateShippingAddress(orderId: string, address: Address) {
|
||||
return apiRequest<OrderDetail>(`/api/orders/${orderId}/shipping-address`, {
|
||||
method: "POST",
|
||||
body: JSON.stringify(address)
|
||||
});
|
||||
}
|
||||
|
||||
export function updateOrderNotes(orderId: string, notes: string) {
|
||||
return apiRequest<OrderDetail>(`/api/orders/${orderId}/notes`, {
|
||||
method: "POST",
|
||||
@@ -35,6 +28,13 @@ export function updateOrderNotes(orderId: string, notes: string) {
|
||||
});
|
||||
}
|
||||
|
||||
export function updateShippingAddress(orderId: string, address: Address) {
|
||||
return apiRequest<OrderDetail>(`/api/orders/${orderId}/shipping-address`, {
|
||||
method: "POST",
|
||||
body: JSON.stringify(address)
|
||||
});
|
||||
}
|
||||
|
||||
export function cancelOrder(orderId: string, reason?: string) {
|
||||
return apiRequest<OrderDetail>(`/api/orders/${orderId}/cancel`, {
|
||||
method: "POST",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import type { Address, AuditEvent, OrderDetail } from "@orderops/shared";
|
||||
import { AuditTimeline } from "./audit-timeline";
|
||||
import { OrderItemsPanel } from "./order-items-panel";
|
||||
import { OrderNotesPanel } from "./order-notes-panel";
|
||||
import { OrderNotes } from "./order-notes";
|
||||
import { OrderSummaryPanel } from "./order-summary";
|
||||
import { ShippingAddressForm } from "./shipping-address-form";
|
||||
|
||||
@@ -32,8 +32,8 @@ export function OrderDetailPage({
|
||||
</div>
|
||||
<OrderItemsPanel order={order} onUpdateQuantity={onUpdateQuantity} />
|
||||
<ShippingAddressForm order={order} onSave={onSaveAddress} />
|
||||
<OrderNotes order={order} onSave={onSaveNotes} />
|
||||
<AuditTimeline events={auditEvents} />
|
||||
<OrderNotesPanel order={order} onSave={onSaveNotes} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import { useState } from "react";
|
||||
import { maxOrderNotesLength, type OrderDetail } from "@orderops/shared";
|
||||
import type { OrderDetail } from "@orderops/shared";
|
||||
|
||||
interface OrderNotesPanelProps {
|
||||
interface OrderNotesProps {
|
||||
order: OrderDetail;
|
||||
onSave: (notes: string) => Promise<void>;
|
||||
}
|
||||
|
||||
export function OrderNotesPanel({ order, onSave }: OrderNotesPanelProps) {
|
||||
export function OrderNotes({ order, onSave }: OrderNotesProps) {
|
||||
const [notes, setNotes] = useState(order.notes ?? "");
|
||||
|
||||
return (
|
||||
@@ -20,20 +20,15 @@ export function OrderNotesPanel({ order, onSave }: OrderNotesPanelProps) {
|
||||
}}
|
||||
>
|
||||
<label className="block text-sm text-slate-700">
|
||||
<span className="mb-1 block">Notes for the OrderOps team</span>
|
||||
<span className="mb-1 block">Notes</span>
|
||||
<textarea
|
||||
className="w-full rounded-lg border border-slate-300 px-3 py-2"
|
||||
maxLength={maxOrderNotesLength}
|
||||
rows={4}
|
||||
className="w-full resize-none rounded-lg border border-slate-300 px-3 py-2"
|
||||
rows={5}
|
||||
value={notes}
|
||||
onChange={(event) => setNotes(event.target.value)}
|
||||
/>
|
||||
</label>
|
||||
<button
|
||||
className="rounded-md bg-slate-900 px-4 py-2 text-sm font-medium text-white disabled:opacity-50"
|
||||
disabled={!notes.trim()}
|
||||
type="submit"
|
||||
>
|
||||
<button className="rounded-md bg-slate-900 px-4 py-2 text-sm font-medium text-white" type="submit">
|
||||
Save notes
|
||||
</button>
|
||||
</form>
|
||||
@@ -86,7 +86,7 @@ export function OrderPage() {
|
||||
auditEvents={auditEvents}
|
||||
onUpdateQuantity={(itemId, quantity) => runAction(() => updateOrderItemQuantity(order.id, itemId, quantity), "Quantity saved.")}
|
||||
onSaveAddress={(address: Address) => runAction(() => updateShippingAddress(order.id, address), "Shipping address saved.")}
|
||||
onSaveNotes={(notes: string) => runAction(() => updateOrderNotes(order.id, notes), "Notes saved.")}
|
||||
onSaveNotes={(notes) => runAction(() => updateOrderNotes(order.id, notes), "Notes saved.")}
|
||||
onCancel={() => runAction(() => cancelOrder(order.id), "Order cancelled.")}
|
||||
/>
|
||||
) : null}
|
||||
|
||||
@@ -3,9 +3,6 @@ import type { CustomerSummary } from "./customer";
|
||||
import type { Money } from "./money";
|
||||
import type { OrderStatus } from "./order-status";
|
||||
|
||||
// Internal order notes are capped so they stay a short follow-up context, not a document.
|
||||
export const maxOrderNotesLength = 1000;
|
||||
|
||||
export interface OrderItemDetail {
|
||||
id: string;
|
||||
productId: string;
|
||||
@@ -22,8 +19,8 @@ export interface OrderDetail {
|
||||
status: OrderStatus;
|
||||
createdAt: string;
|
||||
updatedAt: string;
|
||||
notes: string | null;
|
||||
customer: CustomerSummary;
|
||||
shippingAddress: Address;
|
||||
items: OrderItemDetail[];
|
||||
notes: string | null;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user