Skip to content

fix(orders): let customers change pickup slot on PRINTED orders (frontend) #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
choden-dev merged 1 commit into from
Jul 17, 2026
Merged

fix(orders): let customers change pickup slot on PRINTED orders (frontend) #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions components/ordercontainer/OrderContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,15 @@ const OrderContainerInner = ({
setActiveOrderId(order.id);
setActiveOrderNumber(order.orderNumber);

// If pickupFor query param, force pickup step (if order is PAID or AWAITING_PICKUP)
// If pickupFor query param, force pickup step so the customer can
// (re)select their timeslot. PRINTED orders are still allowed to
// change their slot (see select-timeslot route), so include it here
// too — otherwise statusToStep would send them to COMPLETE.
if (
pickupForOrderId &&
(order.status === OrderStatus.PAID ||
order.status === OrderStatus.AWAITING_PICKUP)
order.status === OrderStatus.AWAITING_PICKUP ||
order.status === OrderStatus.PRINTED)
) {
setOrderStep(OrderStep.PICKUP);
} else {
Expand Down
5 changes: 4 additions & 1 deletion pages/my-orders.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,10 @@ const MyOrders: NextPage<PageProps> = ({ contactInfo }) => {
</Button>
);
}
if (order.status === OrderStatus.AWAITING_PICKUP) {
if (
order.status === OrderStatus.AWAITING_PICKUP ||
order.status === OrderStatus.PRINTED
) {
return (
<Button
size="sm"
Expand Down
Loading