Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Admin panel - remove summary in order list (new statistic reports will be added)

KrzysztofPajak273675ad7d1d
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/List.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/List.cshtml
index d2cfb68bb..5e806cde4 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/List.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/List.cshtml
@@ -250,15 +250,6 @@
}
}
},
- requestEnd: function (e) {
- if (e.type == "read") {
- var response = e.response;
- if (response) {
- //store extra data
- reportAggregates = e.response["ExtraData"];
- }
- }
- },
error: function (e) {
display_kendoui_grid_error(e);
// Cancel the changes
@@ -362,12 +353,7 @@
width: 150,
template: '#=OrderTotal#',
headerAttributes: { style: "text-align:right" },
- attributes: { style: "text-align:right" },
- footerTemplate: '<div><strong>@Loc["Admin.Orders.Report.Summary"]:</strong></div>' +
- '<div>@Loc["Admin.Orders.Report.Profit"]: <span class=\"pull-right\" id=\"aggregator-profit-block\"></span></div>' +
- '<div>@Loc["Admin.Orders.Report.Shipping"]: <span class=\"pull-right\" id=\"aggregator-shipping-block\"></span></div>' +
- '<div>@Loc["Admin.Orders.Report.Tax"]: <span class=\"pull-right\" id=\"aggregator-tax-block\"></span></div>' +
- '<div>@Loc["Admin.Orders.Report.Total"]: <span class=\"pull-right\" id=\"aggregator-total-block\"></span></div>'
+ attributes: { style: "text-align:right" },
},</text>
}
]
@@ -378,7 +364,6 @@
<script>
var selectedIds = [];
- var reportAggregates = "";
$(document).ready(function () {
@@ -529,15 +514,6 @@
updateMasterCheckbox();
- //update order totals summary
- if (reportAggregates != "") {
- for (var key in reportAggregates) {
- $('#aggregator-profit-block').text(reportAggregates['aggregatorprofit']);
- $('#aggregator-shipping-block').text(reportAggregates['aggregatorshipping']);
- $('#aggregator-tax-block').text(reportAggregates['aggregatortax']);
- $('#aggregator-total-block').text(reportAggregates['aggregatortotal']);
- }
- }
}
function updateMasterCheckbox() {
@@ -548,7 +524,6 @@
</script>
</form>
<form asp-area="@Constants.AreaAdmin" asp-controller="Order" asp-action="ExportXmlSelected" method="post" id="export-xml-selected-form">
-
<input type="hidden" id="selectedIds" name="selectedIds" value="" />
</form>
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs
index b529826fa..b8699cd5d 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs
@@ -789,7 +789,7 @@ namespace Grand.Web.Admin.Controllers
if (_workContext.CurrentVendor != null)
model.VendorId = _workContext.CurrentVendor.Id;
- var (orderModels, aggregator, totalCount) = await orderViewModelService.PrepareOrderModel(model, command.Page, command.PageSize);
+ var (orderModels, totalCount) = await orderViewModelService.PrepareOrderModel(model, command.Page, command.PageSize);
var gridModel = new DataSourceResult
{
Data = orderModels.ToList(),
diff --git a/src/Web/Grand.Web.Admin/Controllers/OrderController.cs b/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
index 41f5c6b06..a5b385d18 100644
--- a/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
@@ -143,12 +143,11 @@ namespace Grand.Web.Admin.Controllers
model.StoreId = _workContext.CurrentCustomer.StaffStoreId;
}
- var (orderModels, aggreratorModel, totalCount) = await _orderViewModelService.PrepareOrderModel(model, command.Page, command.PageSize);
+ var (orderModels, totalCount) = await _orderViewModelService.PrepareOrderModel(model, command.Page, command.PageSize);
var gridModel = new DataSourceResult
{
Data = orderModels.ToList(),
- ExtraData = aggreratorModel,
Total = totalCount
};
return Json(gridModel);
diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductController.cs
index 880fcc579..f8b2ed1a3 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ProductController.cs
@@ -1286,7 +1286,7 @@ namespace Grand.Web.Admin.Controllers
if (_workContext.CurrentVendor != null)
model.VendorId = _workContext.CurrentVendor.Id;
- var (orderModels, aggregator, totalCount) = await orderViewModelService.PrepareOrderModel(model, command.Page, command.PageSize);
+ var (orderModels, totalCount) = await orderViewModelService.PrepareOrderModel(model, command.Page, command.PageSize);
var gridModel = new DataSourceResult
{
Data = orderModels.ToList(),
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IOrderViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IOrderViewModelService.cs
index fcde29754..20fef5fe0 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IOrderViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IOrderViewModelService.cs
@@ -12,7 +12,7 @@ namespace Grand.Web.Admin.Interfaces
public interface IOrderViewModelService
{
Task<OrderListModel> PrepareOrderListModel(int? orderStatusId = null, int? paymentStatusId = null, int? shippingStatusId = null, DateTime? startDate = null, string storeId = null, string code = null);
- Task<(IEnumerable<OrderModel> orderModels, OrderAggreratorModel aggreratorModel, int totalCount)> PrepareOrderModel(OrderListModel model, int pageIndex, int pageSize);
+ Task<(IEnumerable<OrderModel> orderModels, int totalCount)> PrepareOrderModel(OrderListModel model, int pageIndex, int pageSize);
Task PrepareOrderDetailsModel(OrderModel model, Order order);
Task<OrderModel.AddOrderProductModel> PrepareAddOrderProductModel(Order order);
Task<OrderModel.AddOrderProductModel.ProductDetailsModel> PrepareAddProductToOrderModel(Order order, string productId);
diff --git a/src/Web/Grand.Web.Admin/Models/Orders/OrderModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/OrderModel.cs
index b912d006d..ff3bdf815 100644
--- a/src/Web/Grand.Web.Admin/Models/Orders/OrderModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Orders/OrderModel.cs
@@ -451,14 +451,4 @@ namespace Grand.Web.Admin.Models.Orders
#endregion
}
-
-
- public partial class OrderAggreratorModel : BaseModel
- {
- //aggergator properties
- public string aggregatorprofit { get; set; }
- public string aggregatorshipping { get; set; }
- public string aggregatortax { get; set; }
- public string aggregatortotal { get; set; }
- }
}
diff --git a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
index 7e900ba74..8a0c75c9d 100644
--- a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
@@ -280,7 +280,7 @@ namespace Grand.Web.Admin.Services
return model;
}
- public virtual async Task<(IEnumerable<OrderModel> orderModels, OrderAggreratorModel aggreratorModel, int totalCount)> PrepareOrderModel(OrderListModel model, int pageIndex, int pageSize)
+ public virtual async Task<(IEnumerable<OrderModel> orderModels, int totalCount)> PrepareOrderModel(OrderListModel model, int pageIndex, int pageSize)
{
DateTime? startDateValue = (model.StartDate == null) ? null
: (DateTime?)_dateTimeService.ConvertToUtcTime(model.StartDate.Value, _dateTimeService.CurrentTimeZone);
@@ -323,52 +323,11 @@ namespace Grand.Web.Admin.Services
pageSize: pageSize,
orderTagId: model.OrderTag);
- //summary report
- //currently we do not support productId and warehouseId parameters for this report
- var reportSummary = await _orderReportService.GetOrderAverageReportLine(
- storeId: model.StoreId,
- customerId: model.CustomerId,
- vendorId: model.VendorId,
- salesEmployeeId: salesEmployeeId,
- orderId: "",
- paymentMethodSystemName: model.PaymentMethodSystemName,
- os: orderStatus,
- ps: paymentStatus,
- ss: shippingStatus,
- startTimeUtc: startDateValue,
- endTimeUtc: endDateValue,
- billingEmail: model.BillingEmail,
- billingLastName: model.BillingLastName,
- billingCountryId: model.BillingCountryId,
- tagid: model.OrderTag
- );
- var profit = await _orderReportService.ProfitReport(
- storeId: model.StoreId,
- vendorId: model.VendorId,
- salesEmployeeId: salesEmployeeId,
- paymentMethodSystemName: model.PaymentMethodSystemName,
- os: orderStatus,
- ps: paymentStatus,
- ss: shippingStatus,
- startTimeUtc: startDateValue,
- endTimeUtc: endDateValue,
- billingEmail: model.BillingEmail,
- billingLastName: model.BillingLastName,
- billingCountryId: model.BillingCountryId,
- tagid: model.OrderTag
- );
-
+
var primaryStoreCurrency = await _currencyService.GetCurrencyById(_currencySettings.PrimaryStoreCurrencyId);
if (primaryStoreCurrency == null)
throw new Exception("Cannot load primary store currency");
- var aggregate = new OrderAggreratorModel
- {
- aggregatorprofit = _priceFormatter.FormatPrice(profit, false),
- aggregatorshipping = _priceFormatter.FormatShippingPrice(reportSummary.SumShippingExclTax, primaryStoreCurrency, _workContext.WorkingLanguage, false),
- aggregatortax = _priceFormatter.FormatPrice(reportSummary.SumTax, false),
- aggregatortotal = _priceFormatter.FormatPrice(reportSummary.SumOrders, false)
- };
var status = await _orderStatusService.GetAll();
var items = new List<OrderModel>();
foreach (var x in orders)
@@ -402,7 +361,7 @@ namespace Grand.Web.Admin.Services
CreatedOn = _dateTimeService.ConvertToUserTime(x.CreatedOnUtc, DateTimeKind.Utc)
});
}
- return (items, aggregate, orders.TotalCount);
+ return (items, orders.TotalCount);
}
diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
index 2d4733431..3f56d1459 100644
--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
@@ -9475,21 +9475,6 @@
<Resource Name="Admin.Orders.ProductTags.Fields.OrderCount">
<Value>Tagged orders</Value>
</Resource>
- <Resource Name="Admin.Orders.Report.Profit">
- <Value>Profit</Value>
- </Resource>
- <Resource Name="Admin.Orders.Report.Shipping">
- <Value>Shipping</Value>
- </Resource>
- <Resource Name="Admin.Orders.Report.Summary">
- <Value>Summary</Value>
- </Resource>
- <Resource Name="Admin.Orders.Report.Tax">
- <Value>Tax</Value>
- </Resource>
- <Resource Name="Admin.Orders.Report.Total">
- <Value>Total</Value>
- </Resource>
<Resource Name="Admin.Orders.Shipments">
<Value>Shipments</Value>
</Resource>