Adam
/
Mango.Nop.Plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

This commit is contained in:
Adam 2025-10-18 18:35:45 +02:00
parent 8aa84f1e79
commit 192904558d
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/List.cshtml
View File

@ -3,6 +3,7 @@
@inject IStoreService storeService @inject IStoreService storeService
@using FruitBank.Common.Interfaces @using FruitBank.Common.Interfaces
@using Nop.Plugin.Misc.FruitBankPlugin.Models @using Nop.Plugin.Misc.FruitBankPlugin.Models
@using Nop.Plugin.Misc.FruitBankPlugin.Models.Orders
@using Nop.Services.Stores @using Nop.Services.Stores
@using Nop.Web.Areas.Admin.Components @using Nop.Web.Areas.Admin.Components
@using Nop.Web.Areas.Admin.Models.Orders @using Nop.Web.Areas.Admin.Models.Orders
@ -344,13 +345,13 @@
Width = "80" Width = "80"
} }
}; };
gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModelExtended.IsMeasurable)) gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModelExtended.IsMeasured))
{ {
Title = T("Admin.Orders.Fields.ToBeMeasured").Text, Title = T("Admin.Orders.Fields.IsMeasured").Text,
Width = "100", Width = "100",
Render = new RenderCustom("renderColumnIsMeasurable"), Render = new RenderCustom("renderColumnIsMeasurable"),
ClassName = NopColumnClassDefaults.CenterAll ClassName = NopColumnClassDefaults.CenterAll
}); });
gridModel.ColumnCollection.Add(new ColumnProperty(nameof(IOrderDto.DateOfReceipt)) gridModel.ColumnCollection.Add(new ColumnProperty(nameof(IOrderDto.DateOfReceipt))
{ {
Title = T("Admin.Orders.Fields.PickupDate").Text, Title = T("Admin.Orders.Fields.PickupDate").Text,
@ -460,8 +461,24 @@
} }
function renderColumnPickupDateAndTime(data, type, row, meta) { 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() { $(function() {