Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion admin/src/api/orders.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ export type OrderWithItems = {

export type UpdateOrderInput = {
status?: string;
paymentStatus?: string;
fulfillmentStatus?: string;
staffNote?: string;
};
Expand Down
35 changes: 8 additions & 27 deletions admin/src/components/orders/order-detail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import {
FULFILLMENT_STATUSES,
ORDER_STATUSES,
OrderStatusBadge,
PAYMENT_STATUSES,
} from "#/components/orders/order-status";
import { EmptyState } from "#/components/empty-state";
import { ErrorState } from "#/components/error-state";
Expand Down Expand Up @@ -273,7 +272,6 @@ function UpdateOrderDialog({ order, pid }: { order: OrderDetail; pid: string })
const queryClient = useQueryClient();
const [isOpen, setIsOpen] = useState(false);
const [status, setStatus] = useState(order.status);
const [paymentStatus, setPaymentStatus] = useState(order.paymentStatus);
const [fulfillmentStatus, setFulfillmentStatus] = useState(order.fulfillmentStatus);
const [staffNote, setStaffNote] = useState(order.staffNote ?? "");
const mutation = useMutation({
Expand All @@ -293,7 +291,6 @@ function UpdateOrderDialog({ order, pid }: { order: OrderDetail; pid: string })

function resetForm() {
setStatus(order.status);
setPaymentStatus(order.paymentStatus);
setFulfillmentStatus(order.fulfillmentStatus);
setStaffNote(order.staffNote ?? "");
}
Expand All @@ -307,7 +304,6 @@ function UpdateOrderDialog({ order, pid }: { order: OrderDetail; pid: string })
event.preventDefault();
mutation.mutate({
status,
paymentStatus,
fulfillmentStatus,
staffNote,
});
Expand Down Expand Up @@ -344,16 +340,19 @@ function UpdateOrderDialog({ order, pid }: { order: OrderDetail; pid: string })
</Select>
</div>
<div className="grid gap-2">
<Label htmlFor="payment-status">Payment status</Label>
<Label htmlFor="fulfillment-status">Fulfillment status</Label>
<Select
value={paymentStatus}
onValueChange={(value) => value && setPaymentStatus(value)}
value={fulfillmentStatus}
onValueChange={(value) => value && setFulfillmentStatus(value)}
>
<SelectTrigger id="payment-status" className="w-full rounded-lg bg-background">
<SelectTrigger
id="fulfillment-status"
className="w-full rounded-lg bg-background"
>
<SelectValue />
</SelectTrigger>
<SelectContent className="rounded-lg">
{PAYMENT_STATUSES.map((value) => (
{FULFILLMENT_STATUSES.map((value) => (
<SelectItem key={value} value={value}>
{titleCase(value)}
</SelectItem>
Expand All @@ -362,24 +361,6 @@ function UpdateOrderDialog({ order, pid }: { order: OrderDetail; pid: string })
</Select>
</div>
</div>
<div className="grid gap-2">
<Label htmlFor="fulfillment-status">Fulfillment status</Label>
<Select
value={fulfillmentStatus}
onValueChange={(value) => value && setFulfillmentStatus(value)}
>
<SelectTrigger id="fulfillment-status" className="w-full rounded-lg bg-background">
<SelectValue />
</SelectTrigger>
<SelectContent className="rounded-lg">
{FULFILLMENT_STATUSES.map((value) => (
<SelectItem key={value} value={value}>
{titleCase(value)}
</SelectItem>
))}
</SelectContent>
</Select>
</div>
<div className="grid gap-2">
<Label htmlFor="staff-note">Staff note</Label>
<Textarea
Expand Down
Loading
Loading