Add CustomerCompany to OrderList

This commit is contained in:
Loretta 2025-10-23 21:17:37 +02:00
parent d82d7a6aee
commit 9601707396
4 changed files with 854 additions and 849 deletions

View File

@ -384,10 +384,10 @@
Width = "150"
});
}
gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModel.CustomerEmail))
gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModelExtended.CustomerCompany))
{
Title = T("Admin.Orders.Fields.Customer").Text,
Render = new RenderCustom("renderColumnCustomer")
//Render = new RenderCustom("renderColumnCustomer")
});
gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModel.StoreName))
{
@ -450,7 +450,7 @@
console.log("Hello World 2");
var link = '@Url.Content("~/Admin/Customer/Edit/")' + row.CustomerId;
var textRenderer = $.fn.dataTable.render.text().display;
return `${textRenderer(row.CustomerFullName)} <br /><a href="${link}">${data}</a > `;
return `${textRenderer(row.Company)} <br /><a href="${link}">${data}</a > `;
}
function renderColumnIsMeasurable(data, type, row, meta) {

View File

@ -171,6 +171,8 @@ namespace Nop.Plugin.Misc.FruitBankPlugin.Factories
orderModelExtended.IsMeasurable = orderDto.IsMeasurable;
orderModelExtended.DateOfReceipt = orderDto.DateOfReceipt;
orderModelExtended.CustomerCompany = orderDto.Customer.Company;
//orderModelExtended.IsMeasurable = await ShouldMarkAsNeedsMeasurementAsync(orderModel);
//orderModelExtended.DateOfReceipt = await GetPickupDateTimeAsync(orderModel);

View File

@ -5,5 +5,6 @@ namespace Nop.Plugin.Misc.FruitBankPlugin.Models.Orders;
public interface IOrderModelExtended : IMgOrderModelExtended, IMeasurable, IMeasured
{
public DateTime? DateOfReceipt { get; set; }
DateTime? DateOfReceipt { get; set; }
string CustomerCompany { get; set; }
}

View File

@ -7,6 +7,8 @@ namespace Nop.Plugin.Misc.FruitBankPlugin.Models.Orders
public bool IsMeasured { get; set; }
public bool IsMeasurable { get; set; }
public DateTime? DateOfReceipt { get; set; }
public string CustomerCompany { get; set; }
}
}