Skip to content

Commit 279949f

Browse files
Merge pull request #401 from sujitha-kotyada/fix/order-status-consistency
fix(order): standardize initial order status across admin and frontend
2 parents a19907d + a6a8089 commit 279949f

2 files changed

Lines changed: 22 additions & 8 deletions

File tree

admin/src/pages/Order.jsx

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function Order() {
5454
// Get unique status values for filter
5555
const statusOptions = [
5656
"All",
57-
"Order Placed",
57+
"Placed",
5858
"Packing",
5959
"Shipped",
6060
"Out for delivery",
@@ -65,11 +65,17 @@ function Order() {
6565
const filteredOrders =
6666
filterStatus === "All"
6767
? orders
68-
: orders.filter((order) => order.status === filterStatus);
68+
: orders.filter((order) => {
69+
if (filterStatus === "Placed") {
70+
return order.status === "Placed" || order.status === "Order Placed";
71+
}
72+
return order.status === filterStatus;
73+
});
6974

7075
// Status color mapping
7176
const statusColors = {
72-
"Order Placed": "bg-blue-500",
77+
Placed: "bg-blue-500",
78+
"Order Placed": "bg-blue-500", // backward compatibility for legacy records
7379
Packing: "bg-amber-500",
7480
Shipped: "bg-indigo-500",
7581
"Out for delivery": "bg-purple-500",
@@ -263,7 +269,9 @@ function Order() {
263269
statusColors[order.status] || "bg-slate-600"
264270
} text-white`}
265271
>
266-
{order.status}
272+
{order.status === "Order Placed"
273+
? "Placed"
274+
: order.status}
267275
</span>
268276
</div>
269277

@@ -272,11 +280,15 @@ function Order() {
272280
Update Status
273281
</label>
274282
<select
275-
value={order.status}
283+
value={
284+
order.status === "Order Placed"
285+
? "Placed"
286+
: order.status
287+
}
276288
onChange={(e) => statusHandler(e, order._id)}
277289
className="w-full bg-slate-700/40 border border-slate-600 rounded-lg px-4 py-2 text-lg focus:outline-none focus:ring-2 focus:ring-cyan-500 focus:border-transparent transition-all cursor-pointer"
278290
>
279-
<option value="Order Placed">Order Placed</option>
291+
<option value="Placed">Placed</option>
280292
<option value="Packing">Packing</option>
281293
<option value="Shipped">Shipped</option>
282294
<option value="Out for delivery">

frontend/src/pages/Order.jsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ function Order() {
9797

9898
const statusSteps = [
9999
{
100-
name: 'Order Placed',
100+
name: 'Placed',
101101
icon: FaShoppingBag,
102102
color: 'from-blue-500 to-cyan-500',
103103
},
@@ -331,7 +331,9 @@ function Order() {
331331
<span
332332
className={`font-medium ${getStatusColor(item.status)}`}
333333
>
334-
{item.status || 'Processing'}
334+
{item.status === 'Order Placed'
335+
? 'Placed'
336+
: item.status || 'Processing'}
335337
</span>
336338
</div>
337339
<div className="flex items-center gap-2 text-sm text-slate-500 dark:text-gray-400">

0 commit comments

Comments
 (0)