diff --git a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/List.cshtml b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/List.cshtml
index cdf1a37..5784df9 100644
--- a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/List.cshtml
+++ b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/List.cshtml
@@ -3,6 +3,7 @@
 @inject IStoreService storeService
 @using FruitBank.Common.Interfaces
 @using Nop.Plugin.Misc.FruitBankPlugin.Models
+@using Nop.Plugin.Misc.FruitBankPlugin.Models.Orders
 @using Nop.Services.Stores
 @using Nop.Web.Areas.Admin.Components
 @using Nop.Web.Areas.Admin.Models.Orders
@@ -344,13 +345,13 @@
                             Width = "80"
                             }
                             };
-                                    gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModelExtended.IsMeasurable))
-                    {
-                                        Title = T("Admin.Orders.Fields.ToBeMeasured").Text,
-                        Width = "100",
-                        Render = new RenderCustom("renderColumnIsMeasurable"),
-                        ClassName = NopColumnClassDefaults.CenterAll
-                    });
+                                    gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModelExtended.IsMeasured))
+                                    {
+                                        Title = T("Admin.Orders.Fields.IsMeasured").Text,
+                                        Width = "100",
+                                        Render = new RenderCustom("renderColumnIsMeasurable"),
+                                        ClassName = NopColumnClassDefaults.CenterAll
+                                    });
                                     gridModel.ColumnCollection.Add(new ColumnProperty(nameof(IOrderDto.DateOfReceipt))
                                     {
                                         Title = T("Admin.Orders.Fields.PickupDate").Text,
@@ -460,8 +461,24 @@
                                     }
 
                                     function renderColumnPickupDateAndTime(data, type, row, meta) {
+                                        if (!data) return '<span>-</span>';
 
-                                        return `<span>${data}</span>`;
+                                        const date = new Date(data);
+
+                                        // Format: "Oct 18, 2025, Friday 14:30"
+                                        const options = {
+                                            year: 'numeric',
+                                            month: 'short',
+                                            day: 'numeric',
+                                            weekday: 'long',
+                                            hour: '2-digit',
+                                            minute: '2-digit',
+                                            hour12: false // Use true for 12-hour format with AM/PM
+                                        };
+
+                                        const formatted = date.toLocaleString('en-US', options);
+
+                                        return `<span>${formatted}</span>`;
                                     }
 
                                     $(function() {