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 - Minor refactoring - IProductViewModelService

KrzysztofPajake37d686bea7c
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IProductViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IProductViewModelService.cs
index d74b3886f..5d82e78df 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IProductViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IProductViewModelService.cs
@@ -24,14 +24,7 @@ namespace Grand.Web.Admin.Interfaces
Task DeleteProduct(Product product);
Task DeleteSelected(IList<string> selectedIds);
Task<ProductModel.AddRequiredProductModel> PrepareAddRequiredProductModel();
- Task<(IList<ProductModel> products, int totalCount)> PrepareProductModel(ProductModel.AddRequiredProductModel model, int pageIndex, int pageSize);
- Task<(IList<ProductModel> products, int totalCount)> PrepareProductModel(ProductModel.AddRelatedProductModel model, int pageIndex, int pageSize);
- Task<(IList<ProductModel> products, int totalCount)> PrepareProductModel(ProductModel.AddSimilarProductModel model, int pageIndex, int pageSize);
- Task<(IList<ProductModel> products, int totalCount)> PrepareProductModel(ProductModel.AddBundleProductModel model, int pageIndex, int pageSize);
- Task<(IList<ProductModel> products, int totalCount)> PrepareProductModel(ProductModel.AddCrossSellProductModel model, int pageIndex, int pageSize);
- Task<(IList<ProductModel> products, int totalCount)> PrepareProductModel(ProductModel.AddRecommendedProductModel model, int pageIndex, int pageSize);
- Task<(IList<ProductModel> products, int totalCount)> PrepareProductModel(ProductModel.AddAssociatedProductModel model, int pageIndex, int pageSize);
- Task<(IList<ProductModel> products, int totalCount)> PrepareProductModel(ProductModel.ProductAttributeValueModel.AssociateProductToAttributeValueModel model, int pageIndex, int pageSize);
+ Task<(IList<ProductModel> products, int totalCount)> PrepareProductModel(ProductModel.AddProductModel model, int pageIndex, int pageSize);
Task<IList<ProductModel.ProductCategoryModel>> PrepareProductCategoryModel(Product product);
Task InsertProductCategoryModel(ProductModel.ProductCategoryModel model);
Task UpdateProductCategoryModel(ProductModel.ProductCategoryModel model);
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs
index 8ddaf82b3..c009cd0ff 100644
--- a/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs
@@ -415,9 +415,9 @@ namespace Grand.Web.Admin.Models.Catalog
#region Nested classes
- public partial class AddRequiredProductModel : BaseModel
+ public partial class AddProductModel : BaseModel
{
- public AddRequiredProductModel()
+ public AddProductModel()
{
AvailableStores = new List<SelectListItem>();
AvailableVendors = new List<SelectListItem>();
@@ -451,6 +451,12 @@ namespace Grand.Web.Admin.Models.Catalog
public bool IsLoggedInAsVendor { get; set; }
}
+
+ public partial class AddRequiredProductModel : AddProductModel
+ {
+
+ }
+
public partial class AddProductSpecificationAttributeModel : BaseModel
{
public AddProductSpecificationAttributeModel()
@@ -569,44 +575,10 @@ namespace Grand.Web.Admin.Models.Catalog
[GrandResourceDisplayName("Admin.Catalog.Products.RelatedProducts.Fields.DisplayOrder")]
public int DisplayOrder { get; set; }
}
- public partial class AddRelatedProductModel : BaseModel
+ public partial class AddRelatedProductModel : AddProductModel
{
- public AddRelatedProductModel()
- {
- AvailableStores = new List<SelectListItem>();
- AvailableVendors = new List<SelectListItem>();
- AvailableProductTypes = new List<SelectListItem>();
- }
-
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchProductName")]
-
- public string SearchProductName { get; set; }
- [UIHint("Category")]
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchCategory")]
- public string SearchCategoryId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.Brand")]
- [UIHint("Brand")]
- public string SearchBrandId { get; set; }
- [UIHint("Collection")]
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchCollection")]
- public string SearchCollectionId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchStore")]
- public string SearchStoreId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchVendor")]
- public string SearchVendorId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchProductType")]
- public int SearchProductTypeId { get; set; }
-
- public IList<SelectListItem> AvailableStores { get; set; }
- public IList<SelectListItem> AvailableVendors { get; set; }
- public IList<SelectListItem> AvailableProductTypes { get; set; }
-
public string ProductId { get; set; }
-
public string[] SelectedProductIds { get; set; }
-
- //vendor
- public bool IsLoggedInAsVendor { get; set; }
}
public partial class SimilarProductModel : BaseEntityModel
@@ -621,43 +593,11 @@ namespace Grand.Web.Admin.Models.Catalog
public int DisplayOrder { get; set; }
}
- public partial class AddSimilarProductModel : BaseModel
+ public partial class AddSimilarProductModel : AddProductModel
{
- public AddSimilarProductModel()
- {
- AvailableStores = new List<SelectListItem>();
- AvailableVendors = new List<SelectListItem>();
- AvailableProductTypes = new List<SelectListItem>();
- }
-
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchProductName")]
-
- public string SearchProductName { get; set; }
- [UIHint("Category")]
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchCategory")]
- public string SearchCategoryId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.Brand")]
- [UIHint("Brand")]
- public string SearchBrandId { get; set; }
- [UIHint("Collection")]
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchCollection")]
- public string SearchCollectionId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchStore")]
- public string SearchStoreId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchVendor")]
- public string SearchVendorId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchProductType")]
- public int SearchProductTypeId { get; set; }
- public IList<SelectListItem> AvailableStores { get; set; }
- public IList<SelectListItem> AvailableVendors { get; set; }
- public IList<SelectListItem> AvailableProductTypes { get; set; }
-
public string ProductId { get; set; }
public string[] SelectedProductIds { get; set; }
-
- //vendor
- public bool IsLoggedInAsVendor { get; set; }
}
public partial class BundleProductModel : BaseEntityModel
@@ -675,39 +615,11 @@ namespace Grand.Web.Admin.Models.Catalog
public int DisplayOrder { get; set; }
}
- public partial class AddBundleProductModel : BaseModel
+ public partial class AddBundleProductModel : AddProductModel
{
- public AddBundleProductModel()
- {
- AvailableStores = new List<SelectListItem>();
- AvailableVendors = new List<SelectListItem>();
- }
-
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchProductName")]
-
- public string SearchProductName { get; set; }
- [UIHint("Category")]
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchCategory")]
- public string SearchCategoryId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.Brand")]
- [UIHint("Brand")]
- public string SearchBrandId { get; set; }
- [UIHint("Collection")]
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchCollection")]
- public string SearchCollectionId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchStore")]
- public string SearchStoreId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchVendor")]
- public string SearchVendorId { get; set; }
- public IList<SelectListItem> AvailableStores { get; set; }
- public IList<SelectListItem> AvailableVendors { get; set; }
-
public string ProductId { get; set; }
public string[] SelectedProductIds { get; set; }
-
- //vendor
- public bool IsLoggedInAsVendor { get; set; }
}
public partial class AssociatedProductModel : BaseEntityModel
@@ -719,44 +631,11 @@ namespace Grand.Web.Admin.Models.Catalog
public int DisplayOrder { get; set; }
}
- public partial class AddAssociatedProductModel : BaseModel
+ public partial class AddAssociatedProductModel : AddProductModel
{
- public AddAssociatedProductModel()
- {
- AvailableStores = new List<SelectListItem>();
- AvailableVendors = new List<SelectListItem>();
- AvailableProductTypes = new List<SelectListItem>();
- }
-
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchProductName")]
-
- public string SearchProductName { get; set; }
- [UIHint("Category")]
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchCategory")]
- public string SearchCategoryId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.Brand")]
- [UIHint("Brand")]
- public string SearchBrandId { get; set; }
- [UIHint("Collection")]
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchCollection")]
- public string SearchCollectionId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchStore")]
- public string SearchStoreId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchVendor")]
- public string SearchVendorId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchProductType")]
- public int SearchProductTypeId { get; set; }
-
- public IList<SelectListItem> AvailableStores { get; set; }
- public IList<SelectListItem> AvailableVendors { get; set; }
- public IList<SelectListItem> AvailableProductTypes { get; set; }
-
public string ProductId { get; set; }
public string[] SelectedProductIds { get; set; }
-
- //vendor
- public bool IsLoggedInAsVendor { get; set; }
}
public partial class CrossSellProductModel : BaseEntityModel
@@ -767,44 +646,11 @@ namespace Grand.Web.Admin.Models.Catalog
public string Product2Name { get; set; }
}
- public partial class AddCrossSellProductModel : BaseModel
+ public partial class AddCrossSellProductModel : AddProductModel
{
- public AddCrossSellProductModel()
- {
- AvailableStores = new List<SelectListItem>();
- AvailableVendors = new List<SelectListItem>();
- AvailableProductTypes = new List<SelectListItem>();
- }
-
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchProductName")]
-
- public string SearchProductName { get; set; }
- [UIHint("Category")]
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchCategory")]
- public string SearchCategoryId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.Brand")]
- [UIHint("Brand")]
- public string SearchBrandId { get; set; }
- [UIHint("Collection")]
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchCollection")]
- public string SearchCollectionId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchStore")]
- public string SearchStoreId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchVendor")]
- public string SearchVendorId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchProductType")]
- public int SearchProductTypeId { get; set; }
-
- public IList<SelectListItem> AvailableStores { get; set; }
- public IList<SelectListItem> AvailableVendors { get; set; }
- public IList<SelectListItem> AvailableProductTypes { get; set; }
-
public string ProductId { get; set; }
public string[] SelectedProductIds { get; set; }
-
- //vendor
- public bool IsLoggedInAsVendor { get; set; }
}
public partial class RecommendedProductModel : BaseEntityModel
@@ -814,44 +660,11 @@ namespace Grand.Web.Admin.Models.Catalog
[GrandResourceDisplayName("Admin.Catalog.Products.Recommended.Fields.Product")]
public string Product2Name { get; set; }
}
- public partial class AddRecommendedProductModel : BaseModel
+ public partial class AddRecommendedProductModel : AddProductModel
{
- public AddRecommendedProductModel()
- {
- AvailableStores = new List<SelectListItem>();
- AvailableVendors = new List<SelectListItem>();
- AvailableProductTypes = new List<SelectListItem>();
- }
-
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchProductName")]
-
- public string SearchProductName { get; set; }
- [UIHint("Category")]
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchCategory")]
- public string SearchCategoryId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.Brand")]
- [UIHint("Brand")]
- public string SearchBrandId { get; set; }
- [UIHint("Collection")]
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchCollection")]
- public string SearchCollectionId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchStore")]
- public string SearchStoreId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchVendor")]
- public string SearchVendorId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchProductType")]
- public int SearchProductTypeId { get; set; }
-
- public IList<SelectListItem> AvailableStores { get; set; }
- public IList<SelectListItem> AvailableVendors { get; set; }
- public IList<SelectListItem> AvailableProductTypes { get; set; }
-
public string ProductId { get; set; }
public string[] SelectedProductIds { get; set; }
-
- //vendor
- public bool IsLoggedInAsVendor { get; set; }
}
public partial class ProductPriceModel : BaseEntityModel
@@ -1149,42 +962,8 @@ namespace Grand.Web.Admin.Models.Catalog
#region Nested classes
- public partial class AssociateProductToAttributeValueModel : BaseModel
+ public partial class AssociateProductToAttributeValueModel : AddProductModel
{
- public AssociateProductToAttributeValueModel()
- {
- AvailableStores = new List<SelectListItem>();
- AvailableVendors = new List<SelectListItem>();
- AvailableProductTypes = new List<SelectListItem>();
- }
-
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchProductName")]
-
- public string SearchProductName { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchCategory")]
- [UIHint("Category")]
- public string SearchCategoryId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.Brand")]
- [UIHint("Brand")]
- public string SearchBrandId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchCollection")]
- [UIHint("Collection")]
- public string SearchCollectionId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchStore")]
- public string SearchStoreId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchVendor")]
- public string SearchVendorId { get; set; }
- [GrandResourceDisplayName("Admin.Catalog.Products.List.SearchProductType")]
- public int SearchProductTypeId { get; set; }
-
- public IList<SelectListItem> AvailableStores { get; set; }
- public IList<SelectListItem> AvailableVendors { get; set; }
- public IList<SelectListItem> AvailableProductTypes { get; set; }
-
- //vendor
- public bool IsLoggedInAsVendor { get; set; }
-
-
public string AssociatedToProductId { get; set; }
}
diff --git a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs
index aa00d67d1..15166c458 100644
--- a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs
@@ -1083,7 +1083,7 @@ namespace Grand.Web.Admin.Services
model.AvailableProductTypes.Insert(0, new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "0" });
return model;
}
- public virtual async Task<(IList<ProductModel> products, int totalCount)> PrepareProductModel(ProductModel.AddRequiredProductModel model, int pageIndex, int pageSize)
+ public virtual async Task<(IList<ProductModel> products, int totalCount)> PrepareProductModel(ProductModel.AddProductModel model, int pageIndex, int pageSize)
{
//a vendor should have access only to his products
if (_workContext.CurrentVendor != null)
@@ -1096,95 +1096,7 @@ namespace Grand.Web.Admin.Services
var products = await _productService.PrepareProductList(model.SearchCategoryId, model.SearchBrandId, model.SearchCollectionId, model.SearchStoreId, model.SearchVendorId, model.SearchProductTypeId, model.SearchProductName, pageIndex, pageSize);
return (products.Select(x => x.ToModel(_dateTimeService)).ToList(), products.TotalCount);
}
- public virtual async Task<(IList<ProductModel> products, int totalCount)> PrepareProductModel(ProductModel.AddRelatedProductModel model, int pageIndex, int pageSize)
- {
- if (_workContext.CurrentVendor != null)
- {
- model.SearchVendorId = _workContext.CurrentVendor.Id;
- }
- model.SearchStoreId = _workContext.CurrentCustomer.StaffStoreId;
-
- var products = await _productService.PrepareProductList(model.SearchCategoryId, model.SearchBrandId, model.SearchCollectionId, model.SearchStoreId, model.SearchVendorId, model.SearchProductTypeId, model.SearchProductName, pageIndex, pageSize);
- return (products.Select(x => x.ToModel(_dateTimeService)).ToList(), products.TotalCount);
- }
- public virtual async Task<(IList<ProductModel> products, int totalCount)> PrepareProductModel(ProductModel.AddSimilarProductModel model, int pageIndex, int pageSize)
- {
- if (_workContext.CurrentVendor != null)
- {
- model.SearchVendorId = _workContext.CurrentVendor.Id;
- }
- model.SearchStoreId = _workContext.CurrentCustomer.StaffStoreId;
-
- var products = await _productService.PrepareProductList(model.SearchCategoryId, model.SearchBrandId, model.SearchCollectionId, model.SearchStoreId, model.SearchVendorId, model.SearchProductTypeId, model.SearchProductName, pageIndex, pageSize);
- return (products.Select(x => x.ToModel(_dateTimeService)).ToList(), products.TotalCount);
- }
- public virtual async Task<(IList<ProductModel> products, int totalCount)> PrepareProductModel(ProductModel.AddBundleProductModel model, int pageIndex, int pageSize)
- {
- //a vendor should have access only to his products
- if (_workContext.CurrentVendor != null)
- {
- model.SearchVendorId = _workContext.CurrentVendor.Id;
- }
- //limit for store manager
- model.SearchStoreId = _workContext.CurrentCustomer.StaffStoreId;
-
- var products = await _productService.PrepareProductList(model.SearchCategoryId, model.SearchBrandId, model.SearchCollectionId, model.SearchStoreId, model.SearchVendorId, (int)ProductType.SimpleProduct, model.SearchProductName, pageIndex, pageSize);
- return (products.Select(x => x.ToModel(_dateTimeService)).ToList(), products.TotalCount);
- }
- public virtual async Task<(IList<ProductModel> products, int totalCount)> PrepareProductModel(ProductModel.AddCrossSellProductModel model, int pageIndex, int pageSize)
- {
- //a vendor should have access only to his products
- if (_workContext.CurrentVendor != null)
- {
- model.SearchVendorId = _workContext.CurrentVendor.Id;
- }
-
- //limit for store manager
- model.SearchStoreId = _workContext.CurrentCustomer.StaffStoreId;
-
- var products = await _productService.PrepareProductList(model.SearchCategoryId, model.SearchBrandId, model.SearchCollectionId, model.SearchStoreId, model.SearchVendorId, model.SearchProductTypeId, model.SearchProductName, pageIndex, pageSize);
- return (products.Select(x => x.ToModel(_dateTimeService)).ToList(), products.TotalCount);
- }
- public virtual async Task<(IList<ProductModel> products, int totalCount)> PrepareProductModel(ProductModel.AddRecommendedProductModel model, int pageIndex, int pageSize)
- {
- //a vendor should have access only to his products
- if (_workContext.CurrentVendor != null)
- {
- model.SearchVendorId = _workContext.CurrentVendor.Id;
- }
-
- //limit for store manager
- model.SearchStoreId = _workContext.CurrentCustomer.StaffStoreId;
-
- var products = await _productService.PrepareProductList(model.SearchCategoryId, model.SearchBrandId, model.SearchCollectionId, model.SearchStoreId, model.SearchVendorId, model.SearchProductTypeId, model.SearchProductName, pageIndex, pageSize);
- return (products.Select(x => x.ToModel(_dateTimeService)).ToList(), products.TotalCount);
- }
- public virtual async Task<(IList<ProductModel> products, int totalCount)> PrepareProductModel(ProductModel.AddAssociatedProductModel model, int pageIndex, int pageSize)
- {
- //a vendor should have access only to his products
- if (_workContext.CurrentVendor != null)
- {
- model.SearchVendorId = _workContext.CurrentVendor.Id;
- }
- //limit for store manager
- model.SearchStoreId = _workContext.CurrentCustomer.StaffStoreId;
-
- var products = await _productService.PrepareProductList(model.SearchCategoryId, model.SearchBrandId, model.SearchCollectionId, model.SearchStoreId, model.SearchVendorId, model.SearchProductTypeId, model.SearchProductName, pageIndex, pageSize);
- return (products.Select(x => x.ToModel(_dateTimeService)).ToList(), products.TotalCount);
- }
- public virtual async Task<(IList<ProductModel> products, int totalCount)> PrepareProductModel(ProductModel.ProductAttributeValueModel.AssociateProductToAttributeValueModel model, int pageIndex, int pageSize)
- {
- //a vendor should have access only to his products
- if (_workContext.CurrentVendor != null)
- {
- model.SearchVendorId = _workContext.CurrentVendor.Id;
- }
- //limit for store manager
- model.SearchStoreId = _workContext.CurrentCustomer.StaffStoreId;
-
- var products = await _productService.PrepareProductList(model.SearchCategoryId, model.SearchBrandId, model.SearchCollectionId, model.SearchStoreId, model.SearchVendorId, (int)ProductType.SimpleProduct, model.SearchProductName, pageIndex, pageSize);
- return (products.Select(x => x.ToModel(_dateTimeService)).ToList(), products.TotalCount);
- }
+
public virtual async Task<IList<ProductModel.ProductCategoryModel>> PrepareProductCategoryModel(Product product)
{
var productCategories = product.ProductCategories.OrderBy(x => x.DisplayOrder);