Change tracking number addition order in shipping flow
Tracking number is now added after marking the order as shipped instead of before. This ensures the order status is updated prior to associating a tracking number.
This commit is contained in:
@@ -267,13 +267,7 @@ export default function OrderDetailsPage() {
|
|||||||
try {
|
try {
|
||||||
setIsMarkingShipped(true);
|
setIsMarkingShipped(true);
|
||||||
|
|
||||||
// If a tracking number is present in the inline box, add it first
|
// First mark as shipped (clientFetch handles API URL and auth token)
|
||||||
if (trackingNumber && trackingNumber.trim()) {
|
|
||||||
await handleAddTrackingNumber(trackingNumber.trim());
|
|
||||||
setTrackingNumber("");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Then mark as shipped (clientFetch handles API URL and auth token)
|
|
||||||
const response = await clientFetch(`/orders/${orderId}/status`, {
|
const response = await clientFetch(`/orders/${orderId}/status`, {
|
||||||
method: "PUT",
|
method: "PUT",
|
||||||
body: JSON.stringify({ status: "shipped" }),
|
body: JSON.stringify({ status: "shipped" }),
|
||||||
@@ -282,6 +276,12 @@ export default function OrderDetailsPage() {
|
|||||||
if (response && response.message === "Order status updated successfully") {
|
if (response && response.message === "Order status updated successfully") {
|
||||||
setOrder((prevOrder) => prevOrder ? { ...prevOrder, status: "shipped" } : null);
|
setOrder((prevOrder) => prevOrder ? { ...prevOrder, status: "shipped" } : null);
|
||||||
toast.success("Order marked as shipped successfully!");
|
toast.success("Order marked as shipped successfully!");
|
||||||
|
|
||||||
|
// If a tracking number is present in the inline box, add it after marking as shipped
|
||||||
|
if (trackingNumber && trackingNumber.trim()) {
|
||||||
|
await handleAddTrackingNumber(trackingNumber.trim());
|
||||||
|
setTrackingNumber("");
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new Error(response.error || "Failed to mark order as shipped");
|
throw new Error(response.error || "Failed to mark order as shipped");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user