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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -174,7 +174,7 @@
</script> </script>
</div> </div>
</div> </div>
<div class="form-group row" @(Model.IsLoggedInAsVendor ? Html.Raw("style='display: none;'") : null)> <div class="form-group row" @(Model.IsLoggedInAsVendor? Html.Raw("style='display: none;'") : null)>
<div class="col-md-4"> <div class="col-md-4">
<nop-label asp-for="OrderStatusIds" /> <nop-label asp-for="OrderStatusIds" />
</div> </div>
@ -190,7 +190,7 @@
<nop-select asp-for="PaymentStatusIds" asp-items="Model.AvailablePaymentStatuses" asp-multiple="true" /> <nop-select asp-for="PaymentStatusIds" asp-items="Model.AvailablePaymentStatuses" asp-multiple="true" />
</div> </div>
</div> </div>
<div class="form-group row" @(Model.IsLoggedInAsVendor ? Html.Raw("style='display: none;'") : null)> <div class="form-group row" @(Model.IsLoggedInAsVendor? Html.Raw("style='display: none;'") : null)>
<div class="col-md-4"> <div class="col-md-4">
<nop-label asp-for="ShippingStatusIds" /> <nop-label asp-for="ShippingStatusIds" />
</div> </div>
@ -200,7 +200,7 @@
</div> </div>
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
<div class="form-group row" @(Model.HideStoresList ? Html.Raw("style=\"display:none\"") : null)> <div class="form-group row" @(Model.HideStoresList? Html.Raw("style=\"display:none\"") : null)>
<div class="col-md-4"> <div class="col-md-4">
<nop-label asp-for="StoreId" /> <nop-label asp-for="StoreId" />
</div> </div>
@ -384,10 +384,10 @@
Width = "150" 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, Title = T("Admin.Orders.Fields.Customer").Text,
Render = new RenderCustom("renderColumnCustomer") //Render = new RenderCustom("renderColumnCustomer")
}); });
gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModel.StoreName)) gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModel.StoreName))
{ {
@ -450,7 +450,7 @@
console.log("Hello World 2"); console.log("Hello World 2");
var link = '@Url.Content("~/Admin/Customer/Edit/")' + row.CustomerId; var link = '@Url.Content("~/Admin/Customer/Edit/")' + row.CustomerId;
var textRenderer = $.fn.dataTable.render.text().display; 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) { function renderColumnIsMeasurable(data, type, row, meta) {

2
Nop.Plugin.Misc.AIPlugin/Factories/CustomOrderModelFactory.cs
View File

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

3
Nop.Plugin.Misc.AIPlugin/Models/Orders/IOrderModelExtended.cs
View File

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

2
Nop.Plugin.Misc.AIPlugin/Models/Orders/OrderModelExtended.cs
View File

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