Order edit saját kézben

Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/Edit.cshtml

@@ -3,7 +3,7 @@
 
 @{
     //page title
-    ViewBag.PageTitle = T("Admin.Orders.EditOrderDetails").Text + "ANYÁD";
+    ViewBag.PageTitle = T("Admin.Orders.EditOrderDetails").Text;
     //active menu item (system name)
     NopHtml.SetActiveMenuItemSystemName("Orders");
 }
@@ -65,13 +65,13 @@
 
                     <nop-cards id="order-cards">
                         @await Component.InvokeAsync(typeof(AdminWidgetViewComponent), new { widgetZone = AdminWidgetZones.OrderDetailsBlock, additionalData = Model })
-                        <nop-card asp-name="order-info" asp-icon="fas fa-info" asp-title="@T("Admin.Orders.Info")" asp-hide-block-attribute-name="@hideInfoBlockAttributeName" asp-hide="@hideInfoBlock" asp-advanced="false">@await Html.PartialAsync("_OrderDetails.Info", Model)</nop-card>
+                    <nop-card asp-name="order-info" asp-icon="fas fa-info" asp-title="@T("Admin.Orders.Info")" asp-hide-block-attribute-name="@hideInfoBlockAttributeName" asp-hide="@hideInfoBlock" asp-advanced="false">@await Html.PartialAsync("~/Areas/Admin/Views/Order/_OrderDetails.Info.cshtml", Model)</nop-card>
-                        <nop-card asp-name="order-billing-shipping" asp-icon="fas fa-truck" asp-title="@T("Admin.Orders.BillingShippingInfo")" asp-hide-block-attribute-name="@hideBillingAndShippingBlockAttributeName" asp-hide="@hideBillingAndShippingBlock" asp-advanced="false">@await Html.PartialAsync("_OrderDetails.BillingShipping", Model)</nop-card>
+                    <nop-card asp-name="order-billing-shipping" asp-icon="fas fa-truck" asp-title="@T("Admin.Orders.BillingShippingInfo")" asp-hide-block-attribute-name="@hideBillingAndShippingBlockAttributeName" asp-hide="@hideBillingAndShippingBlock" asp-advanced="false">@await Html.PartialAsync("~/Areas/Admin/Views/Order/_OrderDetails.BillingShipping.cshtml", Model)</nop-card>
                     <nop-card asp-name="order-products" asp-icon="fas fa-table-list" asp-title="@T("Admin.Orders.Products")" asp-hide-block-attribute-name="@hideProductsBlockAttributeName" asp-hide="@hideProductsBlock" asp-advanced="true">@await Html.PartialAsync("~/Plugins/Misc.FruitBankPlugin/Areas/Admin/Views/Order/_CustomOrderDetails.Products.cshtml", Model)</nop-card>
 
                         @if (!Model.IsLoggedInAsVendor)
                         {
-                            <nop-card asp-name="order-notes" asp-icon="far fa-sticky-note" asp-title="@T("Admin.Orders.OrderNotes")" asp-hide-block-attribute-name="@hideNotesBlockAttributeName" asp-hide="@hideNotesBlock" asp-advanced="true">@await Html.PartialAsync("_OrderDetails.Notes", Model)</nop-card>
+                        <nop-card asp-name="order-notes" asp-icon="far fa-sticky-note" asp-title="@T("Admin.Orders.OrderNotes")" asp-hide-block-attribute-name="@hideNotesBlockAttributeName" asp-hide="@hideNotesBlock" asp-advanced="true">@await Html.PartialAsync("~/Areas/Admin/Views/Order/_OrderDetails.Notes.cshtml", Model)</nop-card>
                         }
 
                     </nop-cards>

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

@@ -345,6 +345,11 @@
 														Width = "80"
 														}
 														};
+									gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModelExtended.CustomerCompany))
+									{
+										Title = T("Admin.Orders.Fields.Customer").Text,
+										//Render = new RenderCustom("renderColumnCustomer")
+									});
 									gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModelExtended.IsMeasurable))
 									{
 										Title = T("Admin.Orders.Fields.IsMeasurable").Text,
@@ -393,11 +398,7 @@
 											Width = "150"
 										});
 									}
-									gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModelExtended.CustomerCompany))
+									
-									{
-										Title = T("Admin.Orders.Fields.Customer").Text,
-										//Render = new RenderCustom("renderColumnCustomer")
-									});
 									gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModel.StoreName))
 									{
 										Title = T("Admin.Orders.Fields.Store").Text,

Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Product/List.cshtml

@@ -23,15 +23,15 @@
 				Fruitbank @T("Admin.Catalog.Products")
 			</h1>
 			<div class="float-right">
-				<a asp-action="Create" class="btn btn-primary">
+				<a asp-controller="Product" asp-action="Create" class="btn btn-primary">
 					<i class="fas fa-square-plus"></i>
 					@T("Admin.Common.AddNew")
 				</a>
-				<a asp-action="BulkEdit" class="btn btn-info">
+				<a asp-controller="Product" asp-action="BulkEdit" class="btn btn-info">
 					<i class="fas fa-pen"></i>
 					@T("Admin.Catalog.Products.BulkEdit")
 				</a>
-				<button asp-action="DownloadCatalogPDF" type="submit" name="download-catalog-pdf" class="btn bg-purple">
+				<button asp-controller="Product" asp-action="DownloadCatalogPDF" type="submit" name="download-catalog-pdf" class="btn bg-purple">
 					<i class="far fa-file-pdf"></i>
 					@T("Admin.Catalog.Products.List.DownloadPDF")
 				</button>
@@ -47,7 +47,7 @@
 					<ul class="dropdown-menu" role="menu">
 						<li class="dropdown-item">
 
-							<button asp-action="ExportToXml" type="submit" name="exportxml-all">
+							<button asp-controller="Product" asp-action="ExportToXml" type="submit" name="exportxml-all">
 								<i class="far fa-file-code"></i>
 								@T("Admin.Common.ExportToXml.All")
 							</button>
@@ -61,7 +61,7 @@
 						</li>
 						<li class="dropdown-divider"></li>
 						<li class="dropdown-item">
-							<button asp-action="ExportToExcel" type="submit" name="exportexcel-all">
+							<button asp-controller="Product" asp-action="ExportToExcel" type="submit" name="exportexcel-all">
 								<i class="far fa-file-excel"></i>
 								@T("Admin.Common.ExportToExcel.All")
 							</button>

Nop.Plugin.Misc.AIPlugin/Infrastructure/RouteProvider.cs

@@ -141,10 +141,15 @@ public class RouteProvider : IRouteProvider
             name: "Plugin.FruitBank.Admin.Invoice.CreateInvoice",
             pattern: "Admin/Invoice/CreateInvoice",
             defaults: new { controller = "Invoice", action = "CreateInvoice", area = AreaNames.ADMIN });
+
+        endpointRouteBuilder.MapControllerRoute(
+            name: "Plugin.FruitBank.Admin.Order.Edit",
+            pattern: "Admin/Order/Edit/{id}",
+            defaults: new { controller = "CustomOrder", action = "Edit", area = AreaNames.ADMIN });
     }
 
     /// <summary>
     /// Gets a priority of route provider
     /// </summary>
-    public int Priority => 3000;
+    public int Priority => 4000;
 }